Skip to content

Commit

Permalink
Merge commit 'release-1.2.9' into oracle
Browse files Browse the repository at this point in the history 
Conflicts:
	admin/install.php
	config_defaults_inc.php
	core/plugin_api.php
	manage_tags_page.php
  • Loading branch information
@dregad
dregad committed Mar 12, 2012
2 parents f33b189 + 3e11346 commit fb4a44a
Show file tree
Hide file tree
Showing 579 changed files with 7,553 additions and 2,736 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Expand Up @@ -32,6 +32,7 @@ plugins/*
.cache
.project
.settings
*.kdev4

# IIS7
web.config
Expand Down
2 changes: 1 addition & 1 deletion account_delete.php
View file
Expand Up @@ -35,7 +35,7 @@
*
* @package MantisBT
* @copyright Copyright (C) 2000 - 2002 Kenzaburo Ito - kenito@300baud.org
* @copyright Copyright (C) 2002 - 2011 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @copyright Copyright (C) 2002 - 2012 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @link http://www.mantisbt.org
*/
/**
Expand Down
2 changes: 1 addition & 1 deletion account_manage_columns_page.php
View file
Expand Up @@ -17,7 +17,7 @@
/**
* @package MantisBT
* @copyright Copyright (C) 2000 - 2002 Kenzaburo Ito - kenito@300baud.org
* @copyright Copyright (C) 2002 - 2011 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @copyright Copyright (C) 2002 - 2012 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @link http://www.mantisbt.org
*/
/**
Expand Down
2 changes: 1 addition & 1 deletion account_page.php
View file
Expand Up @@ -39,7 +39,7 @@
*
* @package MantisBT
* @copyright Copyright (C) 2000 - 2002 Kenzaburo Ito - kenito@300baud.org
* @copyright Copyright (C) 2002 - 2011 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @copyright Copyright (C) 2002 - 2012 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @link http://www.mantisbt.org
*/
/**
Expand Down
2 changes: 1 addition & 1 deletion account_prefs_inc.php
View file
Expand Up @@ -17,7 +17,7 @@
/**
* @package MantisBT
* @copyright Copyright (C) 2000 - 2002 Kenzaburo Ito - kenito@300baud.org
* @copyright Copyright (C) 2002 - 2011 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @copyright Copyright (C) 2002 - 2012 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @link http://www.mantisbt.org
*/
/**
Expand Down
2 changes: 1 addition & 1 deletion account_prefs_page.php
View file
Expand Up @@ -36,7 +36,7 @@
*
* @package MantisBT
* @copyright Copyright (C) 2000 - 2002 Kenzaburo Ito - kenito@300baud.org
* @copyright Copyright (C) 2002 - 2011 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @copyright Copyright (C) 2002 - 2012 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @link http://www.mantisbt.org
*/
/**
Expand Down
2 changes: 1 addition & 1 deletion account_prefs_reset.php
View file
Expand Up @@ -32,7 +32,7 @@
*
* @package MantisBT
* @copyright Copyright (C) 2000 - 2002 Kenzaburo Ito - kenito@300baud.org
* @copyright Copyright (C) 2002 - 2011 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @copyright Copyright (C) 2002 - 2012 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @link http://www.mantisbt.org
*/
/**
Expand Down
2 changes: 1 addition & 1 deletion account_prefs_update.php
View file
Expand Up @@ -18,7 +18,7 @@
* Updates prefs then redirect to account_prefs_page.php
* @package MantisBT
* @copyright Copyright (C) 2000 - 2002 Kenzaburo Ito - kenito@300baud.org
* @copyright Copyright (C) 2002 - 2011 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @copyright Copyright (C) 2002 - 2012 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @link http://www.mantisbt.org
*/
/**
Expand Down
2 changes: 1 addition & 1 deletion account_prof_edit_page.php
View file
Expand Up @@ -20,7 +20,7 @@
*
* @package MantisBT
* @copyright Copyright (C) 2000 - 2002 Kenzaburo Ito - kenito@300baud.org
* @copyright Copyright (C) 2002 - 2011 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @copyright Copyright (C) 2002 - 2012 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @link http://www.mantisbt.org
*/
/**
Expand Down
2 changes: 1 addition & 1 deletion account_prof_menu_page.php
View file
Expand Up @@ -22,7 +22,7 @@
*
* @package MantisBT
* @copyright Copyright (C) 2000 - 2002 Kenzaburo Ito - kenito@300baud.org
* @copyright Copyright (C) 2002 - 2011 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @copyright Copyright (C) 2002 - 2012 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @link http://www.mantisbt.org
*/
/**
Expand Down
2 changes: 1 addition & 1 deletion account_prof_update.php
View file
Expand Up @@ -19,7 +19,7 @@
* account_prof_menu_page.php
* @package MantisBT
* @copyright Copyright (C) 2000 - 2002 Kenzaburo Ito - kenito@300baud.org
* @copyright Copyright (C) 2002 - 2011 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @copyright Copyright (C) 2002 - 2012 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @link http://www.mantisbt.org
*/
/**
Expand Down
16 changes: 8 additions & 8 deletions account_sponsor_page.php
View file
Expand Up @@ -34,7 +34,7 @@
*
* @package MantisBT
* @copyright Copyright (C) 2000 - 2002 Kenzaburo Ito - kenito@300baud.org
* @copyright Copyright (C) 2002 - 2011 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @copyright Copyright (C) 2002 - 2012 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @link http://www.mantisbt.org
*/
/**
Expand Down Expand Up @@ -127,16 +127,16 @@
$t_sponsor = sponsorship_get( $row['sponsor'] );

# describe bug
$t_status = string_attribute( get_enum_element( 'status', $t_bug->status ) );
$t_resolution = string_attribute( get_enum_element( 'resolution', $t_bug->resolution ) );
$t_status = string_attribute( get_enum_element( 'status', $t_bug->status, auth_get_current_user_id(), $t_bug->project_id ) );
$t_resolution = string_attribute( get_enum_element( 'resolution', $t_bug->resolution, auth_get_current_user_id(), $t_bug->project_id ) );
$t_version_id = version_get_id( $t_bug->fixed_in_version, $t_project );
if ( ( false !== $t_version_id ) && ( VERSION_RELEASED == version_get_field( $t_version_id, 'released' ) ) ) {
$t_released_label = '<a title="' . lang_get( 'released' ) . '">' . $t_bug->fixed_in_version . '</a>';
} else {
$t_released_label = $t_bug->fixed_in_version;
}

echo '<tr bgcolor="' . get_status_color( $t_bug->status ) . '">';
echo '<tr bgcolor="' . get_status_color( $t_bug->status, auth_get_current_user_id(), $t_bug->project_id ) . '">';
echo '<td><a href="' . string_get_bug_view_url( $row['bug'] ) . '">' . bug_format_id( $row['bug'] ) . '</a></td>';
echo '<td>' . project_get_field( $t_bug->project_id, 'name' ) . '&#160;</td>';
echo '<td class="right">' . $t_released_label . '&#160;</td>';
Expand Down Expand Up @@ -191,7 +191,7 @@

$query = "SELECT b.id as bug, s.id as sponsor, s.paid, b.project_id, b.fixed_in_version, b.status
FROM $t_bug_table b, $t_sponsor_table s
WHERE b.handler_id=" . db_param() . " AND s.bug_id = b.id " .
WHERE b.handler_id=" . db_param() . " AND s.bug_id = b.id " .
( $t_show_all ? '' : 'AND ( b.status < ' . db_param() . ' OR s.paid < ' . SPONSORSHIP_PAID . ')' ) . "
AND $t_project_clause
ORDER BY s.paid ASC, b.project_id ASC, b.fixed_in_version ASC, b.status ASC, b.id DESC";
Expand Down Expand Up @@ -237,16 +237,16 @@
$t_buglist[] = $row['bug'] . ':' . $row['sponsor'];

# describe bug
$t_status = string_attribute( get_enum_element( 'status', $t_bug->status ) );
$t_resolution = string_attribute( get_enum_element( 'resolution', $t_bug->resolution ) );
$t_status = string_attribute( get_enum_element( 'status', $t_bug->status, auth_get_current_user_id(), $t_bug->project_id ) );
$t_resolution = string_attribute( get_enum_element( 'resolution', $t_bug->resolution, auth_get_current_user_id(), $t_bug->project_id ) );
$t_version_id = version_get_id( $t_bug->fixed_in_version, $t_project );
if ( ( false !== $t_version_id ) && ( VERSION_RELEASED == version_get_field( $t_version_id, 'released' ) ) ) {
$t_released_label = '<a title="' . lang_get( 'released' ) . '">' . $t_bug->fixed_in_version . '</a>';
} else {
$t_released_label = $t_bug->fixed_in_version;
}

echo '<tr bgcolor="' . get_status_color( $t_bug->status ) . '">';
echo '<tr bgcolor="' . get_status_color( $t_bug->status, auth_get_current_user_id(), $t_bug->project_id ) . '">';
echo '<td><a href="' . string_get_bug_view_url( $row['bug'] ) . '">' . bug_format_id( $row['bug'] ) . '</a></td>';
echo '<td>' . project_get_field( $t_bug->project_id, 'name' ) . '&#160;</td>';
echo '<td class="right">' . $t_released_label . '&#160;</td>';
Expand Down
2 changes: 1 addition & 1 deletion account_sponsor_update.php
View file
Expand Up @@ -21,7 +21,7 @@
*
* @package MantisBT
* @copyright Copyright (C) 2000 - 2002 Kenzaburo Ito - kenito@300baud.org
* @copyright Copyright (C) 2002 - 2011 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @copyright Copyright (C) 2002 - 2012 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @link http://www.mantisbt.org
*/
/**
Expand Down
2 changes: 1 addition & 1 deletion account_update.php
View file
Expand Up @@ -21,7 +21,7 @@
*
* @package MantisBT
* @copyright Copyright (C) 2000 - 2002 Kenzaburo Ito - kenito@300baud.org
* @copyright Copyright (C) 2002 - 2011 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @copyright Copyright (C) 2002 - 2012 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @link http://www.mantisbt.org
*/
/**
Expand Down
2 changes: 1 addition & 1 deletion adm_config_delete.php
View file
Expand Up @@ -17,7 +17,7 @@
/**
* @package MantisBT
* @copyright Copyright (C) 2000 - 2002 Kenzaburo Ito - kenito@300baud.org
* @copyright Copyright (C) 2002 - 2011 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @copyright Copyright (C) 2002 - 2012 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @link http://www.mantisbt.org
*/
/**
Expand Down
2 changes: 1 addition & 1 deletion adm_config_report.php
View file
Expand Up @@ -17,7 +17,7 @@
/**
* @package MantisBT
* @copyright Copyright (C) 2000 - 2002 Kenzaburo Ito - kenito@300baud.org
* @copyright Copyright (C) 2002 - 2011 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @copyright Copyright (C) 2002 - 2012 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @link http://www.mantisbt.org
*/
/**
Expand Down
2 changes: 1 addition & 1 deletion adm_config_set.php
View file
Expand Up @@ -19,7 +19,7 @@
*
* @package MantisBT
* @copyright Copyright (C) 2000 - 2002 Kenzaburo Ito - kenito@300baud.org
* @copyright Copyright (C) 2002 - 2011 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @copyright Copyright (C) 2002 - 2012 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @link http://www.mantisbt.org
*/
/**
Expand Down
2 changes: 1 addition & 1 deletion adm_permissions_report.php
View file
Expand Up @@ -17,7 +17,7 @@
/**
* @package MantisBT
* @copyright Copyright (C) 2000 - 2002 Kenzaburo Ito - kenito@300baud.org
* @copyright Copyright (C) 2002 - 2011 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @copyright Copyright (C) 2002 - 2012 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @author Marcello Scata' <marcelloscata at users.sourceforge.net> ITALY
* @link http://www.mantisbt.org
*/
Expand Down
26 changes: 17 additions & 9 deletions admin/check.php
View file
Expand Up @@ -17,7 +17,7 @@
/**
* @package MantisBT
* @copyright Copyright (C) 2000 - 2002 Kenzaburo Ito - kenito@300baud.org
* @copyright Copyright (C) 2002 - 2011 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @copyright Copyright (C) 2002 - 2012 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @link http://www.mantisbt.org
*/

