summaryrefslogtreecommitdiff
path: root/src/models
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2011-10-09 04:00:06 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2011-10-09 04:00:06 -0400
commit38bb3a7c752199ee8f58e16bc784f48a6a600e08 (patch)
tree771b6d80fbf4fceb6f708ada6bb7b3838e593d66 /src/models
parentf72b9a7658cea71ee1edf4ae678a2c8043d9e5bf (diff)
parent0fd0403876aacecfde74fca0641530875f09200f (diff)
Merge branch 'master' into concurrent-editing
So, here's the deal: * The meat of [concurrent-editing]:Form.class got merged into [master]:DB.class * The string-generation stuff in [concurrent-editing]:Form.class didn't fit nicely anywhere anymore, so I got rid of it by makeing datatype explicit. * Users.class: declare datatypes explicitly in attrib() * index.html.php: use this new explicit data * style.scss: add a .small, which we can do because of the datatypes thing. Conflicts: src/controllers/Users.class.php
Diffstat (limited to 'src/models')
-rw-r--r--src/models/Auth.class.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/models/Auth.class.php b/src/models/Auth.class.php
index 25570bf..b51aef9 100644
--- a/src/models/Auth.class.php
+++ b/src/models/Auth.class.php
@@ -26,12 +26,12 @@ class Auth {
// Current rules:
// * Not in "$illegal_names"
// * Does not contain '.'
- // * Less <256 characters
- $illegal_names = array('', 'new', 'index');
+ // * Fewer than 256 characters
+ $illegal_names = array('', 'new', 'index', 'all');
return true
&& (!in_array($name, $illegal_names))
&& (strpos($name,'.')===false)
- && (strlen($name)<=256);
+ && (strlen($name)<256);
}
protected $db = null;