Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
Choose a Base Repository
mantisbt/mantisbt
01-Scripts/mantisbt
4AceTechnologies/mantisbt
AbsolutelyFreeWeb/mantisbt
Adventsparky/mantisbt
BigelowLab/mantisbt
CeciliaDatko/mantisbt
Cyberocioso/mantisbt
DKuranov/mantisbt
Dentxinho/mantisbt
DigNative/ReqManToo
DragonBe/mantisbt
Elompenta/mantisbt
EnISeeK/mantisbt
FavioGalvis/Inforequest
IPM-Digitaldruck/mantisbt
Jay15761/mantisbt
Jguilbaud/mantisbt
Kels/mantisbt
Kirill/mantisbt
MRa53639/mantisbt
Mathnerd314/mantisbt
MatthieuR/mantisbt
MrBricodage/mantisbt
PierceWashington/mantisbt
RintarouTW/mantisbt
Ruthion/mantisbt
Skhou/mantisbt
ThomasKresnicka/mantisbt
TomR/mantisbt
VVVi/mantisbt
VeMag/mantisbt
Vinny49/mantisbt
Votyer/mantisbt
Wizmaster/mantisbt
aakashrajmathur/mantisbt
abrenoch/mantisbt
afortaleza/mantisbt
alessandroleite/mantisbt
andersruneson/mantisbt
arturaz/mantisbt
ashumkin/mantisbt
atrol/mantisbt
azurebelle00/mantisbt
badfiles/mantisbt
baz4/mantisbt
benv8nam/mantisbt
bieli/mantisbt
bitifet/mantisbt
bpcampbe/mantisbt
branigan/mantisbt
brenard/mantisbt
bstidham/mantisbt
cainianhua/mantisbt
carmenates09/mantisbt
chalx/mantisbt
cheesecracker/mantisbt
chenjundong/mantisbt
cherouati/mantisbt
choppedcode/mantisbt
clouddrd/mantisbt
cybd/mantisbt
darcoto/mantisbt
daryn/mantisbt
davidxchen/mantisbt
debuggings/mantisbt
derherrf/mantisbt
derrickweaver/mantisbt
dineshkummarc/mantisbt
dmolotkov/mantisbt
dregad/mantisbt
dtamajon/mantisbt
dud3/mantisbt
eakzs/mantisbt
eewebadmin/mantisbt
egi/mantisbt
elipavlov/mantisbt
emzec/mantisbt
falconchen/mantisbt
fdsawrewqrewqr/mantisbt
fusenigk/mantisbt
gabriellevan/mantisbt
gbeine/mantisbt
gcompagnon/mantisbt
gitter-badger/mantisbt
gyongyeee/mantisbt
hazerd/mantisbt
hezuo/mantisbt
hloehnert/mantisbt
holodyn/mantisbt
iSC-Labs/mantisbt
initOS/mantisbt
iwapheds/mantisbt
jamiepg1/mantisbt
jeckyhl/mantisbt
jlmanrique/mantisbt
joe-parente/mantisbt
jpanic/mantisbt
jphustman/mantisbt
jumper-forked/mantisbt
justinweb/mantisbt
jvizueta/mantisbt
kaimallea/mantisbt
kaos/mantisbt
kensonman/mantisbt
kichiweb/mantisbt
koganei/mantisbt
kuzn2k/mantisbt
langerheiko/mantisbt
lazar2606/mantisbt
lbayle/mantisbt
leandrotlz/mantisbt
lezouretalice/mantisbt
lioofy/mantisbt
lkinley/mantisbt
lmartelli/mantisbt
lnsoso/mantisbt
lukaszkujawa/mantisbt
ma33/mantisbt
makkintosshu/mantisbt
mamadouly12/mantisbt
manpreetbhasin/mantisbt
mantishub/mantisbt
marcodings/mantisbt
markkimsal/mantisbt
martelkevin/mantisbt
mattwillmart/mantisbt
mcs/mantisbt
mfoXen/mantisbt
mgrdcm/mantisbt
mgretler/mantisbt
mhabrnal/mantisbt
mmarquez/mantisbt
mrschyte/mantisbt
mskarupianski/mantisbt
n3wtron/mantisbt
namvan/mantisbt
neilmillard/mantisbt
netsf/mantisbt
nevvermind/mantisbt
nextgens/mantisbt
ngharo/mantisbt
nsatragno/mantisbt_mobile
obustamante/mantisbt
outsource/mantisbt
ponzmanman/mantisbt
protecomp/mantisbt
qadriinfotech/mantisbt
rasperen/mantisbt
raultm/mantisbt
rkaiser0324/mantisbt
rlaloux/mantisbt
rlerdorf/mantisbt
rombert/mantisbt
ronan-lins/MantisMQ
rranjan19/mantisbt
rspadim/mantisbt
rsuyambu/mantisbt
russor/mantisbt
san45/mantisbt
semicolonth/mantisbt
shekhei/mantisbt
siniguru/mantisbt
skayser/mantisbt
sourceforge-cloud/mantisbt
ssnukala/mantisbt
stovocor/mantisbt
symsec/mantisbt
syncguru/mantisbt
tao-gong/mantisbt
terencejackson/mantisbt
thinkl33t/mantisbt
thomasdingler/mantisbt
thraxisp/mantisbt
tilakkhullar/mantisbt
timokhin/mantisbt
toddpw/mantisbt
tswestendorp/mantisbt
turb/mantisbt
tuxedo/mantisbt
twogood/mantisbt
uncletall/mantisbt
urkle/mantisbt
vboctor/mantisbt
vibe972/mantisbt
vincentsels/mantisbt
vmexell/mantisbt
voevoda/mantisbt
wanglidong/mantisbt
waxberrypy/mantisbt
wentianle/mantisbt
wepl/mantisbt
winston01/mantisbt
wupojung/mantisbt
xiangnap/mantisbt
xiaoyanit/mantisbt
yellowandy/mantisbt
zdroyer/mantisbt
zhanghongyan/mantisbt
zniczu220381/mantisbt
Nothing to show
...
Choose a Head Repository
mantisbt/mantisbt
01-Scripts/mantisbt
4AceTechnologies/mantisbt
AbsolutelyFreeWeb/mantisbt
Adventsparky/mantisbt
BigelowLab/mantisbt
CeciliaDatko/mantisbt
Cyberocioso/mantisbt
DKuranov/mantisbt
Dentxinho/mantisbt
DigNative/ReqManToo
DragonBe/mantisbt
Elompenta/mantisbt
EnISeeK/mantisbt
FavioGalvis/Inforequest
IPM-Digitaldruck/mantisbt
Jay15761/mantisbt
Jguilbaud/mantisbt
Kels/mantisbt
Kirill/mantisbt
MRa53639/mantisbt
Mathnerd314/mantisbt
MatthieuR/mantisbt
MrBricodage/mantisbt
PierceWashington/mantisbt
RintarouTW/mantisbt
Ruthion/mantisbt
Skhou/mantisbt
ThomasKresnicka/mantisbt
TomR/mantisbt
VVVi/mantisbt
VeMag/mantisbt
Vinny49/mantisbt
Votyer/mantisbt
Wizmaster/mantisbt
aakashrajmathur/mantisbt
abrenoch/mantisbt
afortaleza/mantisbt
alessandroleite/mantisbt
andersruneson/mantisbt
arturaz/mantisbt
ashumkin/mantisbt
atrol/mantisbt
azurebelle00/mantisbt
badfiles/mantisbt
baz4/mantisbt
benv8nam/mantisbt
bieli/mantisbt
bitifet/mantisbt
bpcampbe/mantisbt
branigan/mantisbt
brenard/mantisbt
bstidham/mantisbt
cainianhua/mantisbt
carmenates09/mantisbt
chalx/mantisbt
cheesecracker/mantisbt
chenjundong/mantisbt
cherouati/mantisbt
choppedcode/mantisbt
clouddrd/mantisbt
cybd/mantisbt
darcoto/mantisbt
daryn/mantisbt
davidxchen/mantisbt
debuggings/mantisbt
derherrf/mantisbt
derrickweaver/mantisbt
dineshkummarc/mantisbt
dmolotkov/mantisbt
dregad/mantisbt
dtamajon/mantisbt
dud3/mantisbt
eakzs/mantisbt
eewebadmin/mantisbt
egi/mantisbt
elipavlov/mantisbt
emzec/mantisbt
falconchen/mantisbt
fdsawrewqrewqr/mantisbt
fusenigk/mantisbt
gabriellevan/mantisbt
gbeine/mantisbt
gcompagnon/mantisbt
gitter-badger/mantisbt
gyongyeee/mantisbt
hazerd/mantisbt
hezuo/mantisbt
hloehnert/mantisbt
holodyn/mantisbt
iSC-Labs/mantisbt
initOS/mantisbt
iwapheds/mantisbt
jamiepg1/mantisbt
jeckyhl/mantisbt
jlmanrique/mantisbt
joe-parente/mantisbt
jpanic/mantisbt
jphustman/mantisbt
jumper-forked/mantisbt
justinweb/mantisbt
jvizueta/mantisbt
kaimallea/mantisbt
kaos/mantisbt
kensonman/mantisbt
kichiweb/mantisbt
koganei/mantisbt
kuzn2k/mantisbt
langerheiko/mantisbt
lazar2606/mantisbt
lbayle/mantisbt
leandrotlz/mantisbt
lezouretalice/mantisbt
lioofy/mantisbt
lkinley/mantisbt
lmartelli/mantisbt
lnsoso/mantisbt
lukaszkujawa/mantisbt
ma33/mantisbt
makkintosshu/mantisbt
mamadouly12/mantisbt
manpreetbhasin/mantisbt
mantishub/mantisbt
marcodings/mantisbt
markkimsal/mantisbt
martelkevin/mantisbt
mattwillmart/mantisbt
mcs/mantisbt
mfoXen/mantisbt
mgrdcm/mantisbt
mgretler/mantisbt
mhabrnal/mantisbt
mmarquez/mantisbt
mrschyte/mantisbt
mskarupianski/mantisbt
n3wtron/mantisbt
namvan/mantisbt
neilmillard/mantisbt
netsf/mantisbt
nevvermind/mantisbt
nextgens/mantisbt
ngharo/mantisbt
nsatragno/mantisbt_mobile
obustamante/mantisbt
outsource/mantisbt
ponzmanman/mantisbt
protecomp/mantisbt
qadriinfotech/mantisbt
rasperen/mantisbt
raultm/mantisbt
rkaiser0324/mantisbt
rlaloux/mantisbt
rlerdorf/mantisbt
rombert/mantisbt
ronan-lins/MantisMQ
rranjan19/mantisbt
rspadim/mantisbt
rsuyambu/mantisbt
russor/mantisbt
san45/mantisbt
semicolonth/mantisbt
shekhei/mantisbt
siniguru/mantisbt
skayser/mantisbt
sourceforge-cloud/mantisbt
ssnukala/mantisbt
stovocor/mantisbt
symsec/mantisbt
syncguru/mantisbt
tao-gong/mantisbt
terencejackson/mantisbt
thinkl33t/mantisbt
thomasdingler/mantisbt
thraxisp/mantisbt
tilakkhullar/mantisbt
timokhin/mantisbt
toddpw/mantisbt
tswestendorp/mantisbt
turb/mantisbt
tuxedo/mantisbt
twogood/mantisbt
uncletall/mantisbt
urkle/mantisbt
vboctor/mantisbt
vibe972/mantisbt
vincentsels/mantisbt
vmexell/mantisbt
voevoda/mantisbt
wanglidong/mantisbt
waxberrypy/mantisbt
wentianle/mantisbt
wepl/mantisbt
winston01/mantisbt
wupojung/mantisbt
xiangnap/mantisbt
xiaoyanit/mantisbt
yellowandy/mantisbt
zdroyer/mantisbt
zhanghongyan/mantisbt
zniczu220381/mantisbt
Nothing to show
  • 2 commits
  • 190 files changed
  • 4 commit comments
  • 1 contributor
