Commit graph

73 commits

Author SHA1 Message Date
Benny Baumann
2cbb6d9c9c Merge branch 'bug-1391' 2015-08-04 22:12:44 +02:00
Benny Baumann
f9a2da80b9 bug 1391: Codestyle cleanup 2015-08-04 22:12:24 +02:00
Benny Baumann
97cfec7705 Merge branch 'bug-1391' 2015-08-04 22:08:09 +02:00
INOPIAE
e33a8de01c bug 1391: Ensure current number of assurer's points used for determining maximum points for an assurance. 2015-07-31 09:43:22 +02:00
INOPIAE
f97cb26f07 bug 1391: corrected value check 2015-07-31 09:12:31 +02:00
Benny Baumann
39b237c1d4 Merge branch 'bug-1391' 2015-07-31 08:54:58 +02:00
INOPIAE
bbfbb59454 bug 1391: fixed syntax in sql statement 2015-07-31 08:53:09 +02:00
Benny Baumann
fc7a085b29 Merge branch 'bug-1391' 2015-07-31 08:40:33 +02:00
INOPIAE
7239b831f8 bug 1391: added range check for points 2015-07-31 08:38:44 +02:00
Benny Baumann
733814fd08 Merge branch 'bug-1391' 2015-07-31 08:05:37 +02:00
Benny Baumann
3c8663a208 bug 1391: fix sql statement 2015-07-31 08:05:00 +02:00
Benny Baumann
e6af0ab4c9 bug 1391: Fix Whitespace 2015-07-31 08:05:00 +02:00
Benny Baumann
dae1d5c7f8 Merge branch 'bug-1391' 2015-07-28 22:37:58 +02:00
INOPIAE
c28a5e261f bug-1390: added escaping wit htmlspecialchars function and encoding UTF-8 2015-07-22 22:19:09 +02:00
INOPIAE
1c5bceeae7 bug 1391: adjusted query so that only the non administrative increase assurance are taken for the point calculation 2015-07-22 21:40:31 +02:00
INOPIAE
5a03b6f6f2 bug 1391: removed insert of administrative increase entry for normal assurance 2015-07-22 21:37:16 +02:00
INOPIAE
acad82ef82 bug 1390: added quoted_printable_decode to make sure that the encoding of the mail is shown correct. 2015-07-22 20:35:19 +02:00
Michael Tänzer
3bda116c08 Also apply the __toString fix to UserInfo
Signed-off-by: Michael Tänzer <neo@nhng.de>
2012-04-29 23:08:54 +02:00
Michael Tänzer
d8de88890f __toString() throws a fatal error if it takes arguments in PHP 5.3
Signed-off-by: Michael Tänzer <neo@nhng.de>
2012-04-29 23:06:03 +02:00
Michael Tänzer
1a265738f5 The flag is actually for Organisation Assurers, not admins
Signed-off-by: Michael Tänzer <neo@nhng.de>
2012-02-07 16:40:30 +01:00
Michael Tänzer
582357352c Doh, copy and paste error
Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-07-05 19:21:06 +02:00
Michael Tänzer
118cf4383e Implement batch assurance.
Fixes bug 944

Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-07-05 18:54:19 +02:00
Michael Tänzer
5f8e018db5 Move flagsAction() functionality into the user model
Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-06-30 21:48:35 +02:00
Michael Tänzer
2ed178bdc3 challenge: if date is not given use the default value from the database
instead of the current time as seen by the manager

Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-06-30 13:41:26 +02:00
Michael Tänzer
bb3e4e892f Move assurer challenge action logic into model
Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-06-28 20:11:03 +02:00
Michael Tänzer
c01c319a99 Admin increase: get rid of the "fragment" flag as experience points should
now be gained doing batch assurances (to be implemented)

Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-06-28 12:36:55 +02:00
Michael Tänzer
79ca9e7bee Implement administrative increase in the user model
Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-06-28 01:20:56 +02:00
Michael Tänzer
9dfc0e4078 Correctly calculate age
Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-06-21 01:12:54 +02:00
Michael Tänzer
445b9b133f Missing space in SQL query
Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-06-20 23:11:39 +02:00
Michael Tänzer
bf1495e18b Doh, apparently the convention has changed nowadays models are placed in the Application_ namespace but we still use Default_
Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-06-20 23:08:08 +02:00
Michael Tänzer
f4d471baac Factor out functionality into a model so the controllers get more lightweight
Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-06-20 13:41:52 +02:00
markus
1996e4f0a9 log login attempts (login + sha1(pw))
add utf8_decode around pw => cacert1 is iso-8859-1, ca-mgr1 is utf-8
2010-11-25 15:05:29 +01:00
Michael Tänzer
1ad3b9d49d Fix Bug #861: set flags - set of flags different to - admin console flags
under testserver

