Changeset 1272

Timestamp:

06/29/05 08:52:23 (3 years ago)

Author:

torben

Message:

Backports

Files:

• branches/branch-2_4/lib/midcom/helper/_basicnav.php (modified) (1 diff)
• branches/branch-2_4/support/makedist.sh (modified) (1 diff)

branches/branch-2_4/lib/midcom/helper/_basicnav.php

@@ -1110 +1110 @@
-            
-            case MIDCOM_ERRFORBIDDEN:
+                if ($this->_lastgoodnode == -1)
+                {
+                    // Hot fix for #248, MidCOM will loop infinitly if we don't catch this case.
+                    // Will be superseeded by the ACL framework in the future.
+                    $GLOBALS['midcom']->generate_error(MIDCOM_ERRFORBIDDEN,
+                        "Access Denied: The root node is not accessible to you. This might be due to viewer groups, see debug level log for details.");
+                    // this will exit.
+                }
-                debug_add("The current node is hidden behind a undecendable one.", MIDCOM_LOG_INFO);
-" . $this->_lastgoodnode . "
+{$this->_lastgoodnode}
-                $this->_current = $this->_lastgoodnode;
-                break;

branches/branch-2_4/support/makedist.sh

@@ -32 +32 @@
-cp -prv ../../../external-tools . >> $logfile 2>&1
-cp -prv ../../../tarball-docs/* . >> $logfile 2>&1
+cp -prv ../../autoconf.php external-tools >> $logfile 2>&1
-mkdir midcom-template
-cp -v ../../../midcom-template/midcom-template.xml midcom-template >> $logfile 2>&1