Revert "Fix #10890: Remove all references to advanced view/update/rep…

…ort pages"

This reverts commit 931ad8b.

Merge conflicts in language files were not corrected.

account_prefs_update.php

@@ -60,6 +60,9 @@
 		$t_prefs->language = $t_lang;
 	}
 
+	$t_prefs->advanced_report	= gpc_get_bool( 'advanced_report' );
+	$t_prefs->advanced_view		= gpc_get_bool( 'advanced_view' );
+	$t_prefs->advanced_update	= gpc_get_bool( 'advanced_update' );
 	$t_prefs->email_on_new		= gpc_get_bool( 'email_on_new' );
 	$t_prefs->email_on_assigned	= gpc_get_bool( 'email_on_assigned' );
 	$t_prefs->email_on_feedback	= gpc_get_bool( 'email_on_feedback' );

admin/schema.php

@@ -596,6 +596,3 @@ function installer_db_now() {
 $upgrade[] = Array( 'AddColumnSQL', Array( db_get_table( 'mantis_bug_file_table' ), "
 	user_id		I  			UNSIGNED NOTNULL DEFAULT '0' " ) );
 $upgrade[] = Array( 'DropColumnSQL', Array( db_get_table( 'mantis_custom_field_table'), "advanced" ) );
-$upgrade[] = Array( 'DropColumnSQL', Array( db_get_table( 'mantis_user_pref_table'), "advanced_report" ) );
-$upgrade[] = Array( 'DropColumnSQL', Array( db_get_table( 'mantis_user_pref_table'), "advanced_view" ) );
-$upgrade[] = Array( 'DropColumnSQL', Array( db_get_table( 'mantis_user_pref_table'), "advanced_update" ) );

bug_report_page.php

@@ -40,7 +40,7 @@
 
 	# this page is invalid for the 'All Project' selection except if this is a clone
 	if ( ( ALL_PROJECTS == helper_get_current_project() ) && ( 0 == $f_master_bug_id ) ) {
-		print_header_redirect( 'login_select_proj_page.php?ref=bug_report_page.php' );
+		print_header_redirect( 'login_select_proj_page.php?ref=bug_report_advanced_page.php' );
 	}
 
 	if ( $f_master_bug_id > 0 ) {
@@ -167,7 +167,7 @@
 		</td>
 	</tr>
 <?php
-	event_signal( 'EVENT_REPORT_BUG_FORM_TOP', array( $t_project_id ) );
+	event_signal( 'EVENT_REPORT_BUG_FORM_TOP', array( $t_project_id, true ) );
 
 	if ( $tpl_show_category ) {
 ?>
@@ -395,7 +395,7 @@
 		</td>
 	</tr>
 <?php } ?>
-<?php event_signal( 'EVENT_REPORT_BUG_FORM', array( $t_project_id ) ) ?>
+<?php event_signal( 'EVENT_REPORT_BUG_FORM', array( $t_project_id, true ) ); ?>
 	<tr <?php echo helper_alternate_class() ?>>
 		<td class="category">
 			<span class="required">*</span><?php print_documentation_link( 'summary' ) ?>

bug_view_inc.php

@@ -238,11 +238,11 @@
 		$t_index = array_search( $f_bug_id, $t_bugslist );
 		if ( false !== $t_index ) {
 			if ( isset( $t_bugslist[$t_index-1] ) ) {
-				print_bracket_link( 'bug_view_page.php?bug_id='.$t_bugslist[$t_index-1], '<<' );
+				print_bracket_link( 'bug_view_advanced_page.php?bug_id='.$t_bugslist[$t_index-1], '<<' );
 			}
 
 			if ( isset( $t_bugslist[$t_index+1] ) ) {
-				print_bracket_link( 'bug_view_page.php?bug_id='.$t_bugslist[$t_index+1], '>>' );
+				print_bracket_link( 'bug_view_advanced_page.php?bug_id='.$t_bugslist[$t_index+1], '>>' );
 			}
 		}
 		echo '</span></td>';
@@ -577,7 +577,7 @@
 	# Bug Details Event Signal
 	#
 
-	event_signal( 'EVENT_VIEW_BUG_DETAILS', array( $tpl_bug_id ) );
+	event_signal( 'EVENT_VIEW_BUG_DETAILS', array( $tpl_bug_id, true ) );
 
 	# spacer
 	echo '<tr class="spacer"><td colspan="6"></td></tr>';

config_defaults_inc.php

@@ -1219,6 +1219,24 @@
 	 */
 	$g_min_refresh_delay	= 10;
 
+	/**
+	 *
+	 * @global int $g_default_advanced_report
+	 */
+	$g_default_advanced_report		= OFF;
+
+	/**
+	 *
+	 * @global int $g_default_advanced_view
+	 */
+	$g_default_advanced_view		= OFF;
+
+	/**
+	 *
+	 * @global int $g_default_advanced_update
+	 */
+	$g_default_advanced_update		= OFF;
+
 	/**
 	 * in minutes
 	 * @global int $g_default_refresh_delay

core/print_api.php

@@ -1667,7 +1667,7 @@ function get_dropdown( $p_control_array, $p_control_name, $p_match = '', $p_add_
 }
 
 # List the attachments belonging to the specified bug.  This is used from within
-# bug_view_page.php
+# bug_view_page.php and bug_view_advanced_page.php
 function print_bug_attachments_list( $p_bug_id ) {
 	$t_attachments = file_get_visible_attachments( $p_bug_id );
 	$t_attachments_count = count( $t_attachments );

core/user_pref_api.php

@@ -31,6 +31,9 @@
 class UserPreferences {
 	protected $default_profile = NULL;
 	protected $default_project = NULL;
+	protected $advanced_report = NULL;
+	protected $advanced_view = NULL;
+	protected $advanced_update = NULL;
 	protected $refresh_delay = NULL;
 	protected $redirect_delay = NULL;
 	protected $bugnote_order = NULL;
@@ -62,6 +65,9 @@ class UserPreferences {
 	private static $default_mapping = array(
 	'default_profile' => 'default_profile',
 	'default_project' => 'default_project',
+	'advanced_report' => 'default_advanced_report',
+	'advanced_view' => 'default_advanced_view',
+	'advanced_update' => 'default_advanced_update',
 	'refresh_delay' => 'default_refresh_delay',
 	'redirect_delay' => 'default_redirect_delay',
 	'bugnote_order' => 'default_bugnote_order',

docbook/adminguide/en/configuration.sgml

@@ -1172,6 +1172,30 @@
             ($g_default_language).
         </para>
         <variablelist>
+            <varlistentry>
+                <term>$g_default_advanced_report</term>
+                <listitem>
+                    <para>Default user preferences to use the advanced page for
+                        reporting bugs. Default is OFF.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>$g_default_advanced_view</term>
+                <listitem>
+                    <para>Default user preferences to use the advanced page for view
+                        bugs. Default value is OFF.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>$g_default_advanced_update</term>
+                <listitem>
+                    <para>Default user preferences to use the advanced page for
+                        updating bugs. Default value is OFF.
+                    </para>
+                </listitem>
+            </varlistentry>
             <varlistentry>
                 <term>$g_default_refresh_delay</term>
                 <listitem>

docbook/adminguide/en/customizing_mantis.sgml

@@ -123,6 +123,11 @@
                         able to edit the value of the custom field.
                     </para>
                 </listitem>
+                <listitem>
+                    <para>Display only on Advanced Page? - If set, then this
+		    custom field will only show on the advanced pages.
+                    </para>
+                </listitem>
                 <listitem>
                     <para>Display when reporting issues? - If this custom
 		    field should be shown on the Report Issue page.

docbook/adminguide/en/page_descriptions.sgml

@@ -71,16 +71,17 @@
             will reverse the direction of the sort. The default is to sort by
             last modification time, where the last modified issue appears at the
             top. The issue id is a link that leads to a more detailed report about
-            the issue. You can also add issue notes here. The number in the
-            issue note count column will be bold if an issue note has been
-            added in the specified time frame. The addition of an issue note
-            will make the issue note link of the issue appear in the unvisited
-            state. The text in the "Severity" column will be bold if the
-            severity is major, crash, or block and the issue not resolved. The
-            text in the "Updated" column will be bold if the issue has changed
-            in the last "Changed(hrs)" field which is specified in the viewing
-            filters. Each table row is color coded according to the issue
-            status. The colors can be customised through MantisBT
+            the issue. Depending on what you have set in your Account Preferences
+            you will be sent to the simple or advanced view. You can also add
+            issue notes here.The number in the issue note count column will be bold
+            if an issue note has been added in the specified time frame. The
+            addition of an issue note will make the issue note link of the issue appear
+            in the unvisited state.The text in the "Severity" column will be
+            bold if the severity is major, crash, or block and the issue not
+            resolved.The text in the "Updated" column will be bold if the issue
+            has changed in the last "Changed(hrs)" field which is specified in
+            the viewing filters.Each table row is color coded according to the
+            issue status. The colors can be customised through MantisBT
             <ulink url="manual.configuration.html">Configuration</ulink>
             .Severitiesblock
             - prevents further work/progress from being made

docbook/developers/en/event-reference-bug.sgml

@@ -23,6 +23,7 @@
 				<itemizedlist>
 					<title>Parameters</title>
 					<listitem><para>&lt;Integer&gt;: Bug ID</para></listitem>
+					<listitem><para>&lt;Boolean&gt;: Advanced view (false for simple view)</para></listitem>
 				</itemizedlist>
 			</blockquote>
 		</blockquote>
@@ -45,6 +46,7 @@
 				<itemizedlist>
 					<title>Parameters</title>
 					<listitem><para>&lt;Integer&gt;: Bug ID</para></listitem>
+					<listitem><para>&lt;Boolean&gt;: Advanced view (false for simple view)</para></listitem>
 				</itemizedlist>
 			</blockquote>
 		</blockquote>
@@ -72,6 +74,7 @@
 				<itemizedlist>
 					<title>Parameters</title>
 					<listitem><para>&lt;Integer&gt;: Project ID</para></listitem>
+					<listitem><para>&lt;Boolean&gt;: Advanced view (false for simple view)</para></listitem>
 				</itemizedlist>
 			</blockquote>
 		</blockquote>
@@ -94,6 +97,7 @@
 				<itemizedlist>
 					<title>Parameters</title>
 					<listitem><para>&lt;Integer&gt;: Project ID</para></listitem>
+					<listitem><para>&lt;Boolean&gt;: Advanced view (false for simple view)</para></listitem>
 				</itemizedlist>
 			</blockquote>
 		</blockquote>

lang/strings_arabic.txt

@@ -399,6 +399,9 @@ $s_verify_warning = 'معلومات حسابك تم تأكيدها. رسالة 
 $s_verify_change_password = 'يجب أن تضبط كلمة سر هنا ليسمح لك بتسجيل الدخول مرة ثانية.';
 $s_default_account_preferences_title = 'تفضيلات الحساب';
 $s_default_project = 'المشروع الافتراضي';
+$s_advanced_report = 'تقرير متقدم';
+$s_advanced_view = 'عرض متقدم';
+$s_advanced_update = 'تحديث متقدم';
 $s_refresh_delay = 'تحديث التأخير';
 $s_minutes = 'دقائق';
 $s_redirect_delay = 'تحويل التأخير';
@@ -533,6 +536,7 @@ $s_steps_to_reproduce = 'الخطوات لإعادة الإنتاج';
 $s_update_information_button = 'تحديث المعلومات';
 $s_sticky_issue = 'قضية لاصقة';
 $s_profile = 'ملف';
+$s_update_advanced_link = 'تحديث متقدم';
 $s_updating_bug_simple_title = 'تحديث معلومات القضية';
 $s_view_revisions = 'رؤية المراجعات';
 $s_revision = 'المراجعة';
@@ -868,6 +872,7 @@ $s_assign_to = 'موكولة إلى';
 $s_additional_information = 'معلومات إضافية';
 $s_submit_report_button = 'إرسال التقرير';
 $s_check_report_more_bugs = 'اختر للإبلاغ عن مزيد من القضايا';
+$s_advanced_report_link = 'تقرير متقدم';
 $s_report_stay = 'التقرير يبقى';
 $s_selected_project = 'المشروع المختار';
 $s_valid_project_msg = 'يجب أن تختار مشروعا صحيحا';
@@ -971,11 +976,8 @@ $s_attached_files = 'الملفات الملحقة';
 $s_publish = 'نشر';
 $s_cached = 'مخزن';
 $s_add_user_to_monitor = 'أضف';
-<<<<<<< HEAD
 $s_view_advanced_link = 'عرض متقدم';
 $s_viewing_bug_simple_details_title = 'عرض تفاصيل القضية البسيطة';
-=======
->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages
 $s_no_users_monitoring_bug = 'لا يوجد مستخدمون يراقبون هذه القضية.';
 $s_users_monitoring_bug = 'المستخدمون الذين يراقبون هذه القضية';
 $s_monitoring_user_list = 'قائمة المستخدمين';

lang/strings_arabicegyptianspoken.txt

@@ -397,6 +397,9 @@ $s_verify_warning = 'معلومات حسابك تم تأكيدها. رسالة 
 $s_verify_change_password = 'يجب أن تضبط كلمة سر هنا ليسمح لك بتسجيل الدخول مرة ثانية.';
 $s_default_account_preferences_title = 'تفضيلات الحساب';
 $s_default_project = 'المشروع الافتراضي';
+$s_advanced_report = 'تقرير متقدم';
+$s_advanced_view = 'عرض متقدم';
+$s_advanced_update = 'تحديث متقدم';
 $s_refresh_delay = 'تحديث التأخير';
 $s_minutes = 'دقائق';
 $s_redirect_delay = 'تحويل التأخير';
@@ -531,6 +534,7 @@ $s_steps_to_reproduce = 'الخطوات لإعادة الإنتاج';
 $s_update_information_button = 'تحديث المعلومات';
 $s_sticky_issue = 'قضية لاصقة';
 $s_profile = 'ملف';
+$s_update_advanced_link = 'تحديث متقدم';
 $s_updating_bug_simple_title = 'تحديث معلومات القضية';
 $s_vote_added_msg = 'التصويت تمت إضافته...';
 $s_bugnote_added_msg = 'الملاحظة تمت إضافتها...';
@@ -856,6 +860,7 @@ $s_assign_to = 'موكولة إلى';
 $s_additional_information = 'معلومات إضافية';
 $s_submit_report_button = 'إرسال التقرير';
 $s_check_report_more_bugs = 'اختر للإبلاغ عن مزيد من القضايا';
+$s_advanced_report_link = 'تقرير متقدم';
 $s_report_stay = 'التقرير يبقى';
 $s_selected_project = 'المشروع المختار';
 $s_valid_project_msg = 'يجب أن تختار مشروعا صحيحا';
@@ -958,11 +963,8 @@ $s_attached_files = 'الملفات الملحقة';
 $s_publish = 'نشر';
 $s_cached = 'مخزن';
 $s_add_user_to_monitor = 'أضف';
-<<<<<<< HEAD
 $s_view_advanced_link = 'عرض متقدم';
 $s_viewing_bug_simple_details_title = 'عرض تفاصيل القضية البسيطة';
-=======
->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages
 $s_no_users_monitoring_bug = 'لا يوجد مستخدمون يراقبون هذه القضية.';
 $s_users_monitoring_bug = 'المستخدمون الذين يراقبون هذه القضية';
 $s_monitoring_user_list = 'قائمة المستخدمين';

lang/strings_bulgarian.txt

@@ -358,6 +358,9 @@ $s_verify_warning = 'Данните от профила са проверени.
 $s_verify_change_password = 'Изисква се въвеждането на парола за обратен достъп до системата.';
 $s_default_account_preferences_title = 'Настройки на профил';
 $s_default_project = 'Проект';
+$s_advanced_report = 'Разширена информация';
+$s_advanced_view = 'Разширен изглед';
+$s_advanced_update = 'Разширено обновяване';
 $s_refresh_delay = 'Автоматично опресняване';
 $s_minutes = 'минути';
 $s_redirect_delay = 'Автоматично пренасочване';
@@ -488,6 +491,7 @@ $s_steps_to_reproduce = 'Стъпки за възпроизвеждане';
 $s_update_information_button = 'Обновяване на информацията';
 $s_sticky_issue = 'Проблематичен';
 $s_profile = 'Профил';
+$s_update_advanced_link = 'Обновяване с разширен формуляр';
 $s_updating_bug_simple_title = 'Обновяване на информацията за проблем';
 $s_all_revisions = 'Всички версии';
 $s_vote_added_msg = 'Добавена е бележка...';
@@ -778,6 +782,7 @@ $s_assign_to = 'Назначаване на';
 $s_additional_information = 'Допълнителна информация';
 $s_submit_report_button = 'Изпращане';
 $s_check_report_more_bugs = 'Маркирайте, ако искате да съобщите за повече грешки';
+$s_advanced_report_link = 'Разширен формуляр';
 $s_report_stay = 'Още грешки';
 $s_selected_project = 'Избран проект';
 $s_valid_project_msg = 'Изберете валиден проект';
@@ -872,11 +877,8 @@ $s_attached_files = 'Прикрепени файлове';
 $s_publish = 'Публикуване';
 $s_cached = 'Кеширан';
 $s_add_user_to_monitor = 'Добавяне';
-<<<<<<< HEAD
 $s_view_advanced_link = 'Разширен изглед';
 $s_viewing_bug_simple_details_title = 'Опростен изглед на проблем';
-=======
->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages
 $s_no_users_monitoring_bug = 'Няма потребители, наблюдаващи този проблем.';
 $s_users_monitoring_bug = 'Потребители, наблюдаващи този проблем';
 $s_monitoring_user_list = 'Списък с потребители';

lang/strings_catalan.txt

@@ -399,6 +399,9 @@ $s_verify_warning = 'La informació del seu compte ha estat verificada. El missa
 $s_verify_change_password = 'Ha d\'establir una contrasenya per poder entrar una altra vegada';
 $s_default_account_preferences_title = 'Preferències del compte';
 $s_default_project = 'Projecte per defecte';
+$s_advanced_report = 'Informe Avançat';
+$s_advanced_view = 'Vista Avançada';
+$s_advanced_update = 'Actualització Avançada';
 $s_refresh_delay = 'Demora de Refresc';
 $s_minutes = 'minuts';
 $s_redirect_delay = 'Demora de Redirecció';
@@ -534,6 +537,7 @@ $s_steps_to_reproduce = 'Passos per reproduir-lo';
 $s_update_information_button = 'Actualitzar Informació';
 $s_sticky_issue = 'Comanda marcada';
 $s_profile = 'Perfil';
+$s_update_advanced_link = 'Canvia a format d\'Actualització Avançada';
 $s_updating_bug_simple_title = 'Actualitzant informació de la Comanda';
 $s_view_revisions = 'Veure revisions';
 $s_revision = 'Revisió';
@@ -869,6 +873,7 @@ $s_assign_to = 'Assignar a';
 $s_additional_information = 'Informació Addicional';
 $s_submit_report_button = 'Envia comanda';
 $s_check_report_more_bugs = 'Seleccioni per a informar més comandes';
+$s_advanced_report_link = 'Comanda Avançada';
 $s_report_stay = 'Continua informant';
 $s_selected_project = 'Projecte Seleccionat';
 $s_valid_project_msg = 'Ha de seleccionar un projecte vàlid';
@@ -972,11 +977,8 @@ $s_attached_files = 'Arxius Adjunts';
 $s_publish = 'Publica';
 $s_cached = 'En Memòria Cau';
 $s_add_user_to_monitor = 'Afegeix';
-<<<<<<< HEAD
 $s_view_advanced_link = 'Vista Avançada';
 $s_viewing_bug_simple_details_title = 'Vista Simple.';
-=======
->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages
 $s_no_users_monitoring_bug = 'No hi ha usuaris monitoritzant aquesta comanda.';
 $s_users_monitoring_bug = 'Usuaris monitorizant aquesta comanda.';
 $s_monitoring_user_list = 'Llista d\'Usuaris';