summaryrefslogtreecommitdiff
path: root/pages
AgeCommit message (Collapse)Author
2014-07-27bug 1291: Another XSSBenny Baumann
2014-07-15Merge branch 'bug-1226' into releaseBenny Baumann
2014-07-15Merge branch 'bug-1283' into releaseBenny Baumann
2014-07-15Merge branch 'bug-1281' into releaseBenny Baumann
2014-07-15Merge branch 'bug-1280' into releaseBenny Baumann
2014-06-22bug 1226: Only consider values above 1900 as the year when returning a ↵bug-1226Benny Baumann
pre-filled form
2014-06-21bug 1226: Treat the date values as integerMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-06-21bug 1280: Implement normalisation in of language codes in the L10n classbug-1280Michael Tänzer
and use it (in set_translation() and the Assurer contact form) Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-06-21Revert "bug-1280: Parse the language code from the locale."Michael Tänzer
This reverts commit f3885b3bc9ff61da78fb541151f16b0ecfdf62eb.
2014-06-21Revert "bug-1280: Handle more different types of "languages":"Michael Tänzer
This reverts commit 0730c9df3eb440205d7963e3c0762765d9b47031.
2014-06-21Revert "bug-1280: Variable naming, formatting, php-syntax-error"Michael Tänzer
This reverts commit 6b1cd2a57b0aaa88374b1098df40cc6f73cdff5d.
2014-06-13Merge branch 'release' into bug-807Benny Baumann
Conflicts: includes/account.php includes/lib/account.php pages/account/16.php
2014-06-11bug-1280: Variable naming, formatting, php-syntax-errorFelix Dörre
2014-06-11bug-1280: Handle more different types of "languages":Felix Dörre
- zh_CN => zh-cn (in various cases: ZH_cn, zh_cn, ...) - de => de (what the current GUI produces) - de_DE => de, en_AU => en, EN_AU => en (what may be left in the database) ... and more creative upper/lower-cases
2014-06-11bug-1280: Parse the language code from the locale.Felix Dörre
Splitting the string at "_" and lowering the characters.
2014-06-10bug 1283: remove double encodingbug-1283Felix Dörre
The locales are already encoded in the Database.
2014-06-08bug 1281: Fix syntax error in SQL statementbug-1281Benny Baumann
2014-06-08bug 1281: Convert to Unix Line EndingsBenny Baumann
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-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-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: 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-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: 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-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>
2014-04-11bug 1138: Code styleMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-04-11bug 1138: TypoMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-04-11bug 1138: Properly call output_log_domains()Michael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-04-11bug 1138: Properly display domain tableMichael Tänzer
- Wrong call to get_domains() => deleted domains weren't included - <td> needs to be wrapped in a <tr> Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-04-11bug 1138: Always show email address tableMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-04-11bug 1138: more intuitive variable namingMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-04-11bug 1138: Inline $colspandefault because it make the code more complex andMichael Tänzer
isn't very useful Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-04-11bug 1138: properly display announcement settings on account historyMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-04-11bug 1138: Make testing for support access to account details page moreMichael Tänzer
robust and possibly fix some issues - should check for same userid not whether we come from the SE page - always use the already validated values (not $_REQUEST) - make if clause logic more readable Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-04-11bug 1138: make string more readable for translatorsMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-04-11bug 1138: Use CSS styling instead of deprecated attributesMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>