Permalink
Browse files

Merge branch 'master' of github.com:mantisbt/mantisbt

  • Loading branch information...
2 parents 1fe1076 + 22343df commit 0b4589a1e655af87b0a3974c553607dad27c213b @grangeway grangeway committed Nov 2, 2013
Showing with 136 additions and 20,343 deletions.
  1. +3 −0 .gitmodules
  2. +11 −16 core/history_api.php
  3. +2 −1 core/user_api.php
  4. +0 −5 css/default.css
  5. +19 −7 css/login.css
  6. +30 −0 javascript/login.js
  7. +1 −0 lang/strings_english.txt
  8. +2 −2 library/README.libs
  9. +1 −0 library/securimage
  10. BIN library/securimage/AHGBold.ttf
  11. +0 −25 library/securimage/LICENSE.txt
  12. +0 −12 library/securimage/README.FONT.txt
  13. +0 −181 library/securimage/README.txt
  14. +0 −1,864 library/securimage/WavFile.php
  15. BIN library/securimage/audio/en/0.wav
  16. BIN library/securimage/audio/en/1.wav
  17. BIN library/securimage/audio/en/10.wav
  18. BIN library/securimage/audio/en/11.wav
  19. BIN library/securimage/audio/en/12.wav
  20. BIN library/securimage/audio/en/13.wav
  21. BIN library/securimage/audio/en/14.wav
  22. BIN library/securimage/audio/en/15.wav
  23. BIN library/securimage/audio/en/16.wav
  24. BIN library/securimage/audio/en/17.wav
  25. BIN library/securimage/audio/en/18.wav
  26. BIN library/securimage/audio/en/19.wav
  27. BIN library/securimage/audio/en/2.wav
  28. BIN library/securimage/audio/en/20.wav
  29. BIN library/securimage/audio/en/3.wav
  30. BIN library/securimage/audio/en/4.wav
  31. BIN library/securimage/audio/en/5.wav
  32. BIN library/securimage/audio/en/6.wav
  33. BIN library/securimage/audio/en/7.wav
  34. BIN library/securimage/audio/en/8.wav
  35. BIN library/securimage/audio/en/9.wav
  36. BIN library/securimage/audio/en/A.wav
  37. BIN library/securimage/audio/en/B.wav
  38. BIN library/securimage/audio/en/C.wav
  39. BIN library/securimage/audio/en/D.wav
  40. BIN library/securimage/audio/en/E.wav
  41. BIN library/securimage/audio/en/F.wav
  42. BIN library/securimage/audio/en/G.wav
  43. BIN library/securimage/audio/en/H.wav
  44. BIN library/securimage/audio/en/I.wav
  45. BIN library/securimage/audio/en/J.wav
  46. BIN library/securimage/audio/en/K.wav
  47. BIN library/securimage/audio/en/L.wav
  48. BIN library/securimage/audio/en/M.wav
  49. BIN library/securimage/audio/en/MINUS.wav
  50. BIN library/securimage/audio/en/N.wav
  51. BIN library/securimage/audio/en/O.wav
  52. BIN library/securimage/audio/en/P.wav
  53. BIN library/securimage/audio/en/PLUS.wav
  54. BIN library/securimage/audio/en/Q.wav
  55. BIN library/securimage/audio/en/R.wav
  56. BIN library/securimage/audio/en/S.wav
  57. BIN library/securimage/audio/en/T.wav
  58. BIN library/securimage/audio/en/TIMES.wav
  59. BIN library/securimage/audio/en/U.wav
  60. BIN library/securimage/audio/en/V.wav
  61. BIN library/securimage/audio/en/W.wav
  62. BIN library/securimage/audio/en/X.wav
  63. BIN library/securimage/audio/en/Y.wav
  64. BIN library/securimage/audio/en/Z.wav
  65. BIN library/securimage/audio/en/error.wav
  66. BIN library/securimage/audio/noise/check-point-1.wav
  67. BIN library/securimage/audio/noise/crowd-talking-1.wav
  68. BIN library/securimage/audio/noise/crowd-talking-6.wav
  69. BIN library/securimage/audio/noise/crowd-talking-7.wav
  70. BIN library/securimage/audio/noise/kids-playing-1.wav
  71. BIN library/securimage/backgrounds/bg3.jpg
  72. BIN library/securimage/backgrounds/bg4.jpg
  73. BIN library/securimage/backgrounds/bg5.jpg
  74. BIN library/securimage/backgrounds/bg6.png
  75. +0 −13 library/securimage/captcha.html
  76. +0 −1 library/securimage/database/.htaccess
  77. +0 −1 library/securimage/database/index.html
  78. BIN library/securimage/database/securimage.sq3
  79. +0 −207 library/securimage/example_form.ajax.php
  80. +0 −192 library/securimage/example_form.php
  81. BIN library/securimage/images/audio_icon.png
  82. BIN library/securimage/images/refresh.png
  83. +0 −2,212 library/securimage/securimage.php
  84. +0 −47 library/securimage/securimage_play.php
  85. BIN library/securimage/securimage_play.swf
  86. +0 −77 library/securimage/securimage_show.php
  87. +0 −15,457 library/securimage/words/words.txt
  88. +1 −1 manage_proj_edit_page.php
  89. +13 −1 manage_proj_update.php
  90. +53 −21 signup_page.php
