Peter M. Groen / knowledgetree

Commit 996bfc27f93e19065242397445b2c7f5f135d6b7

Authored by Neil Blakey-Milner
1 parent a3181d78

Flatten nested ifs to improve understandability. 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@3117 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 59 additions and 32 deletions
presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteGroupFolderLinkBL.php
  View file @996bfc2
... ... @@ -45,39 +45,33 @@ include_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/fo
45 45 include_once("$default->fileSystemRoot/presentation/Html.inc");
46 46 include_once("groupFolderLinkUI.inc");
47 47  
48   -if (checkSession()) {
49   - if (isset($fFolderID) && isset($fGroupFolderLinkID)) {
50   - // if a folder has been selected
51   - $oPatternCustom = & new PatternCustom();
52   - $oPatternCustom->setHtml("");
53   -
54   - $oFolder = Folder::get($fFolderID);
55   - if (Permission::userHasFolderWritePermission($oFolder)) {
56   - // can only delete group folder links if the user has folder write permission
57   - if (isset($fForDelete)) {
58   - $oGroupFolderLink = & GroupFolderLink::get($fGroupFolderLinkID);
59   - if ($oGroupFolderLink->delete()) {
60   - // on successful deletion, redirect to the folder edit page
61   - controllerRedirect("editFolder", "fFolderID=$fFolderID&fShowSection=folderPermissions");
62   - } else {
63   - // otherwise display an error message
64   - $sErrorMessage = _("The folder access entry could not be deleted from the database");
65   - $oGroupFolderLink = & GroupFolderLink::get($fGroupFolderLinkID);
66   - $oPatternCustom->setHtml(getPage($oGroupFolderLink));
67   - }
68   - } else {
69   - $oGroupFolderLink = & GroupFolderLink::get($fGroupFolderLinkID);
70   - $oPatternCustom->setHtml(getDeletePage($oGroupFolderLink, $fFolderID));
71   - }
72   - } else {
73   - // display an error message
74   - $sErrorMessage = _("You don't have permission to delete this folder access entry.");
75   - }
76   - } else {
77   - $sErrorMessage = _("No folder currently selected");
  48 +if (!checkSession()) {
  49 + // Never returns, but just in case...
  50 + die();
  51 +}
  52 +
  53 +include_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
  54 +
  55 +$oPatternCustom = & new PatternCustom();
  56 +$oPatternCustom->setHtml("");
  57 +
  58 +if (!(isset($fFolderID) && isset($fGroupFolderLinkID))) {
  59 + $sErrorMessage = _("No folder currently selected");
  60 + $main->setCentralPayload($oPatternCustom);
  61 + if (isset($sErrorMessage)) {
  62 + $main->setErrorMessage($sErrorMessage);
78 63 }
79   -
80   - include_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
  64 + $main->setFormAction($_SERVER["PHP_SELF"] . "?fFolderID=$fFolderID&fGroupFolderLinkID=$fGroupFolderLinkID&fForDelete=1");
  65 + $main->setHasRequiredFields(true);
  66 + $main->render();
  67 + exit(0);
  68 +}
  69 +// if a folder has been selected
  70 +
  71 +$oFolder = Folder::get($fFolderID);
  72 +if (!Permission::userHasFolderWritePermission($oFolder)) {
  73 + // display an error message
  74 + $sErrorMessage = _("You don't have permission to delete this folder access entry.");
81 75 $main->setCentralPayload($oPatternCustom);
82 76 if (isset($sErrorMessage)) {
83 77 $main->setErrorMessage($sErrorMessage);
... ... @@ -85,5 +79,38 @@ if (checkSession()) {
85 79 $main->setFormAction($_SERVER["PHP_SELF"] . "?fFolderID=$fFolderID&fGroupFolderLinkID=$fGroupFolderLinkID&fForDelete=1");
86 80 $main->setHasRequiredFields(true);
87 81 $main->render();
  82 + exit(0);
88 83 }
  84 +
  85 +if (!isset($fForDelete)) {
  86 + $oGroupFolderLink = & GroupFolderLink::get($fGroupFolderLinkID);
  87 + $oPatternCustom->setHtml(getDeletePage($oGroupFolderLink, $fFolderID));
  88 + $main->setCentralPayload($oPatternCustom);
  89 + if (isset($sErrorMessage)) {
  90 + $main->setErrorMessage($sErrorMessage);
  91 + }
  92 + $main->setFormAction($_SERVER["PHP_SELF"] . "?fFolderID=$fFolderID&fGroupFolderLinkID=$fGroupFolderLinkID&fForDelete=1");
  93 + $main->setHasRequiredFields(true);
  94 + $main->render();
  95 + exit(0);
  96 +}
  97 +
  98 +$oGroupFolderLink = & GroupFolderLink::get($fGroupFolderLinkID);
  99 +if (!$oGroupFolderLink->delete()) {
  100 + // otherwise display an error message
  101 + $sErrorMessage = _("The folder access entry could not be deleted from the database");
  102 + $oGroupFolderLink = & GroupFolderLink::get($fGroupFolderLinkID);
  103 + $oPatternCustom->setHtml(getPage($oGroupFolderLink));
  104 + $main->setCentralPayload($oPatternCustom);
  105 + if (isset($sErrorMessage)) {
  106 + $main->setErrorMessage($sErrorMessage);
  107 + }
  108 + $main->setFormAction($_SERVER["PHP_SELF"] . "?fFolderID=$fFolderID&fGroupFolderLinkID=$fGroupFolderLinkID&fForDelete=1");
  109 + $main->setHasRequiredFields(true);
  110 + $main->render();
  111 + exit(0);
  112 +}
  113 +
  114 +controllerRedirect("editFolder", "fFolderID=$fFolderID&fShowSection=folderPermissions");
  115 +
89 116 ?>
... ...