diff --git a/about.php b/about.php index e584631..573e88b 100644 --- a/about.php +++ b/about.php @@ -5,7 +5,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/action.php b/action.php index 162a891..db5b3c7 100644 --- a/action.php +++ b/action.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/admin.php b/admin.php index e5e619a..52aa542 100644 --- a/admin.php +++ b/admin.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/bin/automated_upgrade.php b/bin/automated_upgrade.php index f3e14d4..9c792d4 100644 --- a/bin/automated_upgrade.php +++ b/bin/automated_upgrade.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/bin/cleanup.php b/bin/cleanup.php index 6bc2b6e..8d1e015 100644 --- a/bin/cleanup.php +++ b/bin/cleanup.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/bin/expungeall.php b/bin/expungeall.php index d93ff26..76e18e7 100644 --- a/bin/expungeall.php +++ b/bin/expungeall.php @@ -6,7 +6,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/bin/recreateIndexes.php b/bin/recreateIndexes.php index 34748d3..7c1be23 100644 --- a/bin/recreateIndexes.php +++ b/bin/recreateIndexes.php @@ -5,7 +5,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/bin/scheduler.php b/bin/scheduler.php index a3b032c..894da4b 100644 --- a/bin/scheduler.php +++ b/bin/scheduler.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/bin/storageverification.php b/bin/storageverification.php index 6f407e8..135412a 100755 --- a/bin/storageverification.php +++ b/bin/storageverification.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/bin/upgrade/pre-upgrade-3.0b3.php b/bin/upgrade/pre-upgrade-3.0b3.php index 3f8a803..12eb6da 100644 --- a/bin/upgrade/pre-upgrade-3.0b3.php +++ b/bin/upgrade/pre-upgrade-3.0b3.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/bin/upgrade/upgrade-to-2.0.6.php b/bin/upgrade/upgrade-to-2.0.6.php index 0bf6a70..b73c4cd 100644 --- a/bin/upgrade/upgrade-to-2.0.6.php +++ b/bin/upgrade/upgrade-to-2.0.6.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/bin/win32/installScheduler.php b/bin/win32/installScheduler.php index 92dc9ab..b6d8c5e 100644 --- a/bin/win32/installScheduler.php +++ b/bin/win32/installScheduler.php @@ -5,7 +5,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/bin/win32/schedulerService.php b/bin/win32/schedulerService.php index f39e82e..e2403b4 100644 --- a/bin/win32/schedulerService.php +++ b/bin/win32/schedulerService.php @@ -5,7 +5,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/bin/win32/schedulerServiceStatus.php b/bin/win32/schedulerServiceStatus.php index e0fcbb4..351c676 100644 --- a/bin/win32/schedulerServiceStatus.php +++ b/bin/win32/schedulerServiceStatus.php @@ -5,7 +5,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/bin/win32/uninstallScheduler.php b/bin/win32/uninstallScheduler.php index f7fc099..a8ae6df 100644 --- a/bin/win32/uninstallScheduler.php +++ b/bin/win32/uninstallScheduler.php @@ -5,7 +5,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/browse.php b/browse.php index cd33291..0598e16 100755 --- a/browse.php +++ b/browse.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/config/dmsDefaults.php b/config/dmsDefaults.php index e40d743..1cbf86f 100644 --- a/config/dmsDefaults.php +++ b/config/dmsDefaults.php @@ -6,7 +6,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/config/siteMap.inc b/config/siteMap.inc index 288a9a8..c147844 100644 --- a/config/siteMap.inc +++ b/config/siteMap.inc @@ -6,7 +6,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/config/tableMappings.inc b/config/tableMappings.inc index 0247b33..d1d0707 100644 --- a/config/tableMappings.inc +++ b/config/tableMappings.inc @@ -6,7 +6,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/control.php b/control.php index a51014b..0ee42dd 100644 --- a/control.php +++ b/control.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/dashboard.php b/dashboard.php index 647c142..7addf36 100644 --- a/dashboard.php +++ b/dashboard.php @@ -8,7 +8,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/examples/fieldsynchronisation/syncFieldFromLDAP.php b/examples/fieldsynchronisation/syncFieldFromLDAP.php index fda6303..6b5804b 100644 --- a/examples/fieldsynchronisation/syncFieldFromLDAP.php +++ b/examples/fieldsynchronisation/syncFieldFromLDAP.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/help.php b/help.php index 9f9c354..d9066e8 100644 --- a/help.php +++ b/help.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/ktapi/KTAPIConstants.inc.php b/ktapi/KTAPIConstants.inc.php index 64a4ff5..1e8fe2e 100644 --- a/ktapi/KTAPIConstants.inc.php +++ b/ktapi/KTAPIConstants.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/ktapi/KTAPIDocument.inc.php b/ktapi/KTAPIDocument.inc.php index 770d4cc..72bcd70 100644 --- a/ktapi/KTAPIDocument.inc.php +++ b/ktapi/KTAPIDocument.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/ktapi/KTAPIFolder.inc.php b/ktapi/KTAPIFolder.inc.php index ca5c8a0..287a7a7 100644 --- a/ktapi/KTAPIFolder.inc.php +++ b/ktapi/KTAPIFolder.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/ktapi/KTAPISession.inc.php b/ktapi/KTAPISession.inc.php index 64e96e3..48a9a1a 100644 --- a/ktapi/KTAPISession.inc.php +++ b/ktapi/KTAPISession.inc.php @@ -5,7 +5,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/ktapi/ktapi.inc.php b/ktapi/ktapi.inc.php index abe5caf..6869283 100644 --- a/ktapi/ktapi.inc.php +++ b/ktapi/ktapi.inc.php @@ -6,7 +6,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/ktwebdav/index.php b/ktwebdav/index.php index df32c8c..cf01684 100644 --- a/ktwebdav/index.php +++ b/ktwebdav/index.php @@ -5,7 +5,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/ktwebdav/ktwebdav.php b/ktwebdav/ktwebdav.php index 74c0254..d9ac978 100644 --- a/ktwebdav/ktwebdav.php +++ b/ktwebdav/ktwebdav.php @@ -5,7 +5,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/ktwebdav/lib/KTWebDAVServer.inc.php b/ktwebdav/lib/KTWebDAVServer.inc.php index b804e07..8ccc134 100644 --- a/ktwebdav/lib/KTWebDAVServer.inc.php +++ b/ktwebdav/lib/KTWebDAVServer.inc.php @@ -5,7 +5,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/ktwebservice/KTDownloadManager.inc.php b/ktwebservice/KTDownloadManager.inc.php index 667a63c..f09c24f 100644 --- a/ktwebservice/KTDownloadManager.inc.php +++ b/ktwebservice/KTDownloadManager.inc.php @@ -8,7 +8,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/ktwebservice/KTUploadManager.inc.php b/ktwebservice/KTUploadManager.inc.php index 32dd4fd..d14c9d4 100644 --- a/ktwebservice/KTUploadManager.inc.php +++ b/ktwebservice/KTUploadManager.inc.php @@ -8,7 +8,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/ktwebservice/download.php b/ktwebservice/download.php index 72c04a9..bd9d359 100644 --- a/ktwebservice/download.php +++ b/ktwebservice/download.php @@ -6,7 +6,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/ktwebservice/download_cleanup.php b/ktwebservice/download_cleanup.php index ea713f9..d603c1b 100644 --- a/ktwebservice/download_cleanup.php +++ b/ktwebservice/download_cleanup.php @@ -8,7 +8,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/ktwebservice/index.php b/ktwebservice/index.php index 2157e0b..8f00a6d 100644 --- a/ktwebservice/index.php +++ b/ktwebservice/index.php @@ -8,7 +8,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/ktwebservice/upload.php b/ktwebservice/upload.php index 961c789..6ed508a 100644 --- a/ktwebservice/upload.php +++ b/ktwebservice/upload.php @@ -8,7 +8,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/ktwebservice/upload_cleanup.php b/ktwebservice/upload_cleanup.php index 4662c97..d0b8693 100644 --- a/ktwebservice/upload_cleanup.php +++ b/ktwebservice/upload_cleanup.php @@ -8,7 +8,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/ktwebservice/webservice.php b/ktwebservice/webservice.php index a80491c..ea07b48 100644 --- a/ktwebservice/webservice.php +++ b/ktwebservice/webservice.php @@ -8,7 +8,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/ktwsapi/delphi/examples/KTWSAPIExamples.dpr b/ktwsapi/delphi/examples/KTWSAPIExamples.dpr index abacfde..27531b9 100644 --- a/ktwsapi/delphi/examples/KTWSAPIExamples.dpr +++ b/ktwsapi/delphi/examples/KTWSAPIExamples.dpr @@ -1,55 +1,55 @@ -{ - Copyright (c) 2007, The Jam Warehouse Software (Pty) Ltd. - - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - i) Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - ii) Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - iii) Neither the name of the The Jam Warehouse Software (Pty) Ltd nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES ( INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ( INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -} - -{* - This is a Delphi port of the php api for KnowledgeTree WebService. - - @Author Bjarte Kalstveit Vebjørnsen - @Version 1.0 BKV 24.09.2007 Initial revision -*} - - -program KTWSAPIExamples; - -uses - Forms, - uFolderContentExample in 'uFolderContentExample.pas' {FolderContentExample}, - uwebservice in '..\uwebservice.pas', - uktwsapi in '..\uktwsapi.pas', - uPHPserialize in '..\uPHPserialize.pas'; - -{$R *.res} - -begin - Application.Initialize; - Application.CreateForm(TFolderContentExample, FolderContentExample); - Application.Run; -end. - +{ + Copyright (c) 2008, The Jam Warehouse Software (Pty) Ltd. + + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + i) Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + ii) Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + iii) Neither the name of the The Jam Warehouse Software (Pty) Ltd nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES ( INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ( INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +} + +{* + This is a Delphi port of the php api for KnowledgeTree WebService. + + @Author Bjarte Kalstveit Vebj�rnsen + @Version 1.0 BKV 24.09.2007 Initial revision +*} + + +program KTWSAPIExamples; + +uses + Forms, + uFolderContentExample in 'uFolderContentExample.pas' {FolderContentExample}, + uwebservice in '..\uwebservice.pas', + uktwsapi in '..\uktwsapi.pas', + uPHPserialize in '..\uPHPserialize.pas'; + +{$R *.res} + +begin + Application.Initialize; + Application.CreateForm(TFolderContentExample, FolderContentExample); + Application.Run; +end. + diff --git a/ktwsapi/php/examples/ktws_eg_add_document.php b/ktwsapi/php/examples/ktws_eg_add_document.php index 03ce95c..2650304 100644 --- a/ktwsapi/php/examples/ktws_eg_add_document.php +++ b/ktwsapi/php/examples/ktws_eg_add_document.php @@ -1,6 +1,6 @@ getIsConditional()) { - return PEAR::raiseError(_kt("Conditional Fieldsets are not yet implemented")); - } else { + $widgets = array(); $fields = $oFieldset->getFields(); + if ($oFieldset->getIsConditional()) { + $iMasterId = $oFieldset->getMasterFieldId(); + + $oMasterField = DocumentField::get($iMasterId); + + $newfields = array(); + $newfields[] = $oMasterField; + foreach($fields as $oField) { + if($oField->getId() != $iMasterId) { + $newfields[] = $oField; + } + } + + foreach ($newfields as $oField) { + $fname = 'metadata_' . $oField->getId(); + $value = null; + + if (!is_null($oDocument)) { + $oFL = DocumentFieldLink::getByDocumentAndField($oDocument, $oField); + if (!is_null($oFL) && (!PEAR::isError($oFL))) { + $value = $oFL->getValue(); + } + } + + $widgets[] = $this->oWF->get('ktcore.widgets.conditionalselection', + array( + 'label' => $oField->getName(), + 'required' => $oField->getIsMandatory(), + 'name' => $fname, + 'value' => $value, + 'description' => $oField->getDescription(), + 'vocab' => MetaData::getEnabledByDocumentField($oField), + 'id_method' => 'getName', + 'label_method' => 'getName', + 'unselected_label' => _kt("No selection."), + 'simple_select' => false, + 'master' => ($oField->getId() == $iMasterId), + 'masterid' => $iMasterId, + 'fieldset' => $oFieldset->getId(), + 'field' => $oField->getId(), + )); + } + } else { foreach ($fields as $oField) { $fname = 'metadata_' . $oField->getId(); @@ -165,13 +206,17 @@ class KTFieldsetRegistry { } } - return array($this->oWF->get('ktcore.widgets.fieldset',array( + + } + + return array($this->oWF->get('ktcore.widgets.fieldset', + array( 'label' => $oFieldset->getName(), 'description' => $oFieldset->getDescription(), 'name' => $sContainerName, 'widgets' => $widgets, ))); - } + } @@ -184,7 +229,26 @@ class KTFieldsetRegistry { // FIXME delegate. $oFieldset =& $fieldsetOrType; if ($oFieldset->getIsConditional()) { - return PEAR::raiseError(_kt("Conditional Fieldsets are not yet implemented")); + $validators = array(); + $fields = $oFieldset->getFields(); + + if ($bIncludeAuto) { + $widgets = $this->widgetsForFieldset($oFieldset, $sContainerName, $sDocument); + $validators = kt_array_merge($validators, $widgets[0]->getValidators()); + } + + foreach ($fields as $oField) { + $fname = 'metadata_' . $oField->getId(); + + // Change back to 'membership' + $validators[] = $this->oVF->get('ktcore.validators.membership', + array( + 'test' => $fname, + 'output' => $fname, + 'vocab' => MetaData::getEnabledValuesByDocumentField($oField), + 'id_method' => 'getName', + )); + } } else { $validators = array(); $fields = $oFieldset->getFields(); @@ -243,13 +307,14 @@ class KTFieldsetRegistry { } } - return array($this->oVF->get('ktcore.validators.fieldset',array( + } + return array($this->oVF->get('ktcore.validators.fieldset', + array( 'test' => $sContainerName, 'output' => $sContainerName, 'validators' => $validators, ))); } } -} ?> diff --git a/lib/metadata/metadatautil.inc.php b/lib/metadata/metadatautil.inc.php index 0583312..1735ec0 100644 --- a/lib/metadata/metadatautil.inc.php +++ b/lib/metadata/metadatautil.inc.php @@ -7,7 +7,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/metadata/valueinstance.inc.php b/lib/metadata/valueinstance.inc.php index a41575f..3fe1739 100644 --- a/lib/metadata/valueinstance.inc.php +++ b/lib/metadata/valueinstance.inc.php @@ -8,7 +8,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/mime.inc.php b/lib/mime.inc.php index fba26fb..693d85e 100644 --- a/lib/mime.inc.php +++ b/lib/mime.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/permissions/permission.inc.php b/lib/permissions/permission.inc.php index 67a0914..b7264ef 100644 --- a/lib/permissions/permission.inc.php +++ b/lib/permissions/permission.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/permissions/permissionassignment.inc.php b/lib/permissions/permissionassignment.inc.php index 92427f2..c51594a 100644 --- a/lib/permissions/permissionassignment.inc.php +++ b/lib/permissions/permissionassignment.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/permissions/permissiondescriptor.inc.php b/lib/permissions/permissiondescriptor.inc.php index bb54876..cdb310f 100644 --- a/lib/permissions/permissiondescriptor.inc.php +++ b/lib/permissions/permissiondescriptor.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/permissions/permissiondynamiccondition.inc.php b/lib/permissions/permissiondynamiccondition.inc.php index 14f9fbc..4b37267 100644 --- a/lib/permissions/permissiondynamiccondition.inc.php +++ b/lib/permissions/permissiondynamiccondition.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/permissions/permissionlookup.inc.php b/lib/permissions/permissionlookup.inc.php index 3d2a372..3cc0c39 100644 --- a/lib/permissions/permissionlookup.inc.php +++ b/lib/permissions/permissionlookup.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/permissions/permissionlookupassignment.inc.php b/lib/permissions/permissionlookupassignment.inc.php index 4c0d177..72de159 100644 --- a/lib/permissions/permissionlookupassignment.inc.php +++ b/lib/permissions/permissionlookupassignment.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/permissions/permissionobject.inc.php b/lib/permissions/permissionobject.inc.php index 46b52f6..31e2f24 100644 --- a/lib/permissions/permissionobject.inc.php +++ b/lib/permissions/permissionobject.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/permissions/permissionutil.inc.php b/lib/permissions/permissionutil.inc.php index 3a206d2..f369ec0 100644 --- a/lib/permissions/permissionutil.inc.php +++ b/lib/permissions/permissionutil.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/plugins/KTAdminNavigation.php b/lib/plugins/KTAdminNavigation.php index a7c93dd..6a4d30a 100644 --- a/lib/plugins/KTAdminNavigation.php +++ b/lib/plugins/KTAdminNavigation.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/plugins/pageregistry.inc.php b/lib/plugins/pageregistry.inc.php index c5fd017..a73fd15 100644 --- a/lib/plugins/pageregistry.inc.php +++ b/lib/plugins/pageregistry.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/plugins/plugin.inc.php b/lib/plugins/plugin.inc.php index 2517b4b..2e8871f 100644 --- a/lib/plugins/plugin.inc.php +++ b/lib/plugins/plugin.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/plugins/pluginentity.inc.php b/lib/plugins/pluginentity.inc.php index e2bb3ad..0fbd018 100644 --- a/lib/plugins/pluginentity.inc.php +++ b/lib/plugins/pluginentity.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/plugins/pluginregistry.inc.php b/lib/plugins/pluginregistry.inc.php index 9b24f61..8c79cf9 100644 --- a/lib/plugins/pluginregistry.inc.php +++ b/lib/plugins/pluginregistry.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/plugins/pluginutil.inc.php b/lib/plugins/pluginutil.inc.php index 15dda9b..cda4af5 100644 --- a/lib/plugins/pluginutil.inc.php +++ b/lib/plugins/pluginutil.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/roles/Role.inc b/lib/roles/Role.inc index d63cc91..6201cb3 100644 --- a/lib/roles/Role.inc +++ b/lib/roles/Role.inc @@ -6,7 +6,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/roles/documentroleallocation.inc.php b/lib/roles/documentroleallocation.inc.php index 55c7d4d..05e30db 100644 --- a/lib/roles/documentroleallocation.inc.php +++ b/lib/roles/documentroleallocation.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/roles/roleallocation.inc.php b/lib/roles/roleallocation.inc.php index f32301c..025d798 100644 --- a/lib/roles/roleallocation.inc.php +++ b/lib/roles/roleallocation.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/search/savedsearch.inc.php b/lib/search/savedsearch.inc.php index 4d85240..d276c32 100644 --- a/lib/search/savedsearch.inc.php +++ b/lib/search/savedsearch.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/search/searchutil.inc.php b/lib/search/searchutil.inc.php index 4c218d0..7c0f3f7 100644 --- a/lib/search/searchutil.inc.php +++ b/lib/search/searchutil.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/security/Permission.inc b/lib/security/Permission.inc index 96e90a8..e12fc28 100644 --- a/lib/security/Permission.inc +++ b/lib/security/Permission.inc @@ -10,7 +10,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/session/Session.inc b/lib/session/Session.inc index e453e54..6163993 100644 --- a/lib/session/Session.inc +++ b/lib/session/Session.inc @@ -6,7 +6,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/session/SiteMap.inc b/lib/session/SiteMap.inc index ca61b7c..81520b1 100644 --- a/lib/session/SiteMap.inc +++ b/lib/session/SiteMap.inc @@ -6,7 +6,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/session/control.inc b/lib/session/control.inc index e6e62cc..c3246d3 100644 --- a/lib/session/control.inc +++ b/lib/session/control.inc @@ -6,7 +6,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/storage/ondiskhashedstoragemanager.inc.php b/lib/storage/ondiskhashedstoragemanager.inc.php index 1e68b2c..aad3ff0 100644 --- a/lib/storage/ondiskhashedstoragemanager.inc.php +++ b/lib/storage/ondiskhashedstoragemanager.inc.php @@ -7,7 +7,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/storage/ondiskpathstoragemanager.inc.php b/lib/storage/ondiskpathstoragemanager.inc.php index 54dac6a..9112d0a 100644 --- a/lib/storage/ondiskpathstoragemanager.inc.php +++ b/lib/storage/ondiskpathstoragemanager.inc.php @@ -14,7 +14,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/storage/storagemanager.inc.php b/lib/storage/storagemanager.inc.php index d27b262..e8b0fab 100644 --- a/lib/storage/storagemanager.inc.php +++ b/lib/storage/storagemanager.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/subscriptions/Subscription.inc b/lib/subscriptions/Subscription.inc index aa2b3fb..24b4738 100644 --- a/lib/subscriptions/Subscription.inc +++ b/lib/subscriptions/Subscription.inc @@ -2,7 +2,7 @@ /* * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/subscriptions/SubscriptionConstants.inc b/lib/subscriptions/SubscriptionConstants.inc index 345fc9a..dbde61e 100644 --- a/lib/subscriptions/SubscriptionConstants.inc +++ b/lib/subscriptions/SubscriptionConstants.inc @@ -6,7 +6,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/subscriptions/SubscriptionManager.inc b/lib/subscriptions/SubscriptionManager.inc index 9d18315..a828352 100644 --- a/lib/subscriptions/SubscriptionManager.inc +++ b/lib/subscriptions/SubscriptionManager.inc @@ -6,7 +6,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/subscriptions/subscriptions.inc.php b/lib/subscriptions/subscriptions.inc.php index 42192cd..0015320 100644 --- a/lib/subscriptions/subscriptions.inc.php +++ b/lib/subscriptions/subscriptions.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/templating/kt3template.inc.php b/lib/templating/kt3template.inc.php index 3f7e23d..dcb6302 100644 --- a/lib/templating/kt3template.inc.php +++ b/lib/templating/kt3template.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/templating/smartytemplate.inc.php b/lib/templating/smartytemplate.inc.php index 1d21484..568e787 100644 --- a/lib/templating/smartytemplate.inc.php +++ b/lib/templating/smartytemplate.inc.php @@ -6,7 +6,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/templating/template.inc.php b/lib/templating/template.inc.php index b6e75bb..bd1b823 100644 --- a/lib/templating/template.inc.php +++ b/lib/templating/template.inc.php @@ -6,7 +6,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/templating/templating.inc.php b/lib/templating/templating.inc.php index 7b8861b..56ccc76 100644 --- a/lib/templating/templating.inc.php +++ b/lib/templating/templating.inc.php @@ -6,7 +6,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/triggers/triggerregistry.inc.php b/lib/triggers/triggerregistry.inc.php index 32a1844..c40388c 100644 --- a/lib/triggers/triggerregistry.inc.php +++ b/lib/triggers/triggerregistry.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/unitmanagement/Unit.inc b/lib/unitmanagement/Unit.inc index dceea72..731e451 100644 --- a/lib/unitmanagement/Unit.inc +++ b/lib/unitmanagement/Unit.inc @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/upgrades/Ini.inc.php b/lib/upgrades/Ini.inc.php index e900ba8..08d7f6f 100644 --- a/lib/upgrades/Ini.inc.php +++ b/lib/upgrades/Ini.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/upgrades/UpgradeFunctions.inc.php b/lib/upgrades/UpgradeFunctions.inc.php index 2b02b1c..8c7995b 100644 --- a/lib/upgrades/UpgradeFunctions.inc.php +++ b/lib/upgrades/UpgradeFunctions.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/upgrades/UpgradeItems.inc.php b/lib/upgrades/UpgradeItems.inc.php index 760c8c4..73eac31 100644 --- a/lib/upgrades/UpgradeItems.inc.php +++ b/lib/upgrades/UpgradeItems.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/upgrades/upgrade.inc.php b/lib/upgrades/upgrade.inc.php index a9d7824..367b72e 100644 --- a/lib/upgrades/upgrade.inc.php +++ b/lib/upgrades/upgrade.inc.php @@ -7,7 +7,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/users/User.inc b/lib/users/User.inc index a836737..ce74f02 100644 --- a/lib/users/User.inc +++ b/lib/users/User.inc @@ -6,7 +6,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/users/userhistory.inc.php b/lib/users/userhistory.inc.php index 27b02c5..67a577b 100644 --- a/lib/users/userhistory.inc.php +++ b/lib/users/userhistory.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/util/KTStopwords.php b/lib/util/KTStopwords.php index db16523..aafcfe1 100644 --- a/lib/util/KTStopwords.php +++ b/lib/util/KTStopwords.php @@ -5,7 +5,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/util/ktutil.inc b/lib/util/ktutil.inc index 8bfa9d5..9416729 100644 --- a/lib/util/ktutil.inc +++ b/lib/util/ktutil.inc @@ -6,7 +6,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the @@ -283,11 +283,12 @@ class KTUtil { if ($sAppend) { $sCmd .= " >> " . escapeshellarg($sAppend); } - if (OS_WINDOWS) { - $sCmd = "start /b \"kt\" " . $sCmd; - } + $sPopen = KTUtil::arrayGet($aOptions, 'popen'); if ($sPopen) { + if (OS_WINDOWS) { + $sCmd = "start /b \"kt\" " . $sCmd; + } return popen($sCmd, $sPopen); } @@ -296,6 +297,9 @@ class KTUtil { $aOutput = array(); $iRet = ''; + if(OS_WINDOWS){ + $sCmd = 'call '.$sCmd; + } exec($sCmd, $aOutput, $iRet); $aRet['ret'] = $iRet; $aRet['out'] = $aOutput; diff --git a/lib/util/legacy.inc b/lib/util/legacy.inc index c97a120..15a92e5 100644 --- a/lib/util/legacy.inc +++ b/lib/util/legacy.inc @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/util/sanitize.inc b/lib/util/sanitize.inc index b52bfd3..605cd4c 100644 --- a/lib/util/sanitize.inc +++ b/lib/util/sanitize.inc @@ -6,7 +6,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/validation/basevalidator.inc.php b/lib/validation/basevalidator.inc.php index 87b64d2..57e6148 100644 --- a/lib/validation/basevalidator.inc.php +++ b/lib/validation/basevalidator.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/validation/customerrorhandler.php b/lib/validation/customerrorhandler.php index aaa5cbf..9864c7c 100644 --- a/lib/validation/customerrorhandler.php +++ b/lib/validation/customerrorhandler.php @@ -1,63 +1,69 @@ -toString(),1,2) == 'db') - { - $sErrorType = 'database_error'; - } - else - { - $sErrorType = 'unknown_error'; - } - - - $default->log->error($oError->toString()); - - } - } - ?> \ No newline at end of file +. + * + * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place, + * Blake Street, Observatory, 7925 South Africa. or email info@knowledgetree.com. + * + * The interactive user interfaces in modified source and object code versions + * of this program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU General Public License version 3. + * + * In accordance with Section 7(b) of the GNU General Public License version 3, + * these Appropriate Legal Notices must retain the display of the "Powered by + * KnowledgeTree" logo and retain the original copyright notice. If the display of the + * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices + * must display the words "Powered by KnowledgeTree" and retain the original + * copyright notice. + * Contributor( s): ______________________________________ + */ + require_once('config/dmsDefaults.php'); + require_once(KT_LIB_DIR.'/Log.inc'); + + class KTCustomErrorHandler + { + // {{{ initCustomErrorHandler() + function initCustomErrorHandler () + { + return $oCustomErrorHandler =& new KTCustomErrorHandler; + } + // }}} + + // {{{ logError() + function logError($oError) + + { + global $default; + + $sErrorType = ''; + if(substr($oError->toString(),1,2) == 'db') + { + $sErrorType = 'database_error'; + } + else + { + $sErrorType = 'unknown_error'; + } + + + $default->log->error($oError->toString()); + + } + } + ?> diff --git a/lib/validation/customerrorviewer.inc.php b/lib/validation/customerrorviewer.inc.php index 1cb6478..4216f06 100644 --- a/lib/validation/customerrorviewer.inc.php +++ b/lib/validation/customerrorviewer.inc.php @@ -1,129 +1,135 @@ -get('CustomErrorMessages/customerrormessages'); - return $sCustomErrorCheck; - } - //}}} - - //{{{ getCustomErrorHandlerSetting() - function getCustomErrorHandlerSetting() - { - $oKTConfig =& KTConfig::getSingleton(); - $sCustomErrorCheck = $oKTConfig->get('CustomErrorMessages/customerrorhandler'); - return $sCustomErrorCheck; - } - //}}} - - // {{{ getCustomErrorRedirectPage() - function getCustomErrorRedirectPage () - { - $oKTErrorConfig =& KTConfig::getSingleton(); - $sCustomErrorPage = $oKTErrorConfig->get('CustomErrorMessages/customerrorpagepath'); - - //if a filname is specified in the config.ini file make it into a url - if (substr($sCustomErrorPage, 0, 4) != 'http') - { - - $sCustomErrorPage = 'http://'.$_SERVER['HTTP_HOST'].'/'.$sCustomErrorPage; - - } - - //checking if file exists - //curl options will return the page header, we can then check for an http error - $CurlSession = curl_init(); - curl_setopt($CurlSession, CURLOPT_URL, $sCustomErrorPage); - curl_setopt($CurlSession, CURLOPT_HEADER, true); - curl_setopt($CurlSession, CURLOPT_NOBODY, true); - curl_setopt($CurlSession, CURLOPT_RETURNTRANSFER, true); - $data = curl_exec($CurlSession); - curl_close($CurlSession); - preg_match("/HTTP\/1\.[1|0]\s(\d{3})/",$data,$matches); - - //checking for http error - if the retunr code isn't 200 then we have an error - //on an error we return 0 - if ($matches[1] != '200') - { - //if file does not exist return error code of 0 - return '0'; - } - else - { - //if file exists return error page address - return $sCustomErrorPage; - - } - } - // }}} - - // {{{ customErrorPageRedirect() - function doCustomErrorPageRedirect($CustomErrorPage, $oError = null) - { - $sErrorMessage = ''; - if($oError != null) - { - //call error handler - - $aErrorMessage = array (); - $aErrorMessage['Error_MessageOne'] = $oError->getMessage(); - $aErrorMessage['Error_MessageTwo'] = $oError->getUserInfo(); - //echo '
';
-    		//print_r($aErrorMessage);
-    		//echo '
'; - //exit; - $customErrorHandler = KTCustomErrorHandler::initCustomErrorHandler(); - $customErrorHandler->logError($oError); - } - - $ErrorPageCurlSession = curl_init($CustomErrorPage); - //curl_setopt($ErrorPageCurlSession, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($ErrorPageCurlSession, CURLOPT_POST, true); - curl_setopt($ErrorPageCurlSession, CURLOPT_POSTFIELDS, $aErrorMessage); - $ErrorPageSent = curl_exec($ErrorPageCurlSession); - curl_close($ErrorPageCurlSession); - - } - // }}} - } - ?> +. + * + * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place, + * Blake Street, Observatory, 7925 South Africa. or email info@knowledgetree.com. + * + * The interactive user interfaces in modified source and object code versions + * of this program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU General Public License version 3. + * + * In accordance with Section 7(b) of the GNU General Public License version 3, + * these Appropriate Legal Notices must retain the display of the "Powered by + * KnowledgeTree" logo and retain the original copyright notice. If the display of the + * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices + * must display the words "Powered by KnowledgeTree" and retain the original + * copyright notice. + * Contributor( s): ______________________________________ + */ + require_once(KT_LIB_DIR.'/validation/customerrorhandler.php'); + + class KTCustomErrorViewer + { + // {{{ initCustomErrorViewer() + function initCustomErrorViewer() + { + return $oCustomViewer =& new KTCustomErrorViewer; + } + //}}} + + //{{{ getCustomErrorConfigSetting() + function getCustomErrorConfigSetting() + { + $oKTConfig =& KTConfig::getSingleton(); + $sCustomErrorCheck = $oKTConfig->get('CustomErrorMessages/customerrormessages'); + return $sCustomErrorCheck; + } + //}}} + + //{{{ getCustomErrorHandlerSetting() + function getCustomErrorHandlerSetting() + { + $oKTConfig =& KTConfig::getSingleton(); + $sCustomErrorCheck = $oKTConfig->get('CustomErrorMessages/customerrorhandler'); + return $sCustomErrorCheck; + } + //}}} + + // {{{ getCustomErrorRedirectPage() + function getCustomErrorRedirectPage () + { + $oKTErrorConfig =& KTConfig::getSingleton(); + $sCustomErrorPage = $oKTErrorConfig->get('CustomErrorMessages/customerrorpagepath'); + + //if a filname is specified in the config.ini file make it into a url + if (substr($sCustomErrorPage, 0, 4) != 'http') + { + + $sCustomErrorPage = 'http://'.$_SERVER['HTTP_HOST'].'/'.$sCustomErrorPage; + + } + + //checking if file exists + //curl options will return the page header, we can then check for an http error + $CurlSession = curl_init(); + curl_setopt($CurlSession, CURLOPT_URL, $sCustomErrorPage); + curl_setopt($CurlSession, CURLOPT_HEADER, true); + curl_setopt($CurlSession, CURLOPT_NOBODY, true); + curl_setopt($CurlSession, CURLOPT_RETURNTRANSFER, true); + $data = curl_exec($CurlSession); + curl_close($CurlSession); + preg_match("/HTTP\/1\.[1|0]\s(\d{3})/",$data,$matches); + + //checking for http error - if the retunr code isn't 200 then we have an error + //on an error we return 0 + if ($matches[1] != '200') + { + //if file does not exist return error code of 0 + return '0'; + } + else + { + //if file exists return error page address + return $sCustomErrorPage; + + } + } + // }}} + + // {{{ customErrorPageRedirect() + function doCustomErrorPageRedirect($CustomErrorPage, $oError = null) + { + $sErrorMessage = ''; + if($oError != null) + { + //call error handler + + $aErrorMessage = array (); + $aErrorMessage['Error_MessageOne'] = $oError->getMessage(); + $aErrorMessage['Error_MessageTwo'] = $oError->getUserInfo(); + //echo '
';
+    		//print_r($aErrorMessage);
+    		//echo '
'; + //exit; + $customErrorHandler = KTCustomErrorHandler::initCustomErrorHandler(); + $customErrorHandler->logError($oError); + } + + $ErrorPageCurlSession = curl_init($CustomErrorPage); + //curl_setopt($ErrorPageCurlSession, CURLOPT_SSL_VERIFYPEER, false); + curl_setopt($ErrorPageCurlSession, CURLOPT_POST, true); + curl_setopt($ErrorPageCurlSession, CURLOPT_POSTFIELDS, $aErrorMessage); + $ErrorPageSent = curl_exec($ErrorPageCurlSession); + curl_close($ErrorPageCurlSession); + + } + // }}} + } + ?> diff --git a/lib/validation/dispatchervalidation.inc.php b/lib/validation/dispatchervalidation.inc.php index 91297f1..f45666b 100644 --- a/lib/validation/dispatchervalidation.inc.php +++ b/lib/validation/dispatchervalidation.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/validation/errorviewer.inc.php b/lib/validation/errorviewer.inc.php index 5ef499b..a2ba7e7 100644 --- a/lib/validation/errorviewer.inc.php +++ b/lib/validation/errorviewer.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/validation/validatorfactory.inc.php b/lib/validation/validatorfactory.inc.php index 6fabd14..5cd0b40 100644 --- a/lib/validation/validatorfactory.inc.php +++ b/lib/validation/validatorfactory.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/widgets/FieldsetDisplayRegistry.inc.php b/lib/widgets/FieldsetDisplayRegistry.inc.php index 1756383..365cc5d 100644 --- a/lib/widgets/FieldsetDisplayRegistry.inc.php +++ b/lib/widgets/FieldsetDisplayRegistry.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/widgets/basewidget.inc.php b/lib/widgets/basewidget.inc.php index fee5374..19207b2 100644 --- a/lib/widgets/basewidget.inc.php +++ b/lib/widgets/basewidget.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/widgets/fieldWidgets.php b/lib/widgets/fieldWidgets.php index 247fdd3..e89aee7 100644 --- a/lib/widgets/fieldWidgets.php +++ b/lib/widgets/fieldWidgets.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/widgets/fieldsetDisplay.inc.php b/lib/widgets/fieldsetDisplay.inc.php index 03bb154..e85af47 100644 --- a/lib/widgets/fieldsetDisplay.inc.php +++ b/lib/widgets/fieldsetDisplay.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/widgets/forms.inc.php b/lib/widgets/forms.inc.php index d75ed1d..2339360 100644 --- a/lib/widgets/forms.inc.php +++ b/lib/widgets/forms.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/widgets/portlet.inc.php b/lib/widgets/portlet.inc.php index 61a0485..7239f98 100644 --- a/lib/widgets/portlet.inc.php +++ b/lib/widgets/portlet.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/widgets/reorderdisplay.inc.php b/lib/widgets/reorderdisplay.inc.php index 5fa121d..0fe5fc5 100644 --- a/lib/widgets/reorderdisplay.inc.php +++ b/lib/widgets/reorderdisplay.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/widgets/widgetfactory.inc.php b/lib/widgets/widgetfactory.inc.php index a393381..0617553 100644 --- a/lib/widgets/widgetfactory.inc.php +++ b/lib/widgets/widgetfactory.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/workflow/workflow.inc.php b/lib/workflow/workflow.inc.php index e353f49..9325066 100644 --- a/lib/workflow/workflow.inc.php +++ b/lib/workflow/workflow.inc.php @@ -8,7 +8,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/workflow/workflowadminutil.inc.php b/lib/workflow/workflowadminutil.inc.php index fd895ca..032c83a 100644 --- a/lib/workflow/workflowadminutil.inc.php +++ b/lib/workflow/workflowadminutil.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/workflow/workflowstate.inc.php b/lib/workflow/workflowstate.inc.php index ee1c562..3f4f8cd 100644 --- a/lib/workflow/workflowstate.inc.php +++ b/lib/workflow/workflowstate.inc.php @@ -7,7 +7,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/workflow/workflowstatepermissionsassignment.inc.php b/lib/workflow/workflowstatepermissionsassignment.inc.php index e739c4f..801a9a4 100644 --- a/lib/workflow/workflowstatepermissionsassignment.inc.php +++ b/lib/workflow/workflowstatepermissionsassignment.inc.php @@ -7,7 +7,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/workflow/workflowtransition.inc.php b/lib/workflow/workflowtransition.inc.php index 81a0aef..d370fb0 100644 --- a/lib/workflow/workflowtransition.inc.php +++ b/lib/workflow/workflowtransition.inc.php @@ -7,7 +7,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/workflow/workflowtrigger.inc.php b/lib/workflow/workflowtrigger.inc.php index b84ccae..770fa67 100644 --- a/lib/workflow/workflowtrigger.inc.php +++ b/lib/workflow/workflowtrigger.inc.php @@ -11,7 +11,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/workflow/workflowtriggerinstance.inc.php b/lib/workflow/workflowtriggerinstance.inc.php index 25e7633..6ff0594 100644 --- a/lib/workflow/workflowtriggerinstance.inc.php +++ b/lib/workflow/workflowtriggerinstance.inc.php @@ -7,7 +7,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/lib/workflow/workflowutil.inc.php b/lib/workflow/workflowutil.inc.php index 900d814..562b932 100644 --- a/lib/workflow/workflowutil.inc.php +++ b/lib/workflow/workflowutil.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/login.php b/login.php index c8d89ca..b9ef29a 100644 --- a/login.php +++ b/login.php @@ -7,7 +7,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/notify.php b/notify.php index 97721ae..04f9fb0 100644 --- a/notify.php +++ b/notify.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/olddashboard.php b/olddashboard.php index c1121d7..8b691d4 100644 --- a/olddashboard.php +++ b/olddashboard.php @@ -9,7 +9,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/plugin.php b/plugin.php index 7f98f9b..901183b 100644 --- a/plugin.php +++ b/plugin.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/plugins/browseabledashlet/BrowseableDashlet.php b/plugins/browseabledashlet/BrowseableDashlet.php index 5d7b5b4..07524bc 100644 --- a/plugins/browseabledashlet/BrowseableDashlet.php +++ b/plugins/browseabledashlet/BrowseableDashlet.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/plugins/browseabledashlet/BrowseableDashletPlugin.php b/plugins/browseabledashlet/BrowseableDashletPlugin.php index a9822c9..2d4f3a6 100644 --- a/plugins/browseabledashlet/BrowseableDashletPlugin.php +++ b/plugins/browseabledashlet/BrowseableDashletPlugin.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/plugins/housekeeper/DiskUsageDashlet.inc.php b/plugins/housekeeper/DiskUsageDashlet.inc.php index e1a2d86..fb629f7 100644 --- a/plugins/housekeeper/DiskUsageDashlet.inc.php +++ b/plugins/housekeeper/DiskUsageDashlet.inc.php @@ -5,7 +5,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/plugins/housekeeper/FolderUsageDashlet.inc.php b/plugins/housekeeper/FolderUsageDashlet.inc.php index abf1959..c1a96a0 100644 --- a/plugins/housekeeper/FolderUsageDashlet.inc.php +++ b/plugins/housekeeper/FolderUsageDashlet.inc.php @@ -5,7 +5,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/plugins/housekeeper/HouseKeeperDispatcher.php b/plugins/housekeeper/HouseKeeperDispatcher.php index f198113..6b8c445 100644 --- a/plugins/housekeeper/HouseKeeperDispatcher.php +++ b/plugins/housekeeper/HouseKeeperDispatcher.php @@ -5,7 +5,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/plugins/housekeeper/HouseKeeperPlugin.php b/plugins/housekeeper/HouseKeeperPlugin.php index 9f5e671..0855f76 100644 --- a/plugins/housekeeper/HouseKeeperPlugin.php +++ b/plugins/housekeeper/HouseKeeperPlugin.php @@ -5,7 +5,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/plugins/ktcore/KTAssist.php b/plugins/ktcore/KTAssist.php index 2879898..ad43961 100644 --- a/plugins/ktcore/KTAssist.php +++ b/plugins/ktcore/KTAssist.php @@ -5,7 +5,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/plugins/ktcore/KTBulkActions.php b/plugins/ktcore/KTBulkActions.php index d9a84bf..ecca7d0 100644 --- a/plugins/ktcore/KTBulkActions.php +++ b/plugins/ktcore/KTBulkActions.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/plugins/ktcore/KTColumns.inc.php b/plugins/ktcore/KTColumns.inc.php index c2a313f..02fa4d3 100644 --- a/plugins/ktcore/KTColumns.inc.php +++ b/plugins/ktcore/KTColumns.inc.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/plugins/ktcore/KTCoreLanguagePlugin.php b/plugins/ktcore/KTCoreLanguagePlugin.php index bde4baa..8a5205e 100644 --- a/plugins/ktcore/KTCoreLanguagePlugin.php +++ b/plugins/ktcore/KTCoreLanguagePlugin.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/plugins/ktcore/KTCorePlugin.php b/plugins/ktcore/KTCorePlugin.php index 289c5d0..5e59514 100644 --- a/plugins/ktcore/KTCorePlugin.php +++ b/plugins/ktcore/KTCorePlugin.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the @@ -181,6 +181,8 @@ class KTCorePlugin extends KTPlugin { $this->registerWidget('KTDescriptorSelectionWidget', 'ktcore.widgets.descriptorselection', 'KTWidgets.php'); $this->registerWidget('KTCoreFolderCollectionWidget', 'ktcore.widgets.foldercollection', 'KTWidgets.php'); + $this->registerWidget('KTCoreConditionalSelectionWidget', 'ktcore.widgets.conditionalselection', 'KTWidgets.php'); + $this->registerPage('collection', 'KTCoreCollectionPage', 'KTWidgets.php'); $this->registerPage('notifications', 'KTNotificationOverflowPage', 'KTMiscPages.php'); diff --git a/plugins/ktcore/KTDashlets.php b/plugins/ktcore/KTDashlets.php index 489f58d..6ff2eee 100644 --- a/plugins/ktcore/KTDashlets.php +++ b/plugins/ktcore/KTDashlets.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/plugins/ktcore/KTDocumentActions.php b/plugins/ktcore/KTDocumentActions.php index 1356b31..612b2ae 100644 --- a/plugins/ktcore/KTDocumentActions.php +++ b/plugins/ktcore/KTDocumentActions.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/plugins/ktcore/KTDocumentViewlets.php b/plugins/ktcore/KTDocumentViewlets.php index 40d292e..ce63f07 100644 --- a/plugins/ktcore/KTDocumentViewlets.php +++ b/plugins/ktcore/KTDocumentViewlets.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/plugins/ktcore/KTFolderActions.php b/plugins/ktcore/KTFolderActions.php index 82d814c..9f6fcb2 100644 --- a/plugins/ktcore/KTFolderActions.php +++ b/plugins/ktcore/KTFolderActions.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/plugins/ktcore/KTMiscPages.php b/plugins/ktcore/KTMiscPages.php index 022cc3b..2e66fee 100644 --- a/plugins/ktcore/KTMiscPages.php +++ b/plugins/ktcore/KTMiscPages.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/plugins/ktcore/KTPermissions.php b/plugins/ktcore/KTPermissions.php index 4338541..2bd54f3 100644 --- a/plugins/ktcore/KTPermissions.php +++ b/plugins/ktcore/KTPermissions.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/plugins/ktcore/KTPortlets.php b/plugins/ktcore/KTPortlets.php index 75020a8..889e34f 100644 --- a/plugins/ktcore/KTPortlets.php +++ b/plugins/ktcore/KTPortlets.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/plugins/ktcore/KTValidators.php b/plugins/ktcore/KTValidators.php index dd9825e..7d35a6b 100644 --- a/plugins/ktcore/KTValidators.php +++ b/plugins/ktcore/KTValidators.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the diff --git a/plugins/ktcore/KTWidgets.php b/plugins/ktcore/KTWidgets.php index 36fd44a..3226c47 100644 --- a/plugins/ktcore/KTWidgets.php +++ b/plugins/ktcore/KTWidgets.php @@ -4,7 +4,7 @@ * * KnowledgeTree Open Source Edition * Document Management Made Simple - * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited + * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the @@ -767,4 +767,160 @@ class KTCoreCollectionPage extends KTStandardDispatcher { } -?> + +// based on the selection widget, this carries a mapping array, +// which is converted to JSON and inserted into the output. javascript +// enforces the various relationships between conditional fields. + +class KTCoreConditionalSelectionWidget extends KTCoreSelectionWidget { + var $sNamespace = 'ktcore.widgets.conditionalselection'; + + var $sIdMethod; + var $sLabelMethod; + + var $bIsMaster; + var $bMappings; + + function _getFieldIdForMetadataId($iMetadata) { + $sTable = 'metadata_lookup'; + $sQuery = "SELECT document_field_id FROM " . $sTable . " WHERE id = ?"; + $aParams = array($iMetadata); + + $res = DBUtil::getOneResultKey(array($sQuery, $aParams), 'document_field_id'); + if (PEAR::isError($res)) { + return false; + } + return $res; + } + + + function configure($aOptions) { + $res = parent::configure($aOptions); + if (PEAR::isError($res)) { + return $res; + } + + $this->sIdMethod = KTUtil::arrayGet($aOptions, 'id_method', 'getId'); + $this->sLabelMethod = KTUtil::arrayGet($aOptions, 'label_method'); + if (empty($this->sLabelMethod)) { + return PEAR::raiseError(_kt('No label method specified.')); + } + $existing_entities = (array) KTUtil::arrayGet($aOptions, 'existing_entities'); + + if (empty($this->value)) { + $this->value = array(); + foreach ($existing_entities as $oEntity) { + $this->value[] = call_user_func(array(&$oEntity, $this->sIdMethod)); + } + } + + $this->iField = KTUtil::arrayGet($aOptions, 'field'); + $this->iMasterId = KTUtil::arrayGet($aOptions, 'masterid'); + + // if we're the master, we have to build the dependancy array and store it as JSON + // also, include the javascript + if(KTUtil::arrayGet($aOptions, 'master', false)) { + $this->bMaster = true; + $this->aJavascript = array('resources/js/conditional_selection.js'); + + $oFieldset = KTFieldset::get(KTUtil::arrayGet($aOptions, 'fieldset')); + $aLookups = array(); + $aConnections = array(); + + foreach($oFieldset->getFields() as $oField) { + $c = array(); + + foreach($oField->getEnabledValues() as $oMetadata) { + $a = array(); + // print '
';
+
+		    $nvals = KTMetadataUtil::getNextValuesForLookup($oMetadata->getId());
+		    if($nvals) {
+			foreach($nvals as $i=>$aVals) {
+			    $a = array_merge($a, $aVals);
+			    
+			    foreach($aVals as $id) {
+			      $field = $this->_getFieldIdForMetadataId($id);
+			      // print 'id ' . $id . ' is in field ' . $field . "
";
+			      if(!in_array($field, $c)) {
+				$c[] = $field;
+			      }
+			    }
+			}
+		    }
+
+		    $aLookups[$oMetadata->getId()] = $a;
+		}
+		$aConnections[$oField->getId()] = $c;
+	    }
+	    
+	    //exit(0);
+
+	    $oJSON = new Services_JSON;
+	    $this->sLookupsJSON = $oJSON->encode($aLookups);
+	    $this->sConnectionsJSON = $oJSON->encode($aConnections);
+	}
+		
+
+        $new_vocab = array();
+        foreach ($this->aVocab as $oEntity) {
+            $id = call_user_func(array(&$oEntity, $this->sIdMethod));
+            $label = call_user_func(array(&$oEntity, $this->sLabelMethod));
+            $new_vocab[$id] = array($label, $oEntity->getId());
+        }
+        $this->aVocab = $new_vocab;
+    }
+
+    function getWidget() {
+        $bHasErrors = false;       
+        if (count($this->aErrors) != 0) { $bHasErrors = true; }
+
+	$this->sTemplate = 'ktcore/forms/widgets/conditional_selection';        
+        
+        $oTemplating =& KTTemplating::getSingleton();        
+        $oTemplate = $oTemplating->loadTemplate($this->sTemplate);
+
+        $unselected = KTUtil::arrayGet($this->aOptions, 'unselected_label');
+        if (!empty($unselected)) {
+            $vocab = array();
+            $vocab[] = $unselected;
+            foreach ($this->aVocab as $k => $v) {
+                $vocab[$k] = $v;
+            }
+            $this->aVocab = $vocab;
+            if (empty($this->value)) {
+                $this->value = '0';
+            }
+        }
+
+        if ($this->bMulti) {
+            $this->_valuesearch = array();
+            $value = (array) $this->value;
+            foreach ($value as $v) {
+                $this->_valuesearch[$v] = true;
+            }
+        }
+        
+        $aTemplateData = array(
+            'context' => $this,
+            'name' => $this->sName,
+            'has_id' => ($this->sId !== null),
+            'id' => $this->sId,
+            'has_value' => ($this->value !== null),
+            'value' => $this->value,
+            'options' => $this->aOptions,
+            'vocab' => $this->aVocab,
+	    'lookups' => $this->sLookupsJSON,
+	    'connections' => $this->sConnectionsJSON,
+	    'master' => $this->bMaster,
+	    'masterid' => $this->iMasterId,
+	    'field' => $this->iField,
+        );
+        return $oTemplate->render($aTemplateData);
+    }
+    
+
+
+}
+
+
diff --git a/plugins/ktcore/KTWorkflowTriggers.inc.php b/plugins/ktcore/KTWorkflowTriggers.inc.php
index 9c6eb6b..eaa3f9a 100644
--- a/plugins/ktcore/KTWorkflowTriggers.inc.php
+++ b/plugins/ktcore/KTWorkflowTriggers.inc.php
@@ -5,7 +5,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/admin/ajaxComplexConditionals.php b/plugins/ktcore/admin/ajaxComplexConditionals.php
index cc009ee..e365725 100755
--- a/plugins/ktcore/admin/ajaxComplexConditionals.php
+++ b/plugins/ktcore/admin/ajaxComplexConditionals.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/admin/ajaxSimpleConditionals.php b/plugins/ktcore/admin/ajaxSimpleConditionals.php
index eac57c7..0b9fb8a 100755
--- a/plugins/ktcore/admin/ajaxSimpleConditionals.php
+++ b/plugins/ktcore/admin/ajaxSimpleConditionals.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/admin/archivedDocuments.php b/plugins/ktcore/admin/archivedDocuments.php
index e64c029..3072083 100755
--- a/plugins/ktcore/admin/archivedDocuments.php
+++ b/plugins/ktcore/admin/archivedDocuments.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/admin/conditions.php b/plugins/ktcore/admin/conditions.php
index 9cbdf61..44d4d7d 100755
--- a/plugins/ktcore/admin/conditions.php
+++ b/plugins/ktcore/admin/conditions.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/admin/deletedDocuments.php b/plugins/ktcore/admin/deletedDocuments.php
index b52c511..be5f9fc 100755
--- a/plugins/ktcore/admin/deletedDocuments.php
+++ b/plugins/ktcore/admin/deletedDocuments.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/admin/documentCheckout.php b/plugins/ktcore/admin/documentCheckout.php
index 60832e9..9edb93e 100644
--- a/plugins/ktcore/admin/documentCheckout.php
+++ b/plugins/ktcore/admin/documentCheckout.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/admin/documentFieldsv2.php b/plugins/ktcore/admin/documentFieldsv2.php
index bb1e149..3f7d5cf 100644
--- a/plugins/ktcore/admin/documentFieldsv2.php
+++ b/plugins/ktcore/admin/documentFieldsv2.php
@@ -5,7 +5,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/admin/documentTypes.php b/plugins/ktcore/admin/documentTypes.php
index fd9cdcb..9b688da 100755
--- a/plugins/ktcore/admin/documentTypes.php
+++ b/plugins/ktcore/admin/documentTypes.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/admin/expungeList.php b/plugins/ktcore/admin/expungeList.php
index e9641bc..229f292 100644
--- a/plugins/ktcore/admin/expungeList.php
+++ b/plugins/ktcore/admin/expungeList.php
@@ -4,7 +4,7 @@
  *    
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/admin/fieldsets/basic.inc.php b/plugins/ktcore/admin/fieldsets/basic.inc.php
index 1011a3a..0e683f5 100644
--- a/plugins/ktcore/admin/fieldsets/basic.inc.php
+++ b/plugins/ktcore/admin/fieldsets/basic.inc.php
@@ -5,7 +5,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/admin/fieldsets/conditional.inc.php b/plugins/ktcore/admin/fieldsets/conditional.inc.php
index 8cceb0c..31065f2 100644
--- a/plugins/ktcore/admin/fieldsets/conditional.inc.php
+++ b/plugins/ktcore/admin/fieldsets/conditional.inc.php
@@ -5,7 +5,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
@@ -414,6 +414,16 @@ ordering!");
 
         $oField = $data['master_field'];
 