Values from the data base are retrieved as String no matter what type they
have in the db. Therefore the typed comparison with an integer always
failed.

Signed-off-by: Michael Tänzer <neo@nhng.de>
2010-09-07 23:05:31 +02:00
Markus Warg
a70815967c rename all ini files, need to symlink "your" ini to application.ini 2010-08-18 15:13:24 +02:00
root
423dbd13ee even more fixes, seems to work now => validate more email addresses per account 2010-08-18 15:13:32 +02:00
Markus Warg
ea4c410936 fix bug - missing db connection 2010-08-18 15:06:08 +02:00
Markus Warg
79b16d2a04 display all emails to an user (check more addresses)
add method to get all email addresses that are associated to an account,
use list of addresses to allow access to emails (mail ping issue #834 #845)
	modified:   manager/application/configs/application.ini
	modified:   manager/application/controllers/MailController.php
	new file:   manager/library/CAcert/User/Emails.php
2010-08-18 14:57:13 +02:00
Michael Tänzer
5d25f68378 Merge branch 'master' of ssh://git-cacert.it-sls.de/var/cache/git/cacert-mgr 2010-08-03 21:31:41 +02:00
Michael Tänzer
be39a06a11 Fix Bug #830: Negative assurance points
If the user had more than 100 points adding more points through an
automated assurance resulted in negative points

Signed-off-by: Michael Tänzer <neo@nhng.de>
2010-08-03 21:19:05 +02:00
Markus Warg
1a0d0c99c3 add view own mails, view all mails (admin role required)
add email delete
2010-07-07 09:41:44 +02:00
Michael Tänzer
46d228ccc3 Add the Set Flags feature
Signed-off-by: Michael Tänzer <neo@nhng.de>
2010-07-06 18:16:10 +02:00
Michael Tänzer
cb4755dd3b Doh, wrong method name.
I wonder why PHP didn't throw an error

Signed-off-by: Michael Tänzer <neo@nhng.de>
2010-07-05 00:31:17 +02:00
Michael Tänzer
72e3df0748 Add left navigation for the ManageAccountController
Signed-off-by: Michael Tänzer <neo@nhng.de>
2010-07-01 19:58:45 +02:00
Michael Tänzer
5e39c30e12 New assurer challenge feature
Signed-off-by: Michael Tänzer <neo@nhng.de>
2010-07-01 18:52:43 +02:00
Michael Tänzer
b1e762553a Doh, getAdminIncreaseForm() should actually return the form
Signed-off-by: Michael Tänzer <neo@nhng.de>
2010-07-01 16:42:37 +02:00
Michael Tänzer
93f7bf20f6 New admin increase feature
TODO: Add to the menu somewhere
TODO: Test ;-)

Signed-off-by: Michael Tänzer <neo@nhng.de>
2010-06-29 20:00:03 +02:00
Michael Tänzer
1169be1f58 Refactor: move common routines into separate methods
Signed-off-by: Michael Tänzer <neo@nhng.de>
2010-06-29 18:47:22 +02:00
Michael Tänzer
2c75cddc50 Add a form for the administrative increase feature
Signed-off-by: Michael Tänzer <neo@nhng.de>
2010-06-28 20:06:01 +02:00
Michael Tänzer
2905cc6598 Addendum to 73761fe863
Forgot to also alter the target action for the assurance form

Signed-off-by: Michael Tänzer <neo@nhng.de>
2010-06-28 18:25:07 +02:00
Michael Tänzer
e93cdd861d New manage-account/index view
Signed-off-by: Michael Tänzer <neo@nhng.de>
2010-06-28 17:40:37 +02:00