summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-06-06Merge branch 'bug-413' into bug-1138bug-1138Benny Baumann
Conflicts: pages/account/12.php pages/account/5.php
2014-05-27bug 413: Port same change as for 5.php over to 12.phpbug-413Benny Baumann
2014-05-27bug 413: Backport changes from 7aced740 by Michael Tänzer to avoid ↵Benny Baumann
conflicts when integrating both together
2014-05-27bug 1138: that "if" should contain a blockMichael Tänzer
goto fail; Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-05-20bug 1138: fix double-escaping in wot/10Benny Baumann
2014-05-01bug 1138: $verified is a string that is directly filled with data from theMichael Tänzer
translation system => do not intval() Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-05-01bug 1138: This is an int, no need to mysql_real_escape()Michael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-05-01bug 1138: Avoid double escaping of $_SESSION['_config']['OU'] and fix XSSMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-05-01bug 1138: Avoid double escaping.Michael Tänzer
These session variables should be local variables as they aren't needed anywhere else Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-05-01bug 1138: Avoid double escaping in `description` which was stored into theMichael Tänzer
session mysql_real_escaped Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-05-01bug 1138: Avoid double escapingMichael Tänzer
Yes it's ugly but should be fixed in a separate bug Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-05-01Merge branch 'release' into bug-1138Benny Baumann
2014-04-30bug 1138: additional brackets for better readabilityBenny Baumann
2014-04-30bug 1138: Reorder fields to better show which variables belong togetherBenny Baumann
2014-04-30bug 1138: Whitespace changes and code formattingBenny Baumann
2014-04-30bug 1138: And yet another bunch of escapingBenny Baumann
2014-04-30bug 1138: Some escaping for the GnuPG codeBenny Baumann
2014-04-30bug 1138: And yet another bunch of missing escapesBenny Baumann
2014-04-30bug 1138: And yet some more sanitizing of database query argumentsBenny Baumann
2014-04-30bug 1138: Add some more mising escaping for values from the databaseBenny Baumann
2014-04-30bug 1138: Add some more mising escaping for values from the databaseBenny Baumann
2014-04-30bug 1138: Add some mising escaping for values from the databaseBenny Baumann
2014-04-30bug 1138: Add quite some instances of mising escapingBenny Baumann
2014-04-30bug 1138: Be more paranoid regarding database query parametersBenny Baumann
2014-04-30bug 1138: Properly bail out to remark on missing ticket numberBenny Baumann
2014-04-29bug 1138: Implement log parameter for output_assurances*() and use it forMichael Tänzer
data summary Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-04-29bug 1138: Move rendering of the email addresses and such for each assuranceMichael Tänzer
into output_assurances_row() Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-04-29bug 1138: Store the calculated awarded points in the row array to avoidMichael Tänzer
parameters to the output_assurances_row() Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-04-29bug 1138: Reduce number of parameters for output_assurances_row()Michael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-04-29bug 1138: Only revoke assurance if we actually found oneMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-04-29Merge branch 'bug-1221' into bug-1138Michael Tänzer
Conflicts: includes/account.php includes/general.php includes/loggedin.php includes/notary.inc.php pages/account/43.php pages/account/55.php pages/wot/10.php www/index.php www/wot.php Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-04-22bug 1221: Adjust the interface of calc_assurances() to be consistent andbug-1221Michael Tänzer
use the `deleted` column for the Thawte revocation Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-04-22bug 1221: Reduce number of parameters for calc_experience() and document itMichael Tänzer
also respect revoked assurances and use calc_awarded() Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-04-22bug 1221: Add comments and restrict TTP assurancesMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-04-22bug 1221: Put the assurance method independent logic in one placeMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-04-22bug 1221: Rename function to better reflect its useMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-04-21bug 1221: Move calc_points() up to the other point calculation functionsMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-04-21Merge branch 'tarballs' into releaseMichael Tänzer
2014-04-21Source code taken from cacert-20140419.tar.bz2Michael Tänzer
2014-04-19bug 1272: Fix for a typobug-1272Benny Baumann
2014-04-19bug 1272: Properly escape the filename passed to OpenSSLBenny Baumann
2014-04-15Merge branch 'bug-1184' into releaseBenny Baumann
2014-04-15Merge branch 'bug-1266' into releaseBenny Baumann
2014-04-15bug 1221: remove redundant lineMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-04-15bug 1221: properly name the other part of the assuranceMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-04-14bug 1138: Require number suffix for valid ticket numbersMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-04-11bug 1138: Set $oldidMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-04-11bug 1138: Always provide a back linkMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-04-11bug 1138: correct colspan for cert tablesMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-04-11bug 1138: Only use support engineer mode if not viewing own historyMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>