From dd8ee85187810a49bff6b5e6d614ae711bf5ebd2 Mon Sep 17 00:00:00 2001 From: hickert Date: Tue, 13 Nov 2007 13:18:23 +0000 Subject: [PATCH] Updated lists tests git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-playground@7789 594d385d-05f5-0310-b6e9-bd551577e9d8 --- tests/ListTest/1/index.php | 27 +++++++++++---------------- tests/ListTest/2/index.php | 10 ---------- tests/ListTest/3/index.php | 22 +++++----------------- 3 files changed, 16 insertions(+), 43 deletions(-) diff --git a/tests/ListTest/1/index.php b/tests/ListTest/1/index.php index 79e7afcaf..4272f76ea 100644 --- a/tests/ListTest/1/index.php +++ b/tests/ListTest/1/index.php @@ -1,3 +1,8 @@ + @@ -7,10 +12,6 @@ -No Footer & Header - -No Footer - -No Header - -Normal load("../../../gosa.conf"); - /* Get a new test instance of ObjectListViewports */ - $vp= new ObjectListViewport("plugin/sample"); - if(isset($_GET['d']) && preg_match("/f/",$_GET['d'])){ - $vp->enableFooter(FALSE); - } - if(isset($_GET['d']) && preg_match("/h/",$_GET['d'])){ - $vp->enableHeader(FALSE); - } + /* Get a new test instance of ObjectListViewports */ + if(!isset($_SESSION['vp3'])){ + $_SESSION['vp3'] = new ObjectListViewport("plugin/sample",TRUE); + } + $vp = $_SESSION['vp3']; $content= $vp->render(); } catch (Exception $e) { @@ -63,7 +58,7 @@ try { } ?> - +

diff --git a/tests/ListTest/2/index.php b/tests/ListTest/2/index.php index bbfb49161..fcab9584e 100644 --- a/tests/ListTest/2/index.php +++ b/tests/ListTest/2/index.php @@ -34,10 +34,6 @@ session_start(); -No Footer & Header - -No Footer - -No Header - -Normal enableFooter(FALSE); - } - if(isset($_GET['d']) && preg_match("/h/",$_GET['d'])){ - $vp->enableHeader(FALSE); - } $content= $vp->render(); echo preg_replace("/%LIST%/",$content,file_get_contents('tpl')); diff --git a/tests/ListTest/3/index.php b/tests/ListTest/3/index.php index 2e94d0a5b..b4dc71f04 100644 --- a/tests/ListTest/3/index.php +++ b/tests/ListTest/3/index.php @@ -1,3 +1,8 @@ + @@ -28,17 +33,11 @@ -No Footer & Header - -No Footer - -No Header - -Normal enableFooter(FALSE); - $vp2->enableFooter(FALSE); - } - if(isset($_GET['d']) && preg_match("/h/",$_GET['d'])){ - $vp1->enableHeader(FALSE); - $vp2->enableHeader(FALSE); - } $content1= $vp1->render(); $content2= $vp2->render(); -- 2.30.2