general tidy ups

BaseAastra needs to have no cancel URL if we're at the start
BlacklistManager should show the list title rather than the generic
Blacklist/Whitelist when managing a list.

Signed-off-by: James Bottomley <JBottomley@Parallels.com>

2 files changed, 3 insertions, 0 deletions

diff --git a/include/BaseAastra.class.php b/include/BaseAastra.class.php
index 7d35682..537aca8 100644
--- a/include/BaseAastra.class.php
+++ b/include/BaseAastra.class.php
@@ -52,6 +52,7 @@ abstract class BaseAastra {
 		if (isset($_GET['action'])) {
 		 	$this->$_GET['action']();
 		} else {
+			$this->back = null;
 			$this->start();
 		}
 		if (!$this->do) {
diff --git a/include/BlacklistManager.class.php b/include/BlacklistManager.class.php
index eeb6a2e..ac984d3 100644
--- a/include/BlacklistManager.class.php
+++ b/include/BlacklistManager.class.php
@@ -9,12 +9,14 @@ require_once('DatabaseListManager.class.php');
 
 class BlacklistManager extends Blacklist {
 	function white_manager() {
+		$this->title = 'Whitelist';
 		$list = new DatabaseListManager($this, $this->url.'?action=white_manager');
 		$list->manager('whitelist', true,
 				$this->url.'?action=newnum&num=');
 	}
 
 	function black_manager() {
+		$this->title = 'Blacklist';
 		$list = new DatabaseListManager($this, $this->url.'?action=black_manager');
 		$list->manager('blacklist', false,
 			       $this->url.'?action=newnum&num=');