Peter M. Groen / knowledgetree

Commit b8dacf4e416e8054dc2839592148a919ba45ad35

Authored by Michael Joseph
1 parent 6ade5b3e

moved check for folderID outside check for folder write permission (and reformatted) 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@926 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 60 additions and 52 deletions
presentation/lookAndFeel/knowledgeTree/foldermanagement/editBL.php
  View file @b8dacf4
... ... @@ -3,7 +3,7 @@
3 3 * Business logic used to edit folder properties
4 4 *
5 5 * Expected form variables:
6   -* o $fFolderID - primary key of folder user is currently browsing
  6 +* o $fFolderID - primary key of folder user is currently browsing
7 7 *
8 8 * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
9 9 * @date 2 February 2003
... ... @@ -14,57 +14,65 @@
14 14 require_once("../../../../config/dmsDefaults.php");
15 15  
16 16 if (checkSession()) {
17   - require_once("$default->owl_fs_root/lib/visualpatterns/PatternListBox.inc");
18   - require_once("$default->owl_fs_root/lib/visualpatterns/PatternEditableListFromQuery.inc");
19   - require_once("editUI.inc");
20   - require_once("$default->owl_fs_root/lib/security/permission.inc");
21   - require_once("$default->owl_fs_root/presentation/webpageTemplate.inc");
22   - require_once("$default->owl_fs_root/lib/visualpatterns/PatternCustom.inc");
23   - require_once("$default->owl_fs_root/lib/foldermanagement/Folder.inc");
24   - require_once("$default->owl_fs_root/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
25   - require_once("$default->owl_fs_root/presentation/Html.inc");
26   -
27   - if (Permission::userHasFolderWritePermission($fFolderID)) {
28   - //if the user can edit the folder
29   - if (isset($fFolderID)) {
30   - if (isset($fCollaborationEdit)) {
31   - //user attempted to edit the folder collaboration process but could not because there is
32   - //a document currently in this process
33   - $oPatternCustom = & new PatternCustom();
34   - $oPatternCustom->setHtml(getPage($fFolderID));
35   - $main->setErrorMessage("You cannot edit this folder collaboration process as a document is currently undergoing this collaboration process");
36   - $main->setCentralPayload($oPatternCustom);
37   - $main->setHasRequiredFields(true);
38   - $main->setFormAction("../store.php?fReturnURL=" . urlencode("$default->owl_root_url/control.php?action=browse&fFolderID=$fFolderID"));
39   - $main->render();
40   - } else if (isset($fCollaborationDelete)) {
41   - //user attempted to delete the folder collaboration process but could not because there is
42   - //a document currently in this process
43   - $oPatternCustom = & new PatternCustom();
44   - $oPatternCustom->setHtml(getPage($fFolderID));
45   - $main->setErrorMessage("You cannot delete this folder collaboration process as a document is currently undergoing this collaboration process");
46   - $main->setCentralPayload($oPatternCustom);
47   - $main->setHasRequiredFields(true);
48   - $main->setFormAction("../store.php?fReturnURL=" . urlencode("$default->owl_root_url/control.php?action=browse&fFolderID=$fFolderID"));
49   - $main->render();
50   - } else {
51   - $oPatternCustom = & new PatternCustom();
52   - $oPatternCustom->setHtml(getPage($fFolderID));
53   - $main->setCentralPayload($oPatternCustom);
54   - $main->setHasRequiredFields(true);
55   - $main->setFormAction("../store.php?fReturnURL=" . urlencode("$default->owl_root_url/control.php?action=browse&fFolderID=$fFolderID"));
56   - $main->render();
57   - }
58   - } else {
59   - //else display an error message
60   - $oPatternCustom = & new PatternCustom();
61   - $oPatternCustom->setHtml("");
62   - $main->setCentralPayload($oPatternCustom);
63   - $mail->setErrorMessage("No folder currently selected");
64   - $main->setFormAction("../store.php?fReturnURL=" . urlencode("$default->owl_root_url/control.php?action=browse&fFolderID=$fFolderID"));
65   - $main->render();
66   - }
67   - }
  17 + require_once("$default->owl_fs_root/lib/visualpatterns/PatternListBox.inc");
  18 + require_once("$default->owl_fs_root/lib/visualpatterns/PatternEditableListFromQuery.inc");
  19 + require_once("editUI.inc");
  20 + require_once("$default->owl_fs_root/lib/security/permission.inc");
  21 + require_once("$default->owl_fs_root/presentation/webpageTemplate.inc");
  22 + require_once("$default->owl_fs_root/lib/visualpatterns/PatternCustom.inc");
  23 + require_once("$default->owl_fs_root/lib/foldermanagement/Folder.inc");
  24 + require_once("$default->owl_fs_root/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
  25 + require_once("$default->owl_fs_root/presentation/Html.inc");
  26 +
  27 + if (isset($fFolderID)) {
  28 + //if the user can edit the folder
  29 + if (Permission::userHasFolderWritePermission($fFolderID)) {
  30 + if (isset($fCollaborationEdit)) {
  31 + //user attempted to edit the folder collaboration process but could not because there is
  32 + //a document currently in this process
  33 + $oPatternCustom = & new PatternCustom();
  34 + $oPatternCustom->setHtml(getPage($fFolderID));
  35 + $main->setErrorMessage("You cannot edit this folder collaboration process as a document is currently undergoing this collaboration process");
  36 + $main->setCentralPayload($oPatternCustom);
  37 + $main->setHasRequiredFields(true);
  38 + $main->setFormAction("../store.php?fReturnURL=" . urlencode("$default->owl_root_url/control.php?action=browse&fFolderID=$fFolderID"));
  39 + $main->render();
  40 + } else if (isset($fCollaborationDelete)) {
  41 + //user attempted to delete the folder collaboration process but could not because there is
  42 + //a document currently in this process
  43 + $oPatternCustom = & new PatternCustom();
  44 + $oPatternCustom->setHtml(getPage($fFolderID));
  45 + $main->setErrorMessage("You cannot delete this folder collaboration process as a document is currently undergoing this collaboration process");
  46 + $main->setCentralPayload($oPatternCustom);
  47 + $main->setHasRequiredFields(true);
  48 + $main->setFormAction("../store.php?fReturnURL=" . urlencode("$default->owl_root_url/control.php?action=browse&fFolderID=$fFolderID"));
  49 + $main->render();
  50 + } else {
  51 + $oPatternCustom = & new PatternCustom();
  52 + $oPatternCustom->setHtml(getPage($fFolderID));
  53 + $main->setCentralPayload($oPatternCustom);
  54 + $main->setHasRequiredFields(true);
  55 + $main->setFormAction("../store.php?fReturnURL=" . urlencode("$default->owl_root_url/control.php?action=browse&fFolderID=$fFolderID"));
  56 + $main->render();
  57 + }
  58 + } else {
  59 + //user does not have write permission for this folder,
  60 + require_once("$default->owl_fs_root/presentation/webpageTemplate.inc");
  61 + $oPatternCustom = & new PatternCustom();
  62 + $oPatternCustom->setHtml("");
  63 + $main->setCentralPayload($oPatternCustom);
  64 + $main->setErrorMessage("You do not have permission to edit this folder");
  65 + $main->render();
  66 + }
  67 + } else {
  68 + //else display an error message
  69 + $oPatternCustom = & new PatternCustom();
  70 + $oPatternCustom->setHtml("");
  71 + $main->setCentralPayload($oPatternCustom);
  72 + $main->setErrorMessage("No folder currently selected");
  73 + $main->setFormAction("../store.php?fReturnURL=" . urlencode("$default->owl_root_url/control.php?action=browse&fFolderID=$fFolderID"));
  74 + $main->render();
  75 + }
68 76 }
69 77  
70 78 ?>
... ...