--- FreeBSD/tinderbox/webui/module/moduleTinderd.php	2007/11/02 20:55:00	1.1.1.1
+++ FreeBSD/tinderbox/webui/module/moduleTinderd.php	2007/11/13 07:36:19	1.1.1.1.2.1
@@ -24,22 +24,21 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
+# $Paefchen$
 # $MCom: portstools/tinderbox/webui/module/moduleTinderd.php,v 1.9 2007/10/13 02:28:48 ade Exp $
 #
 
-require_once 'module/module.php';
-require_once 'module/moduleBuilds.php';
-require_once 'module/moduleUsers.php';
-
 class moduleTinderd extends module {
+	private $moduleBuilds = null;
+	private $moduleUsers = null;
 
-	function moduleTinderd() {
-		$this->module();
-		$this->moduleBuilds = new moduleBuilds();
-		$this->moduleUsers  = new moduleUsers();
+	public function __construct() {
+		parent::__construct();
+		$this->moduleBuilds = new moduleBuilds;
+		$this->moduleUsers  = new moduleUsers;
 	}
 
-	function checkQueueEntryAccess( $entry, $mode ) {
+	public function checkQueueEntryAccess( $entry, $mode ) {
 
 		if( $this->moduleUsers->checkWwwAdmin() ) {
 			return true;
@@ -86,7 +85,7 @@ class moduleTinderd extends module {
 
 	}
 
-	function create_prio_array( $entry ) {
+	public function create_prio_array( $entry ) {
 		if( $this->checkQueueEntryAccess( $entry, 'priolower5' ) ) {
 			$i = 1;
 		} else {
@@ -103,7 +102,7 @@ class moduleTinderd extends module {
 		return $prio;
 	}
 
-	function list_tinderd_queue( $build_id ) {
+	public function list_tinderd_queue( $build_id ) {
 
 		if( !$this->moduleUsers->is_logged_in() ) {
 			return $this->template_parse( 'please_login.tpl' );
@@ -181,7 +180,7 @@ class moduleTinderd extends module {
 		}
 	}
 
-	function change_tinderd_queue( $action, $entry_id, $build_id, $priority, $email_on_completion ) {
+	public function change_tinderd_queue( $action, $entry_id, $build_id, $priority, $email_on_completion ) {
 
 		if( !$this->moduleUsers->is_logged_in() ) {
 			return $this->template_parse( 'please_login.tpl' );
@@ -224,7 +223,7 @@ class moduleTinderd extends module {
 		return;
 	}
 
-	function add_tinderd_queue( $action, $build_id, $priority, $port_directory, $email_on_completion ) {
+	public function add_tinderd_queue( $action, $build_id, $priority, $port_directory, $email_on_completion ) {
 
 		if( !$this->moduleUsers->is_logged_in() ) {
 			return $this->template_parse( 'please_login.tpl' );
@@ -257,4 +256,5 @@ class moduleTinderd extends module {
 		return;
 	}
 }
+
 ?>