+	// remove all existing behaviors
+	$aFieldIds = array();
+	foreach($this->oFieldset->getFields() as $i) {
+	    $aFieldIds[] = $i->getId();
+	}
+
+	$sTable = KTUtil::getTableName('field_behaviours');
+	$aQuery = array("DELETE FROM $sTable WHERE field_id IN (" . DBUtil::paramArray($aFieldIds) . ")", $aFieldIds);
+	$res = DBUtil::runQuery($aQuery);		
+
         $res = KTMetadataUtil::removeFieldOrdering($this->oFieldset);
         $this->oFieldset->setMasterFieldId($oField->getId());
         $res = $this->oFieldset->update();
diff --git a/plugins/ktcore/admin/groupManagement.php b/plugins/ktcore/admin/groupManagement.php
index df9cc66..0ee8fbc 100755
--- a/plugins/ktcore/admin/groupManagement.php
+++ b/plugins/ktcore/admin/groupManagement.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/admin/manageCleanup.php b/plugins/ktcore/admin/manageCleanup.php
index 68a8e95..36a887b 100755
--- a/plugins/ktcore/admin/manageCleanup.php
+++ b/plugins/ktcore/admin/manageCleanup.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/admin/manageConditionals.php b/plugins/ktcore/admin/manageConditionals.php
index dbdcc50..ee90b41 100755
--- a/plugins/ktcore/admin/manageConditionals.php
+++ b/plugins/ktcore/admin/manageConditionals.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/admin/manageHelp.php b/plugins/ktcore/admin/manageHelp.php
index eab467b..2a1a26c 100755
--- a/plugins/ktcore/admin/manageHelp.php
+++ b/plugins/ktcore/admin/manageHelp.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/admin/managePermissions.php b/plugins/ktcore/admin/managePermissions.php
index 9bedf9e..0b5d1b4 100755
--- a/plugins/ktcore/admin/managePermissions.php
+++ b/plugins/ktcore/admin/managePermissions.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/admin/manageViews.php b/plugins/ktcore/admin/manageViews.php
index 38af7a6..1106325 100644
--- a/plugins/ktcore/admin/manageViews.php
+++ b/plugins/ktcore/admin/manageViews.php
@@ -4,7 +4,7 @@
  *    
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/admin/plugins.php b/plugins/ktcore/admin/plugins.php
index 0765cd2..9e55d03 100755
--- a/plugins/ktcore/admin/plugins.php
+++ b/plugins/ktcore/admin/plugins.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/admin/roleManagement.php b/plugins/ktcore/admin/roleManagement.php
index ba01139..937f1c8 100644
--- a/plugins/ktcore/admin/roleManagement.php
+++ b/plugins/ktcore/admin/roleManagement.php
@@ -6,7 +6,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/admin/savedSearch.php b/plugins/ktcore/admin/savedSearch.php
index 087a0de..87a3c72 100755
--- a/plugins/ktcore/admin/savedSearch.php
+++ b/plugins/ktcore/admin/savedSearch.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/admin/techsupport.php b/plugins/ktcore/admin/techsupport.php
index 586118f..20cee17 100644
--- a/plugins/ktcore/admin/techsupport.php
+++ b/plugins/ktcore/admin/techsupport.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/admin/unitManagement.php b/plugins/ktcore/admin/unitManagement.php
index 6268713..87d5b3e 100755
--- a/plugins/ktcore/admin/unitManagement.php
+++ b/plugins/ktcore/admin/unitManagement.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/admin/userManagement.php b/plugins/ktcore/admin/userManagement.php
index f97bb17..1a43611 100755
--- a/plugins/ktcore/admin/userManagement.php
+++ b/plugins/ktcore/admin/userManagement.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/admin/workflow/newworkflow.inc.php b/plugins/ktcore/admin/workflow/newworkflow.inc.php
index a76c6f6..4fc4946 100644
--- a/plugins/ktcore/admin/workflow/newworkflow.inc.php
+++ b/plugins/ktcore/admin/workflow/newworkflow.inc.php
@@ -4,7 +4,7 @@
  *    
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/admin/workflowsv2.php b/plugins/ktcore/admin/workflowsv2.php
index cee5a27..5929493 100644
--- a/plugins/ktcore/admin/workflowsv2.php
+++ b/plugins/ktcore/admin/workflowsv2.php
@@ -4,7 +4,7 @@
  *    
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/authentication/authenticationadminpage.inc.php b/plugins/ktcore/authentication/authenticationadminpage.inc.php
index c2b4388..95b4855 100644
--- a/plugins/ktcore/authentication/authenticationadminpage.inc.php
+++ b/plugins/ktcore/authentication/authenticationadminpage.inc.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/document/Rename.php b/plugins/ktcore/document/Rename.php
index 2b51cf3..7e0b555 100644
--- a/plugins/ktcore/document/Rename.php
+++ b/plugins/ktcore/document/Rename.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/document/edit.php b/plugins/ktcore/document/edit.php
index 419d4df..c9f7c48 100644
--- a/plugins/ktcore/document/edit.php
+++ b/plugins/ktcore/document/edit.php
@@ -3,7 +3,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/folder/BulkImport.php b/plugins/ktcore/folder/BulkImport.php
index 74ba7fa..a7c978d 100644
--- a/plugins/ktcore/folder/BulkImport.php
+++ b/plugins/ktcore/folder/BulkImport.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/folder/BulkUpload.php b/plugins/ktcore/folder/BulkUpload.php
index e95dd6f..d659a52 100644
--- a/plugins/ktcore/folder/BulkUpload.php
+++ b/plugins/ktcore/folder/BulkUpload.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/folder/Permissions.php b/plugins/ktcore/folder/Permissions.php
index 7ca2fbc..1295f84 100644
--- a/plugins/ktcore/folder/Permissions.php
+++ b/plugins/ktcore/folder/Permissions.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/folder/Rename.php b/plugins/ktcore/folder/Rename.php
index 727f3b7..2fe40bd 100644
--- a/plugins/ktcore/folder/Rename.php
+++ b/plugins/ktcore/folder/Rename.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/folder/Transactions.php b/plugins/ktcore/folder/Transactions.php
index 82a9af9..47b4b37 100644
--- a/plugins/ktcore/folder/Transactions.php
+++ b/plugins/ktcore/folder/Transactions.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/folder/addDocument.php b/plugins/ktcore/folder/addDocument.php
index e46df60..f566450 100644
--- a/plugins/ktcore/folder/addDocument.php
+++ b/plugins/ktcore/folder/addDocument.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/scheduler/background.php b/plugins/ktcore/scheduler/background.php
index 0313b17..9ce9f73 100644
--- a/plugins/ktcore/scheduler/background.php
+++ b/plugins/ktcore/scheduler/background.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/scheduler/scheduler.php b/plugins/ktcore/scheduler/scheduler.php
index 78ff4a0..b5d2dac 100644
--- a/plugins/ktcore/scheduler/scheduler.php
+++ b/plugins/ktcore/scheduler/scheduler.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/scheduler/schedulerDashlet.php b/plugins/ktcore/scheduler/schedulerDashlet.php
index 3fa4aab..5dc60f8 100644
--- a/plugins/ktcore/scheduler/schedulerDashlet.php
+++ b/plugins/ktcore/scheduler/schedulerDashlet.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/scheduler/schedulerEntity.php b/plugins/ktcore/scheduler/schedulerEntity.php
index fb60fbe..7b2ecd7 100644
--- a/plugins/ktcore/scheduler/schedulerEntity.php
+++ b/plugins/ktcore/scheduler/schedulerEntity.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/scheduler/schedulerUtil.php b/plugins/ktcore/scheduler/schedulerUtil.php
index 5839787..02f7535 100644
--- a/plugins/ktcore/scheduler/schedulerUtil.php
+++ b/plugins/ktcore/scheduler/schedulerUtil.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktcore/scheduler/taskScheduler.php b/plugins/ktcore/scheduler/taskScheduler.php
index 61a31a9..326c440 100644
--- a/plugins/ktcore/scheduler/taskScheduler.php
+++ b/plugins/ktcore/scheduler/taskScheduler.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktstandard/AdminVersionPlugin/AdminVersionDashlet.php b/plugins/ktstandard/AdminVersionPlugin/AdminVersionDashlet.php
index 2e89643..5c9d794 100644
--- a/plugins/ktstandard/AdminVersionPlugin/AdminVersionDashlet.php
+++ b/plugins/ktstandard/AdminVersionPlugin/AdminVersionDashlet.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktstandard/AdminVersionPlugin/AdminVersionPage.php b/plugins/ktstandard/AdminVersionPlugin/AdminVersionPage.php
index 44fb158..39ee528 100644
--- a/plugins/ktstandard/AdminVersionPlugin/AdminVersionPage.php
+++ b/plugins/ktstandard/AdminVersionPlugin/AdminVersionPage.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktstandard/AdminVersionPlugin/AdminVersionPlugin.php b/plugins/ktstandard/AdminVersionPlugin/AdminVersionPlugin.php
index 5d902d8..fa9c01f 100644
--- a/plugins/ktstandard/AdminVersionPlugin/AdminVersionPlugin.php
+++ b/plugins/ktstandard/AdminVersionPlugin/AdminVersionPlugin.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktstandard/ImmutableActionPlugin.php b/plugins/ktstandard/ImmutableActionPlugin.php
index a638c0b..da77b37 100644
--- a/plugins/ktstandard/ImmutableActionPlugin.php
+++ b/plugins/ktstandard/ImmutableActionPlugin.php
@@ -5,7 +5,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktstandard/KTBulkExportPlugin.php b/plugins/ktstandard/KTBulkExportPlugin.php
index 8d31fc6..7af5381 100644
--- a/plugins/ktstandard/KTBulkExportPlugin.php
+++ b/plugins/ktstandard/KTBulkExportPlugin.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktstandard/KTDisclaimers.php b/plugins/ktstandard/KTDisclaimers.php
index ed18a45..55a065c 100644
--- a/plugins/ktstandard/KTDisclaimers.php
+++ b/plugins/ktstandard/KTDisclaimers.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktstandard/KTDiscussion.php b/plugins/ktstandard/KTDiscussion.php
index b9b36f4..1727d92 100644
--- a/plugins/ktstandard/KTDiscussion.php
+++ b/plugins/ktstandard/KTDiscussion.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktstandard/KTDocumentLinks.php b/plugins/ktstandard/KTDocumentLinks.php
index 27ee103..8190a2f 100644
--- a/plugins/ktstandard/KTDocumentLinks.php
+++ b/plugins/ktstandard/KTDocumentLinks.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktstandard/KTDocumentLinksColumns.php b/plugins/ktstandard/KTDocumentLinksColumns.php
index e40bcfc..863e2bd 100644
--- a/plugins/ktstandard/KTDocumentLinksColumns.php
+++ b/plugins/ktstandard/KTDocumentLinksColumns.php
@@ -5,7 +5,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktstandard/KTEmail.php b/plugins/ktstandard/KTEmail.php
index 6cf1ec3..d599636 100644
--- a/plugins/ktstandard/KTEmail.php
+++ b/plugins/ktstandard/KTEmail.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktstandard/KTIndexer.php b/plugins/ktstandard/KTIndexer.php
index 9e3ae21..5b46066 100644
--- a/plugins/ktstandard/KTIndexer.php
+++ b/plugins/ktstandard/KTIndexer.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktstandard/KTLDAPAuthenticationPlugin.php b/plugins/ktstandard/KTLDAPAuthenticationPlugin.php
index 91a14d2..df87a42 100644
--- a/plugins/ktstandard/KTLDAPAuthenticationPlugin.php
+++ b/plugins/ktstandard/KTLDAPAuthenticationPlugin.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktstandard/KTStandardPlugin.php b/plugins/ktstandard/KTStandardPlugin.php
index 75d2328..e2f8520 100644
--- a/plugins/ktstandard/KTStandardPlugin.php
+++ b/plugins/ktstandard/KTStandardPlugin.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktstandard/KTSubscriptions.php b/plugins/ktstandard/KTSubscriptions.php
index 3d154e9..8a98ece 100644
--- a/plugins/ktstandard/KTSubscriptions.php
+++ b/plugins/ktstandard/KTSubscriptions.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktstandard/KTWebDAVDashletPlugin.php b/plugins/ktstandard/KTWebDAVDashletPlugin.php
index d7cddca..3e03791 100644
--- a/plugins/ktstandard/KTWebDAVDashletPlugin.php
+++ b/plugins/ktstandard/KTWebDAVDashletPlugin.php
@@ -5,7 +5,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktstandard/KTWorkflowAssociation.php b/plugins/ktstandard/KTWorkflowAssociation.php
index 997cd10..7c8d292 100644
--- a/plugins/ktstandard/KTWorkflowAssociation.php
+++ b/plugins/ktstandard/KTWorkflowAssociation.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktstandard/PDFGeneratorAction.php b/plugins/ktstandard/PDFGeneratorAction.php
index 054de9a..97a380c 100644
--- a/plugins/ktstandard/PDFGeneratorAction.php
+++ b/plugins/ktstandard/PDFGeneratorAction.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktstandard/PDFGeneratorPlugin.php b/plugins/ktstandard/PDFGeneratorPlugin.php
index c6fd13e..5cd9426 100644
--- a/plugins/ktstandard/PDFGeneratorPlugin.php
+++ b/plugins/ktstandard/PDFGeneratorPlugin.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktstandard/admin/manageDisclaimers.php b/plugins/ktstandard/admin/manageDisclaimers.php
index ce31c20..3409cab 100644
--- a/plugins/ktstandard/admin/manageDisclaimers.php
+++ b/plugins/ktstandard/admin/manageDisclaimers.php
@@ -5,7 +5,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktstandard/contents/BaseIndexer.php b/plugins/ktstandard/contents/BaseIndexer.php
index 04eb62d..eeeb5e5 100644
--- a/plugins/ktstandard/contents/BaseIndexer.php
+++ b/plugins/ktstandard/contents/BaseIndexer.php
@@ -4,33 +4,33 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
- *
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
+ * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
  * Free Software Foundation.
