From 58d1740eb84ac2e3903c99be97baa28dca4cc648 Mon Sep 17 00:00:00 2001 From: x2000habouzit Date: Mon, 3 Jan 2005 10:40:25 +0000 Subject: [PATCH] get rid of session.inc.php --- include/.cvsignore | 1 - include/banana.inc.php.in | 13 ++++++++++++- include/misc.inc.php | 5 +++-- install.d/session.inc.php | 47 ----------------------------------------------- 4 files changed, 15 insertions(+), 51 deletions(-) delete mode 100644 install.d/session.inc.php diff --git a/include/.cvsignore b/include/.cvsignore index c8cf4f6..84cd208 100644 --- a/include/.cvsignore +++ b/include/.cvsignore @@ -5,4 +5,3 @@ format.inc.php header.inc.php profile_form.inc.php profile.inc.php -session.inc.php diff --git a/include/banana.inc.php.in b/include/banana.inc.php.in index cbe4d6d..4e25e7d 100644 --- a/include/banana.inc.php.in +++ b/include/banana.inc.php.in @@ -7,7 +7,6 @@ * Copyright: See COPYING files that comes with this distribution ********************************************************************************/ -require_once("include/session.inc.php"); require_once("include/misc.inc.php"); require_once("include/groups.inc.php"); require_once("include/format.inc.php"); @@ -70,6 +69,18 @@ class Banana $banana = new Banana; +switch (basename($_SERVER['SCRIPT_NAME'])) { + case "thread.php": + if (!isset($_SESSION['bananapostok'])) { + $_SESSION['bananapostok']=true; + } + break; + + default: + $_SESSION['bananapostok']=true; + break; +} + if (empty($css)) { $css = array( 'bananashortcuts' => 'bananashortcuts', diff --git a/include/misc.inc.php b/include/misc.inc.php index 767d739..abb15dd 100644 --- a/include/misc.inc.php +++ b/include/misc.inc.php @@ -78,12 +78,13 @@ function formatDisplayHeader($_header,$_text) { $text = preg_split("/[ \t]/",strtr($text,$banana->spool->ids)); $parents = preg_grep("/^\d+$/",$text); $p = array_pop($parents); + $par_ok = Array(); while ($p) { - $valid_parents[]=$p; + $par_ok[]=$p; $p = $banana->spool->overview[$p]->parent; } - foreach (array_reverse($valid_parents) as $p) { + foreach (array_reverse($par_ok) as $p) { $rsl .= "spool->group}&id=$p\">$ndx "; $ndx++; } diff --git a/install.d/session.inc.php b/install.d/session.inc.php deleted file mode 100644 index e08b5ee..0000000 --- a/install.d/session.inc.php +++ /dev/null @@ -1,47 +0,0 @@ - -- 2.1.4