Commits on Jul 10, 2014
Commits on Jul 13, 2014
Code Standards/PHP Doc improvements
Improvements to code base to follow coding standards,
and improve phpdoc validation from PHP Codesniffer rules
Showing with 3,647 additions and 3,812 deletions.
  1. +19 −13 account_page.php
  2. +1 −1 account_prof_update.php
  3. +12 −13 account_sponsor_page.php
  4. +24 −26 adm_config_report.php
  5. +10 −10 adm_config_set.php
  6. +11 −9 admin/check/check_api.php
  7. +1 −1 admin/check/check_config_inc.php
  8. +9 −11 admin/check/check_database_inc.php
  9. +2 −2 admin/check/check_integrity_inc.php
  10. +3 −3 admin/check/check_paths_inc.php
  11. +1 −1 admin/db_stats.php
  12. +4 −4 admin/email_queue.php
  13. +57 −57 admin/install.php
  14. +16 −16 admin/move_attachments.php
  15. +12 −12 admin/move_attachments_page.php
  16. +261 −262 admin/schema.php
  17. +1 −1 admin/test_icons.php
  18. +98 −103 admin/test_langs.php
  19. +22 −22 admin/upgrade_unattended.php
  20. +1 −2 admin/upgrade_warning.php
  21. +10 −10 api/soap/mantisconnect.php
  22. +14 −14 api/soap/mc_api.php
  23. +2 −2 api/soap/mc_config_api.php
  24. +16 −23 api/soap/mc_file_api.php
  25. +67 −67 api/soap/mc_issue_api.php
  26. +38 −38 api/soap/mc_project_api.php
  27. +6 −6 api/soap/mc_tag_api.php
  28. +8 −9 billing_inc.php
  29. +178 −193 bug_actiongroup.php
  30. +6 −23 bug_actiongroup_page.php
  31. +25 −31 bug_change_status_page.php
  32. +3 −3 bug_monitor_list_view_inc.php
  33. +1 −2 bug_relationship_add.php
  34. +4 −4 bug_relationship_graph.php
  35. +2 −2 bug_report.php
  36. +20 −11 bug_report_page.php
  37. +3 −1 bug_revision_view_page.php
  38. +2 −2 bug_sponsorship_list_view_inc.php
  39. +2 −2 bug_update.php
  40. +3 −3 bug_update_page.php
  41. +2 −2 bug_view_inc.php
  42. +1 −1 bugnote_edit_page.php
  43. +8 −14 bugnote_stats_inc.php
  44. +4 −4 bugnote_view_inc.php
  45. +15 −15 changelog_page.php
  46. +2 −2 core.php
  47. +2 −4 core/access_api.php
  48. +4 −5 core/authentication_api.php
  49. +82 −89 core/bug_api.php
  50. +19 −33 core/bug_revision_api.php
  51. +31 −40 core/bugnote_api.php
  52. +27 −28 core/category_api.php
  53. +6 −6 core/cfdefs/cfdef_standard.php
  54. +64 −64 core/classes/MantisEnum.class.php
  55. +1 −1 core/collapse_api.php
  56. +10 −10 core/columns_api.php
  57. +23 −29 core/config_api.php
  58. +2 −2 core/constant_inc.php
  59. +2 −2 core/crypto_api.php
  60. +80 −82 core/custom_field_api.php
  61. +35 −39 core/database_api.php
  62. +24 −28 core/date_api.php
  63. +20 −21 core/email_api.php
  64. +5 −5 core/email_queue_api.php
  65. +8 −9 core/error_api.php
  66. +1 −1 core/event_api.php
  67. +5 −5 core/excel_api.php
  68. +45 −50 core/file_api.php
  69. +382 −402 core/filter_api.php
  70. +6 −10 core/gpc_api.php
  71. +4 −6 core/graphviz_api.php
  72. +8 −6 core/helper_api.php
  73. +8 −10 core/history_api.php
  74. +54 −55 core/html_api.php
  75. +1 −1 core/http_api.php
  76. +4 −4 core/icon_api.php
  77. +47 −47 core/install_helper_functions_api.php
  78. +2 −2 core/json_api.php
  79. +1 −2 core/lang_api.php
  80. +40 −40 core/ldap_api.php
  81. +5 −5 core/logging_api.php
  82. +33 −34 core/news_api.php
  83. +1 −2 core/php_api.php
  84. +8 −11 core/plugin_api.php
  85. +74 −77 core/print_api.php
  86. +23 −23 core/profile_api.php
  87. +45 −47 core/project_api.php
  88. +16 −16 core/project_hierarchy_api.php
  89. +33 −33 core/relationship_api.php
  90. +2 −2 core/relationship_graph_api.php
  91. +4 −4 core/rss_api.php
  92. +1 −1 core/session_api.php
  93. +17 −17 core/sponsorship_api.php
  94. +4 −4 core/string_api.php
  95. +85 −90 core/summary_api.php
  96. +47 −47 core/tag_api.php
  97. +7 −7 core/timeline_api.php
  98. +13 −14 core/tokens_api.php
  99. +77 −80 core/user_api.php
  100. +13 −15 core/user_pref_api.php
  101. +1 −1 core/utility_api.php
  102. +50 −53 core/version_api.php
  103. +1 −1 docbook/Admin_Guide/en-US/Customizing.xml
  104. +5 −5 docbook/Admin_Guide/en-US/Project_Management.xml
  105. +2 −2 docbook/Developers_Guide/en-US/Plugins_Building.xml
  106. +2 −2 docbook/Developers_Guide/en-US/Plugins_Building_Source.xml
  107. +1 −1 excel_xml_export.php
  108. +7 −6 file_download.php
  109. +39 −39 issues_rss.php
  110. +1 −1 library/adodb
  111. +2 −2 login_anon.php
  112. +4 −5 login_page.php
  113. +1 −1 login_select_proj_page.php
  114. +3 −3 main_page.php
  115. +59 −58 manage_config_email_page.php
  116. +66 −68 manage_config_work_threshold_page.php
  117. +14 −15 manage_config_work_threshold_set.php
  118. +58 −58 manage_config_workflow_page.php
  119. +1 −1 manage_config_workflow_set.php
  120. +1 −1 manage_custom_field_create.php
  121. +8 −1 manage_custom_field_edit_page.php
  122. +1 −1 manage_overview_page.php
  123. +4 −4 manage_plugin_page.php
  124. +6 −4 manage_plugin_update.php
  125. +2 −3 manage_proj_cat_delete.php
  126. +10 −10 manage_proj_edit_page.php
  127. +6 −6 manage_proj_page.php
  128. +5 −5 manage_tags_page.php
  129. +4 −2 manage_user_create_page.php
  130. +25 −22 manage_user_page.php
  131. +6 −7 manage_user_prune.php
  132. +10 −10 manage_user_update.php
  133. +38 −38 my_view_inc.php
  134. +6 −9 my_view_page.php
  135. +2 −3 news_list_page.php
  136. +3 −3 news_rss.php
  137. +1 −1 news_update.php
  138. +1 −1 permalink_page.php
  139. +7 −7 plugins/MantisGraph/core/Period.php
  140. +85 −104 plugins/MantisGraph/core/graph_api.php
  141. +6 −6 plugins/MantisGraph/pages/bug_graph_bycategory.php
  142. +4 −4 plugins/MantisGraph/pages/bug_graph_bystatus.php
  143. +7 −7 plugins/MantisGraph/pages/config.php
  144. +1 −1 plugins/MantisGraph/pages/config_edit.php
  145. +2 −2 plugins/MantisGraph/pages/summary_jpgraph_page.php
  146. +13 −13 plugins/XmlImportExport/ImportXml.php
  147. +40 −42 plugins/XmlImportExport/ImportXml/Issue.php
  148. +1 −1 plugins/XmlImportExport/pages/export.php
  149. +1 −1 plugins/XmlImportExport/pages/import.php
  150. +33 −28 print_all_bug_options_inc.php
  151. +1 −3 print_all_bug_options_reset.php
  152. +1 −3 print_all_bug_options_update.php
  153. +6 −6 print_all_bug_page.php
  154. +3 −3 print_all_bug_page_word.php
  155. +5 −5 print_bug_page.php
  156. +104 −105 print_bugnote_inc.php
  157. +1 −1 proj_doc_delete.php
  158. +1 −1 proj_doc_edit_page.php
  159. +15 −16 proj_doc_page.php
  160. +8 −8 proj_doc_update.php
  161. +7 −7 project_page.php
  162. +9 −10 query_delete.php
  163. +1 −1 query_store_page.php
  164. +3 −3 query_view_page.php
  165. +11 −11 return_dynamic_filters.php
  166. +9 −9 roadmap_page.php
  167. +2 −2 set_project.php
  168. +1 −1 signup.php
  169. +3 −3 signup_page.php
  170. +6 −6 summary_page.php
  171. +1 −1 tag_attach.php
  172. +1 −2 tag_update.php
  173. +1 −2 tag_update_page.php
  174. +1 −1 tag_view_page.php
  175. +5 −5 tests/TestConfig.php
  176. +3 −3 tests/soap/AttachmentTest.php
  177. +16 −18 tests/soap/FilterTest.php
  178. +10 −10 tests/soap/IssueAddTest.php
  179. +5 −5 tests/soap/IssueNoteTest.php
  180. +5 −5 tests/soap/IssueUpdateTest.php
  181. +10 −10 tests/soap/LoginTest.php
  182. +3 −3 tests/soap/ProjectTest.php
  183. +3 −3 tests/soap/TagTest.php
  184. +2 −2 tests/test_config_get_set.php
  185. +1 −1 verify.php
  186. +15 −16 view_all_inc.php
  187. +110 −112 view_all_set.php
  188. +31 −17 view_filters_page.php
  189. +1 −1 view_user_page.php
  190. +2 −2 xmlhttprequest.php