Expand Down Expand Up @@ -224,9 +224,7 @@ function test_database_utf8() {
<td class="form-title" width="30%" colspan="2"><?php echo 'Checking your installation' ?></td>
</tr>

<?php

require_once( 'obsolete.php' );
<?php

print_test_row( 'MantisBT requires at least <b>PHP ' . PHP_MIN_VERSION . '</b>. You are running <b>PHP ' . phpversion(), $result = version_compare( phpversion(), PHP_MIN_VERSION, '>=' ) );

Expand All @@ -239,6 +237,8 @@ function test_database_utf8() {
print_info_row( 'Database is not connected - Can not continue checks' );
}

require_once( 'obsolete.php' );

if( isset( $ADODB_vers ) ) {
# ADOConnection::Version() is broken as it treats v5.1 the same as v5.10
# Therefore we must extract the correct version ourselves
Expand All @@ -251,7 +251,7 @@ function test_database_utf8() {

print_test_row('Checking using bundled adodb with some drivers...', !(db_is_pgsql() || db_is_mssql() || db_is_db2()) || strstr($ADODB_vers, 'MantisBT Version') !== false );
$t_serverinfo = $g_db->ServerInfo();

print_info_row( 'Database Type (adodb)', $g_db->databaseType );
print_info_row( 'Database Provider (adodb)', $g_db->dataProvider );
print_info_row( 'Database Server Description (adodb)', $t_serverinfo['description'] );
Expand All @@ -277,13 +277,21 @@ function test_database_utf8() {
}

if ( db_is_mssql() ) {
if( 'mssql' == config_get_global( 'db_type' ) ) {
print_test_warn_row( 'Checking PHP support for Microsoft SQL Server driver',
version_compare( phpversion(), '5.3' ) < 0,
"'mssql' driver is no longer supported in PHP >= 5.3, please use 'mssqlnative' instead"
);
}

if ( print_test_row( 'check mssql textsize in php.ini...', ini_get( 'mssql.textsize' ) != 4096, ini_get( 'mssql.textsize' ) ) ) {
print_test_warn_row( 'check mssql textsize in php.ini...', ini_get( 'mssql.textsize' ) == 2147483647, ini_get( 'mssql.textsize' ) );
}
if ( print_test_row( 'check mssql textsize in php.ini...', ini_get( 'mssql.textlimit' ) != 4096 , ini_get( 'mssql.textlimit' ) ) ) {
print_test_warn_row( 'check mssql textsize in php.ini...', ini_get( 'mssql.textsize' ) == 2147483647, ini_get( 'mssql.textsize' ) );
}
}

print_test_row( 'check variables_order includes GPCS', stristr( ini_get( 'variables_order' ), 'G' ) && stristr( ini_get( 'variables_order' ), 'P' ) && stristr( ini_get( 'variables_order' ), 'C' ) && stristr( ini_get( 'variables_order' ), 'S' ), ini_get( 'variables_order' ) );


Expand Down Expand Up @@ -368,7 +376,7 @@ function test_database_utf8() {

if ( config_get_global( 'allow_file_upload' ) ) {
print_test_row( 'Checking that fileuploads are allowed in php (enabled in mantis config)', ini_get_bool( 'file_uploads' ) );

print_info_row( 'PHP variable "upload_max_filesize"', ini_get_number( 'upload_max_filesize' ) );
print_info_row( 'PHP variable "post_max_size"', ini_get_number( 'post_max_size' ) );
print_info_row( 'MantisBT variable "max_file_size"', config_get_global( 'max_file_size' ) );
Expand All @@ -384,11 +392,11 @@ function test_database_utf8() {
break;
case DISK:
$t_upload_path = config_get_global( 'absolute_path_default_upload_folder' );
print_test_row( 'Checking that absolute_path_default_upload_folder has a trailing directory separator: "' . $t_upload_path . '"',
print_test_row( 'Checking that absolute_path_default_upload_folder has a trailing directory separator: "' . $t_upload_path . '"',
( DIRECTORY_SEPARATOR == substr( $t_upload_path, -1, 1 ) ) );
break;
}

print_info_row( 'There may also be settings in your web server that prevent you from uploading files or limit the maximum file size. See the documentation for those packages if you need more information.');
}
?>
Expand All @@ -409,7 +417,7 @@ function test_database_utf8() {
<td bgcolor="#f4f4f4">All Tests Passed. If you would like to view passed tests click <a href="check.php?showall=1">here</a>.</td>
</tr>
</table>
<?php
<?php
}
?>
</body>
Expand Down
2 changes: 1 addition & 1 deletion admin/copy_field.php
View file
Expand Up @@ -18,7 +18,7 @@
/**
* @package MantisBT
* @copyright Copyright (C) 2000 - 2002 Kenzaburo Ito - kenito@300baud.org
* @copyright Copyright (C) 2002 - 2011 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @copyright Copyright (C) 2002 - 2012 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @link http://www.mantisbt.org
*/
/**
Expand Down
2 changes: 1 addition & 1 deletion admin/db_stats.php
View file
Expand Up @@ -17,7 +17,7 @@
/**
* @package MantisBT
* @copyright Copyright (C) 2000 - 2002 Kenzaburo Ito - kenito@300baud.org
* @copyright Copyright (C) 2002 - 2011 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @copyright Copyright (C) 2002 - 2012 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @link http://www.mantisbt.org
*/
/**
Expand Down
2 changes: 1 addition & 1 deletion admin/email_queue.php
View file
Expand Up @@ -17,7 +17,7 @@
/**
* @package MantisBT
* @copyright Copyright (C) 2000 - 2002 Kenzaburo Ito - kenito@300baud.org
* @copyright Copyright (C) 2002 - 2011 Mantis Team - mantisbt-dev@lists.sourceforge.net
* @copyright Copyright (C) 2002 - 2012 Mantis Team - mantisbt-dev@lists.sourceforge.net
* @link http://www.mantisbt.org
*/
/**
Expand Down
15 changes: 10 additions & 5 deletions admin/index.php
View file
Expand Up @@ -17,7 +17,7 @@
/**
* @package MantisBT
* @copyright Copyright (C) 2000 - 2002 Kenzaburo Ito - kenito@300baud.org
* @copyright Copyright (C) 2002 - 2011 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @copyright Copyright (C) 2002 - 2012 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @link http://www.mantisbt.org
*/
/**
Expand Down Expand Up @@ -56,21 +56,26 @@ function print_info_row( $p_description, $p_value ) {
<tr>
<td class="form-title" width="30%" colspan="2"><?php echo lang_get( 'install_information' ) ?></td>
</tr>
<?php
print_info_row( lang_get( 'mantis_version' ), MANTIS_VERSION, ( $t_version_suffix ? " $t_version_suffix" : '' ) );
<?php
if( ON == config_get( 'show_version' ) ) {
$t_version_suffix = config_get_global( 'version_suffix' );
} else {
$t_version_suffix = '';
}
print_info_row( lang_get( 'mantis_version' ), MANTIS_VERSION, $t_version_suffix );
print_info_row( 'php_version', phpversion());
?>
<tr>
<td class="form-title" width="30%" colspan="2"><?php echo lang_get( 'database_information' ) ?></td>
</tr>
<?php
<?php
print_info_row( lang_get( 'schema_version' ), config_get( 'database_version' ) );
print_info_row( 'adodb_version', $g_db->Version() );
?>
<tr>
<td class="form-title" width="30%" colspan="2"><?php echo lang_get( 'path_information' ) ?></td>
</tr>
<?php
<?php
print_info_row( lang_get( 'site_path' ), config_get( 'absolute_path' ) );
print_info_row( lang_get( 'core_path' ), config_get( 'core_path' ) );
print_info_row( lang_get( 'plugin_path' ), config_get( 'plugin_path' ) );
Expand Down

0 comments on commit fb4a44a

Please sign in to comment.