Changeset 1321 for twitter/files/lib/system/event/listener/UserLoginTwitterListener.class.php

Timestamp:

03/06/11 19:13:48 (2 years ago)

Author:

Torben Brodt

Message:

users registering with twitter need to accept the rules

Files:

• twitter/files/lib/system/event/listener/UserLoginTwitterListener.class.php (modified) (3 diffs)

twitter/files/lib/system/event/listener/UserLoginTwitterListener.class.php

@@ -30 +30 @@
                         
                         // did agree with rules?
-                        case 'SessionFactory':
+                        default:
                                 // didInit
-                                $this->validateRuleAgree($eventObj->session);
+                                if($eventObj instanceof SessionFactory) $this->validateRuleAgree($eventObj->session);
                         break;
                 
@@ -96 +96 @@
                 
                 // if the modul activate and the user is twitter user he must agree the rules after a change, and the user is not a guest.
-                if ($session->getUser()->userID && TwitterUtil::hasTwitterUser($session->getUser()->userID)) {
+                if ($session->getUser()->userID && $session->getUser()->didSkipRulesTwitter) {
                         // select all packageids of the packages where the user is agree with the rules.
                         $packageIDs = $session->getVar('package_agrees');
@@ -104 +104 @@
                                 // we check the agreement, is the user agree with the rules, we put the package id in to the array and leave the event.
                                 if (Ruleset::isUserAgree($session->getUser()->userID, PACKAGE_ID)) {
-                                        if (is_null($packageIDs) || !is_array($packageIDs)) 
+                                        if (is_null($packageIDs) || !is_array($packageIDs)) {
                                                 $packageIDs = array(PACKAGE_ID);
-                                        else $packageIDs[] = PACKAGE_ID;
-                                                $session->register('package_agrees', $packageIDs);
+                                        } else {
+                                                $packageIDs[] = PACKAGE_ID;
+                                        }
+                                        $session->register('package_agrees', $packageIDs);
+                                        
+                                        $session->getUser()->getEditor()->update(null, null, null, null, array(
+                                                array(
+                                                        'optionID' => User::getUserOptionID('didSkipRulesTwitter'),
+                                                        'optionValue' => 0
+                                                )
+                                        ));
                                         return;
                                 }