diff --git a/control.php b/control.php index f97346b..93d65b1 100644 --- a/control.php +++ b/control.php @@ -12,7 +12,7 @@ * * @version $Revision$ * @author Michael Joseph , Jam Warehouse (Pty) Ltd, South Africa - * @package control + * @package controller */ // main library routines and defaults diff --git a/documentBrowser.php b/documentBrowser.php index f128a77..eb3f1f3 100644 --- a/documentBrowser.php +++ b/documentBrowser.php @@ -13,7 +13,7 @@ * * @version $Revision$ * @author Michael Joseph , Jam Warehouse (Pty) Ltd, South Africa - * @package dms + * @package presentation * * Querystring variables * --------------------- diff --git a/tests/administration/groupManTesting.php b/tests/administration/groupManTesting.php index 92e562d..c296c07 100644 --- a/tests/administration/groupManTesting.php +++ b/tests/administration/groupManTesting.php @@ -21,7 +21,7 @@ * * @version $Revision$ * @author Mukhtar Dharsey - * @package testing + * @package tests.administration */ /*-----------------------------------------------------------------*/ diff --git a/tests/administration/userManTesting.php b/tests/administration/userManTesting.php index 0619137..52ae920 100644 --- a/tests/administration/userManTesting.php +++ b/tests/administration/userManTesting.php @@ -21,7 +21,7 @@ * * @version $Revision$ * @author Mukhtar Dharsey - * @package testing + * @package tests.administration */ /*-----------------------------------------------------------------*/ diff --git a/tests/documentmanagement/DocumentBrowser.php b/tests/documentmanagement/DocumentBrowser.php index faf69db..400fc27 100644 --- a/tests/documentmanagement/DocumentBrowser.php +++ b/tests/documentmanagement/DocumentBrowser.php @@ -16,88 +16,85 @@ require_once ("$default->owl_fs_root/lib/documentmanagement/DocumentBrowser.inc" * * @version $Revision$ * @author Michael Joseph , Jam Warehouse (Pty) Ltd, South Africa - * @package tests/documentmanagement + * @package tests.documentmanagement */ // ------------------------------- // page start // ------------------------------- -if (checkSession()) { +if (checkSession()) { $default->log->debug("DocumentBrowser.php:: authorised flag:" . $_SESSION["authorised"]); - // check if this page is authorised, ie. has come from control.php - if ($_SESSION["authorised"]) { - - echo "
";
         
-        $db = new DocumentBrowser();
+    echo "
";
+    
+    $db = new DocumentBrowser();
 
-        // default browse- should resolve to root folder
-        echo "default browse- starts at this users root folder
"; - $artifacts = $db->browseByFolder(); - if (!is_null($_SESSION["errorMessage"])) { - echo "error: " . $_SESSION["errorMessage"] . "
"; - $_SESSION["errorMessage"] = NULL; - } - print_r($artifacts); - - // now supply a folderid - $folderID = 3; - echo "browse- starting at folder (folderID=$folderID)
"; - $artifacts = $db->browseByFolder($folderID); - if (!is_null($_SESSION["errorMessage"])) { - echo "error: " . $_SESSION["errorMessage"] . "
"; - $_SESSION["errorMessage"] = NULL; - } - print_r($artifacts); + // default browse- should resolve to root folder + echo "default browse- starts at this users root folder
"; + $artifacts = $db->browseByFolder(); + if (!is_null($_SESSION["errorMessage"])) { + echo "error: " . $_SESSION["errorMessage"] . "
"; + $_SESSION["errorMessage"] = NULL; + } + print_r($artifacts); + + // now supply a folderid + $folderID = 3; + echo "browse- starting at folder (folderID=$folderID)
"; + $artifacts = $db->browseByFolder($folderID); + if (!is_null($_SESSION["errorMessage"])) { + echo "error: " . $_SESSION["errorMessage"] . "
"; + $_SESSION["errorMessage"] = NULL; + } + print_r($artifacts); - // browse by category - echo "category browse- return a list of categories:
"; - $categories = $db->browseByCategory(); - if (!is_null($_SESSION["errorMessage"])) { - echo "error: " . $_SESSION["errorMessage"] . "
"; - $_SESSION["errorMessage"] = NULL; - } - print_r($categories); - - // pick a random category - srand ((float) microtime() * 10000000); - $rand_keys = array_rand ($categories, 1); - $category = $categories[$rand_keys]; - echo "browsing by category = $category
"; - $artifacts = $db->browseByCategory($category); - if (!is_null($_SESSION["errorMessage"])) { - echo "error: " . $_SESSION["errorMessage"] . "
"; - $_SESSION["errorMessage"] = NULL; - } - print_r($artifacts); + // browse by category + echo "category browse- return a list of categories:
"; + $categories = $db->browseByCategory(); + if (!is_null($_SESSION["errorMessage"])) { + echo "error: " . $_SESSION["errorMessage"] . "
"; + $_SESSION["errorMessage"] = NULL; + } + print_r($categories); + + // pick a random category + srand ((float) microtime() * 10000000); + $rand_keys = array_rand ($categories, 1); + $category = $categories[$rand_keys]; + echo "browsing by category = $category
"; + $artifacts = $db->browseByCategory($category); + if (!is_null($_SESSION["errorMessage"])) { + echo "error: " . $_SESSION["errorMessage"] . "
"; + $_SESSION["errorMessage"] = NULL; + } + print_r($artifacts); - // document type browsing - echo "document type browse- get list of doc types
"; - $documentTypes = $db->browseByDocumentType(); - if (!is_null($_SESSION["errorMessage"])) { - echo "error: " . $_SESSION["errorMessage"] . "
"; - $_SESSION["errorMessage"] = NULL; - } - print_r($documentTypes); - - // pick a random document type - srand ((float) microtime() * 10000000); - $documentTypeID = array_rand ($documentTypes, 1); - - echo "browsing by document type = " . $documentTypeID . "
"; - $artifacts = $db->browseByDocumentType($documentTypeID); - if (!is_null($_SESSION["errorMessage"])) { - echo "error: " . $_SESSION["errorMessage"] . "
"; - $_SESSION["errorMessage"] = NULL; - } - print_r($artifacts); + // document type browsing + echo "document type browse- get list of doc types
"; + $documentTypes = $db->browseByDocumentType(); + if (!is_null($_SESSION["errorMessage"])) { + echo "error: " . $_SESSION["errorMessage"] . "
"; + $_SESSION["errorMessage"] = NULL; + } + print_r($documentTypes); + + // pick a random document type + srand ((float) microtime() * 10000000); + $documentTypeID = array_rand ($documentTypes, 1); + + echo "browsing by document type = " . $documentTypeID . "
"; + $artifacts = $db->browseByDocumentType($documentTypeID); + if (!is_null($_SESSION["errorMessage"])) { + echo "error: " . $_SESSION["errorMessage"] . "
"; + $_SESSION["errorMessage"] = NULL; + } + print_r($artifacts); - echo "
"; - } else { - // FIXME: redirect to no permission page - print "you do not have access to view this page! please go away, and come back when you do.
"; - echo generateLink("logout") . "logout"; - } + echo "
"; +} else { + // FIXME: redirect to no permission page + print "you do not have access to view this page! please go away, and come back when you do.
"; + echo generateLink("logout") . "logout"; } ?>