As long as we decide to support both implementations we should add all non-generic
- * factory code to this class.
+ * TODO: Consider removing this class since it currently has one implementation which
+ * targets the php soap extension.
*/
class SoapObjectsFactory {
-
static function newSoapFault( $p_fault_code, $p_fault_string) {
- if ( class_exists('soap_fault') )
- return new soap_fault( $p_fault_code, '', $p_fault_string );
- else
- return new SoapFault( $p_fault_code, $p_fault_string );
+ return new SoapFault( $p_fault_code, $p_fault_string );
}
static function unwrapObject( $p_object ) {
- if ( is_object( $p_object ) )
+ if ( is_object( $p_object ) ) {
return get_object_vars( $p_object );
+ }
return $p_object;
}
static function newDateTimeVar( $p_value ) {
-
$string_value = self::newDateTimeString( $p_value );
- if ( class_exists('soapval') )
- return new soapval( 'due_date', 'xsd:dateTime', $string_value );
- else
- return new SoapVar( $string_value, XSD_DATETIME, 'xsd:dateTime');
+ return new SoapVar( $string_value, XSD_DATETIME, 'xsd:dateTime');
}
static function newDateTimeString ( $p_timestamp ) {
-
- if ( $p_timestamp == null || date_is_null( $p_timestamp) )
+ if ( $p_timestamp == null || date_is_null( $p_timestamp ) ) {
return null;
- else if ( function_exists('timestamp_to_iso8601') )
- return timestamp_to_iso8601( $p_timestamp, false);
- else {
- return date('c', (int) $p_timestamp);
}
+
+ return date('c', (int) $p_timestamp);
}
static function parseDateTimeString ( $p_string ) {
-
- if ( function_exists('iso8601_to_timestamp') ) {
- return iso8601_to_timestamp( $p_string );
- } else {
- return strtotime( $p_string );
- }
+ return strtotime( $p_string );
}
static function encodeBinary ( $p_binary ) {
- if ( class_exists('soap_fault') )
- return base64_encode( $p_binary );
- else
- return $p_binary;
+ return $p_binary;
}
static function isSoapFault ( $p_maybe_fault ) {
- if ( ! is_object( $p_maybe_fault ) )
+ if ( !is_object( $p_maybe_fault ) ) {
return false;
-
- if ( class_exists('soap_fault') ) {
- return get_class($p_maybe_fault ) == 'soap_fault';
- } else {
- return get_class($p_maybe_fault ) == 'SoapFault';
}
+
+ return get_class($p_maybe_fault ) == 'SoapFault';
}
}
diff --git a/api/soap/mc_config_defaults_inc.php b/api/soap/mc_config_defaults_inc.php
index 79895440ab..a3406e42f2 100644
--- a/api/soap/mc_config_defaults_inc.php
+++ b/api/soap/mc_config_defaults_inc.php
@@ -45,13 +45,3 @@
# Default version to be used if the specified version is not found and $g_mc_error_when_version_not_found == OFF.
# (at the moment this value does not depend on the project).
$g_mc_version_when_not_found = '';
-
-/**
- * MantisConnect - use nusoap for SOAP handling
- *
- * When the native PHP extension is available this flag default to OFF, which means that nusoap
- * will not used. The native extension has the advantage of being faster, more memory efficient and
- * maintained to work with recent versions on PHP. When the extension is not available
- * MantisBT falls back to using nusoap.
- */
-$g_mc_use_nusoap = extension_loaded('soap') && defined('SOAP_USE_XSI_ARRAY_TYPE') ? OFF : ON;
diff --git a/bug_update_advanced_page.php b/bug_update_advanced_page.php
index 5c63d81f87..919c5e1eb0 100644
--- a/bug_update_advanced_page.php
+++ b/bug_update_advanced_page.php
@@ -139,7 +139,11 @@
$tpl_additional_information_textarea = $tpl_show_additional_information ? string_textarea( $tpl_bug->additional_information ) : '';
$tpl_show_steps_to_reproduce = in_array( 'steps_to_reproduce', $t_fields );
$tpl_steps_to_reproduce_textarea = $tpl_show_steps_to_reproduce ? string_textarea( $tpl_bug->steps_to_reproduce ) : '';
-$tpl_handler_name = string_display_line( user_get_name( $tpl_bug->handler_id ) );
+if( NO_USER == $tpl_bug->handler_id ) {
+ $tpl_handler_name = '';
+} else {
+ $tpl_handler_name = string_display_line( user_get_name( $tpl_bug->handler_id ) );
+}
$tpl_can_change_view_state = $tpl_show_view_state && access_has_project_level( config_get( 'change_view_status_threshold' ) );
@@ -263,10 +267,17 @@
echo '', "\n";
event_signal( 'EVENT_LAYOUT_CONTENT_BEGIN' );
@@ -466,7 +467,7 @@ function html_body_begin() {
function html_header() {
$t_title = config_get( 'page_title' );
if( !is_blank( $t_title ) ) {
- echo '
', string_display( $t_title ), '
', "\n";
+ echo '
' . string_display( $t_title ) . "
\n";
}
}
@@ -519,6 +520,7 @@ function html_login_info() {
$t_now = date( config_get( 'complete_date_format' ) );
$t_realname = current_user_get_field( 'realname' );
+ # Login information
echo '
';
if( current_user_is_anonymous() ) {
$t_return_page = $_SERVER['SCRIPT_NAME'];
@@ -543,16 +545,7 @@ function html_login_info() {
}
echo '
';
- # Project Selector hidden if only one project visisble to user
- $t_show_project_selector = true;
- $t_project_ids = current_user_get_accessible_projects();
- if( count( $t_project_ids ) == 1 ) {
- $t_project_id = (int) $t_project_ids[0];
- if( count( current_user_get_accessible_subprojects( $t_project_id ) ) == 0 ) {
- $t_show_project_selector = false;
- }
- }
-
+ # RSS feed
if( OFF != config_get( 'rss_enabled' ) ) {
echo '';
}
+ # Project Selector (hidden if only one project visisble to user)
+ $t_show_project_selector = true;
+ $t_project_ids = current_user_get_accessible_projects();
+ if( count( $t_project_ids ) == 1 ) {
+ $t_project_id = (int) $t_project_ids[0];
+ if( count( current_user_get_accessible_subprojects( $t_project_id ) ) == 0 ) {
+ $t_show_project_selector = false;
+ }
+ }
+
if( $t_show_project_selector ) {
+ echo '
';
echo '
';
- echo '
' . $t_now . '
';
+ echo '
';
} else {
# User has only one project, set it as both current and default
if( ALL_PROJECTS == helper_get_current_project() ) {
@@ -591,8 +595,10 @@ function html_login_info() {
html_meta_redirect( $t_redirect_url, 0, false );
}
}
- echo '
' . $t_now . '
';
}
+
+ # Current time
+ echo '
' . $t_now . '
';
}
/**
@@ -906,26 +912,28 @@ function print_menu() {
if( !current_user_is_anonymous() ) {
$t_menu_options[] = '
' ) . lang_get( 'logout_link' ) . '';
}
- echo '