R-2.6.3

never got to understand ASI. Let's behave and have a semicolon.

Makefile

@@ -30,7 +30,7 @@ update:
 	echo "remember that pymysql was tweaked"
 src:
 	### Use semantic versioning
-	echo 'Version 2.6.1-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION
+	echo 'Version 2.6.3-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION
 	### rm -f all junk files
 	make clean
 	### clean up baisc apps

VERSION

@@ -1 +1 @@
-Version 2.6.1-stable+timestamp.2013.09.12.17.08.08
+Version 2.6.3-stable+timestamp.2013.09.15.11.59.21

applications/admin/controllers/debug.py

@@ -234,4 +234,3 @@ def list_breakpoints():
         session.flash = str(e)
         ok = False
     return response.json({'ok': ok, 'breakpoints': breakpoints})
-

applications/admin/controllers/default.py

@@ -108,7 +108,7 @@ def index():
     if session.authorized:
         redirect(send)
     elif request.vars.password:
-        if verify_password(request.vars.password):
+        if verify_password(request.vars.password[:1024]):
             session.authorized = True
             login_record(True)
 
@@ -583,7 +583,7 @@ def edit():
 
     # show settings tab and save prefernces
     if 'settings' in request.vars:
-        if request.post_vars:	#save new preferences
+        if request.post_vars:        #save new preferences
             if config.save(request.post_vars.items()):
                 response.headers["web2py-component-flash"] = T('Preferences saved correctly')
             else:

applications/admin/models/access.py

@@ -49,7 +49,7 @@ def verify_password(password):
     session.pam_user = None
     if DEMO_MODE:
         return True
-    elif not 'password' in _config:
+    elif not _config.get('password'):
         return False
     elif _config['password'].startswith('pam_user:'):
         session.pam_user = _config['password'][9:].strip()

applications/admin/settings.cfg

@@ -0,0 +1,6 @@
+[DEFAULT]
+theme = web2py
+
+[editor]
+theme = night
+

applications/admin/static/js/web2py.js

@@ -179,7 +179,7 @@
       });
       var datetime_format = (typeof w2p_ajax_datetime_format != 'undefined') ? w2p_ajax_datetime_format : "%Y-%m-%d %H:%M:%S";
       doc.on('click', "input.datetime", function () {
-        var tformat = $(this).data('w2p_datetime_format')
+        var tformat = $(this).data('w2p_datetime_format');
         var active = $(this).data('w2p_datetime');
         var format = (typeof tformat != 'undefined') ? tformat : datetime_format;
         if(active === undefined) {
@@ -196,7 +196,7 @@
       });
       var date_format = (typeof w2p_ajax_date_format != 'undefined') ? w2p_ajax_date_format : "%Y-%m-%d";
       doc.on('click', "input.date", function () {
-        var tformat = $(this).data('w2p_date_format')
+        var tformat = $(this).data('w2p_date_format');
         var active = $(this).data('w2p_date');
         var format = (typeof tformat != 'undefined') ? tformat : date_format;
         if(active === undefined) {

applications/examples/controllers/simple_examples.py

@@ -1,4 +1,3 @@
-
 def hello1():
     """ simple page without template """
 

applications/examples/static/js/web2py.js

@@ -179,7 +179,7 @@
       });
       var datetime_format = (typeof w2p_ajax_datetime_format != 'undefined') ? w2p_ajax_datetime_format : "%Y-%m-%d %H:%M:%S";
       doc.on('click', "input.datetime", function () {
-        var tformat = $(this).data('w2p_datetime_format')
+        var tformat = $(this).data('w2p_datetime_format');
         var active = $(this).data('w2p_datetime');
         var format = (typeof tformat != 'undefined') ? tformat : datetime_format;
         if(active === undefined) {
@@ -196,7 +196,7 @@
       });
       var date_format = (typeof w2p_ajax_date_format != 'undefined') ? w2p_ajax_date_format : "%Y-%m-%d";
       doc.on('click', "input.date", function () {
-        var tformat = $(this).data('w2p_date_format')
+        var tformat = $(this).data('w2p_date_format');
         var active = $(this).data('w2p_date');
         var format = (typeof tformat != 'undefined') ? tformat : date_format;
         if(active === undefined) {

applications/welcome/static/js/web2py.js

@@ -179,7 +179,7 @@
       });
       var datetime_format = (typeof w2p_ajax_datetime_format != 'undefined') ? w2p_ajax_datetime_format : "%Y-%m-%d %H:%M:%S";
       doc.on('click', "input.datetime", function () {
-        var tformat = $(this).data('w2p_datetime_format')
+        var tformat = $(this).data('w2p_datetime_format');
         var active = $(this).data('w2p_datetime');
         var format = (typeof tformat != 'undefined') ? tformat : datetime_format;
         if(active === undefined) {
@@ -196,7 +196,7 @@
       });
       var date_format = (typeof w2p_ajax_date_format != 'undefined') ? w2p_ajax_date_format : "%Y-%m-%d";
       doc.on('click', "input.date", function () {
-        var tformat = $(this).data('w2p_date_format')
+        var tformat = $(this).data('w2p_date_format');
         var active = $(this).data('w2p_date');
         var format = (typeof tformat != 'undefined') ? tformat : date_format;
         if(active === undefined) {

gluon/dal.py

@@ -234,12 +234,6 @@ except ImportError:
         except ImportError:
             simplejson = None
 
-try:
-    from gluon import validators
-    have_validators = True
-except (ImportError, SyntaxError):
-    have_validators = False
-
 LOGGER = logging.getLogger("web2py.dal")
 DEFAULT = lambda:0
 
@@ -6872,7 +6866,9 @@ def sqlhtml_validators(field):
     fieldtype
     """
     db = field.db
-    if not have_validators:
+    try:
+        from gluon import validators
+    except ImportError:
         return []
     field_type, field_length = field.type, field.length
     if isinstance(field_type, SQLCustomType):

gluon/tools.py

@@ -2414,9 +2414,9 @@ class Auth(object):
                 next = cas.logout_url(next)
 
         current.session.auth = None
-        current.session.flash = self.messages.logged_out
         if self.settings.renew_session_onlogout:
             current.session.renew(clear_session=not self.settings.keep_session_onlogout)
+        current.session.flash = self.messages.logged_out
         if not next is None:
             redirect(next)
 
@@ -5858,7 +5858,7 @@ class Wiki(object):
 class Config(object):
     def __init__(
         self,
-		filename,
+                filename,
         section,
         default_values={}
     ):

gluon/validators.py

@@ -2890,7 +2890,8 @@ class CRYPT(object):
                  key=None,
                  digest_alg='pbkdf2(1000,20,sha512)',
                  min_length=0,
-                 error_message='too short', salt=True):
+                 error_message='too short', salt=True,
+                 max_length=1024):
         """
         important, digest_alg='md5' is not the default hashing algorithm for
         web2py. This is only an example of usage of this function.
@@ -2901,10 +2902,12 @@ class CRYPT(object):
         self.key = key
         self.digest_alg = digest_alg
         self.min_length = min_length
+        self.max_length = max_length
         self.error_message = error_message
         self.salt = salt
 
     def __call__(self, value):
+        value = value and value[:self.max_length]
         if len(value) < self.min_length:
             return ('', translate(self.error_message))
         return (LazyCrypt(self, value), None)