- *
+ * 
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
  * details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see .
- *
+ * 
  * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place,
  * Blake Street, Observatory, 7925 South Africa. or email info@knowledgetree.com.
- *
+ * 
  * The interactive user interfaces in modified source and object code versions
  * of this program must display Appropriate Legal Notices, as required under
  * Section 5 of the GNU General Public License version 3.
- *
+ * 
  * In accordance with Section 7(b) of the GNU General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "Powered by
- * KnowledgeTree" logo and retain the original copyright notice. If the display of the
+ * KnowledgeTree" logo and retain the original copyright notice. If the display of the 
  * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
- * must display the words "Powered by KnowledgeTree" and retain the original
- * copyright notice.
+ * must display the words "Powered by KnowledgeTree" and retain the original 
+ * copyright notice. 
  * Contributor( s): ______________________________________
  *
  */
@@ -106,7 +106,6 @@ class KTBaseIndexerTrigger {
         $sBasedir = $oKTConfig->get("urls/tmpDirectory");
 
         $myfilename = tempnam($sBasedir, 'kt.' . $tempstub);
-
         if (OS_WINDOWS) {
             $intermediate = tempnam($sBasedir, 'kt.' . $tempstub);
             if (!@copy($sFile, $intermediate)) {
@@ -155,11 +154,8 @@ class KTBaseIndexerTrigger {
             $cmdline[] = $sTempFilename;
         }
 
-        if(OS_WINDOWS){
-            $aRet = KTUtil::winexec($cmdline, $aOptions);
-        }else{
-            $aRet = KTUtil::pexec($cmdline, $aOptions);
-        }
+        $aRet = KTUtil::pexec($cmdline, $aOptions);
+
         $this->aCommandOutput = $aRet['out'];
         $contents = file_get_contents($sTempFilename);
 
diff --git a/plugins/ktstandard/contents/ExcelIndexer.php b/plugins/ktstandard/contents/ExcelIndexer.php
index 0fa5337..19f69e5 100644
--- a/plugins/ktstandard/contents/ExcelIndexer.php
+++ b/plugins/ktstandard/contents/ExcelIndexer.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktstandard/contents/OpenDocumentIndexer.php b/plugins/ktstandard/contents/OpenDocumentIndexer.php
index 86a70dc..b559372 100644
--- a/plugins/ktstandard/contents/OpenDocumentIndexer.php
+++ b/plugins/ktstandard/contents/OpenDocumentIndexer.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktstandard/contents/PdfIndexer.php b/plugins/ktstandard/contents/PdfIndexer.php
index 1be2f68..920786e 100644
--- a/plugins/ktstandard/contents/PdfIndexer.php
+++ b/plugins/ktstandard/contents/PdfIndexer.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktstandard/contents/PowerpointIndexer.php b/plugins/ktstandard/contents/PowerpointIndexer.php
index 7ef928b..a52abcb 100644
--- a/plugins/ktstandard/contents/PowerpointIndexer.php
+++ b/plugins/ktstandard/contents/PowerpointIndexer.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktstandard/contents/PsIndexer.php b/plugins/ktstandard/contents/PsIndexer.php
index 680a203..e0414fa 100644
--- a/plugins/ktstandard/contents/PsIndexer.php
+++ b/plugins/ktstandard/contents/PsIndexer.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktstandard/contents/RtfIndexer.php b/plugins/ktstandard/contents/RtfIndexer.php
index d74f84a..9af120e 100644
--- a/plugins/ktstandard/contents/RtfIndexer.php
+++ b/plugins/ktstandard/contents/RtfIndexer.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktstandard/contents/TextIndexer.php b/plugins/ktstandard/contents/TextIndexer.php
index 3a3e631..ede0ecf 100644
--- a/plugins/ktstandard/contents/TextIndexer.php
+++ b/plugins/ktstandard/contents/TextIndexer.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktstandard/contents/WordIndexer.php b/plugins/ktstandard/contents/WordIndexer.php
index d288b2a..63c387b 100644
--- a/plugins/ktstandard/contents/WordIndexer.php
+++ b/plugins/ktstandard/contents/WordIndexer.php
@@ -4,33 +4,33 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
- *
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
+ * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
  * Free Software Foundation.
- *
+ * 
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
  * details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see .
- *
+ * 
  * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place,
  * Blake Street, Observatory, 7925 South Africa. or email info@knowledgetree.com.
- *
+ * 
  * The interactive user interfaces in modified source and object code versions
  * of this program must display Appropriate Legal Notices, as required under
  * Section 5 of the GNU General Public License version 3.
- *
+ * 
  * In accordance with Section 7(b) of the GNU General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "Powered by
- * KnowledgeTree" logo and retain the original copyright notice. If the display of the
+ * KnowledgeTree" logo and retain the original copyright notice. If the display of the 
  * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
- * must display the words "Powered by KnowledgeTree" and retain the original
- * copyright notice.
+ * must display the words "Powered by KnowledgeTree" and retain the original 
+ * copyright notice. 
  * Contributor( s): ______________________________________
  *
  */
@@ -54,7 +54,7 @@ class KTWordIndexerTrigger extends KTBaseIndexerTrigger {
         }
 	  putenv('LANG=en_US.UTF-8');
 
-	  $sCommand = KTUtil::findCommand($this->commandconfig, $this->command);
+	    $sCommand = KTUtil::findCommand($this->commandconfig, $this->command);
         if (empty($sCommand)) {
             return false;
         }
@@ -62,25 +62,6 @@ class KTWordIndexerTrigger extends KTBaseIndexerTrigger {
         if (OS_WINDOWS) {
             $sDir = dirname(dirname($sCommand));
 	        putenv('HOME=' . $sDir);
-
-	        /*
-            $cmdline = array($sCommand);
-            $cmdline = kt_array_merge($cmdline, $this->args);
-            $cmdline[] = $sFilename;
-
-            $sCmd = KTUtil::safeShellString($cmdline);
-        	$sCmd .= " >> " . escapeshellarg($sTempFilename);
-
-        	$sCmd = str_replace( '/','\\',$sCmd);
-
-            $sCmd = "start /b \"kt\" " . $sCmd;
-
-            pclose(popen($sCmd, 'r'));
-
-            $this->aCommandOutput = 1;
-            $contents = file_get_contents($sTempFilename);
-            return $contents;
-            */
         }
         return parent::extract_contents($sFilename, $sTempFilename);
     }
diff --git a/plugins/ktstandard/contents/XmlHtmlIndexer.php b/plugins/ktstandard/contents/XmlHtmlIndexer.php
index 3ca8f66..63830f8 100644
--- a/plugins/ktstandard/contents/XmlHtmlIndexer.php
+++ b/plugins/ktstandard/contents/XmlHtmlIndexer.php
@@ -5,7 +5,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktstandard/ldap/activedirectoryauthenticationprovider.inc.php b/plugins/ktstandard/ldap/activedirectoryauthenticationprovider.inc.php
index 3c3e3f6..32e1711 100644
--- a/plugins/ktstandard/ldap/activedirectoryauthenticationprovider.inc.php
+++ b/plugins/ktstandard/ldap/activedirectoryauthenticationprovider.inc.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktstandard/ldap/ldapauthenticationprovider.inc.php b/plugins/ktstandard/ldap/ldapauthenticationprovider.inc.php
index b780b21..c657d04 100644
--- a/plugins/ktstandard/ldap/ldapauthenticationprovider.inc.php
+++ b/plugins/ktstandard/ldap/ldapauthenticationprovider.inc.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktstandard/ldap/ldapbaseauthenticationprovider.inc.php b/plugins/ktstandard/ldap/ldapbaseauthenticationprovider.inc.php
index fd0d0bd..5631f68 100644
--- a/plugins/ktstandard/ldap/ldapbaseauthenticationprovider.inc.php
+++ b/plugins/ktstandard/ldap/ldapbaseauthenticationprovider.inc.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktstandard/workflow/FolderAssociator.php b/plugins/ktstandard/workflow/FolderAssociator.php
index 639401e..b0b0b8c 100644
--- a/plugins/ktstandard/workflow/FolderAssociator.php
+++ b/plugins/ktstandard/workflow/FolderAssociator.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktstandard/workflow/TypeAssociator.php b/plugins/ktstandard/workflow/TypeAssociator.php
index fcf33a0..d4edde2 100644
--- a/plugins/ktstandard/workflow/TypeAssociator.php
+++ b/plugins/ktstandard/workflow/TypeAssociator.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/ktstandard/workflow/adminpage.php b/plugins/ktstandard/workflow/adminpage.php
index 185bc8f..d9dcdef 100644
--- a/plugins/ktstandard/workflow/adminpage.php
+++ b/plugins/ktstandard/workflow/adminpage.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/rssplugin/KTrss.inc.php b/plugins/rssplugin/KTrss.inc.php
index a55b1d8..bf94e9b 100644
--- a/plugins/rssplugin/KTrss.inc.php
+++ b/plugins/rssplugin/KTrss.inc.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/rssplugin/RSSDashlet.php b/plugins/rssplugin/RSSDashlet.php
index a304fe6..0ec62a3 100644
--- a/plugins/rssplugin/RSSDashlet.php
+++ b/plugins/rssplugin/RSSDashlet.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/rssplugin/RSSDedicatedDashlet.php b/plugins/rssplugin/RSSDedicatedDashlet.php
index 382c616..f8c8e39 100644
--- a/plugins/rssplugin/RSSDedicatedDashlet.php
+++ b/plugins/rssplugin/RSSDedicatedDashlet.php
@@ -1,79 +1,79 @@
-.
- * 
- * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place,
- * Blake Street, Observatory, 7925 South Africa. or email info@knowledgetree.com.
- * 
- * The interactive user interfaces in modified source and object code versions
- * of this program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU General Public License version 3.
- * 
- * In accordance with Section 7(b) of the GNU General Public License version 3,
- * these Appropriate Legal Notices must retain the display of the "Powered by
- * KnowledgeTree" logo and retain the original copyright notice. If the display of the 
- * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
- * must display the words "Powered by KnowledgeTree" and retain the original 
- * copyright notice. 
- * Contributor( s): ______________________________________
- *
- */
-
-require_once(KT_LIB_DIR . '/browse/browseutil.inc.php');
-require_once(KT_DIR. '/plugins/rssplugin/rss2array.inc.php');
-require_once(KT_DIR. '/plugins/rssplugin/KTrss.inc.php');
-
-class RSSDedicatedDashlet extends KTBaseDashlet {
-	var $oUser;
-	
-	function RSSDedicatedDashlet(){
-		$oKTConfig =& KTConfig::getSingleton();
-
-        $sTitle = $oKTConfig->get('urls/dedicatedrsstitle', 'RSS');
-		$this->sTitle = $sTitle;
-	}
-	
-	function is_active($oUser) {
-		$this->oUser = $oUser;
-		return true;
-	}
-
-	function render() {
-		global $main;
-        $main->requireJSResource("plugins/rssplugin/js/update.js");
-		
-		$oTemplating =& KTTemplating::getSingleton();
-       	$oTemplate = $oTemplating->loadTemplate('RSSPlugin/dedicated_dashlet');
-       	
-       	$iUId = $this->oUser->getId();
-		$oKTConfig =& KTConfig::getSingleton();
-
-        $sUrl = $oKTConfig->get('urls/dedicatedrssurl', '');
-		
-        // Prepare template data
-		$aTemplateData = array(
-			'context' => $this,
-			'url' => $sUrl,
-			'user' => $iUId,
-		);
-      
-        return $oTemplate->render($aTemplateData);
-    }
-}
-?>
+.
+ * 
+ * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place,
+ * Blake Street, Observatory, 7925 South Africa. or email info@knowledgetree.com.
+ * 
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ * 
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "Powered by
+ * KnowledgeTree" logo and retain the original copyright notice. If the display of the 
+ * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
+ * must display the words "Powered by KnowledgeTree" and retain the original 
+ * copyright notice. 
+ * Contributor( s): ______________________________________
+ *
+ */
+
+require_once(KT_LIB_DIR . '/browse/browseutil.inc.php');
+require_once(KT_DIR. '/plugins/rssplugin/rss2array.inc.php');
+require_once(KT_DIR. '/plugins/rssplugin/KTrss.inc.php');
+
+class RSSDedicatedDashlet extends KTBaseDashlet {
+	var $oUser;
+	
+	function RSSDedicatedDashlet(){
+		$oKTConfig =& KTConfig::getSingleton();
+
+        $sTitle = $oKTConfig->get('urls/dedicatedrsstitle', 'RSS');
+		$this->sTitle = $sTitle;
+	}
+	
+	function is_active($oUser) {
+		$this->oUser = $oUser;
+		return true;
+	}
+
+	function render() {
+		global $main;
+        $main->requireJSResource("plugins/rssplugin/js/update.js");
+		
+		$oTemplating =& KTTemplating::getSingleton();
+       	$oTemplate = $oTemplating->loadTemplate('RSSPlugin/dedicated_dashlet');
+       	
+       	$iUId = $this->oUser->getId();
+		$oKTConfig =& KTConfig::getSingleton();
+
+        $sUrl = $oKTConfig->get('urls/dedicatedrssurl', '');
+		
+        // Prepare template data
+		$aTemplateData = array(
+			'context' => $this,
+			'url' => $sUrl,
+			'user' => $iUId,
+		);
+      
+        return $oTemplate->render($aTemplateData);
+    }
+}
+?>
diff --git a/plugins/rssplugin/RSSDocumentLinkAction.php b/plugins/rssplugin/RSSDocumentLinkAction.php
index 18743fb..0359420 100644
--- a/plugins/rssplugin/RSSDocumentLinkAction.php
+++ b/plugins/rssplugin/RSSDocumentLinkAction.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/rssplugin/RSSFolderLinkAction.php b/plugins/rssplugin/RSSFolderLinkAction.php
index 5e45df0..1497166 100644
--- a/plugins/rssplugin/RSSFolderLinkAction.php
+++ b/plugins/rssplugin/RSSFolderLinkAction.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/rssplugin/RSSPlugin.php b/plugins/rssplugin/RSSPlugin.php
index 38178d8..dffa5c3 100644
--- a/plugins/rssplugin/RSSPlugin.php
+++ b/plugins/rssplugin/RSSPlugin.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/rssplugin/loadDedicatedFeed.inc.php b/plugins/rssplugin/loadDedicatedFeed.inc.php
index 7cd2d3d..64922cd 100644
--- a/plugins/rssplugin/loadDedicatedFeed.inc.php
+++ b/plugins/rssplugin/loadDedicatedFeed.inc.php
@@ -1,93 +1,93 @@
-.
- * 
- * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place,
- * Blake Street, Observatory, 7925 South Africa. or email info@knowledgetree.com.
- * 
- * The interactive user interfaces in modified source and object code versions
- * of this program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU General Public License version 3.
- * 
- * In accordance with Section 7(b) of the GNU General Public License version 3,
- * these Appropriate Legal Notices must retain the display of the "Powered by
- * KnowledgeTree" logo and retain the original copyright notice. If the display of the 
- * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
- * must display the words "Powered by KnowledgeTree" and retain the original 
- * copyright notice. 
- * Contributor( s): ______________________________________
- *
- */
- require_once('../../config/dmsDefaults.php');
- require_once(KT_DIR. '/plugins/rssplugin/rss2array.inc.php');
- require_once(KT_DIR. '/plugins/rssplugin/KTrss.inc.php');
- 
- $feed = $_GET["feed"];
- $user = $_GET["user"];
- session_start();
- 
- $sCache = _checkCache($feed);
- 
- if(!is_null($sCache)) {
- 	$aRSSArray =  $sCache;
- }else{
- 	$aRSSArray = rss2array($feed);
-	$_SESSION['kt_dedicated_rss'][$feed]['lastcheck'] = time();
-    $_SESSION['kt_dedicated_rss'][$feed] = $aRSSArray;
- }
- // Prepare response data to be passed back to page
- $reposonse = "
".$aRSSArray[channel][title]."
" .
- 		"
" .
- 		"";
-		for($i=0;$i".$aRSSArray[items][$i][title]."
-			
-			
-				
-			
-			";
-		}
- $reposonse .= "
".$aRSSArray[items][$i][description]."


";
-	 
- echo  $reposonse;
- 
- function _checkCache($feed) {
-	session_start();
-    $iLastCheck = $_SESSION['kt_dedicated_rss'][$feed]['lastcheck'];
-
-    if (empty($iLastCheck)) {
-        return;
-    }
-    $sStoredFeed = $_SESSION['kt_dedicated_rss'][$feed];
-    if (empty($sStoredFeed)) {
-        $now = time();
-        $diff = $now - $iLastCheck;
-        if ($diff > (5*60)) {
-            return;
-        }
-    }
-    $now = time();
-    $diff = $now - $iLastCheck;
-    if ($diff > (5*60)) {
-        return;
-    }
-    return $sStoredFeed;
-}
-?>
+.
+ * 
+ * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place,
+ * Blake Street, Observatory, 7925 South Africa. or email info@knowledgetree.com.
+ * 
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ * 
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "Powered by
+ * KnowledgeTree" logo and retain the original copyright notice. If the display of the 
+ * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
+ * must display the words "Powered by KnowledgeTree" and retain the original 
+ * copyright notice. 
+ * Contributor( s): ______________________________________
+ *
+ */
+ require_once('../../config/dmsDefaults.php');
+ require_once(KT_DIR. '/plugins/rssplugin/rss2array.inc.php');
+ require_once(KT_DIR. '/plugins/rssplugin/KTrss.inc.php');
+ 
+ $feed = $_GET["feed"];
+ $user = $_GET["user"];
+ session_start();
+ 
+ $sCache = _checkCache($feed);
+ 
+ if(!is_null($sCache)) {
+ 	$aRSSArray =  $sCache;
+ }else{
+ 	$aRSSArray = rss2array($feed);
+	$_SESSION['kt_dedicated_rss'][$feed]['lastcheck'] = time();
+    $_SESSION['kt_dedicated_rss'][$feed] = $aRSSArray;
+ }
+ // Prepare response data to be passed back to page
+ $reposonse = "
".$aRSSArray[channel][title]."
" .
+ 		"
" .
+ 		"";
+		for($i=0;$i".$aRSSArray[items][$i][title]."
+			
+			
+				
+			
+			";
+		}
+ $reposonse .= "
".$aRSSArray[items][$i][description]."


";
+	 
+ echo  $reposonse;
+ 
+ function _checkCache($feed) {
+	session_start();
+    $iLastCheck = $_SESSION['kt_dedicated_rss'][$feed]['lastcheck'];
+
+    if (empty($iLastCheck)) {
+        return;
+    }
+    $sStoredFeed = $_SESSION['kt_dedicated_rss'][$feed];
+    if (empty($sStoredFeed)) {
+        $now = time();
+        $diff = $now - $iLastCheck;
+        if ($diff > (5*60)) {
+            return;
+        }
+    }
+    $now = time();
+    $diff = $now - $iLastCheck;
+    if ($diff > (5*60)) {
+        return;
+    }
+    return $sStoredFeed;
+}
+?>
diff --git a/plugins/rssplugin/loadFeed.inc.php b/plugins/rssplugin/loadFeed.inc.php
index ec20e6d..6b5e987 100644
--- a/plugins/rssplugin/loadFeed.inc.php
+++ b/plugins/rssplugin/loadFeed.inc.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/rssplugin/manageRSSFeeds.php b/plugins/rssplugin/manageRSSFeeds.php
index a36c3c7..0743808 100644
--- a/plugins/rssplugin/manageRSSFeeds.php
+++ b/plugins/rssplugin/manageRSSFeeds.php
@@ -5,7 +5,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/rssplugin/rss2array.inc.php b/plugins/rssplugin/rss2array.inc.php
index 92c2b82..3124f40 100644
--- a/plugins/rssplugin/rss2array.inc.php
+++ b/plugins/rssplugin/rss2array.inc.php
@@ -5,7 +5,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/search2/ExternalDashlet.php b/plugins/search2/ExternalDashlet.php
index d8a40cd..7ed7fc0 100644
--- a/plugins/search2/ExternalDashlet.php
+++ b/plugins/search2/ExternalDashlet.php
@@ -5,7 +5,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/search2/IndexingStatusDashlet.php b/plugins/search2/IndexingStatusDashlet.php
index 6eb1a14..527eaf2 100644
--- a/plugins/search2/IndexingStatusDashlet.php
+++ b/plugins/search2/IndexingStatusDashlet.php
@@ -5,7 +5,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/search2/LuceneStatisticsDashlet.php b/plugins/search2/LuceneStatisticsDashlet.php
index 3cec0de..3cc6544 100644
--- a/plugins/search2/LuceneStatisticsDashlet.php
+++ b/plugins/search2/LuceneStatisticsDashlet.php
@@ -5,7 +5,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/search2/MigrationDashlet.php b/plugins/search2/MigrationDashlet.php
index c5db154..7d30698 100644
--- a/plugins/search2/MigrationDashlet.php
+++ b/plugins/search2/MigrationDashlet.php
@@ -5,7 +5,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/tagcloud/TagCloudDashlet.php b/plugins/tagcloud/TagCloudDashlet.php
index 08597cb..cdf5b94 100644
--- a/plugins/tagcloud/TagCloudDashlet.php
+++ b/plugins/tagcloud/TagCloudDashlet.php
@@ -5,7 +5,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/tagcloud/TagCloudPlugin.php b/plugins/tagcloud/TagCloudPlugin.php
index 038fe00..a83324c 100644
--- a/plugins/tagcloud/TagCloudPlugin.php
+++ b/plugins/tagcloud/TagCloudPlugin.php
@@ -5,7 +5,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/tagcloud/TagCloudRedirectPage.php b/plugins/tagcloud/TagCloudRedirectPage.php
index cea5c72..f1179be 100644
--- a/plugins/tagcloud/TagCloudRedirectPage.php
+++ b/plugins/tagcloud/TagCloudRedirectPage.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/plugins/tagcloud/TagCloudTriggers.php b/plugins/tagcloud/TagCloudTriggers.php
index 47a8124..9de5f2c 100644
--- a/plugins/tagcloud/TagCloudTriggers.php
+++ b/plugins/tagcloud/TagCloudTriggers.php
@@ -1,247 +1,247 @@
-.
- * 
- * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place,
- * Blake Street, Observatory, 7925 South Africa. or email info@knowledgetree.com.
- * 
- * The interactive user interfaces in modified source and object code versions
- * of this program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU General Public License version 3.
- * 
- * In accordance with Section 7(b) of the GNU General Public License version 3,
- * these Appropriate Legal Notices must retain the display of the "Powered by
- * KnowledgeTree" logo and retain the original copyright notice. If the display of the 
- * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
- * must display the words "Powered by KnowledgeTree" and retain the original 
- * copyright notice. 
- * Contributor( s): ______________________________________
- *
- */
-/**
- * Trigger for document add (postValidate)
- *
- */
-class KTAddDocumentTrigger {
-    var $aInfo = null;
-    /**
-     * function to set the info for the trigger
-     *
-     * @param array $aInfo
-     */
-    function setInfo(&$aInfo) {
-        $this->aInfo =& $aInfo;
-    }
-
-    /**
-     * postValidate method for trigger
-     *
-     * @return unknown
-     */
-    function postValidate() {
-        global $default;
-        $oDocument =& $this->aInfo['document'];    
-        $aMeta = & $this->aInfo['aOptions'];
-     
-        $iDocId = $oDocument->getID();        
-        
-        // get tag id from document_fields table where name = Tag
-		$sQuery = 'SELECT df.id AS id FROM document_fields AS df ' .
-				'WHERE df.name = \'Tag\'';
-
-        $sTags = DBUtil::getOneResultKey(array($sQuery), 'id');
-        if (PEAR::isError($sTags)) {
-            // XXX: log error
-            return false;
-        }
-        $tagString = '';
-        // add tags
-        if ($sTags) {
-        	if (count($aMeta['metadata']) > 0)
-        	{
-        		foreach($aMeta['metadata'] as $aMetaData)
-        		{
-        		 
-				$oProxy = $aMetaData[0];
-				if($oProxy->iId == $sTags)
-				{
-					$tagString = $aMetaData[1];
-				}
-        		}
-			}
-			if($tagString != ''){
-	        	$words_table = KTUtil::getTableName('tag_words');
-	        	$tagString = str_replace(' ', '', $tagString);
-		    	$tags = explode(',',$tagString);
-		    	
-		    	$aTagIds = array();
-		    	
-		    	foreach($tags as $sTag)
-		    	{
-		    		$sTag=strtolower(trim($sTag));
-		    		
-		    		$res = DBUtil::getOneResult(array("SELECT id FROM $words_table WHERE tag = ?", array($sTag)));
-		
-		    		if (PEAR::isError($res)) {
-		            	return $res;
-		        	}
-		        	
-		        	if (is_null($res)) 
-		        	{
-		        		$id = & DBUtil::autoInsert($words_table, array('tag'=>$sTag));
-		        		$aTagIds[$sTag] = $id;
-		        	}
-		        	else 
-		        	{
-		        		$aTagIds[$sTag] = $res['id'];
-		        	}
-		    	}
-		    	
-		    	$doc_tags = KTUtil::getTableName('document_tags');
-		    	
-		    	foreach($aTagIds as $sTag=>$tagid)
-		    	{
-		    		DBUtil::autoInsert($doc_tags, array(
-		    			
-		    			'document_id'=>$iDocId,
-		    			'tag_id'=>$tagid),
-		    			array('noid'=>true));
-		    	}
-        	}
-        }
-    }
-}
-
-
-/**
- * Trigger for document edit (postValidate)
- *
- */
-class KTEditDocumentTrigger {
-    var $aInfo = null;
-     /**
-     * function to set the info for the trigger
-     *
-     * @param array $aInfo
-     */
-    function setInfo(&$aInfo) {
-        $this->aInfo =& $aInfo;
-    }
-
-    /**
-     * postValidate method for trigger
-     *
-     * @return unknown
-     */
-    function postValidate() {
-        global $default;
-        $oDocument =& $this->aInfo['document'];    
-        $aMeta = & $this->aInfo['aOptions'];
-      	// get document id
-        $iDocId = $oDocument->getID();        
-		
-        // get all tags that are linked to the document
-		$sQuery = 'SELECT tw.id FROM tag_words AS tw, document_tags AS dt, documents AS d ' .
-				'WHERE dt.tag_id = tw.id ' .
-				'AND dt.document_id = d.id ' .
-				'AND d.id = ?';
-		$aParams = array($iDocId);
-        $aTagId = DBUtil::getResultArray(array($sQuery, $aParams));
-        if (PEAR::isError($aTagId)) {
-            // XXX: log error
-            return false;
-        }
-        // if there are any related tags proceed
-        if ($aTagId) {
-        	// delete all entries from document_tags table for the document
-			$sQuery = 'DELETE FROM document_tags ' .
-					'WHERE document_id = ?';
-			$aParams = array($iDocId);
-			$removed = DBUtil::runQuery(array($sQuery, $aParams));
-			if (PEAR::isError($removed)) {
-        		// XXX: log error
-        		return false;
-    		}
-        }
-        // proceed to add the tags as per normaly
-		$sQuery = 'SELECT df.id AS id FROM document_fields AS df ' .
-		'WHERE df.name = \'Tag\'';
-
-        $sTags = DBUtil::getOneResultKey(array($sQuery), 'id');
-        if (PEAR::isError($sTags)) {
-            // XXX: log error
-            return false;
-        }
-        $tagString = '';
-        if ($sTags) {
-        	// it is actually correct using $aMeta. It is different to the add trigger above...
-        	if (count($aMeta) > 0)
-        	{
-        		foreach($aMeta as $aMetaData)
-        		{
-        			$oProxy = $aMetaData[0];
-        			if($oProxy->iId == $sTags)
-        			{
-        				$tagString = $aMetaData[1];
-        				break;
-					}
-        		}
-			}
-			if($tagString != ''){
-	        	$words_table = KTUtil::getTableName('tag_words');
-	        	$tagString = str_replace('  ', ' ', $tagString);
-		    	$tags = explode(',',$tagString);
-		    	
-		    	$aTagIds = array();
-		    	
-		    	foreach($tags as $sTag)
-		    	{
-		    		$sTag=strtolower(trim($sTag));
-		    		
-		    		$res = DBUtil::getOneResult(array("SELECT id FROM $words_table WHERE tag = ?", array($sTag)));
-		
-		    		if (PEAR::isError($res)) {
-		            	return $res;
-		        	}
-		        	
-		        	if (is_null($res)) 
-		        	{
-		        		$id = & DBUtil::autoInsert($words_table, array('tag'=>$sTag));
-		        		$aTagIds[$sTag] = $id;
-		        	}
-		        	else 
-		        	{
-		        		$aTagIds[$sTag] = $res['id'];
-		        	}
-		    	}
-		    	
-		    	$doc_tags = KTUtil::getTableName('document_tags');
-		    	
-		    	foreach($aTagIds as $sTag=>$tagid)
-		    	{
-		    		DBUtil::autoInsert($doc_tags, array(
-		    			'document_id'=>$iDocId,
-		    			'tag_id'=>$tagid),
-		    			array('noid'=>true));
-		    	}
-        	}
-        }
-    }
-}
+.
+ * 
+ * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place,
+ * Blake Street, Observatory, 7925 South Africa. or email info@knowledgetree.com.
+ * 
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ * 
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "Powered by
+ * KnowledgeTree" logo and retain the original copyright notice. If the display of the 
+ * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
+ * must display the words "Powered by KnowledgeTree" and retain the original 
+ * copyright notice. 
+ * Contributor( s): ______________________________________
+ *
+ */
+/**
+ * Trigger for document add (postValidate)
+ *
+ */
+class KTAddDocumentTrigger {
+    var $aInfo = null;
+    /**
+     * function to set the info for the trigger
+     *
+     * @param array $aInfo
+     */
+    function setInfo(&$aInfo) {
+        $this->aInfo =& $aInfo;
+    }
+
+    /**
+     * postValidate method for trigger
+     *
+     * @return unknown
+     */
+    function postValidate() {
+        global $default;
+        $oDocument =& $this->aInfo['document'];    
+        $aMeta = & $this->aInfo['aOptions'];
+     
+        $iDocId = $oDocument->getID();        
+        
+        // get tag id from document_fields table where name = Tag
+		$sQuery = 'SELECT df.id AS id FROM document_fields AS df ' .
+				'WHERE df.name = \'Tag\'';
+
+        $sTags = DBUtil::getOneResultKey(array($sQuery), 'id');
+        if (PEAR::isError($sTags)) {
+            // XXX: log error
+            return false;
+        }
+        $tagString = '';
+        // add tags
+        if ($sTags) {
+        	if (count($aMeta['metadata']) > 0)
+        	{
+        		foreach($aMeta['metadata'] as $aMetaData)
+        		{
+        		 
+				$oProxy = $aMetaData[0];
+				if($oProxy->iId == $sTags)
+				{
+					$tagString = $aMetaData[1];
+				}
+        		}
+			}
+			if($tagString != ''){
+	        	$words_table = KTUtil::getTableName('tag_words');
+	        	$tagString = str_replace(' ', '', $tagString);
+		    	$tags = explode(',',$tagString);
+		    	
+		    	$aTagIds = array();
+		    	
+		    	foreach($tags as $sTag)
+		    	{
+		    		$sTag=strtolower(trim($sTag));
+		    		
+		    		$res = DBUtil::getOneResult(array("SELECT id FROM $words_table WHERE tag = ?", array($sTag)));
+		
+		    		if (PEAR::isError($res)) {
+		            	return $res;
+		        	}
+		        	
+		        	if (is_null($res)) 
+		        	{
+		        		$id = & DBUtil::autoInsert($words_table, array('tag'=>$sTag));
+		        		$aTagIds[$sTag] = $id;
+		        	}
+		        	else 
+		        	{
+		        		$aTagIds[$sTag] = $res['id'];
+		        	}
+		    	}
+		    	
+		    	$doc_tags = KTUtil::getTableName('document_tags');
+		    	
+		    	foreach($aTagIds as $sTag=>$tagid)
+		    	{
+		    		DBUtil::autoInsert($doc_tags, array(
+		    			
+		    			'document_id'=>$iDocId,
+		    			'tag_id'=>$tagid),
+		    			array('noid'=>true));
+		    	}
+        	}
+        }
+    }
+}
+
+
+/**
+ * Trigger for document edit (postValidate)
+ *
+ */
+class KTEditDocumentTrigger {
+    var $aInfo = null;
+     /**
+     * function to set the info for the trigger
+     *
+     * @param array $aInfo
+     */
+    function setInfo(&$aInfo) {
+        $this->aInfo =& $aInfo;
+    }
+
+    /**
+     * postValidate method for trigger
+     *
+     * @return unknown
+     */
+    function postValidate() {
+        global $default;
+        $oDocument =& $this->aInfo['document'];    
+        $aMeta = & $this->aInfo['aOptions'];
+      	// get document id
+        $iDocId = $oDocument->getID();        
+		
+        // get all tags that are linked to the document
+		$sQuery = 'SELECT tw.id FROM tag_words AS tw, document_tags AS dt, documents AS d ' .
+				'WHERE dt.tag_id = tw.id ' .
+				'AND dt.document_id = d.id ' .
+				'AND d.id = ?';
+		$aParams = array($iDocId);
+        $aTagId = DBUtil::getResultArray(array($sQuery, $aParams));
+        if (PEAR::isError($aTagId)) {
+            // XXX: log error
+            return false;
+        }
+        // if there are any related tags proceed
+        if ($aTagId) {
+        	// delete all entries from document_tags table for the document
+			$sQuery = 'DELETE FROM document_tags ' .
+					'WHERE document_id = ?';
+			$aParams = array($iDocId);
+			$removed = DBUtil::runQuery(array($sQuery, $aParams));
+			if (PEAR::isError($removed)) {
+        		// XXX: log error
+        		return false;
+    		}
+        }
+        // proceed to add the tags as per normaly
+		$sQuery = 'SELECT df.id AS id FROM document_fields AS df ' .
+		'WHERE df.name = \'Tag\'';
+
+        $sTags = DBUtil::getOneResultKey(array($sQuery), 'id');
+        if (PEAR::isError($sTags)) {
+            // XXX: log error
+            return false;
+        }
+        $tagString = '';
+        if ($sTags) {
+        	// it is actually correct using $aMeta. It is different to the add trigger above...
+        	if (count($aMeta) > 0)
+        	{
+        		foreach($aMeta as $aMetaData)
+        		{
+        			$oProxy = $aMetaData[0];
+        			if($oProxy->iId == $sTags)
+        			{
+        				$tagString = $aMetaData[1];
+        				break;
+					}
+        		}
+			}
+			if($tagString != ''){
+	        	$words_table = KTUtil::getTableName('tag_words');
+	        	$tagString = str_replace('  ', ' ', $tagString);
+		    	$tags = explode(',',$tagString);
+		    	
+		    	$aTagIds = array();
+		    	
+		    	foreach($tags as $sTag)
+		    	{
+		    		$sTag=strtolower(trim($sTag));
+		    		
+		    		$res = DBUtil::getOneResult(array("SELECT id FROM $words_table WHERE tag = ?", array($sTag)));
+		
+		    		if (PEAR::isError($res)) {
+		            	return $res;
+		        	}
+		        	
+		        	if (is_null($res)) 
+		        	{
+		        		$id = & DBUtil::autoInsert($words_table, array('tag'=>$sTag));
+		        		$aTagIds[$sTag] = $id;
+		        	}
+		        	else 
+		        	{
+		        		$aTagIds[$sTag] = $res['id'];
+		        	}
+		    	}
+		    	
+		    	$doc_tags = KTUtil::getTableName('document_tags');
+		    	
+		    	foreach($aTagIds as $sTag=>$tagid)
+		    	{
+		    		DBUtil::autoInsert($doc_tags, array(
+		    			'document_id'=>$iDocId,
+		    			'tag_id'=>$tagid),
+		    			array('noid'=>true));
+		    	}
+        	}
+        }
+    }
+}
 ?>
\ No newline at end of file
diff --git a/preferences.php b/preferences.php
index 089e2ec..b638669 100644
--- a/preferences.php
+++ b/preferences.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/presentation/i18nJavascript.php b/presentation/i18nJavascript.php
index 9990175..599f096 100644
--- a/presentation/i18nJavascript.php
+++ b/presentation/i18nJavascript.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/presentation/logout.php b/presentation/logout.php
index f62f0e0..8bd29ec 100644
--- a/presentation/logout.php
+++ b/presentation/logout.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/presentation/lookAndFeel/knowledgeTree/ajaxConditional.php b/presentation/lookAndFeel/knowledgeTree/ajaxConditional.php
index ed4eeaa..3a1ac19 100644
--- a/presentation/lookAndFeel/knowledgeTree/ajaxConditional.php
+++ b/presentation/lookAndFeel/knowledgeTree/ajaxConditional.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/getTypeMetadataFields.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/getTypeMetadataFields.php
index 0f27328..5a24b34 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/getTypeMetadataFields.php
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/getTypeMetadataFields.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/presentation/lookAndFeel/knowledgeTree/help.php b/presentation/lookAndFeel/knowledgeTree/help.php
index 9c5c220..0899293 100644
--- a/presentation/lookAndFeel/knowledgeTree/help.php
+++ b/presentation/lookAndFeel/knowledgeTree/help.php
@@ -6,7 +6,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/presentation/lookAndFeel/knowledgeTree/noAccess.php b/presentation/lookAndFeel/knowledgeTree/noAccess.php
index 1030f12..5c4ff49 100644
--- a/presentation/lookAndFeel/knowledgeTree/noAccess.php
+++ b/presentation/lookAndFeel/knowledgeTree/noAccess.php
@@ -6,7 +6,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/resources/css/kt-framing.css b/resources/css/kt-framing.css
index 7377c4a..9763b18 100644
--- a/resources/css/kt-framing.css
+++ b/resources/css/kt-framing.css
@@ -553,8 +553,10 @@ a.main_nav_item {
     top: 0;
     z-index: 1;
     width:auto;
-    padding: 0 2em 1em 0;
-    overflow: auto;
+    /*padding: 0 2em 1em 0; 
+    overflow: auto;*/ 
+    padding: 0.25em 2em 0em 0em; 
+    overflow: hidden; 
     min-height: 600px;
 }
 
diff --git a/resources/js/conditional_selection.js b/resources/js/conditional_selection.js
new file mode 100755
index 0000000..df27143
--- /dev/null
+++ b/resources/js/conditional_selection.js
@@ -0,0 +1,172 @@
+// 'lookups' and 'connections' are produced by the master conditional widget
+var NOSELECTION = 'No selection.';
+
+function ConditionalSelection() {
+}
+
+function in_array(a, val) {
+    if(!a.length) {
+	return;
+    }
+    for(var i=0;i
+var lookups_{$masterid} = {$lookups};
+var connections_{$masterid} = {$connections};
+
+{/if}
+
+
+{if empty($vocab)}
+    
{$context->sEmptyMessage}

+{else}
+  
+{/if}
diff --git a/templates/ktcore/metadata/conditional/conditional_admin_overview.smarty b/templates/ktcore/metadata/conditional/conditional_admin_overview.smarty
index 17aeb48..9e7a5eb 100644
--- a/templates/ktcore/metadata/conditional/conditional_admin_overview.smarty
+++ b/templates/ktcore/metadata/conditional/conditional_admin_overview.smarty
@@ -29,30 +29,6 @@ values in the other fields.  Only lookup fields can be added to
 

 
 
-

-    {i18n}Rename Behaviours{/i18n}
-    {i18n}Rename Behaviours{/i18n}
-

-
-{if $oFieldset->getIsComplex()}
-
{i18n}The fieldset is currently designated as Complex.{/i18n} {i18n}Changing the conditional type set will remove all existing field
-ordering!{/i18n}
 
-
-
-
{i18n}Change to simple{/i18n}
-{i18n}Change to simple{/i18n}

-
-{else}
-
-
{i18n}The fieldset is currently designated as Simple.{/i18n}
 
-
-
{i18n}Change to complex{/i18n}
-{i18n}Change to complex{/i18n}

-
-{/if}
-
 
 
 

diff --git a/templates/ktcore/metadata/conditional/manageConditional.smarty b/templates/ktcore/metadata/conditional/manageConditional.smarty
index c878bc5..3bab28f 100644
--- a/templates/ktcore/metadata/conditional/manageConditional.smarty
+++ b/templates/ktcore/metadata/conditional/manageConditional.smarty
@@ -1,16 +1,11 @@
 
{i18n}Manage conditional fieldset{/i18n}

 
 
{i18n}Conditional fieldsets allow you to restrict the options
-a user has for values in some fields based on the values in other fields.  There
-are two kinds of conditional fieldsets:  Simple and Complex
-.  Simple fieldsets should be sufficient for most things:  they allow you to say that 
+a user has for values in some fields based on the values in other fields, allowing you to say that 
 the values of one field are restricted to a certain subset of values if another field
 has a specific value.  For example, you could say that if the field "Street" is "Jeffrey", 
 then the field "Residents" must be one of "Jones","Smith" or "Friedman".{/i18n}

 
-
{i18n}Complex fieldsets allow you to give far more detailed structure to
-your information:  The value of "Residents" can depend not only on "Street", but on
-how the user was allowed to select the specific street (given another field).{/i18n}

 
 {* don't show warnings until the basics are done. *}
 
@@ -42,29 +37,6 @@ to complete{/i18n}: {$sIncomplete}
 
 
{i18n}Conditional type{/i18n}

 
-{if $oFieldset->getIsComplex()}
-
{i18n}The fieldset is currently designated as Complex{/i18n}
 
-
-{if ($oMasterField && empty($free_fields))}
{i18n}Manage
-complex conditional{/i18n}
{/if}
-
-

-
-
-
-

-
-{else}
-
-
{i18n}The fieldset is currently designated as Simple{/i18n}
 
-
-{if ($oMasterField && empty($free_fields))}
{i18n}Manage simple conditional{/i18n}
-

-{/if}
 
 

 
diff --git a/tests/api/authentication.php b/tests/api/authentication.php
index 84e8c26..fd99329 100644
--- a/tests/api/authentication.php
+++ b/tests/api/authentication.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/tests/api/document.php b/tests/api/document.php
index 5546490..f72bdaf 100644
--- a/tests/api/document.php
+++ b/tests/api/document.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/tests/api/folder.php b/tests/api/folder.php
index 23d6f59..6337957 100644
--- a/tests/api/folder.php
+++ b/tests/api/folder.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
diff --git a/view.php b/view.php
index 920f897..bc9da30 100755
--- a/view.php
+++ b/view.php
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
- * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the