[Fusionforge-commits] r11748 - in trunk/src/plugins/mantisbt/action: . admin
Franck VILLAUME
nerville at libremir.placard.fr.eu.org
Thu Dec 9 17:40:47 CET 2010
Author: nerville
Date: 2010-12-09 17:40:47 +0100 (Thu, 09 Dec 2010)
New Revision: 11748
Modified:
trunk/src/plugins/mantisbt/action/addAttachment.php
trunk/src/plugins/mantisbt/action/addIssue.php
trunk/src/plugins/mantisbt/action/addNote.php
trunk/src/plugins/mantisbt/action/admin/addVersion.php
trunk/src/plugins/mantisbt/action/deleteAttachment.php
trunk/src/plugins/mantisbt/action/deleteNote.php
trunk/src/plugins/mantisbt/action/updateIssue.php
trunk/src/plugins/mantisbt/action/updateNote.php
Log:
cleanup
Modified: trunk/src/plugins/mantisbt/action/addAttachment.php
===================================================================
--- trunk/src/plugins/mantisbt/action/addAttachment.php 2010-12-09 16:00:15 UTC (rev 11747)
+++ trunk/src/plugins/mantisbt/action/addAttachment.php 2010-12-09 16:40:47 UTC (rev 11748)
@@ -1,8 +1,6 @@
<?php
-
/*
- * Copyright 2010, Capgemini
- * Authors: Franck Villaume - capgemini
+ * Copyright 2010, Franck Villaume - Capgemini
*
* This file is part of FusionForge.
*
@@ -21,15 +19,15 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-$data = file_get_contents ($_FILES['attachment']['tmp_name'] );
-$content = base64_encode ($data);
+$data = file_get_contents($_FILES['attachment']['tmp_name'] );
+$content = base64_encode($data);
try {
- $clientSOAP = new SoapClient("http://".forge_get_config('server','mantisbt')."/api/soap/mantisconnect.php?wsdl", array('trace'=>true, 'exceptions'=>true));
- $clientSOAP->__soapCall('mc_issue_attachment_add', array("username" => $username, "password" => $password, "issue_id" => $idBug, "name" => $_FILES['attachment']['name'], "file_type" => $_FILES['attachment']['type'], "content" => $content ));
- $feedback = 'Opération réussie';
+ $clientSOAP = new SoapClient(forge_get_config('server_url','mantisbt')."/api/soap/mantisconnect.php?wsdl", array('trace'=>true, 'exceptions'=>true));
+ $clientSOAP->__soapCall('mc_issue_attachment_add', array("username" => $username, "password" => $password, "issue_id" => $idBug, "name" => $_FILES['attachment']['name'], "file_type" => $_FILES['attachment']['type'], "content" => $content ));
+ $feedback = _('Task Successed');
} catch (SoapFault $soapFault) {
- $feedback = 'Error : '.$soapFault->faultstring;
- session_redirect('plugins/mantisbt/?type=group&id='.$id.'&pluginname=mantisbt&idBug='.$idBug.'&view=viewIssue&error_msg='.urlencode($feedback));
+ $error_msg = _('Task failed:').' '.$soapFault->faultstring;
+ session_redirect('plugins/mantisbt/?type=group&id='.$id.'&pluginname=mantisbt&idBug='.$idBug.'&view=viewIssue&error_msg='.urlencode($error_msg));
}
session_redirect('plugins/mantisbt/?type=group&id='.$id.'&pluginname=mantisbt&idBug='.$idBug.'&view=viewIssue&feedback='.urlencode($feedback));
?>
Modified: trunk/src/plugins/mantisbt/action/addIssue.php
===================================================================
--- trunk/src/plugins/mantisbt/action/addIssue.php 2010-12-09 16:00:15 UTC (rev 11747)
+++ trunk/src/plugins/mantisbt/action/addIssue.php 2010-12-09 16:40:47 UTC (rev 11748)
@@ -1,7 +1,6 @@
<?php
/*
- * Copyright 2010, Capgemini
- * Authors: Franck Villaume - capgemini
+ * Copyright 2010, Franck Villaume - Capgemini
*
* This file is part of FusionForge.
*
@@ -26,17 +25,17 @@
$defect['project']['id'] = $idProjetMantis;
try {
- $clientSOAP = new SoapClient("http://".forge_get_config('server','mantisbt')."/api/soap/mantisconnect.php?wsdl", array('trace'=>true, 'exceptions'=>true));
- $listSeverities = $clientSOAP->__soapCall('mc_enum_severities', array("username" => $username, "password" => $password));
- $listReproducibilities = $clientSOAP->__soapCall('mc_enum_reproducibilities', array("username" => $username, "password" => $password));
- $listUsers = $clientSOAP->__soapCall('mc_project_get_users', array("username" => $username, "password" => $password, "project_id" => $idProjetMantis, "acces" => 10));
- $listViewStates = $clientSOAP->__soapCall('mc_enum_view_states', array("username" => $username, "password" => $password));
- $listPriorities = $clientSOAP->__soapCall('mc_enum_priorities', array("username" => $username, "password" => $password));
- $listResolutions= $clientSOAP->__soapCall('mc_enum_resolutions', array("username" => $username, "password" => $password));
- $listStatus= $clientSOAP->__soapCall('mc_enum_status', array("username" => $username, "password" => $password));
+ $clientSOAP = new SoapClient(forge_get_config('server_url','mantisbt')."/api/soap/mantisconnect.php?wsdl", array('trace'=>true, 'exceptions'=>true));
+ $listSeverities = $clientSOAP->__soapCall('mc_enum_severities', array("username" => $username, "password" => $password));
+ $listReproducibilities = $clientSOAP->__soapCall('mc_enum_reproducibilities', array("username" => $username, "password" => $password));
+ $listUsers = $clientSOAP->__soapCall('mc_project_get_users', array("username" => $username, "password" => $password, "project_id" => $idProjetMantis, "acces" => 10));
+ $listViewStates = $clientSOAP->__soapCall('mc_enum_view_states', array("username" => $username, "password" => $password));
+ $listPriorities = $clientSOAP->__soapCall('mc_enum_priorities', array("username" => $username, "password" => $password));
+ $listResolutions= $clientSOAP->__soapCall('mc_enum_resolutions', array("username" => $username, "password" => $password));
+ $listStatus= $clientSOAP->__soapCall('mc_enum_status', array("username" => $username, "password" => $password));
} catch (SoapFault $soapFault) {
- $feedback = 'Error : '.$soapFault->faultstring;
- session_redirect('plugins/mantisbt/?type='.$type.'&id='.$group_id.'&pluginname=mantisbt&view=viewIssues&error_msg='.urlencode($feedback));
+ $error_msg = _('Task failed:').' '.$soapFault->faultstring;
+ session_redirect('plugins/mantisbt/?type='.$type.'&id='.$group_id.'&pluginname=mantisbt&view=viewIssues&error_msg='.urlencode($feedback));
}
foreach($listSeverities as $key => $severity){
if ($_POST['severite'] == $severity->name){
@@ -122,12 +121,12 @@
}
try {
- $newIdBug = $clientSOAP->__soapCall('mc_issue_add', array("username" => $username, "password" => $password, "issue" => $defect));
- $feedback = 'Ticket '.$newIdBug.' crée';
- session_redirect('plugins/mantisbt/?type=group&id='.$id.'&pluginname=mantisbt&idBug='.$newIdBug.'&view=viewIssue&feedback='.urlencode($feedback));
+ $newIdBug = $clientSOAP->__soapCall('mc_issue_add', array("username" => $username, "password" => $password, "issue" => $defect));
+ $feedback = _('Ticket '.$newIdBug.' created successfully');
+ session_redirect('plugins/mantisbt/?type=group&id='.$id.'&pluginname=mantisbt&idBug='.$newIdBug.'&view=viewIssue&feedback='.urlencode($feedback));
} catch (SoapFault $soapFault) {
- $feedback = 'Erreur : '.$soapFault->faultstring;
- session_redirect('plugins/mantisbt/?type=group&id='.$id.'&pluginname=mantisbt&error_msg='.urlencode($feedback));
+ $error_msg = _('Task failed:').' '.$soapFault->faultstring;
+ session_redirect('plugins/mantisbt/?type=group&id='.$id.'&pluginname=mantisbt&error_msg='.urlencode($error_msg));
}
?>
Modified: trunk/src/plugins/mantisbt/action/addNote.php
===================================================================
--- trunk/src/plugins/mantisbt/action/addNote.php 2010-12-09 16:00:15 UTC (rev 11747)
+++ trunk/src/plugins/mantisbt/action/addNote.php 2010-12-09 16:40:47 UTC (rev 11748)
@@ -1,8 +1,6 @@
<?php
-
/*
- * Copyright 2010, Capgemini
- * Author: Franck Villaume - Capgemini
+ * Copyright 2010, Franck Villaume - Capgemini
*
* This file is part of FusionForge.
*
@@ -21,30 +19,36 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-$clientSOAP = new SoapClient("http://".forge_get_config('server','mantisbt')."/api/soap/mantisconnect.php?wsdl", array('trace'=>true, 'exceptions'=>true));
-$noteEdit;
+try {
+ $clientSOAP = new SoapClient(forge_get_config('server_url','mantisbt')."/api/soap/mantisconnect.php?wsdl", array('trace'=>true, 'exceptions'=>true));
+ $noteEdit;
-$note['text'] = $_POST['edit_texte_note'];
+ $note['text'] = $_POST['edit_texte_note'];
-$note['view_state']['id'] = 10;
-$listViewStates = $clientSOAP->__soapCall('mc_enum_view_states', array("username" => $username, "password" => $password));
-foreach($listViewStates as $state){
- if($state->id == 10){
- $note['view_state']['name'] = $state->name;
+ $note['view_state']['id'] = 10;
+ $listViewStates = $clientSOAP->__soapCall('mc_enum_view_states', array("username" => $username, "password" => $password));
+ foreach($listViewStates as $state){
+ if($state->id == 10){
+ $note['view_state']['name'] = $state->name;
+ }
}
-}
-$listUsers = $clientSOAP->__soapCall('mc_project_get_users', array("username" => $username, "password" => $password, "project_id" => $defect->project->id, "acces" => 10));
-foreach($listUsers as $key => $mantisuser){
- if ($username == $mantisuser->name){
- $note['reporter']['id'] = $mantisuser->id;
- $note['reporter']['name'] = $mantisuser->name;
- $note['reporter']['real_name'] = $mantisuser->real_name;
- $note['reporter']['email'] = $mantisuser->email;
- break;
+ $listUsers = $clientSOAP->__soapCall('mc_project_get_users', array("username" => $username, "password" => $password, "project_id" => $defect->project->id, "acces" => 10));
+ foreach($listUsers as $key => $mantisuser){
+ if ($username == $mantisuser->name){
+ $note['reporter']['id'] = $mantisuser->id;
+ $note['reporter']['name'] = $mantisuser->name;
+ $note['reporter']['real_name'] = $mantisuser->real_name;
+ $note['reporter']['email'] = $mantisuser->email;
+ break;
+ }
}
+
+ $clientSOAP->__soapCall('mc_issue_note_add', array("username" => $username, "password" => $password, "issue_id" => $idBug, "note" => $note));
+ $feedback = _('Note added successfully');
+} catch (SoapFault $soapFault) {
+ $error_msg = _('Task failed:').' '.$soapFault->faultstring;
+ session_redirect('plugins/mantisbt/?type=group&id='.$id.'&pluginname=mantisbt&idBug='.$idBug.'&view=viewIssue&error_msg='.urlencode($error_msg));
}
-
-return $clientSOAP->__soapCall('mc_issue_note_add', array("username" => $username, "password" => $password, "issue_id" => $idBug, "note" => $note));
-
+session_redirect('plugins/mantisbt/?type=group&id='.$id.'&pluginname=mantisbt&idBug='.$idBug.'&view=viewIssue&feedback='.urlencode($feedback));
?>
Modified: trunk/src/plugins/mantisbt/action/admin/addVersion.php
===================================================================
--- trunk/src/plugins/mantisbt/action/admin/addVersion.php 2010-12-09 16:00:15 UTC (rev 11747)
+++ trunk/src/plugins/mantisbt/action/admin/addVersion.php 2010-12-09 16:40:47 UTC (rev 11748)
@@ -1,8 +1,6 @@
<?php
-
/*
- * Copyright 2010, Capgemini
- * Authors: Franck Villaume - capgemini
+ * Copyright 2010, Franck Villaume - Capgemini
*
* This file is part of FusionForge.
*
@@ -22,41 +20,43 @@
*/
/* addVersion action page */
-if (isset($_POST['version'])) {
+if (isset($_POST['version']) && !empty($_POST['version'])) {
$versionStruct = array();
$versionStruct['name'] = $_POST['version'];
$versionStruct['project_id'] = $idProjetMantis;
$versionStruct['released'] = '';
$versionStruct['description'] = '';
$versionStruct['date_order'] = '';
- try {
- $clientSOAP = new SoapClient("http://".forge_get_config('server','mantisbt')."/api/soap/mantisconnect.php?wsdl", array('trace'=>true, 'exceptions'=>true));
- $clientSOAP->__soapCall('mc_project_version_add', array("username" => $username, "password" => $password, "version" => $versionStruct));
- if (isset($_POST['transverse'])) {
- $listChild = $clientSOAP->__soapCall('mc_project_get_subprojects', array("username" => $username, "password" => $password, "project_id" => $idProjetMantis));
- foreach ($listChild as $key => $child) {
- $listVersions = $clientSOAP->__soapCall('mc_project_get_versions', array("username" => $username, "password" => $password, "project_id" => $child));
- $todo = 1;
- foreach ($listVersions as $key => $version ) {
- if ($version->name == $versionStruct['name'])
- $todo = 0;
- }
- if ($todo) {
- try {
- $versionStruct['project_id'] = $child;
- $clientSOAP->__soapCall('mc_project_version_add', array("username" => $username, "password" => $password, "version" => $versionStruct));
- } catch (SoapFault $soapFault) {
- echo 'Error : '.$versionStruct['name'].' '.$soapFault->faultstring;
- echo "<br/>";
- }
- }
- }
- }
- } catch (SoapFault $soapFault) {
- $msg = 'Erreur : '.$versionStruct['name'].' '.$soapFault->faultstring;
- session_redirect('plugins/mantisbt/?type=admin&id='.$id.'&pluginname=mantisbt&error_msg='.urlencode($msg));
- }
- $feedback = 'Opération réussie';
- session_redirect('plugins/mantisbt/?type=admin&id='.$id.'&pluginname=mantisbt&feedback='.urlencode($feedback));
+ try {
+ $clientSOAP = new SoapClient(forge_get_config('server_url','mantisbt')."/api/soap/mantisconnect.php?wsdl", array('trace'=>true, 'exceptions'=>true));
+ $clientSOAP->__soapCall('mc_project_version_add', array("username" => $username, "password" => $password, "version" => $versionStruct));
+ if (isset($_POST['transverse'])) {
+ $listChild = $clientSOAP->__soapCall('mc_project_get_subprojects', array("username" => $username, "password" => $password, "project_id" => $idProjetMantis));
+ foreach ($listChild as $key => $child) {
+ $listVersions = $clientSOAP->__soapCall('mc_project_get_versions', array("username" => $username, "password" => $password, "project_id" => $child));
+ $todo = 1;
+ foreach ($listVersions as $key => $version ) {
+ if ($version->name == $versionStruct['name'])
+ $todo = 0;
+ }
+ if ($todo) {
+ try {
+ $versionStruct['project_id'] = $child;
+ $clientSOAP->__soapCall('mc_project_version_add', array("username" => $username, "password" => $password, "version" => $versionStruct));
+ } catch (SoapFault $soapFault) {
+ $msg = _('Task failed:').' '.$versionStruct['name'].' '.$soapFault->faultstring;
+ session_redirect('plugins/mantisbt/?type=admin&id='.$id.'&pluginname=mantisbt&error_msg='.urlencode($msg));
+ }
+ }
+ }
+ }
+ } catch (SoapFault $soapFault) {
+ $msg = _('Task failed:').' '.$versionStruct['name'].' '.$soapFault->faultstring;
+ session_redirect('plugins/mantisbt/?type=admin&id='.$id.'&pluginname=mantisbt&error_msg='.urlencode($msg));
+ }
+ $feedback = _('Task succeeded');
+ session_redirect('plugins/mantisbt/?type=admin&id='.$id.'&pluginname=mantisbt&feedback='.urlencode($feedback));
}
+$warning_msg = _('Missing version');
+session_redirect('plugins/mantisbt/?type=admin&id='.$id.'&pluginname=mantisbt&warning_msg='.urlencode($warning_msg));
?>
Modified: trunk/src/plugins/mantisbt/action/deleteAttachment.php
===================================================================
--- trunk/src/plugins/mantisbt/action/deleteAttachment.php 2010-12-09 16:00:15 UTC (rev 11747)
+++ trunk/src/plugins/mantisbt/action/deleteAttachment.php 2010-12-09 16:40:47 UTC (rev 11748)
@@ -1,8 +1,6 @@
<?php
-
/*
- * Copyright 2010, Capgemini
- * Authors: Franck Villaume - capgemini
+ * Copyright 2010, Franck Villaume - Capgemini
*
* This file is part of FusionForge.
*
@@ -23,12 +21,16 @@
$idAttachment = getIntFromRequest('idAttachment');
if ($idAttachment) {
- try {
- $clientSOAP = new SoapClient("http://".forge_get_config('server','mantisbt')."/api/soap/mantisconnect.php?wsdl", array('trace'=>true, 'exceptions'=>true));
- $clientSOAP->__soapCall('mc_issue_attachment_delete', array("username" => $username, "password" => $password, "issue_attachment_id" => $idAttachment));
- } catch (SoapFault $soapFault) {
- echo 'Error : '.$soapFault->faultstring;
- echo '<br/>';
- }
+ try {
+ $clientSOAP = new SoapClient(forge_get_config('server_url','mantisbt')."/api/soap/mantisconnect.php?wsdl", array('trace'=>true, 'exceptions'=>true));
+ $clientSOAP->__soapCall('mc_issue_attachment_delete', array("username" => $username, "password" => $password, "issue_attachment_id" => $idAttachment));
+ $feedback = _('Attachment deleted successfully');
+ } catch (SoapFault $soapFault) {
+ $error_msg _('Task failed:').' '.$soapFault->faultstring;
+ session_redirect('plugins/mantisbt/?type=group&id='.$id.'&pluginname=mantisbt&idBug='.$idBug.'&view=viewIssue&error_msg='.urlencode($error_msg));
+ }
+ session_redirect('plugins/mantisbt/?type=group&id='.$id.'&pluginname=mantisbt&idBug='.$idBug.'&view=viewIssue&feedback='.urlencode($feedback));
}
+$warning_msg = _('Missing Attachment ID to delete');
+session_redirect('plugins/mantisbt/?type=group&id='.$id.'&pluginname=mantisbt&idBug='.$idBug.'&view=viewIssue&warning_msg='.urlencode($warning_msg));
?>
Modified: trunk/src/plugins/mantisbt/action/deleteNote.php
===================================================================
--- trunk/src/plugins/mantisbt/action/deleteNote.php 2010-12-09 16:00:15 UTC (rev 11747)
+++ trunk/src/plugins/mantisbt/action/deleteNote.php 2010-12-09 16:40:47 UTC (rev 11748)
@@ -1,8 +1,6 @@
<?php
-
/*
- * Copyright 2010, Capgemini
- * Authors: Franck Villaume - capgemini
+ * Copyright 2010, Franck Villaume - Capgemini
*
* This file is part of FusionForge.
*
@@ -22,12 +20,12 @@
*/
try {
- $clientSOAP = new SoapClient("http://".forge_get_config('server','mantisbt')."/api/soap/mantisconnect.php?wsdl", array('trace'=>true, 'exceptions'=>true));
- $clientSOAP->__soapCall('mc_issue_note_delete', array("username" => $username, "password" => $password, "issue_note_id" => $idNote));
+ $clientSOAP = new SoapClient(forge_get_config('server_url','mantisbt')."/api/soap/mantisconnect.php?wsdl", array('trace'=>true, 'exceptions'=>true));
+ $clientSOAP->__soapCall('mc_issue_note_delete', array("username" => $username, "password" => $password, "issue_note_id" => $idNote));
} catch (SoapFault $soapFault) {
- $feedback = 'Error : '.$soapFault->faultstring;
- session_redirect('plugins/mantisbt/?type=group&id='.$id.'&pluginname=mantisbt&idBug='.$idBug.'&view=viewIssue&error_msg='.urlencode($feedback));
+ $feedback = _('Task failed:').' '.$soapFault->faultstring;
+ session_redirect('plugins/mantisbt/?type=group&id='.$id.'&pluginname=mantisbt&idBug='.$idBug.'&view=viewIssue&error_msg='.urlencode($feedback));
}
-$feedback = 'Opération réussie';
+$feedback = _('Note deleted successfully');
session_redirect('plugins/mantisbt/?type=group&id='.$id.'&pluginname=mantisbt&idBug='.$idBug.'&view=viewIssue&feedback='.urlencode($feedback));
?>
Modified: trunk/src/plugins/mantisbt/action/updateIssue.php
===================================================================
--- trunk/src/plugins/mantisbt/action/updateIssue.php 2010-12-09 16:00:15 UTC (rev 11747)
+++ trunk/src/plugins/mantisbt/action/updateIssue.php 2010-12-09 16:40:47 UTC (rev 11748)
@@ -1,9 +1,7 @@
<?php
-
/*
- * Copyright 2010, Capgemini
- * Authors: Franck Villaume - capgemini
- * Antoine Mercadal - capgemini
+ * Copyright 2010, Franck Villaume - Capgemini
+ * Copyright 2010, Antoine Mercadal - Capgemini
*
* This file is part of FusionForge.
*
@@ -22,16 +20,16 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-$clientSOAP = new SoapClient("http://".forge_get_config('server','mantisbt')."/api/soap/mantisconnect.php?wsdl", array('trace'=>true, 'exceptions'=>true));
+$clientSOAP = new SoapClient(forge_get_config('server_url','mantisbt')."/api/soap/mantisconnect.php?wsdl", array('trace'=>true, 'exceptions'=>true));
$defect = $clientSOAP->__soapCall('mc_issue_get', array("username" => $username, "password" => $password, "issue_id" => $idBug));
-if ($defect->category != $_POST['categorie']){
+if ($defect->category != $_POST['categorie']) {
$defect->category = $_POST['categorie'];
}
-if ($defect->severity->name != $_POST['severite']){
+if ($defect->severity->name != $_POST['severite']) {
$listSeverities = $clientSOAP->__soapCall('mc_enum_severities', array("username" => $username, "password" => $password));
- foreach($listSeverities as $key => $severity){
- if ($_POST['severite'] == $severity->name){
+ foreach($listSeverities as $key => $severity) {
+ if ($_POST['severite'] == $severity->name) {
$defect->severity->id = $severity->id;
$defect->severity->name = $severity->name;
break;
@@ -39,10 +37,10 @@
}
}
-if ($defect->reproducibility->name != $_POST['reproductibilite']){
+if ($defect->reproducibility->name != $_POST['reproductibilite']) {
$listReproducibilities = $clientSOAP->__soapCall('mc_enum_reproducibilities', array("username" => $username, "password" => $password));
- foreach($listReproducibilities as $key => $reproducibility){
- if ($_POST['reproductibilite'] == $reproducibility->name){
+ foreach($listReproducibilities as $key => $reproducibility) {
+ if ($_POST['reproductibilite'] == $reproducibility->name) {
$defect->reproducibility->id = $reproducibility->id;
$defect->reproducibility->name = $reproducibility->name;
break;
@@ -50,10 +48,10 @@
}
}
-if ($defect->reporter->name != $_POST['reporter']){
+if ($defect->reporter->name != $_POST['reporter']) {
$listUsers = $clientSOAP->__soapCall('mc_project_get_users', array("username" => $username, "password" => $password, "project_id" => $defect->project->id, "acces" => 10));
- foreach($listUsers as $key => $usermantis){
- if ($_POST['reporter'] == $usermantis->name){
+ foreach($listUsers as $key => $usermantis) {
+ if ($_POST['reporter'] == $usermantis->name) {
$defect->reporter->id = $usermantis->id;
$defect->reporter->name = $usermantis->name;
$defect->reporter->real_name = $usermantis->real_name;
@@ -63,10 +61,10 @@
}
}
-if ($defect->view_state->name != $_POST['viewstate']){
+if ($defect->view_state->name != $_POST['viewstate']) {
$listViewStates = $clientSOAP->__soapCall('mc_enum_view_states', array("username" => $username, "password" => $password));
- foreach($listViewStates as $key => $viewState){
- if ($_POST['viewstate'] == $viewState->name){
+ foreach($listViewStates as $key => $viewState) {
+ if ($_POST['viewstate'] == $viewState->name) {
$defect->view_state->id = $viewState->id;
$defect->view_state->name = $viewState->name;
break;
@@ -74,11 +72,11 @@
}
}
-if ($defect->handler->name != $_POST['handler']){
+if ($defect->handler->name != $_POST['handler']) {
if ($_POST['handler'] != ""){
$listUsers = $clientSOAP->__soapCall('mc_project_get_users', array("username" => $username, "password" => $password, "project_id" => $defect->project->id, "acces" => 10));
- foreach($listUsers as $key => $usermantis){
- if ($_POST['handler'] == $usermantis->name){
+ foreach($listUsers as $key => $usermantis) {
+ if ($_POST['handler'] == $usermantis->name) {
$defect->handler->id = $usermantis->id;
$defect->handler->name = $usermantis->name;
$defect->handler->real_name = $usermantis->real_name;
@@ -91,10 +89,10 @@
}
}
-if ($defect->priority->name != $_POST['priorite']){
+if ($defect->priority->name != $_POST['priorite']) {
$listPriorities = $clientSOAP->__soapCall('mc_enum_priorities', array("username" => $username, "password" => $password));
- foreach($listPriorities as $key => $priority){
- if ($_POST['priorite'] == $priority->name){
+ foreach($listPriorities as $key => $priority) {
+ if ($_POST['priorite'] == $priority->name) {
$defect->priority->id = $priority->id;
$defect->priority->name = $priority->name;
break;
@@ -102,10 +100,10 @@
}
}
-if ($defect->resolution->name != $_POST['resolution']){
+if ($defect->resolution->name != $_POST['resolution']) {
$listResolutions= $clientSOAP->__soapCall('mc_enum_resolutions', array("username" => $username, "password" => $password));
- foreach($listResolutions as $key => $resolution){
- if ($_POST['resolution'] == $resolution->name){
+ foreach($listResolutions as $key => $resolution) {
+ if ($_POST['resolution'] == $resolution->name) {
$defect->resolution->id = $resolution->id;
$defect->resolution->name = $resolution->name;
break;
@@ -113,10 +111,10 @@
}
}
-if ($defect->status->name != $_POST['etat']){
+if ($defect->status->name != $_POST['etat']) {
$listStatus= $clientSOAP->__soapCall('mc_enum_status', array("username" => $username, "password" => $password));
- foreach($listStatus as $key => $status){
- if ($_POST['etat'] == $status->name){
+ foreach($listStatus as $key => $status) {
+ if ($_POST['etat'] == $status->name) {
$defect->status->id = $status->id;
$defect->status->name = $status->name;
break;
@@ -124,11 +122,11 @@
}
}
-if ($defect->description != $_POST['description']){
+if ($defect->description != $_POST['description']) {
$defect->description = $_POST['description'];
}
-if ($defect->additional_information != $_POST['informations']){
+if ($defect->additional_information != $_POST['informations']) {
$defect->additional_information = $_POST['informations'];
}
@@ -149,10 +147,10 @@
}
try {
- $clientSOAP->__soapCall('mc_issue_update', array("username" => $username, "password" => $password, "issue_id" => $idBug, "issue" => $defect));
+ $clientSOAP->__soapCall('mc_issue_update', array("username" => $username, "password" => $password, "issue_id" => $idBug, "issue" => $defect));
} catch (SoapFault $soapFault) {
- $feedback = 'Erreur : '.$soapFault->faultstring;
- session_redirect('plugins/mantisbt/?type=group&id='.$id.'&pluginname=mantisbt&idBug='.$idBug.'&view=viewIssue&error_msg='.urlencode($feedback));
+ $error_msg = _('Task failed:').' '.$soapFault->faultstring;
+ session_redirect('plugins/mantisbt/?type=group&id='.$id.'&pluginname=mantisbt&idBug='.$idBug.'&view=viewIssue&error_msg='.urlencode($feedback));
}
//TODO : est-ce vraiment utilise ?
@@ -174,7 +172,7 @@
$clientSOAP->__soapCall('mc_issue_note_add', array("username" => $username, "password" => $password, "issue_id" => $idBug, "note" => $note));
}
-$feedback = 'Opération réussie';
+$feedback = _('Task succeeded');
session_redirect('plugins/mantisbt/?type=group&id='.$id.'&pluginname=mantisbt&idBug='.$idBug.'&view=viewIssue&feedback='.urlencode($feedback));
?>
Modified: trunk/src/plugins/mantisbt/action/updateNote.php
===================================================================
--- trunk/src/plugins/mantisbt/action/updateNote.php 2010-12-09 16:00:15 UTC (rev 11747)
+++ trunk/src/plugins/mantisbt/action/updateNote.php 2010-12-09 16:40:47 UTC (rev 11748)
@@ -1,8 +1,6 @@
<?php
-
/*
- * Copyright 2010, Capgemini
- * Authors: Franck Villaume - capgemini
+ * Copyright 2010, Franck Villaume - Capgemini
*
* This file is part of FusionForge.
*
@@ -22,7 +20,7 @@
*/
$noteEdit;
-$clientSOAP = new SoapClient("http://".forge_get_config('server','mantisbt')."/api/soap/mantisconnect.php?wsdl", array('trace'=>true, 'exceptions'=>true));
+$clientSOAP = new SoapClient(forge_get_config('server_url','mantisbt')."/api/soap/mantisconnect.php?wsdl", array('trace'=>true, 'exceptions'=>true));
$defect = $clientSOAP->__soapCall('mc_issue_get', array("username" => $username, "password" => $password, "issue_id" => $idBug));
foreach($defect->notes as $key => $note){
if ($note->id == $idNote){
@@ -33,12 +31,12 @@
if (isset($_POST['edit_texte_note'])){
$noteEdit->text = $_POST['edit_texte_note'];
- try {
- $clientSOAP->__soapCall('mc_issue_note_update', array("username" => $username, "password" => $password, "issue_id" => $idBug, "issue_note_id" => $idNote, "note" => $noteEdit, "type_update" => "text"));
- } catch (SoapFault $soapFault) {
- $feedback = 'Erreur : '.$soapFault->faultstring;
- session_redirect('plugins/mantisbt/?type=group&id='.$id.'&pluginname=mantisbt&idBug='.$idBug.'&view=viewIssue&error_msg='.urlencode($feedback));
- }
+ try {
+ $clientSOAP->__soapCall('mc_issue_note_update', array("username" => $username, "password" => $password, "issue_id" => $idBug, "issue_note_id" => $idNote, "note" => $noteEdit, "type_update" => "text"));
+ } catch (SoapFault $soapFault) {
+ $error_msg = _('Task failed:').' '.$soapFault->faultstring;
+ session_redirect('plugins/mantisbt/?type=group&id='.$id.'&pluginname=mantisbt&idBug='.$idBug.'&view=viewIssue&error_msg='.urlencode($error_msg));
+ }
} else {
$listViewStates = $clientSOAP->__soapCall('mc_enum_view_states', array("username" => $username, "password" => $password));
foreach($listViewStates as $state){
@@ -49,15 +47,15 @@
}
}
- try {
- $clientSOAP->__soapCall('mc_issue_note_update', array("username" => $username, "password" => $password, "issue_id" => $idBug, "issue_note_id" => $idNote, "note" => $noteEdit, "type_update" => "state"));
- } catch (SoapFault $soapFault) {
- $feedback = 'Erreur : '.$soapFault->faultstring;
- session_redirect('plugins/mantisbt/?type=group&id='.$id.'&pluginname=mantisbt&idBug='.$idBug.'&view=viewIssue&error_msg='.urlencode($feedback));
- }
+ try {
+ $clientSOAP->__soapCall('mc_issue_note_update', array("username" => $username, "password" => $password, "issue_id" => $idBug, "issue_note_id" => $idNote, "note" => $noteEdit, "type_update" => "state"));
+ } catch (SoapFault $soapFault) {
+ $error_msg = _('Task failed:').' '.$soapFault->faultstring;
+ session_redirect('plugins/mantisbt/?type=group&id='.$id.'&pluginname=mantisbt&idBug='.$idBug.'&view=viewIssue&error_msg='.urlencode($error_msg));
+ }
}
-$feedback = 'Opération réussie';
+$feedback = _('Task succeeded');
session_redirect('plugins/mantisbt/?type=group&id='.$id.'&pluginname=mantisbt&idBug='.$idBug.'&view=viewIssue&feedback='.urlencode($feedback));
?>
More information about the Fusionforge-commits
mailing list