From b71ac98dbf685e37f20cecfc4690c510c7bc6353 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Thu, 17 Nov 2011 08:12:42 +0000
Subject: [PATCH] Mantis Projekt DropDown

---
 content/projekt/mantisdetail.overlay.xul.php |  19 ++-
 content/projekt/projekttask.overlay.js.php   |   8 +-
 include/mantis.class.php                     | 131 +++++++++++--------
 soap/.htaccess                               |  15 ---
 4 files changed, 98 insertions(+), 75 deletions(-)
 delete mode 100755 soap/.htaccess

diff --git a/content/projekt/mantisdetail.overlay.xul.php b/content/projekt/mantisdetail.overlay.xul.php
index 09913eb0f..80a5f2b58 100755
--- a/content/projekt/mantisdetail.overlay.xul.php
+++ b/content/projekt/mantisdetail.overlay.xul.php
@@ -53,8 +53,21 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
    					<textbox id="textbox-projekttask-mantis-issue_last_updated" disabled="true"/>
 				</row>
 				<row>
-					<label value="Projekt ID" control="textbox-projekttask-mantis-issue_project_id"/>
-   					<textbox id="textbox-projekttask-mantis-issue_project_id"/>
+					<label value="Projekt ID" control="menulist-projekttask-mantis-issue_project_id"/>
+					<menulist id="menulist-projekttask-mantis-issue_project_id"
+				          datasources="<?php echo APP_ROOT;?>rdf/mantis_projects.rdf.php"
+				          ref="http://www.technikum-wien.at/mantis_project"
+
+				         >
+						<template>
+								<menupopup>
+									<menuitem value="rdf:http://www.technikum-wien.at/mantis_project/rdf#id"
+					        			      label="rdf:http://www.technikum-wien.at/mantis_project/rdf#name"
+								  			  uri="rdf:*"/>
+								</menupopup>
+
+						</template>
+					</menulist>
    					<label value="Projekt Name" control="textbox-projekttask-mantis-issue_project_name"/>
    					<textbox id="textbox-projekttask-mantis-issue_project_name" disabled="true"/>
 				</row>
@@ -159,4 +172,4 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 			<button id="button-projekttask-mantis-speichern" oncommand="saveProjekttaskMantis()" label="Speichern" />
 		</hbox>
 	</vbox>
-</overlay>
\ No newline at end of file
+</overlay>
diff --git a/content/projekt/projekttask.overlay.js.php b/content/projekt/projekttask.overlay.js.php
index 8aaf65cd0..73ce47723 100755
--- a/content/projekt/projekttask.overlay.js.php
+++ b/content/projekt/projekttask.overlay.js.php
@@ -410,7 +410,7 @@ function onselectProjekttask()
 	//Mantis Tab reset
 	document.getElementById('textbox-projekttask-mantis-issue_summary').value=bezeichnung;
 	document.getElementById('textbox-projekttask-mantis-issue_description').value=beschreibung;
-	document.getElementById('textbox-projekttask-mantis-issue_project_id').value='1';
+	//document.getElementById('textbox-projekttask-mantis-issue_project_id').value='1';
     document.getElementById('textbox-projekttask-mantis-issue_category').value='General';
 	
 	document.getElementById('textbox-projekttask-mantis-mantis_id').value='';
@@ -497,7 +497,7 @@ function onselectProjekttask()
 		document.getElementById('textbox-projekttask-mantis-issue_view_state_id').value=issue_view_state_id;
 		document.getElementById('textbox-projekttask-mantis-issue_view_state_name').value=issue_view_state_name;
 		document.getElementById('textbox-projekttask-mantis-issue_last_updated').value=issue_last_updated;
-		document.getElementById('textbox-projekttask-mantis-issue_project_id').value=issue_project_id;
+		document.getElementById('menulist-projekttask-mantis-issue_project_id').value=issue_project_id;
 		document.getElementById('textbox-projekttask-mantis-issue_project_name').value=issue_project_name;
 		document.getElementById('textbox-projekttask-mantis-issue_category').value=issue_category;
 		document.getElementById('textbox-projekttask-mantis-issue_priority_id').value=issue_priority_id;
@@ -539,7 +539,7 @@ function saveProjekttaskMantis()
 	var issue_view_state_id=document.getElementById('textbox-projekttask-mantis-issue_view_state_id').value;
 	var issue_view_state_name=document.getElementById('textbox-projekttask-mantis-issue_view_state_name').value;
 	var issue_last_updated=document.getElementById('textbox-projekttask-mantis-issue_last_updated').value;
