RELEASE 0.9.1

collapse.php

@@ -12,18 +12,20 @@
  * Note: this script is equal and opposite to expand.php
  */
 
-require 'config.php';
-require_once 'functions.php';
+require 'common.php';
 
-$dn = stripslashes( $_GET['dn'] );
+$dn = $_GET['dn'];
 $encoded_dn = rawurlencode( $dn );
 $server_id = $_GET['server_id'];
 
 check_server_id( $server_id ) or pla_error( "Bad server_id: " . htmlspecialchars( $server_id ) );
 
 session_start();
-session_is_registered( 'tree' ) or pla_error( "Your session tree is not registered. That's weird. Shouldn't ever happen".
-							". Just go back and it should be fixed automagically." );
+
+// dave commented this out since it was being triggered for weird reasons
+//session_is_registered( 'tree' ) or pla_error( "Your session tree is not registered. That's weird. Shouldn't ever happen".
+//							". Just go back and it should be fixed automagically." );
+
 $tree = $_SESSION['tree'];
 
 // and remove this instance of the dn as well
@@ -38,6 +40,12 @@ session_write_close();
 $time = gettimeofday();
 $random_junk = md5( strtotime( 'now' ) . $time['usec'] );
 
-header( "Location: tree.php?foo=$random_junk#{$server_id}_{$encoded_dn}" );
+// If cookies were disabled, build the url parameter for the session id.
+// It will be append to the url to be redirect
+$id_session_param="";
+if(SID != ""){
+  $id_session_param = "&".session_name()."=".session_id();
+}
 
-; ?>
+header( "Location:tree.php?foo=$random_junk%23{$server_id}_{$encoded_dn}$id_session_param" );
+?>