diff --git a/MicropolisCore/src/pyMicropolis/micropolisEngine/micropolisturbogearsengine.py b/MicropolisCore/src/pyMicropolis/micropolisEngine/micropolisturbogearsengine.py index 74d586ca..8acc39ce 100644 --- a/MicropolisCore/src/pyMicropolis/micropolisEngine/micropolisturbogearsengine.py +++ b/MicropolisCore/src/pyMicropolis/micropolisEngine/micropolisturbogearsengine.py @@ -497,7 +497,7 @@ def createEngine(self): user = GetCurrentUser() - print "Session creatEngine got user", user + print "Session createEngine got user", user if user: @@ -1530,7 +1530,7 @@ def handleMessage_cancelScreenCapture(self, session, messageDict, user): def saveUserCity(self): user = GetCurrentUser() - print "MicropolisTurboGearsEngine saveUserCity user", user.current_city_id, user + #print "MicropolisTurboGearsEngine saveUserCity user", user if user: diff --git a/laszlo/micropolis/classes/screencapture.lzx b/laszlo/micropolis/classes/screencapture.lzx index df0ec8a1..b91782e1 100644 --- a/laszlo/micropolis/classes/screencapture.lzx +++ b/laszlo/micropolis/classes/screencapture.lzx @@ -215,7 +215,7 @@ width, rows)); - // Swizzle the bytes from Flash's RGBA order to Cairo's RGBA order. + // Swizzle the bytes from Flash's RGBA order to Cairo's ABGR order. var n = chunk.length; var i; for (i = 0; i < n; i += 4) { diff --git a/turbogears/micropolis/controllers.py b/turbogears/micropolis/controllers.py index 9b5d7416..addcdfa1 100644 --- a/turbogears/micropolis/controllers.py +++ b/turbogears/micropolis/controllers.py @@ -1545,6 +1545,47 @@ def facebookCanvas( } + ######################################################################## + # facebookDeauthorize + # + # Facebook page admin interface. + # + @expose() + def facebookDeauthorize( + self, + signed_request='', + *args, + **kw): + + print "\nFACEBOOKDEAUTHROIZE", request.method, "ARGS", args, "KW", kw + + if not signed_request: + print "FACEBOOKDEAUTHROIZE ERROR: missing signed_request" + return "" + + data = ParseSignedRequest(signed_request) + if not data: + print "FACEBOOKDEAUTHROIZE ERROR: invalid signed_request", signed_request + return "" + + print data + + user_id = data.get(u'user_id', '') + if not user_id: + print "FACEBOOKDEAUTHROIZE ERROR: missing user_id in signed request data", data + return "" + + user = User.query.filter_by(facebook_user_id=user_id).first() + if not user: + print "FACEBOOKDEAUTHROIZE ERROR: unknown user_id", user_id + return "" + + # TODO: Remember that the user is de-authorized. + print "FACEBOOKDEAUTHROIZE deauthorized user_id", user_id, "user", user + + return "" + + ######################################################################## # facebookPageAdmin # diff --git a/turbogears/micropolis/templates/adminUser.html b/turbogears/micropolis/templates/adminUser.html index d66734f2..59068049 100644 --- a/turbogears/micropolis/templates/adminUser.html +++ b/turbogears/micropolis/templates/adminUser.html @@ -53,8 +53,7 @@ email third party id nick name - credits - donation + credits paid karma groups created @@ -86,7 +85,7 @@ ${len(user.cities)} / ${user.city_slots} + >${len(user.cities)} / ${user.save_slots} @@ -119,10 +118,7 @@ ${user.nick_name} - ${user.credits} - - - ${user.donation} + ${user.credits_paid} ${user.karma} diff --git a/turbogears/micropolis/templates/facebookCanvas.html b/turbogears/micropolis/templates/facebookCanvas.html index f6583e7d..37d4e1df 100644 --- a/turbogears/micropolis/templates/facebookCanvas.html +++ b/turbogears/micropolis/templates/facebookCanvas.html @@ -56,11 +56,22 @@ />
+ + Please + add Micropolis + to save your city and play with your friends. + + Please tell your friends, and buy + 1000, @@ -95,16 +107,6 @@ >open source project.
- - Please - add Micropolis - to save your city and play with your friends. - -