View
@@ -128,17 +128,23 @@
echo '</ul>';
echo '</div>';
}
+
+$t_force_pw_reset_html = '';
+if( $t_force_pw_reset ) {
+ $t_force_pw_reset_html = ' class="has-required"';
+}
?>
<div id="account-update-div" class="form-container">
<form id="account-update-form" method="post" action="account_update.php">
- <fieldset <?php if( $t_force_pw_reset ) { ?> class="has-required"<?php } ?>>
+ <fieldset <?php echo $t_force_pw_reset_html ?>>
<legend><span><?php echo lang_get( 'edit_account_title' ); ?></span></legend>
<?php echo form_security_field( 'account_update' );
print_account_menu( 'account_page.php' );
- if( !helper_call_custom_function( 'auth_can_change_password', array() ) ) {
- # With LDAP --> ?>
+ if( !helper_call_custom_function( 'auth_can_change_password', array() ) ) {
+ # With LDAP -->
+ ?>
<div class="field-container">
<span class="display-label"><span><?php echo lang_get( 'username' ) ?></span></span>
<span class="input"><span class="field-value"><?php echo string_display_line( $u_username ) ?></span></span>
@@ -149,9 +155,9 @@
<span class="input"><span class="field-value"><?php echo lang_get( 'no_password_change' ) ?></span></span>
<span class="label-style"></span>
</div><?php
- } else {
- # Without LDAP
- $t_show_update_button = true;
+ } else {
+ # Without LDAP
+ $t_show_update_button = true;
?>
<div class="field-container">
<span class="display-label"><span><?php echo lang_get( 'username' ) ?></span></span>
@@ -164,22 +170,22 @@
} else {
?>
<div class="field-container">
- <label for="password" <?php if( $t_force_pw_reset ) { ?> class="required" <?php } ?>><span><?php echo lang_get( 'current_password' ) ?></span></label>
+ <label for="password" <?php echo $t_force_pw_reset_html ?>><span><?php echo lang_get( 'current_password' ) ?></span></label>
<span class="input"><input id="password-current" type="password" name="password_current" size="32" maxlength="<?php echo auth_get_password_max_size(); ?>" /></span>
<span class="label-style"></span>
- </div><?php
- } ?>
+ </div>
+ <?php } ?>
<div class="field-container">
- <label for="password" <?php if( $t_force_pw_reset ) { ?> class="required" <?php } ?>><span><?php echo lang_get( 'password' ) ?></span></label>
+ <label for="password" <?php echo $t_force_pw_reset_html ?>><span><?php echo lang_get( 'password' ) ?></span></label>
<span class="input"><input id="password" type="password" name="password" size="32" maxlength="<?php echo auth_get_password_max_size(); ?>" /></span>
<span class="label-style"></span>
</div>
<div class="field-container">
- <label for="password-confirm" <?php if( $t_force_pw_reset ) { ?> class="required" <?php } ?>><span><?php echo lang_get( 'confirm_password' ) ?></span></label>
+ <label for="password-confirm" <?php echo $t_force_pw_reset_html ?>><span><?php echo lang_get( 'confirm_password' ) ?></span></label>
<span class="input"><input id="password-confirm" type="password" name="password_confirm" size="32" maxlength="<?php echo auth_get_password_max_size(); ?>" /></span>
<span class="label-style"></span>
- </div><?php
- } ?>
+ </div>
+ <?php } ?>
<div class="field-container">
<span class="display-label"><span><?php echo lang_get( 'email' ) ?></span></span>
<span class="input"><?php
View
@@ -68,7 +68,7 @@
}
}
-switch ( $f_action ) {
+switch( $f_action ) {
case 'edit':
form_security_purge( 'profile_update' );
print_header_redirect( 'account_prof_edit_page.php?profile_id=' . $f_profile_id );
View
@@ -115,12 +115,12 @@
$t_project_clause = helper_project_specific_where( $t_project );
-$t_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 s.user_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";
+$t_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 s.user_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';
$t_result = db_query_bound( $t_query, $t_show_all ? array( $t_user ) : array( $t_user , $t_resolved ) );
@@ -139,7 +139,6 @@
<br />
<div>
<table class="width100" cellspacing="1">
-
<!-- Headings -->
<tr>
<td class="form-title" colspan="9">
@@ -231,12 +230,12 @@
</div>
<?php } # end sponsored issues
-$t_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 " .
- ( $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";
+$t_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 ' .
+ ( $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';
$t_result = db_query_bound( $t_query, $t_show_all ? array( $t_user ) : array( $t_user , $t_resolved ) );
View
@@ -106,7 +106,7 @@ function print_config_value_as_string( $p_type, $p_value, $p_for_display = true
case CONFIG_TYPE_STRING:
$t_value = string_nl2br( string_html_specialchars( config_eval( $p_value ) ) );
if( $p_for_display ) {
- $t_value = '<p id="adm-config-value">' . "'$t_value'" . '</p>';
+ $t_value = '<p id="adm-config-value">\'' . $t_value . '\'</p>';
}
echo $t_value;
return;
@@ -142,9 +142,9 @@ function print_config_value_as_string( $p_type, $p_value, $p_for_display = true
*/
function print_option_list_from_array( array $p_array, $p_filter_value ) {
foreach( $p_array as $t_key => $t_value ) {
- echo "<option value='$t_key'";
+ echo '<option value="' . $t_key . '"';
check_selected( (string)$p_filter_value, (string)$t_key );
- echo '>' . string_attribute( $t_value ) . "</option>\n";
+ echo '>' . string_attribute( $t_value ) . '</option>' . "\n";
}
}
@@ -207,7 +207,7 @@ function print_option_list_from_array( array $p_array, $p_filter_value ) {
$t_project_table = db_get_table( 'project' );
# Get users in db having specific configs
-$t_query = "SELECT DISTINCT user_id FROM $t_config_table WHERE user_id <> " . db_param() ;
+$t_query = 'SELECT DISTINCT user_id FROM ' . $t_config_table . ' WHERE user_id <> ' . db_param() ;
$t_result = db_query_bound( $t_query, array( ALL_USERS ) );
if( $t_filter_user_value != META_FILTER_NONE && $t_filter_user_value != ALL_USERS ) {
# Make sure the filter value exists in the list
@@ -228,11 +228,11 @@ function print_option_list_from_array( array $p_array, $p_filter_value ) {
+ $t_users_list;
# Get projects in db with specific configs
-$t_query = "SELECT DISTINCT project_id, pt.name as project_name
- FROM $t_config_table as ct
- JOIN $t_project_table as pt ON pt.id = ct.project_id
+$t_query = 'SELECT DISTINCT project_id, pt.name as project_name
+ FROM ' . $t_config_table . ' as ct
+ JOIN ' . $t_project_table . ' as pt ON pt.id = ct.project_id
WHERE project_id!=0
- ORDER BY project_name";
+ ORDER BY project_name';
$t_result = db_query_bound( $t_query );
$t_projects_list[META_FILTER_NONE] = '[' . lang_get( 'any' ) . ']';
$t_projects_list[ALL_PROJECTS] = lang_get( 'all_projects' );
@@ -242,7 +242,7 @@ function print_option_list_from_array( array $p_array, $p_filter_value ) {
}
# Get config list used in db
-$t_query = "SELECT DISTINCT config_id FROM $t_config_table ORDER BY config_id";
+$t_query = 'SELECT DISTINCT config_id FROM ' . $t_config_table . ' ORDER BY config_id';
$t_result = db_query_bound( $t_query );
$t_configs_list[META_FILTER_NONE] = '[' . lang_get( 'any' ) . ']';
if( $t_filter_config_value != META_FILTER_NONE ) {
@@ -258,25 +258,23 @@ function print_option_list_from_array( array $p_array, $p_filter_value ) {
$t_where = '';
$t_param = array();
if( $t_filter_user_value != META_FILTER_NONE ) {
- $t_where .= " AND user_id = " . db_param();
+ $t_where .= ' AND user_id = ' . db_param();
$t_param[] = $t_filter_user_value;
}
if( $t_filter_project_value != META_FILTER_NONE ) {
- $t_where .= " AND project_id = " . db_param();
+ $t_where .= ' AND project_id = ' . db_param();
$t_param[] = $t_filter_project_value;
}
if( $t_filter_config_value != META_FILTER_NONE ) {
- $t_where .= " AND config_id = " . db_param();
+ $t_where .= ' AND config_id = ' . db_param();
$t_param[] = $t_filter_config_value;
}
if( $t_where != '' ) {
- $t_where = " WHERE 1=1 " . $t_where;
+ $t_where = ' WHERE 1=1 ' . $t_where;
}
-$t_query = "SELECT config_id, user_id, project_id, type, value, access_reqd
- FROM $t_config_table
- $t_where
- ORDER BY user_id, project_id, config_id ";
+$t_query = 'SELECT config_id, user_id, project_id, type, value, access_reqd
+ FROM ' . $t_config_table . $t_where . ' ORDER BY user_id, project_id, config_id ';
$t_result = db_query_bound( $t_query, $t_param );
?>
@@ -313,23 +311,23 @@ function print_option_list_from_array( array $p_array, $p_filter_value ) {
<tr class="row-1">
<td>
<select name="filter_user_id">
- <?php
- print_option_list_from_array( $t_users_list, $t_filter_user_value );
- ?>
+ <?php
+ print_option_list_from_array( $t_users_list, $t_filter_user_value );
+ ?>
</select>
</td>
<td>
<select name="filter_project_id">
- <?php
- print_option_list_from_array( $t_projects_list, $t_filter_project_value );
- ?>
+ <?php
+ print_option_list_from_array( $t_projects_list, $t_filter_project_value );
+ ?>
</select>
</td>
<td>
<select name="filter_config_id">
- <?php
- print_option_list_from_array( $t_configs_list, $t_filter_config_value );
- ?>
+ <?php
+ print_option_list_from_array( $t_configs_list, $t_filter_config_value );
+ ?>
</select>
</td>
</tr>
View
@@ -165,18 +165,18 @@ function process_complex_value( $p_value, $p_trimquotes = false ) {
')';
}
- if( preg_match( "/$s_regex_array/s", $t_value, $t_match ) === 1 ) {
+ if( preg_match( '/' . $s_regex_array . '/s', $t_value, $t_match ) === 1 ) {
# It's an array - process each element
$t_processed = array();
- if( preg_match_all( "/$s_regex_element/", $t_match[1], $t_elements ) ) {
+ if( preg_match_all( '/' . $s_regex_element . '/', $t_match[1], $t_elements ) ) {
foreach( $t_elements[0] as $t_key => $t_element ) {
if( !trim( $t_element ) ) {
# Empty element - skip it
continue;
}
# Check if element is associative array
- preg_match_all( "/($s_regex_string)\s*=>\s*(.*)/", $t_element, $t_split );
+ preg_match_all( '/(' . $s_regex_string . ')\s*=>\s*(.*)/', $t_element, $t_split );
if( !empty( $t_split[0] ) ) {
# associative array
$t_new_key = constant_replace( trim( $t_split[1][0], " \t\n\r\0\x0B\"'" ) );
@@ -207,7 +207,7 @@ function process_complex_value( $p_value, $p_trimquotes = false ) {
*/
function special_split ( $p_string ) {
$t_values = array();
- $t_array_element = "";
+ $t_array_element = '';
$t_paren_level = 0;
$t_inside_quote = false;
$t_escape_next = false;
@@ -216,17 +216,17 @@ function special_split ( $p_string ) {
if( $t_escape_next ) {
$t_array_element .= $t_character;
$t_escape_next = false;
- } else if( $t_character == "," && $t_paren_level==0 && !$t_inside_quote ) {
+ } else if( $t_character == ',' && $t_paren_level==0 && !$t_inside_quote ) {
array_push( $t_values, $t_array_element );
- $t_array_element = "";
+ $t_array_element = '';
} else {
- if( $t_character == "(" && !$t_inside_quote ) {
+ if( $t_character == '(' && !$t_inside_quote ) {
$t_paren_level++;
- } else if( $t_character == ")" && !$t_inside_quote ) {
+ } else if( $t_character == ')' && !$t_inside_quote ) {
$t_paren_level--;
- } else if( $t_character == "'" ) {
+ } else if( $t_character == '\'' ) {
$t_inside_quote = !$t_inside_quote;
- } else if( $t_character == "\\" ) {
+ } else if( $t_character == '\\' ) {
# escape character
$t_escape_next = true;
# keep the escape if the string will be going through another recursion
View
@@ -124,7 +124,7 @@ function check_print_error_rows() {
$t_error_description = htmlentities( $t_error['error'] );
}
echo "\t<tr>\n\t\t<td colspan=\"2\" class=\"error\">";
- echo "<strong>$t_error_type:</strong> $t_error_description<br />";
+ echo '<strong>' . $t_error_type . ':</strong> ' . $t_error_description . '<br />';
echo '<em>Raised in file ' . htmlentities( $t_error['file'] ) . ' on line ' . htmlentities( $t_error['line'] ) . '</em>';
echo "</td>\n\t</tr>\n";
}
@@ -157,8 +157,10 @@ function check_print_info_row( $p_description, $p_info = null ) {
if( !$g_show_all ) {
return;
}
- echo "\t<tr>\n\t\t<td class=\"description$g_alternate_row\">$p_description</td>\n";
- echo "\t\t<td class=\"info$g_alternate_row\">$p_info</td>\n\t</tr>\n";
+ echo "\t" . '<tr>' . "\n\t\t";
+ echo '<td class="description' . $g_alternate_row . '">' . $p_description . '</td>' . "\n";
+ echo "\t\t" . '<td class="info' . $g_alternate_row . '">' . $p_info . '</td>' . "\n";
+ echo "\t" . '</tr>' . "\n";
$g_alternate_row = $g_alternate_row === 1 ? 2 : 1;
}
@@ -169,16 +171,16 @@ function check_print_info_row( $p_description, $p_info = null ) {
*/
function check_print_test_result( $p_result ) {
global $g_alternate_row, $g_failed_test, $g_passed_test_with_warnings;
- switch ( $p_result ) {
+ switch( $p_result ) {
case BAD:
- echo "\t\t<td class=\"fail$g_alternate_row\">FAIL</td>\n";
+ echo "\t\t" . '<td class="fail' . $g_alternate_row . '">FAIL</td>' . "\n";
$g_failed_test = true;
break;
case GOOD:
- echo "\t\t<td class=\"pass$g_alternate_row\">PASS</td>\n";
+ echo "\t\t" . '<td class="pass' . $g_alternate_row . '">PASS</td>' . "\n";
break;
case WARN:
- echo "\t\t<td class=\"warn$g_alternate_row\">WARN</td>\n";
+ echo "\t\t" . '<td class="warn' . $g_alternate_row . '">WARN</td>' . "\n";
$g_passed_test_with_warnings = true;
break;
}
@@ -198,7 +200,7 @@ function check_print_test_row( $p_description, $p_pass, $p_info = null ) {
return $p_pass;
}
- echo "\t<tr>\n\t\t<td class=\"description$g_alternate_row\">$p_description";
+ echo "\t<tr>\n\t\t<td class=\"description" . $g_alternate_row . '\">' . $p_description;
if( $p_info !== null ) {
if( is_array( $p_info ) && isset( $p_info[$p_pass] ) ) {
echo '<br /><em>' . $p_info[$p_pass] . '</em>';
@@ -238,7 +240,7 @@ function check_print_test_warn_row( $p_description, $p_pass, $p_info = null ) {
if( !$g_show_all && $p_pass && !$t_unhandled ) {
return $p_pass;
}
- echo "\t<tr>\n\t\t<td class=\"description$g_alternate_row\">$p_description";
+ echo "\t<tr>\n\t\t<td class=\"description" . $g_alternate_row . '">' . $p_description;
if( $p_info !== null ) {
if( is_array( $p_info ) && isset( $p_info[$p_pass] ) ) {
echo '<br /><em>' . $p_info[$p_pass] . '</em>';
@@ -92,7 +92,7 @@
check_print_test_warn_row( 'Email debugging should be OFF',
empty( $g_debug_email ),
- array( false => "All notification e-mails will be sent to: $g_debug_email" )
+ array( false => 'All notification e-mails will be sent to: ' . $g_debug_email )
);
Oops, something went wrong.

Showing you all comments on commits in this comparison.

Member

atrol commented on b78f966 Jul 14, 2014

In file filter_api.php function print_filter_plugin_field lines 4056 and 4061 $g_filter has to be used instead of $t_filter

Member

atrol commented on ee1b1c9 Jul 14, 2014

File manage_config_work_set_threshold.php function set_capability_row line 105
Should be $g_project instead of $t_project

Contributor

grangeway commented on b78f966 Jul 14, 2014

Member

atrol commented on b78f966 Jul 15, 2014

I’d love to know how you spotted that when I struggled whilst doing it ;)

PhpStorm found usage of undefined variable