mantisbt · Apr 11, 2013 · Apr 11, 2013 · Apr 19, 2013
diff --git a/account_delete.php b/account_delete.php
@@ -43,7 +43,6 @@
  * @uses authentication_api.php
  * @uses config_api.php
  * @uses constant_inc.php
- * @uses current_user_api.php
  * @uses form_api.php
  * @uses helper_api.php
  * @uses print_api.php
@@ -55,7 +54,6 @@
 require_api( 'authentication_api.php' );
 require_api( 'config_api.php' );
 require_api( 'constant_inc.php' );
-require_api( 'current_user_api.php' );
 require_api( 'form_api.php' );
 require_api( 'helper_api.php' );
 require_api( 'print_api.php' );
@@ -65,7 +63,7 @@
 
 auth_ensure_user_authenticated();
 
-current_user_ensure_unprotected();
+user_ensure_unprotected();
 
 # Only allow users to delete their own accounts if allow_account_delete = ON or
 # the user has permission to manage user accounts.
@@ -76,7 +74,7 @@
 
 # check that we are not deleting the last administrator account
 $t_admin_threshold = config_get_global( 'admin_site_threshold' );
-if ( current_user_is_administrator() &&
+if ( user_is_administrator( auth_get_current_user_id() ) &&
      user_count_level( $t_admin_threshold ) <= 1 ) {
 	throw new MantisBT\Exception\User\ProtectedLastAdministrator();
 }

diff --git a/account_manage_columns_page.php b/account_manage_columns_page.php
@@ -36,17 +36,15 @@
  * @link http://www.mantisbt.org
  *
  * @uses core.php
- * @uses current_user_api.php
  * @uses html_api.php
  */
 
 require_once( 'core.php' );
-require_api( 'current_user_api.php' );
 require_api( 'html_api.php' );
 
 html_page_top( _( 'Manage Columns' ) );
 
-current_user_ensure_unprotected();
+user_ensure_unprotected();
 
 # Define constant that will be checked by the include page.
 define ( 'ACCOUNT_COLUMNS', true );

diff --git a/account_page.php b/account_page.php
@@ -46,7 +46,6 @@
  * @uses authentication_api.php
  * @uses config_api.php
  * @uses constant_inc.php
- * @uses current_user_api.php
  * @uses form_api.php
  * @uses helper_api.php
  * @uses html_api.php
@@ -61,7 +60,6 @@
 require_api( 'authentication_api.php' );
 require_api( 'config_api.php' );
 require_api( 'constant_inc.php' );
-require_api( 'current_user_api.php' );
 require_api( 'form_api.php' );
 require_api( 'helper_api.php' );
 require_api( 'html_api.php' );
@@ -74,7 +72,7 @@
 #============ Permissions ============
 auth_ensure_user_authenticated();
 
-current_user_ensure_unprotected();
+user_ensure_unprotected();
 
 # extracts the user information for the currently logged in user
 # and prefixes it with u_
@@ -188,7 +186,7 @@
 			</div>
 			<div class="field-container">
 				<span class="display-label"><span><?php echo _( 'Project Access Level' ) ?></span></span>
-				<span class="input"><span class="field-value"><?php echo get_enum_element( 'access_levels', current_user_get_access_level() ); ?></span></span>
+				<span class="input"><span class="field-value"><?php echo get_enum_element( 'access_levels', user_get_access_level() ); ?></span></span>
 				<span class="label-style"></span>
 			</div>
 			<?php

diff --git a/account_prefs_page.php b/account_prefs_page.php
@@ -41,13 +41,11 @@
  *
  * @uses core.php
  * @uses authentication_api.php
- * @uses current_user_api.php
  * @uses html_api.php
  */
 
 require_once( 'core.php' );
 require_api( 'authentication_api.php' );
-require_api( 'current_user_api.php' );
 require_api( 'html_api.php' );
 
 #============ Parameters ============
@@ -56,7 +54,7 @@
 #============ Permissions ============
 auth_ensure_user_authenticated();
 
-current_user_ensure_unprotected();
+user_ensure_unprotected();
 
 define( 'ACCOUNT_PREFS_INC_ALLOW', true );
 include( dirname( __FILE__ ) . '/account_prefs_inc.php' );

diff --git a/account_prof_edit_page.php b/account_prof_edit_page.php
@@ -28,7 +28,6 @@
  * @uses authentication_api.php
  * @uses config_api.php
  * @uses constant_inc.php
- * @uses current_user_api.php
  * @uses form_api.php
  * @uses gpc_api.php
  * @uses html_api.php
@@ -41,7 +40,6 @@
 require_api( 'authentication_api.php' );
 require_api( 'config_api.php' );
 require_api( 'constant_inc.php' );
-require_api( 'current_user_api.php' );
 require_api( 'form_api.php' );
 require_api( 'gpc_api.php' );
 require_api( 'html_api.php' );
@@ -54,7 +52,7 @@
 
 auth_ensure_user_authenticated();
 
-current_user_ensure_unprotected();
+user_ensure_unprotected();
 
 $f_profile_id	= gpc_get_int( 'profile_id' );
 

diff --git a/account_prof_menu_page.php b/account_prof_menu_page.php
@@ -30,7 +30,6 @@
  * @uses authentication_api.php
  * @uses config_api.php
  * @uses constant_inc.php
- * @uses current_user_api.php
  * @uses form_api.php
  * @uses html_api.php
  * @uses print_api.php
@@ -42,7 +41,6 @@
 require_api( 'authentication_api.php' );
 require_api( 'config_api.php' );
 require_api( 'constant_inc.php' );
-require_api( 'current_user_api.php' );
 require_api( 'form_api.php' );
 require_api( 'html_api.php' );
 require_api( 'print_api.php' );
@@ -60,7 +58,7 @@
 
 auth_ensure_user_authenticated();
 
-current_user_ensure_unprotected();
+user_ensure_unprotected();
 
 if ( $g_global_profiles ) {
 	access_ensure_global_level( config_get( 'manage_global_profile_threshold' ) );

diff --git a/account_prof_update.php b/account_prof_update.php
@@ -28,7 +28,6 @@
  * @uses authentication_api.php
  * @uses config_api.php
  * @uses constant_inc.php
- * @uses current_user_api.php
  * @uses form_api.php
  * @uses gpc_api.php
  * @uses print_api.php
@@ -40,7 +39,6 @@
 require_api( 'authentication_api.php' );
 require_api( 'config_api.php' );
 require_api( 'constant_inc.php' );
-require_api( 'current_user_api.php' );
 require_api( 'form_api.php' );
 require_api( 'gpc_api.php' );
 require_api( 'print_api.php' );
@@ -54,7 +52,7 @@
 
 auth_ensure_user_authenticated();
 
-current_user_ensure_unprotected();
+user_ensure_unprotected();
 
 $f_action = gpc_get_string('action');
 
@@ -129,7 +127,7 @@
 
 	case 'make_default':
 		$f_profile_id = gpc_get_int( 'profile_id' );
-		current_user_set_pref( 'default_profile', $f_profile_id );
+		user_pref_set_pref( auth_get_current_user_id(), 'default_profile', $f_profile_id );
 		form_security_purge('profile_update');
 		print_header_redirect( 'account_prof_menu_page.php' );
 		break;

diff --git a/account_sponsor_page.php b/account_sponsor_page.php
@@ -43,7 +43,6 @@
  * @uses bug_api.php
  * @uses config_api.php
  * @uses constant_inc.php
- * @uses current_user_api.php
  * @uses database_api.php
  * @uses form_api.php
  * @uses gpc_api.php
@@ -62,7 +61,6 @@
 require_api( 'bug_api.php' );
 require_api( 'config_api.php' );
 require_api( 'constant_inc.php' );
-require_api( 'current_user_api.php' );
 require_api( 'database_api.php' );
 require_api( 'form_api.php' );
 require_api( 'gpc_api.php' );
@@ -80,7 +78,7 @@
 }
 
 # anonymous users are not allowed to sponsor issues
-if ( current_user_is_anonymous() ) {
+if ( user_is_anonymous( auth_get_current_user_id() ) ) {
 	throw new MantisBT\Exception\Access\AccessDenied();
 }
 

diff --git a/account_update.php b/account_update.php
@@ -28,7 +28,6 @@
  * @uses authentication_api.php
  * @uses config_api.php
  * @uses constant_inc.php
- * @uses current_user_api.php
  * @uses email_api.php
  * @uses form_api.php
  * @uses gpc_api.php
@@ -43,7 +42,6 @@
 require_api( 'authentication_api.php' );
 require_api( 'config_api.php' );
 require_api( 'constant_inc.php' );
-require_api( 'current_user_api.php' );
 require_api( 'email_api.php' );
 require_api( 'form_api.php' );
 require_api( 'gpc_api.php' );
@@ -57,7 +55,7 @@
 
 auth_ensure_user_authenticated();
 
-current_user_ensure_unprotected();
+user_ensure_unprotected();
 
 $f_email           	= gpc_get_string( 'email', '' );
 $f_realname        	= gpc_get_string( 'realname', '' );

diff --git a/admin/check/check_anonymous_inc.php b/admin/check/check_anonymous_inc.php
@@ -87,7 +87,7 @@
 	'anonymous_account user does not have administrator permissions',
 	!user_is_administrator( $t_anonymous_user_id ),
 	array(
-		true => 'The anonymous user account currently has an access level of: ' . htmlentities( get_enum_element( 'access_levels', user_get_access_level( $t_anonymous_user_id ) ) ),
+		true => 'The anonymous user account currently has an access level of: ' . htmlentities( get_enum_element( 'access_levels', user_get_access_level( $t_anonymous_user_id, ALL_PROJECTS ) ) ),
 		false => 'The anonymous user account should not have administrator level permissions.'
 	)
 );
diff --git a/admin/install.php b/admin/install.php
@@ -564,7 +564,7 @@ function InsertData( $p_table, $p_data ) {
 			print_test_result( GOOD );
 			$t_db_open = true;
 		} else {
-			$dict = new MantisDatabaseDict( $g_db );
+			$dict = MantisDatabaseDict::get_driver_instance($f_db_type);
 
 			$sqlarray = $dict->CreateDatabase( $f_database_name );
 				$ret = $dict->ExecuteSQLarray( $sqlarray );
@@ -676,7 +676,7 @@ function InsertData( $p_table, $p_data ) {
 			}
 
 			$g_db->SetPrefixes( 'mantis_', '_table' );
-			$dict = new MantisDatabaseDict( $g_db );
+			$dict = MantisDatabaseDict::get_driver_instance($f_db_type);
 			$t_sql = true;
 			$t_target = $upgrade[$i][1][0];
 			if( $upgrade[$i][0] == 'InsertData' ) {

diff --git a/bug_actiongroup.php b/bug_actiongroup.php
@@ -92,13 +92,10 @@
 	bug_ensure_exists( $t_bug_id );
 	$t_bug = bug_get( $t_bug_id, true );
 
-	if( $t_bug->project_id != helper_get_current_project() ) {
-		# in case the current project is not the same project of the bug we are viewing...
-		# ... override the current project. This to avoid problems with categories and handlers lists etc.
-		$g_project_override = $t_bug->project_id;
-		/** @todo (thraxisp) the next line goes away if the cache was smarter and used project */
-		config_flush_cache(); # flush the config cache so that configs are refetched
-	}
+	MantisContext::SetProject( $t_bug->project_id );
+	/** @todo (thraxisp) the next line goes away if the cache was smarter and used project */
+	// @TODO ?!!!?
+	config_flush_cache(); # flush the config cache so that configs are refetched
 
 	$t_status = $t_bug->status;
 

diff --git a/bug_actiongroup_ext.php b/bug_actiongroup_ext.php
@@ -76,7 +76,7 @@
 $t_failed_ids = array();
 
 foreach( $t_projects_bugs as $t_project_id => $t_bugs ) {
-	$g_project_override = $t_project_id;
+	MantisContext::SetProject( $t_project_id );
 	foreach( $t_bugs as $t_bug_id ) {
 		$t_fail_reason = bug_group_action_validate( $f_action, $t_bug_id );
 		if( $t_fail_reason !== null ) {
@@ -89,10 +89,9 @@
 			}
 		}
 	}
+	MantisContext::PopProject();
 }
 
-$g_project_override = null;
-
 form_security_purge( $t_form_name );
 
 if ( count( $t_failed_ids ) > 0 ) {

diff --git a/bug_actiongroup_page.php b/bug_actiongroup_page.php
@@ -88,12 +88,8 @@
 	$t_project_id = ALL_PROJECTS;
 	$t_projects[ALL_PROJECTS] = ALL_PROJECTS;
 }
-# override the project if necessary
-if( $t_project_id != helper_get_current_project() ) {
-	# in case the current project is not the same project of the bug we are viewing...
-	# ... override the current project. This to avoid problems with categories and handlers lists etc.
-	$g_project_override = $t_project_id;
-}
+
+MantisContext::SetProject( $t_project_id );
 
 define( 'BUG_ACTIONGROUP_INC_ALLOW', true );
 

diff --git a/bug_change_status_page.php b/bug_change_status_page.php
@@ -70,11 +70,7 @@
 $tpl_force_readonly = true;
 $tpl_fields_config_option = 'bug_change_status_page_columns';
 
-if( $t_bug->project_id != helper_get_current_project() ) {
-	# in case the current project is not the same project of the bug we are viewing...
-	# ... override the current project. This to avoid problems with categories and handlers lists etc.
-	$g_project_override = $t_bug->project_id;
-}
+MantisContext::SetProject( $t_bug->project_id );
 
 $f_new_status = gpc_get_int( 'new_status' );
 $f_reopen_flag = gpc_get_int( 'reopen_flag', OFF );

diff --git a/bug_file_add.php b/bug_file_add.php
@@ -60,11 +60,7 @@
 form_security_validate( 'bug_file_add' );
 
 $t_bug = bug_get( $f_bug_id, true );
-if( $t_bug->project_id != helper_get_current_project() ) {
-	# in case the current project is not the same project of the bug we are viewing...
-	# ... override the current project. This to avoid problems with categories and handlers lists etc.
-	$g_project_override = $t_bug->project_id;
-}
+MantisContext::SetProject( $t_bug->project_id );
 
 if ( !file_allow_bug_upload( $t_bug ) ) {
 	throw new MantisBT\Exception\Access\AccessDenied();

diff --git a/bug_file_delete.php b/bug_file_delete.php
@@ -51,11 +51,7 @@
 $t_bug_id = file_get_field( $f_file_id, 'bug_id' );
 
 $t_bug = bug_get( $t_bug_id, true );
-if( $t_bug->project_id != helper_get_current_project() ) {
-	# in case the current project is not the same project of the bug we are viewing...
-	# ... override the current project. This to avoid problems with categories and handlers lists etc.
-	$g_project_override = $t_bug->project_id;
-}
+MantisContext::SetProject( $t_bug->project_id );
 
 access_ensure_bug_level( config_get( 'update_bug_threshold' ), $t_bug_id );
 

diff --git a/bug_monitor_add.php b/bug_monitor_add.php
@@ -65,7 +65,7 @@
 		$t_user_id = user_get_id_by_realname( $f_username );
 
 		if ( $t_user_id === false ) {
-			throw new MantisBT\Exception\User_By_Name_Not_Found( $f_username );
+			throw new MantisBT\Exception\User\UserNotFound( $f_username );
 		}
 	}
 }
@@ -76,11 +76,7 @@
 
 bug_ensure_exists( $f_bug_id );
 
-if( $t_bug->project_id != helper_get_current_project() ) {
-	# in case the current project is not the same project of the bug we are viewing...
-	# ... override the current project. This to avoid problems with categories and handlers lists etc.
-	$g_project_override = $t_bug->project_id;
-}
+MantisContext::SetProject( $t_bug->project_id );
 
 if ( $t_logged_in_user_id == $t_user_id ) {
 	access_ensure_bug_level( config_get( 'monitor_bug_threshold' ), $f_bug_id );

diff --git a/bug_monitor_delete.php b/bug_monitor_delete.php
@@ -68,11 +68,7 @@
 
 bug_ensure_exists( $f_bug_id );
 
-if( $t_bug->project_id != helper_get_current_project() ) {
-	# in case the current project is not the same project of the bug we are viewing...
-	# ... override the current project. This to avoid problems with categories and handlers lists etc.
-	$g_project_override = $t_bug->project_id;
-}
+MantisContext::SetProject( $t_bug->project_id );
 
 if ( $t_logged_in_user_id == $t_user_id ) {
 	access_ensure_bug_level( config_get( 'monitor_bug_threshold' ), $f_bug_id );