-	var issue_project_id=document.getElementById('textbox-projekttask-mantis-issue_project_id').value;
+	var issue_project_id=document.getElementById('menulist-projekttask-mantis-issue_project_id').value;
 	var issue_project_name=document.getElementById('textbox-projekttask-mantis-issue_project_name').value;
 	var issue_category=document.getElementById('textbox-projekttask-mantis-issue_category').value;
 	var issue_priority_id=document.getElementById('textbox-projekttask-mantis-issue_priority_id').value;
@@ -678,4 +678,4 @@ function ProjekttaskUpdateErledigt(event)
 			}
 		});
 	}
-}                         
\ No newline at end of file
+}
diff --git a/include/mantis.class.php b/include/mantis.class.php
index a6a25b162..45f9a5579 100755
--- a/include/mantis.class.php
+++ b/include/mantis.class.php
@@ -121,44 +121,53 @@ class mantis extends basis_db
 	 */
 	public function getIssue($issue_id=1)
 	{
-		$params=array('username' => MANTIS_USERNAME, 'password' => MANTIS_PASSWORT,'issue_id' => $issue_id);
-		$result = $this->soapClient->__soapCall('mc_issue_get',$params);
+		try 
+		{
+			$params=array('username' => MANTIS_USERNAME, 'password' => MANTIS_PASSWORT,'issue_id' => $issue_id);
+			$result = $this->soapClient->__soapCall('mc_issue_get',$params);
 		
-		$this->issue_id = $result->id;			
-		$this->issue_view_state->id = $result->view_state->id;	
-		$this->issue_view_state->name = $result->view_state->name;		
-		$this->issue_last_updated = $result->last_updated; 		
-		$this->issue_project->id = $result->project->id;			
-		$this->issue_project->name = $result->project->name;		
-		$this->issue_category = $result->category;		
-		$this->issue_priority->id = $result->priority->id;
-		$this->issue_priority->name = $result->priority->name;		
-		$this->issue_severity->id = $result->severity->id;		
-		$this->issue_severity->name = $result->severity->name;		
-		$this->issue_status->id = $result->status->id;			
-		$this->issue_status->name = $result->status->name;			
-		$this->issue_reporter->id = $result->reporter->id;			
-		$this->issue_reporter->name = $result->reporter->name;			
-		$this->issue_reporter->real_name = $result->reporter->real_name;			
-		$this->issue_reporter->email = $result->reporter->email;		
-		$this->issue_summary = $result->summary;		
-		$this->issue_reproducibility->id = $result->reproducibility->id;
-		$this->issue_reproducibility->name = $result->reproducibility->name;	
-		$this->issue_date_submitted = $result->date_submitted;		
-		$this->issue_sponsorship_total = $result->sponsorship_total;	
-		$this->issue_projection->id = $result->projection->id;		
-		$this->issue_projection->name = $result->projection->name;		
-		$this->issue_eta->id = $result->eta->id;		
-		$this->issue_eta->name = $result->eta->name;
-		$this->issue_resolution->id = $result->resolution->id;	
-		$this->issue_resolution->name = $result->resolution->name;	
-		$this->issue_description = $result->description;	
-		//$this->issue_attachments = $result->attachments;	
-		$this->issue_due_date = $result->due_date;	
-		$this->issue_steps_to_reproduce = (isset($result->steps_to_reproduce)?$result->steps_to_reproduce:'');
-		$this->issue_additional_information = (isset($result->additional_information)?$result->additional_information:'');
+			$this->issue_id = $result->id;			
+			$this->issue_view_state->id = $result->view_state->id;	
+			$this->issue_view_state->name = $result->view_state->name;		
+			$this->issue_last_updated = $result->last_updated; 		
+			$this->issue_project->id = $result->project->id;			
+			$this->issue_project->name = $result->project->name;		
+			$this->issue_category = $result->category;		
+			$this->issue_priority->id = $result->priority->id;
+			$this->issue_priority->name = $result->priority->name;		
+			$this->issue_severity->id = $result->severity->id;		
+			$this->issue_severity->name = $result->severity->name;		
+			$this->issue_status->id = $result->status->id;			
+			$this->issue_status->name = $result->status->name;			
+			$this->issue_reporter->id = $result->reporter->id;			
+			$this->issue_reporter->name = $result->reporter->name;			
+			$this->issue_reporter->real_name = $result->reporter->real_name;			
+			$this->issue_reporter->email = $result->reporter->email;		
+			$this->issue_summary = $result->summary;		
+			$this->issue_reproducibility->id = $result->reproducibility->id;
+			$this->issue_reproducibility->name = $result->reproducibility->name;	
+			$this->issue_date_submitted = $result->date_submitted;		
+			$this->issue_sponsorship_total = $result->sponsorship_total;	
+			$this->issue_projection->id = $result->projection->id;		
+			$this->issue_projection->name = $result->projection->name;		
+			$this->issue_eta->id = $result->eta->id;		
+			$this->issue_eta->name = $result->eta->name;
+			$this->issue_resolution->id = $result->resolution->id;	
+			$this->issue_resolution->name = $result->resolution->name;	
+			$this->issue_description = $result->description;	
+			//$this->issue_attachments = $result->attachments;	
+			$this->issue_due_date = $result->due_date;	
+			$this->issue_steps_to_reproduce = (isset($result->steps_to_reproduce)?$result->steps_to_reproduce:'');
+			$this->issue_additional_information = (isset($result->additional_information)?$result->additional_information:'');
 		
-		return true;
+			return true;
+		} 
+		catch (SoapFault $fault) 
+		{
+			$this->errormsg="SOAP-Fehler: ".$fault->faultstring;
+			return false;
+		}
+
 	}
 
 	/**
@@ -166,18 +175,26 @@ class mantis extends basis_db
 	 */
 	public function getProjects()
 	{
-		$params=array('username' => MANTIS_USERNAME, 'password' => MANTIS_PASSWORT);
-		$result = $this->soapClient->__soapCall('mc_projects_get_user_accessible',$params);
-
-		foreach($result as $row)
+		try
 		{
-			$obj = new mantis();
-			$obj->issue_project->name = $row->name;
-			$obj->issue_project->id = $row->id;
+			$params=array('username' => MANTIS_USERNAME, 'password' => MANTIS_PASSWORT);
+			$result = $this->soapClient->__soapCall('mc_projects_get_user_accessible',$params);
 
-			$this->result[] = $obj;
+			foreach($result as $row)
+			{
+				$obj = new mantis();
+				$obj->issue_project->name = $row->name;
+				$obj->issue_project->id = $row->id;
+
+				$this->result[] = $obj;
+			}
+			return true;
+		} 
+		catch (SoapFault $fault) 
+		{
+			$this->errormsg="SOAP-Fehler: ".$fault->faultstring;
+			return false;
 		}
-		return true;
 	}
 
 	/**
@@ -185,16 +202,24 @@ class mantis extends basis_db
 	 */
 	public function getCategories($project_id)
 	{
-		$params=array('username' => MANTIS_USERNAME, 'password' => MANTIS_PASSWORT, 'project_id'=>$project_id);
-		$result = $this->soapClient->__soapCall('mc_project_get_categories',$params);
-
-		foreach($result as $val)
+		try
 		{
-			$obj = new mantis();
-			$obj->issue_category = $val;
+			$params=array('username' => MANTIS_USERNAME, 'password' => MANTIS_PASSWORT, 'project_id'=>$project_id);
+			$result = $this->soapClient->__soapCall('mc_project_get_categories',$params);
 
-			$this->result[] = $obj;
+			foreach($result as $val)
+			{
+				$obj = new mantis();
+				$obj->issue_category = $val;
+
+				$this->result[] = $obj;
+			}
+			return true;
+		} 
+		catch (SoapFault $fault) 
+		{
+			$this->errormsg="SOAP-Fehler: ".$fault->faultstring;
+			return false;
 		}
-		return true;
 	}
 }
diff --git a/soap/.htaccess b/soap/.htaccess
deleted file mode 100755
index 3a1a27b86..000000000
--- a/soap/.htaccess
+++ /dev/null
@@ -1,15 +0,0 @@
-Order deny,allow
-Deny from all
-Allow from 10.63.0.36
-
-AuthBasicProvider ldap
-AuthName "Technikum-Wien"
-AuthType Basic
-AuthBasicAuthoritative Off
-AuthLDAPURL "ldap://ldap.technikum-wien.at:389/ou=People,dc=technikum-wien,dc=at?uid?one?objectclass=posixAccount"
-AuthLDAPGroupAttributeIsDN Off
-AuthLDAPGroupAttribute memberuid
-Require ldap-group cn=fhadmin,ou=Group,dc=technikum-wien,dc=at
-require ldap-group cn=hadesadm,ou=Group,dc=technikum-wien,dc=at
-
-satisfy any