View
@@ -4,3 +4,6 @@
[submodule "library/phpmailer"]
path = library/phpmailer
url = https://github.com/mantisbt/PHPMailer
+[submodule "library/securimage"]
+ path = library/securimage
+ url = https://github.com/mantisbt/securimage.git
View
@@ -139,18 +139,18 @@ function history_log_event_special( $p_bug_id, $p_type, $p_optional = '', $p_opt
function history_get_events_array( $p_bug_id, $p_user_id = null ) {
$t_normal_date_format = config_get( 'normal_date_format' );
- $raw_history = history_get_raw_events_array( $p_bug_id, $p_user_id );
- $raw_history_count = count( $raw_history );
- $history = array();
-
- for( $i = 0;$i < $raw_history_count;$i++ ) {
- $history[$i] = history_localize_item( $raw_history[$i]['field'], $raw_history[$i]['type'], $raw_history[$i]['old_value'], $raw_history[$i]['new_value'] );
- $history[$i]['date'] = date( $t_normal_date_format, $raw_history[$i]['date'] );
- $history[$i]['userid'] = $raw_history[$i]['userid'];
- $history[$i]['username'] = $raw_history[$i]['username'];
+ $t_raw_history = history_get_raw_events_array( $p_bug_id, $p_user_id );
+ $t_history = array();
+
+ foreach( $t_raw_history as $k => $t_item ) {
+ extract( $t_item, EXTR_PREFIX_ALL, 'v' );
+ $t_history[$k] = history_localize_item( $v_field, $v_type, $v_old_value, $v_new_value );
+ $t_history[$k]['date'] = date( $t_normal_date_format, $v_date );
+ $t_history[$k]['userid'] = $v_userid;
+ $t_history[$k]['username'] = $v_username;
}
- return( $history );
+ return( $t_history );
}
/**
@@ -192,12 +192,7 @@ function history_get_raw_events_array( $p_bug_id, $p_user_id = null ) {
$t_standard_fields = columns_get_standard();
$j = 0;
while( $t_row = db_fetch_array( $result ) ) {
- $v_type = $t_row['type'];
- $v_field_name = $t_row['field_name'];
- $v_user_id = $t_row['user_id'];
- $v_new_value = $t_row['new_value'];
- $v_old_value = $t_row['old_value'];
- $v_date_modified = $t_row['date_modified'];
+ extract( $t_row, EXTR_PREFIX_ALL, 'v' );
if ( $v_type == NORMAL_TYPE ) {
if ( !in_array( $v_field_name, $t_standard_fields ) ) {
View
@@ -647,10 +647,11 @@ function user_delete( $p_user_id ) {
# Remove project specific access levels
user_delete_project_specific_access_levels( $p_user_id );
+ $t_user_table = db_get_table( 'user' );
+
# unset non-unique realname flags if necessary
if( config_get( 'differentiate_duplicates' ) ) {
$c_realname = user_get_field( $p_user_id, 'realname' );
- $t_user_table = db_get_table( 'user' );
$t_query = "SELECT id FROM $t_user_table WHERE realname=" . db_param();
$t_result = db_query_bound( $t_query, array( $c_realname ) );
View
@@ -330,11 +330,6 @@ div.quick-summary-right { width: 49%; padding: 2px; text-align: right; float: ri
{
float: right;
border: 0;
-
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- -moz-border-radius-bottomright: 10px;
- -webkit-border-bottom-right-radius: 10px;
border-radius: 5px;
}
View
@@ -24,24 +24,36 @@ span#no-password-msg, #signup-info, #lost-password-msg {
display: block;
padding: 1em;
}
+#login-links,
+#captcha-refresh {
+ list-style: none;
+ margin: 0em;
+ padding: 0em;
+}
#login-links {
position: absolute;
top: .5em;
right: 0em;
- list-style: none;
- margin: 0em;
- padding: 0em;
}
-#login-links li {
+#login-links li,
+#captcha-refresh li {
float: left;
padding: 0em .25em;
}
-#login-links li:before {
+#login-links li:before,
+#captcha-refresh li:before {
content: '[';
}
-#login-links li:after {
+#login-links li:after,
+#captcha-refresh li:after {
content: ']';
}
-#login-links li a {
+#login-links li a,
+#captcha-refresh li a {
padding: 0em .35em;
}
+
+#captcha-image {
+ cursor: pointer;
+ padding-right:3px;
+}
View
@@ -0,0 +1,30 @@
+/*
+# Mantis - a php based bugtracking system
+
+# Copyright 2000 - 2002 Kenzaburo Ito - kenito@300baud.org
+# Copyright 2002 MantisBT Team - mantisbt-dev@lists.sourceforge.net
+
+# Mantis is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# Mantis is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Mantis. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+$(document).ready( function() {
+ // Captcha refresh
+ $('#captcha-image, #captcha-refresh li a').click( function(e) {
+ var img = $('#captcha-image img');
+ var captcha = img.attr('src');
+ img.attr('src', captcha.split('?', 1) + '?' + Math.random());
+ $('#captcha-field').focus();
+ e.preventDefault();
+ });
+});
View
@@ -1112,6 +1112,7 @@ $s_no_reponse_msg = 'You will have seven days to complete the account confirmati
# signup_page.php
$s_signup_captcha_request_label = 'Enter the code as it is shown in the box on the right:';
+$s_signup_captcha_refresh = 'Generate a new code';
$s_signup_info = 'On completion of this form and verification of your answers, you will be sent a confirmation e-mail to the e-mail address you specified.<br />Using the confirmation e-mail, you will be able to activate your account. If you fail to activate your account within seven days, it will be purged.<br />You must specify a valid e-mail address in order to receive the account confirmation e-mail.';
$s_signup_title = 'Signup';
$s_signup_button = 'Signup';
View
@@ -11,7 +11,7 @@ ezc | ez Components | 2009.2.1 | unpatched
phpmailer | PHPMailer | 5.2.6 | unpatched [1]
rssbuilder | RSSBuilder | 2.2.1 | patched [2]
utf8 | phputf8 | 0.5 | unpatched
-Securimage | Securimage | 3.5.1 | unpatched
+securimage | PHP Captcha | 3.5.1 | unpatched [1]
-------------------------------------------------------------------
[1] Library is tracked as a GIT submodule; refer to the corresponding
@@ -27,4 +27,4 @@ ezc - http://ezcomponents.org/
phpmailer - https://github.com/PHPMailer/PHPMailer
rssbuilder - http://code.google.com/p/flaimo-php/
utf8 - http://sourceforge.net/projects/phputf8
-secureimage - http://www.phpcaptcha.org/download/
+secureimage - http://www.phpcaptcha.org/
Submodule securimage added at b9f0d5
Binary file not shown.
@@ -1,25 +0,0 @@
-COPYRIGHT:
- Copyright (c) 2011 Drew Phillips
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- - Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- - Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
-
@@ -1,12 +0,0 @@
-AHGBold.ttf is used by Securimage under the following license:
-
-Alte Haas Grotesk is a typeface that look like an helvetica printed in an old Muller-Brockmann Book.
-
-These fonts are freeware and can be distributed as long as they are
-together with this text file.
-
-I would appreciate very much to see what you have done with it anyway.
-
-yann le coroller
-www.yannlecoroller.com
-yann@lecoroller.com
@@ -1,181 +0,0 @@
-NAME:
-
- Securimage - A PHP class for creating captcha images and audio with many options.
-
-VERSION: 3.5.1
-
-AUTHOR:
-
- Drew Phillips <drew@drew-phillips.com>
-
-DOWNLOAD:
-
- The latest version can always be
- found at http://www.phpcaptcha.org
-
-DOCUMENTATION:
-
- Online documentation of the class, methods, and variables can
- be found at http://www.phpcaptcha.org/Securimage_Docs/
-
-REQUIREMENTS:
- PHP 5.2 or greater
- GD 2.0
- FreeType (Required, for TTF fonts)
- PDO (if using Sqlite, MySQL, or PostgreSQL)
-
-SYNOPSIS:
-
- require_once 'securimage.php';
-
- $image = new Securimage();
-
- $image->show();
-
- // Code Validation
-
- $image = new Securimage();
- if ($image->check($_POST['code']) == true) {
- echo "Correct!";
- } else {
- echo "Sorry, wrong code.";
- }
-
-DESCRIPTION:
-
- What is Securimage?
-
- Securimage is a PHP class that is used to generate and validate CAPTCHA images.
- The classes uses an existing PHP session or creates its own if none is found to store the
- CAPTCHA code. Variables within the class are used to control the style and display of the image.
- The class supports TTF fonts and effects for strengthening the security of the image.
- An audible code can also be streamed to the browser for visually impared users.
-
-
-COPYRIGHT:
- Copyright (c) 2013 Drew Phillips
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- - Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- - Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
-
- -----------------------------------------------------------------------------
- The WavFile.php class used in Securimage by Drew Phillips and Paul Voegler is
- used under the BSD License. See WavFile.php for details.
- Many thanks to Paul Voegler (http://www.voegler.eu/) for contributing to
- Securimage.
-
- -----------------------------------------------------------------------------
- Flash code created for Securimage by Age Bosma & Mario Romero (animario@hotmail.com)
- Many thanks for releasing this to the project!
-
- ------------------------------------------------------------------------------
- Portions of Securimage contain code from Han-Kwang Nienhuys' PHP captcha
-
- Han-Kwang Nienhuys' PHP captcha
- Copyright June 2007
-
- This copyright message and attribution must be preserved upon
- modification. Redistribution under other licenses is expressly allowed.
- Other licenses include GPL 2 or higher, BSD, and non-free licenses.
- The original, unrestricted version can be obtained from
- http://www.lagom.nl/linux/hkcaptcha/
-
- -------------------------------------------------------------------------------
- AHGBold.ttf (AlteHaasGroteskBold.ttf) font was created by Yann Le Coroller and is distributed as freeware
-
- Alte Haas Grotesk is a typeface that look like an helvetica printed in an old Muller-Brockmann Book.
-
- These fonts are freeware and can be distributed as long as they are
- together with this text file.
-
- I would appreciate very much to see what you have done with it anyway.
-
- yann le coroller
- www.yannlecoroller.com
- yann@lecoroller.com
-
- -------------------------------------------------------------------------------
- Portions of securimage_play.swf use the PopForge flash library for playing audio
-
- /**
- * Copyright(C) 2007 Andre Michelle and Joa Ebert
- *
- * PopForge is an ActionScript3 code sandbox developed by Andre Michelle and Joa Ebert
- * http://sandbox.popforge.de
- *
- * PopforgeAS3Audio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * PopforgeAS3Audio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- */
-
- -------------------------------------------------------------------------------
- Some graphics used are from the Humility Icon Pack by WorLord
-
- License: GNU/GPL (http://findicons.com/pack/1723/humility)
- http://findicons.com/icon/192558/gnome_volume_control
- http://findicons.com/icon/192562/gtk_refresh
-
- -------------------------------------------------------------------------------
- Background noise sound files are from SoundJay.com
- http://www.soundjay.com/tos.html
-
- All sound effects on this website are created by us and protected under
- the copyright laws, international treaty provisions and other applicable
- laws. By downloading sounds, music or any material from this site implies
- that you have read and accepted these terms and conditions:
-
- Sound Effects
- You are allowed to use the sounds free of charge and royalty free in your
- projects (such as films, videos, games, presentations, animations, stage
- plays, radio plays, audio books, apps) be it for commercial or
- non-commercial purposes.
-
- But you are NOT allowed to
- - post the sounds (as sound effects or ringtones) on any website for
- others to download, copy or use
- - use them as a raw material to create sound effects or ringtones that
- you will sell, distribute or offer for downloading
- - sell, re-sell, license or re-license the sounds (as individual sound
- effects or as a sound effects library) to anyone else
- - claim the sounds as yours
- - link directly to individual sound files
- - distribute the sounds in apps or computer programs that are clearly
- sound related in nature (such as sound machine, sound effect
- generator, ringtone maker, funny sounds app, sound therapy app, etc.)
- or in apps or computer programs that use the sounds as the program's
- sound resource library for other people's use (such as animation
- creator, digital book creator, song maker software, etc.). If you are
- developing such computer programs, contact us for licensing options.
-
- If you use the sound effects, please consider giving us a credit and
- linking back to us but it's not required.
-
-
Oops, something went wrong.

0 comments on commit 0b4589a

Please sign in to comment.