R-2.4.6

Added an ANY_OF validator

CHANGELOG

@@ -1,3 +1,10 @@
+## 2.4.6
+
+- better tests
+- new ANY_OF and IS_IPV6 validators
+- new custom save option
+- many small bug fixes
+
 ## 2.4.5
 
 - travis.ci integration (thanks Marc Abramowitz and Niphlod). Passes all tests (thanks Niplod).

Makefile

@@ -30,7 +30,7 @@ update:
 	echo "remember that pymysql was tweaked"
 src:
 	### Use semantic versioning
-	echo 'Version 2.4.5-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION
+	echo 'Version 2.4.6-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION
 	### rm -f all junk files
 	make clean
 	### clean up baisc apps
@@ -114,7 +114,6 @@ commit:
 	make src
 	echo '' > NEWINSTALL
 	hg commit -m "$(S)"
-	#bzr commit -m "$(S)"
 	git commit -a -m "$(S)"
 push:
 	hg push

NEWINSTALL

@@ -1 +0,0 @@
-

VERSION

@@ -1 +1 @@
-Version 2.4.5-stable+timestamp.2013.03.18.17.37.19
+Version 2.4.6-stable+timestamp.2013.04.06.12.11.51

app.example.yaml

@@ -21,6 +21,10 @@ default_expiration: "24h"   # for static files
 
 handlers:
 
+# Warning! Static mapping - below - isn't compatible with 
+# the parametric router's language logic. 
+# You cannot use them together.
+
 - url: /(?P<a>.+?)/static/(?P<b>.+)
   static_files: applications/\1/static/\2
   upload: applications/(.+?)/static/(.+)

applications/admin/controllers/appadmin.py

@@ -54,6 +54,10 @@ response.menu = [[T('design'), False, URL('admin', 'default', 'design',
 # ## auxiliary functions
 # ###########################################################
 
+if False and request.tickets_db:
+    from gluon.restricted import TicketStorage
+    ts = TicketStorage()
+    ts._get_table(request.tickets_db, ts.tablename, request.application)
 
 def get_databases(request):
     dbs = {}

applications/admin/controllers/default.py

@@ -27,7 +27,7 @@ from gluon.languages import (read_possible_languages, read_dict, write_dict,
                              read_plural_dict, write_plural_dict)
 
 
-if DEMO_MODE and request.function in ['change_password', 'pack', 'pack_plugin', 'upgrade_web2py', 'uninstall', 'cleanup', 'compile_app', 'remove_compiled_app', 'delete', 'delete_plugin', 'create_file', 'upload_file', 'update_languages', 'reload_routes', 'git_push', 'git_pull']:
+if DEMO_MODE and request.function in ['change_password', 'pack', 'pack_custom','pack_plugin', 'upgrade_web2py', 'uninstall', 'cleanup', 'compile_app', 'remove_compiled_app', 'delete', 'delete_plugin', 'create_file', 'upload_file', 'update_languages', 'reload_routes', 'git_push', 'git_pull']:
     session.flash = T('disabled in demo mode')
     redirect(URL('site'))
 
@@ -146,7 +146,7 @@ def check_version():
     elif new_version != True:
         return A(T('web2py is up to date'), _href=WEB2PY_URL)
     elif platform.system().lower() in ('windows', 'win32', 'win64') and os.path.exists("web2py.exe"):
-        return SPAN('You should upgrade to version %s.%s.%s' % version_number[:3])
+        return SPAN('You should upgrade to version %s' % version_number)
     else:
         return sp_button(URL('upgrade_web2py'), T('upgrade now to %s') % version_number.split('-')[0])
 
@@ -341,7 +341,6 @@ def pack():
         session.flash = T('internal error: %s' % e)
         redirect(URL('site'))
 
-
 def pack_plugin():
     app = get_app()
     if len(request.args) == 2:
@@ -356,6 +355,33 @@ def pack_plugin():
         session.flash = T('internal error')
         redirect(URL('plugin', args=request.args))
 
+def pack_custom():
+    app = get_app()
+    base = apath(app, r=request)
+    if request.post_vars.file:
+        files = request.post_vars.file
+        files = [files] if not isinstance(files,list) else files
+        fname = 'web2py.app.%s.w2p' % app
+        try:
+            filename = app_pack(app, request, raise_ex=True, filenames=files)
+        except Exception, e:
+            filename = None
+        if filename:
+            response.headers['Content-Type'] = 'application/w2p'
+            disposition = 'attachment; filename=%s' % fname
+            response.headers['Content-Disposition'] = disposition
+            return safe_read(filename, 'rb')
+        else:
+            session.flash = T('internal error: %s' % e)
+            redirect(URL(args=request.args))
+    def ignore(fs):
+        return [f for f in fs if not (
+                f[:1] in '#' or f.endswith('~') or f.endswith('.bak'))]
+    files = {}
+    for (r,d,f) in os.walk(base):
+        files[r] = {'folders':ignore(d),'files':ignore(f)}
+    return locals()
+
 
 def upgrade_web2py():
     dialog = FORM.confirm(T('Upgrade'),
@@ -682,7 +708,7 @@ def edit():
         cfilename = os.path.join(request.args[0], 'controllers',
                                  request.args[2] + '.py')
         if os.path.exists(apath(cfilename, r=request)):
-            edit_controller = URL('edit', args=[cfilename])
+            edit_controller = URL('edit',args=[cfilename.replace(os.sep, "/")])
             view = request.args[3].replace('.html', '')
             view_link = URL(request.args[0], request.args[2], view)
     elif filetype == 'python' and request.args[1] == 'controllers':

applications/admin/languages/cs.py

@@ -1,390 +1,480 @@
 # coding: utf8
 {
 '!langcode!': 'cs-cz',
-'!langname!': '?e?tina',
+'!langname!': 'čeština',
-'"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': 'Kolonka "Upravit" je nepovinn? v?raz, nap??klad "pole1=\'nov?hodnota\'". V?sledky datab?zov?ho JOINu nem??ete mazat ani upravovat.',
+'"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': 'Kolonka "Upravit" je nepovinný výraz, například "pole1=\'nováhodnota\'". Výsledky databázového JOINu nemůžete mazat ani upravovat.',
-'%%{Row} in Table': '%%{??dek} v tabulce',
+'"User Exception" debug mode. An error ticket could be issued!': '"User Exception" debug mode. An error ticket could be issued!',
-'%%{Row} selected': 'ozna?en?ch %%{??dek}',
+'%%{Row} in Table': '%%{řádek} v tabulce',
-'%s %%{row} deleted': '%s smazan?ch %%{z?znam}',
+'%%{Row} selected': 'označených %%{řádek}',
-'%s %%{row} updated': '%s upraven?ch %%{z?znam}',
+'%s %%{row} deleted': '%s smazaných %%{záznam}',
-'%s selected': '%s ozna?en?ch',
+'%s %%{row} updated': '%s upravených %%{záznam}',
+'%s selected': '%s označených',
 '%Y-%m-%d': '%d.%m.%Y',
 '%Y-%m-%d %H:%M:%S': '%d.%m.%Y %H:%M:%S',
-'(requires internet access)': '(vy?aduje p?ipojen? k internetu)',
+'(requires internet access)': '(vyžaduje připojení k internetu)',
-'(something like "it-it")': '(nap??klad "cs-cs")',
+'(requires internet access, experimental)': '(requires internet access, experimental)',
+'(something like "it-it")': '(například "cs-cs")',
 '@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(soubor **gluon/contrib/plural_rules/%s.py** nenalezen)',
-'@markmin\x01Searching: **%s** %%{file}': 'Hled?n?: **%s** %%{soubor}',
+'@markmin\x01Searching: **%s** %%{file}': 'Hledání: **%s** %%{soubor}',
 'About': 'O programu',
 'About application': 'O aplikaci',
-'Access Control': '??zen? p??stupu',
+'Access Control': 'Řízení přístupu',
-'Add breakpoint': 'P?idat bod p?eru?en?',
+'Add breakpoint': 'Přidat bod přerušení',
-'Additional code for your application': 'Dal?? k?d pro Va?i aplikaci',
+'Additional code for your application': 'Další kód pro Vaši aplikaci',
-'Admin language': 'jazyk rozhran?',
+'Admin design page': 'Admin design page',
-'Administrative interface': 'pro administr?torsk? rozhran? klikn?te sem',
+'Admin language': 'jazyk rozhraní',
-'Administrative Interface': 'Administr?torsk? rozhran?',
+'Administrative interface': 'pro administrátorské rozhraní klikněte sem',
-'administrative interface': 'rozhran? pro spr?vu',
+'Administrative Interface': 'Administrátorské rozhraní',
-'Administrator Password:': 'Administr?torsk? heslo:',
+'administrative interface': 'rozhraní pro správu',
+'Administrator Password:': 'Administrátorské heslo:',
 'Ajax Recipes': 'Recepty s ajaxem',
-'and rename it:': 'a p?ejmenovat na:',
+'An error occured, please %s the page': 'An error occured, please %s the page',
+'and rename it:': 'a přejmenovat na:',
 'appadmin': 'appadmin',
-'appadmin is disabled because insecure channel': 'appadmin je zak?zan? bez zabezpe?en?ho spojen?',
+'appadmin is disabled because insecure channel': 'appadmin je zakázaná bez zabezpečeného spojení',
-'application "%s" uninstalled': 'application "%s" odinstalov?na',
+'Application': 'Application',
-'application compiled': 'aplikace zkompilov?na',
+'application "%s" uninstalled': 'application "%s" odinstalována',
-'Application name:': 'N?zev aplikace:',
+'application compiled': 'aplikace zkompilována',
-'are not used': 'nepou?ita',
+'Application name:': 'Název aplikace:',
-'are not used yet': 'je?t? nepou?ita',
+'are not used': 'nepoužita',
+'are not used yet': 'ještě nepoužita',
 'Are you sure you want to delete this object?': 'Opravdu chcete odstranit tento objekt?',
 'Are you sure you want to uninstall application "%s"?': 'Opravdu chcete odinstalovat aplikaci "%s"?',
-'Available Databases and Tables': 'Dostupn? datab?ze a tabulky',
+'arguments': 'arguments',
-'back': 'zp?t',
+'at char %s': 'at char %s',
+'at line %s': 'at line %s',
+'ATTENTION:': 'ATTENTION:',
+'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.',
+'Available Databases and Tables': 'Dostupné databáze a tabulky',
+'back': 'zpět',
+'Back to wizard': 'Back to wizard',
 'Basics': 'Basics',
-'Begin': 'Za??t',
+'Begin': 'Začít',
-'breakpoint': 'bod p?eru?en?',
+'breakpoint': 'bod přerušení',
-'Breakpoints': 'Body p?eru?en?',
+'Breakpoints': 'Body přerušení',
-'breakpoints': 'body p?eru?en?',
+'breakpoints': 'body přerušení',
 'Buy this book': 'Koupit web2py knihu',
 'Cache': 'Cache',
 'cache': 'cache',
-'Cache Keys': 'Kl??e cache',
+'Cache Keys': 'Klíče cache',
-'cache, errors and sessions cleaned': 'cache, chyby a relace byly pro?i?t?ny',
+'cache, errors and sessions cleaned': 'cache, chyby a relace byly pročištěny',
-'can be a git repo': 'm??e to b?t git repo',
+'can be a git repo': 'může to být git repo',
 'Cancel': 'Storno',
-'Cannot be empty': 'Nem??e b?t pr?zdn?',
+'Cannot be empty': 'Nemůže být prázdné',
-'Change admin password': 'Zm?nit heslo pro str?vu aplikac?',
+'Change Admin Password': 'Změnit heslo pro správu',
-'Change password': 'Zm?na hesla',
+'Change admin password': 'Změnit heslo pro správu aplikací',
-'check all': 'v?e ozna?it',
+'Change password': 'Změna hesla',
+'check all': 'vše označit',
 'Check for upgrades': 'Zkusit aktualizovat',
-'Check to delete': 'Ozna?it ke smaz?n?',
+'Check to delete': 'Označit ke smazání',
-'Check to delete:': 'Ozna?it ke smaz?n?:',
+'Check to delete:': 'Označit ke smazání:',
-'Checking for upgrades...': 'Zji??uji, zda jsou k dispozici aktualizace...',
+'Checking for upgrades...': 'Zjišťuji, zda jsou k dispozici aktualizace...',
-'Clean': 'Pro?istit',
+'Clean': 'Pročistit',
 'Clear CACHE?': 'Vymazat CACHE?',
 'Clear DISK': 'Vymazat DISK',
 'Clear RAM': 'Vymazat RAM',
-'Click row to expand traceback': 'Pro rozbalen? stopy, klikn?te na ??dek',
+'Click row to expand traceback': 'Pro rozbalení stopy, klikněte na řádek',
-'Click row to view a ticket': 'Pro zobrazen? chyby (ticketu), klikn?te na ??dku...',
+'Click row to view a ticket': 'Pro zobrazení chyby (ticketu), klikněte na řádku...',
 'Client IP': 'IP adresa klienta',
-'collapse/expand all': 'v?e sbalit/rozbalit',
+'code': 'code',
+'Code listing': 'Code listing',
+'collapse/expand all': 'vše sbalit/rozbalit',
 'Community': 'Komunita',
 'Compile': 'Zkompilovat',
-'compiled application removed': 'zkompilovan? aplikace smaz?na',
+'compiled application removed': 'zkompilovaná aplikace smazána',
-'Components and Plugins': 'Komponenty a z?suvn? moduly',
+'Components and Plugins': 'Komponenty a zásuvné moduly',
-'Condition': 'Podm?nka',
+'Condition': 'Podmínka',
-'Controller': 'Kontrol?r (Controller)',
+'continue': 'continue',
-'Controllers': 'Kontrol?ry',
+'Controller': 'Kontrolér (Controller)',
-'controllers': 'kontrol?ry',
+'Controllers': 'Kontroléry',
+'controllers': 'kontroléry',
 'Copyright': 'Copyright',
-'Count': 'Po?et',
+'Count': 'Počet',
-'Create': 'Vytvo?it',
+'Create': 'Vytvořit',
-'create file with filename:': 'vytvo?it soubor s n?zvem:',
+'create file with filename:': 'vytvořit soubor s názvem:',
-'created by': 'vytvo?il',
+'created by': 'vytvořil',
-'Created By': 'Vytvo?eno - k?m',
+'Created By': 'Vytvořeno - kým',
-'Created On': 'Vytvo?eno - kdy',
+'Created On': 'Vytvořeno - kdy',
 'crontab': 'crontab',
-'Current request': 'Aktu?ln? po?adavek',
+'Current request': 'Aktuální požadavek',
-'Current response': 'Aktu?ln? odpov??',
+'Current response': 'Aktuální odpověď',
-'Current session': 'Aktu?ln? relace',
+'Current session': 'Aktuální relace',
-'currently running': 'pr?v? b???',
+'currently running': 'právě běží',
-'currently saved or': 'ulo?eno nebo',
+'currently saved or': 'uloženo nebo',
-'customize me!': 'upravte m?!',
+'customize me!': 'upravte mě!',
-'data uploaded': 'data nahr?na',
+'data uploaded': 'data nahrána',
-'Database': 'Rozhran? datab?ze',
+'Database': 'Rozhraní databáze',
-'Database %s select': 'datab?ze %s v?b?r',
+'Database %s select': 'databáze %s výběr',
-'database administration': 'spr?va datab?ze',
+'Database administration': 'Database administration',
-'Date and Time': 'Datum a ?as',
+'database administration': 'správa databáze',
+'Date and Time': 'Datum a čas',
 'day': 'den',
 'db': 'db',
-'DB Model': 'Datab?zov? model',
+'DB Model': 'Databázový model',
-'Debug': 'Lad?n?',
+'Debug': 'Ladění',
+'defines tables': 'defines tables',
 'Delete': 'Smazat',
 'delete': 'smazat',
-'delete all checked': 'smazat v?e ozna?en?',
+'delete all checked': 'smazat vše označené',
-'Delete this file (you will be asked to confirm deletion)': 'Smazat tento soubor (budete po??d?n o potvrzen? maz?n?)',
+'delete plugin': 'delete plugin',
+'Delete this file (you will be asked to confirm deletion)': 'Smazat tento soubor (budete požádán o potvrzení mazání)',
 'Delete:': 'Smazat:',
-'deleted after first hit': 'smazat po prvn?m dosa?en?',
+'deleted after first hit': 'smazat po prvním dosažení',
 'Demo': 'Demo',
-'Deploy': 'Nahr?t',
+'Deploy': 'Nahrát',
-'Deploy on Google App Engine': 'Nahr?t na Google App Engine',
+'Deploy on Google App Engine': 'Nahrát na Google App Engine',
-'Deploy to OpenShift': 'Nahr?t na OpenShift',
+'Deploy to OpenShift': 'Nahrát na OpenShift',
 'Deployment Recipes': 'Postupy pro deployment',
 'Description': 'Popis',
-'design': 'n?vrh',
+'design': 'návrh',
-'direction: ltr': 'direction: ltr',
+'Detailed traceback description': 'Podrobný výpis prostředí',
+'details': 'podrobnosti',
+'direction: ltr': 'směr: ltr',
 'Disable': 'Zablokovat',
 'DISK': 'DISK',
-'Disk Cache Keys': 'Kl??e diskov? cache',
+'Disk Cache Keys': 'Klíče diskové cache',
-'Disk Cleared': 'Disk smaz?n',
+'Disk Cleared': 'Disk smazán',
 'docs': 'dokumentace',
 'Documentation': 'Dokumentace',
-"Don't know what to do?": 'Nev?te kudy kam?',
+"Don't know what to do?": 'Nevíte kudy kam?',
 'done!': 'hotovo!',
-'Download': 'St?hnout',
+'Download': 'Stáhnout',
-'download layouts': 'st?hnout moduly rozvr?en? str?nky',
+'download layouts': 'stáhnout moduly rozvržení stránky',
-'download plugins': 'st?hnout z?suvn? moduly',
+'download plugins': 'stáhnout zásuvné moduly',
 'E-mail': 'E-mail',
 'Edit': 'Upravit',
 'edit all': 'edit all',
-'Edit application': 'Spr?va aplikace',
+'Edit application': 'Správa aplikace',
-'Edit current record': 'Upravit aktu?ln? z?znam',
+'edit controller': 'edit controller',
+'Edit current record': 'Upravit aktuální záznam',
 'Edit Profile': 'Upravit profil',
-'Editing file "%s"': '?prava souboru "%s"',
+'edit views:': 'upravit pohled:',
-'Editing Language file': '?prava jazykov?ho souboru',
+'Editing file "%s"': 'Úprava souboru "%s"',
+'Editing Language file': 'Úprava jazykového souboru',
+'Editing Plural Forms File': 'Editing Plural Forms File',
 'Email and SMS': 'Email a SMS',
 'Enable': 'Odblokovat',
-'enter a number between %(min)g and %(max)g': 'zadejte ??slo mezi %(min)g a %(max)g',
+'enter a number between %(min)g and %(max)g': 'zadejte číslo mezi %(min)g a %(max)g',
-'enter an integer between %(min)g and %(max)g': 'zadejte cel? ??slo mezi %(min)g a %(max)g',
+'enter an integer between %(min)g and %(max)g': 'zadejte celé číslo mezi %(min)g a %(max)g',
 'Error': 'Chyba',
-'Error logs for "%(app)s"': 'Seznam v?skytu chyb pro aplikaci "%(app)s"',
+'Error logs for "%(app)s"': 'Seznam výskytu chyb pro aplikaci "%(app)s"',
+'Error snapshot': 'Snapshot chyby',
+'Error ticket': 'Ticket chyby',
 'Errors': 'Chyby',
+'Exception %(extype)s: %(exvalue)s': 'Exception %(extype)s: %(exvalue)s',
+'Exception %s': 'Exception %s',
+'Exception instance attributes': 'Prvky instance výjimky',
+'Expand Abbreviation': 'Expand Abbreviation',
 'export as csv file': 'exportovat do .csv souboru',
 'exposes': 'vystavuje',
-'extends': 'roz?i?uje',
+'exposes:': 'vystavuje funkce:',
-'FAQ': '?asto kladen? dotazy',
+'extends': 'rozšiřuje',
+'failed to compile file because:': 'soubor se nepodařilo zkompilovat, protože:',
+'FAQ': 'Často kladené dotazy',
 'File': 'Soubor',
 'file': 'soubor',
-'file saved on %(time)s': 'soubor ulo?en %(time)s',
+'file "%(filename)s" created': 'file "%(filename)s" created',
-'Filename': 'N?zev souboru',
+'file saved on %(time)s': 'soubor uložen %(time)s',
+'file saved on %s': 'soubor uložen %s',
+'Filename': 'Název souboru',
 'filter': 'filtr',
-'Find Next': 'Naj?t dal??',
+'Find Next': 'Najít další',
-'Find Previous': 'Naj?t p?edchoz?',
+'Find Previous': 'Najít předchozí',
-'First name': 'K?estn? jm?no',
+'First name': 'Křestní jméno',
-'Forgot username?': 'Zapomn?l jste svoje p?ihla?ovac? jm?no?',
+'Forgot username?': 'Zapomněl jste svoje přihlašovací jméno?',
-'forgot username?': 'zapomn?l jste svoje p?ihla?ovac? jm?no?',
+'forgot username?': 'zapomněl jste svoje přihlašovací jméno?',
-'Forms and Validators': 'Formul??e a valid?tory',
+'Forms and Validators': 'Formuláře a validátory',
+'Frames': 'Frames',
 'Free Applications': 'Aplikace zdarma',
-'Generate': 'Vytvo?it',
+'Functions with no doctests will result in [passed] tests.': 'Functions with no doctests will result in [passed] tests.',
-'Get from URL:': 'St?hnout z internetu:',
+'Generate': 'Vytvořit',
+'Get from URL:': 'Stáhnout z internetu:',
 'Git Pull': 'Git Pull',
 'Git Push': 'Git Push',
-'Globals##debug': 'Glob?ln? prom?nn?',
+'Globals##debug': 'Globální proměnné',
 'go!': 'OK!',
-'Group %(group_id)s created': 'Skupina %(group_id)s vytvo?ena',
+'Goto': 'Goto',
+'graph model': 'graph model',
+'Group %(group_id)s created': 'Skupina %(group_id)s vytvořena',
 'Group ID': 'ID skupiny',
 'Groups': 'Skupiny',
-'Hello World': 'Ahoj sv?te',
+'Hello World': 'Ahoj světe',
-'Help': 'N?pov?da',
+'Help': 'Nápověda',
-'Hide/Show Translated strings': 'Skr?t/Zobrazit p?elo?en? texty',
+'Hide/Show Translated strings': 'Skrýt/Zobrazit přeložené texty',
-'Hits': 'Kolikr?t dosa?eno',
+'Hits': 'Kolikrát dosaženo',
-'Home': 'Domovsk? str?nka',
+'Home': 'Domovská stránka',
-'honored only if the expression evaluates to true': 'br?t v potaz jen kdy? se tato podm?nka vyhodnot? kladn?',
+'honored only if the expression evaluates to true': 'brát v potaz jen když se tato podmínka vyhodnotí kladně',
-'How did you get here?': 'Jak jste se sem vlastn? dostal?',
+'How did you get here?': 'Jak jste se sem vlastně dostal?',
+'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
 'import': 'import',
 'Import/Export': 'Import/Export',
 'includes': 'zahrnuje',
 'Index': 'Index',
-'insert new': 'vlo?it nov? z?znam ',
+'insert new': 'vložit nový záznam ',
-'insert new %s': 'vlo?it nov? z?znam %s',
+'insert new %s': 'vložit nový záznam %s',
+'inspect attributes': 'inspect attributes',
 'Install': 'Instalovat',
-'Installed applications': 'Nainstalovan? aplikace',
+'Installed applications': 'Nainstalované aplikace',
-'Internal State': 'Vnit?n? stav',
+'Interaction at %s line %s': 'Interakce v %s, na řádce %s',
-'Introduction': '?vod',
+'Interactive console': 'Interaktivní příkazová řádka',
-'Invalid email': 'Neplatn? email',
+'Internal State': 'Vnitřní stav',
-'Invalid password': 'Nespr?vn? heslo',
+'Introduction': 'Úvod',
-'invalid password.': 'neplatn? heslo',
+'Invalid email': 'Neplatný email',
-'Invalid Query': 'Neplatn? dotaz',
+'Invalid password': 'Nesprávné heslo',
-'invalid request': 'Neplatn? po?adavek',
+'invalid password.': 'neplatné heslo',
-'Is Active': 'Je aktivn?',
+'Invalid Query': 'Neplatný dotaz',
+'invalid request': 'Neplatný požadavek',
+'Is Active': 'Je aktivní',
 'It is %s %%{day} today.': 'Dnes je to %s %%{den}.',
-'Key': 'Kl??',
+'Key': 'Klíč',
-'Key bindings': 'Vazby kl???',
+'Key bindings': 'Vazby klíčů',
+'Key bindings for ZenCoding Plugin': 'Key bindings for ZenCoding Plugin',
 'languages': 'jazyky',
 'Languages': 'Jazyky',
-'Last name': 'P??jmen?',
+'Last name': 'Příjmení',
-'Last saved on:': 'Naposledy ulo?eno:',
+'Last saved on:': 'Naposledy uloženo:',
-'Layout': 'Rozvr?en? str?nky (layout)',
+'Layout': 'Rozvržení stránky (layout)',
-'Layout Plugins': 'Moduly rozvr?en? str?nky (Layout Plugins)',
+'Layout Plugins': 'Moduly rozvržení stránky (Layout Plugins)',
-'Layouts': 'Rozvr?en? str?nek',
+'Layouts': 'Rozvržení stránek',
 'License for': 'Licence pro',
-'Line number': '??slo ??dku',
+'Line number': 'Číslo řádku',
-'LineNo': '?.??dku',
+'LineNo': 'Č.řádku',
 'Live Chat': 'Online pokec',
-'loading...': 'nahr?v?m...',
+'loading...': 'nahrávám...',
-'Locals##debug': 'Lok?ln? prom?nn?',
+'locals': 'locals',
-'Logged in': 'P?ihl??en? prob?hlo ?sp??n?',
+'Locals##debug': 'Lokální proměnné',
-'Logged out': 'Odhl??en? prob?hlo ?sp??n?',
+'Logged in': 'Přihlášení proběhlo úspěšně',
-'Login': 'P?ihl?sit se',
+'Logged out': 'Odhlášení proběhlo úspěšně',
-'login': 'p?ihl?sit se',
+'Login': 'Přihlásit se',
-'Login to the Administrative Interface': 'P?ihl?sit se do Spr?vce aplikac?',
+'login': 'přihlásit se',
-'logout': 'odhl?sit se',
+'Login to the Administrative Interface': 'Přihlásit se do Správce aplikací',
-'Logout': 'Odhl?sit se',
+'logout': 'odhlásit se',
-'Lost Password': 'Zapomn?l jste heslo',
+'Logout': 'Odhlásit se',
-'Lost password?': 'Zapomn?l jste heslo?',
+'Lost Password': 'Zapomněl jste heslo',
-'lost password?': 'zapomn?l jste heslo?',
+'Lost password?': 'Zapomněl jste heslo?',
+'lost password?': 'zapomněl jste heslo?',
+'Manage': 'Manage',
 'Manage Cache': 'Manage Cache',
-'Menu Model': 'Model rozbalovac? nab?dky',
+'Menu Model': 'Model rozbalovací nabídky',
 'Models': 'Modely',
 'models': 'modely',
-'Modified By': 'Zm?n?no - k?m',
+'Modified By': 'Změněno - kým',
-'Modified On': 'Zm?n?no - kdy',
+'Modified On': 'Změněno - kdy',
 'Modules': 'Moduly',
 'modules': 'moduly',
-'My Sites': 'Spr?va aplikac?',
+'My Sites': 'Správa aplikací',
-'Name': 'Jm?no',
+'Name': 'Jméno',
-'New Application Wizard': 'Nov? pr?vodce aplikac?',
+'new application "%s" created': 'nová aplikace "%s" vytvořena',
-'New application wizard': 'Nov? pr?vodce aplikac?',
+'New Application Wizard': 'Nový průvodce aplikací',
-'New password': 'Nov? heslo',
+'New application wizard': 'Nový průvodce aplikací',
-'New Record': 'Nov? z?znam',
+'New password': 'Nové heslo',
-'new record inserted': 'nov? z?znam byl zalo?en',
+'New Record': 'Nový záznam',
-'New simple application': 'Vytvo?it primitivn? aplikaci',
+'new record inserted': 'nový záznam byl založen',
-'next 100 rows': 'dal??ch 100 ??dk?',
+'New simple application': 'Vytvořit primitivní aplikaci',
-'No databases in this application': 'V t?to aplik?ci nejsou ??dn? datab?ze',
+'next': 'next',
-'No Interaction yet': 'Je?t? ??dn? interakce nenastala',
+'next 100 rows': 'dalších 100 řádků',
-'No ticket_storage.txt found under /private folder': 'Soubor ticket_storage.txt v adres??i /private nenalezen',
+'No databases in this application': 'V této aplikaci nejsou žádné databáze',
-'Object or table name': 'Objekt ?i tabulka',
+'No Interaction yet': 'Ještě žádná interakce nenastala',
-'Old password': 'P?vodn? heslo',
+'No ticket_storage.txt found under /private folder': 'Soubor ticket_storage.txt v adresáři /private nenalezen',
-'online designer': 'online n?vrh??',
+'Object or table name': 'Objekt či tabulka',
-'Online examples': 'P??klady online',
+'Old password': 'Původní heslo',
+'online designer': 'online návrhář',
+'Online examples': 'Příklady online',
+'Open new app in new window': 'Open new app in new window',
+'or alternatively': 'or alternatively',
+'Or Get from URL:': 'Or Get from URL:',
 'or import from csv file': 'nebo importovat z .csv souboru',
-'Origin': 'P?vod',
+'Origin': 'Původ',
-'Original/Translation': 'Origin?l/P?eklad',
+'Original/Translation': 'Originál/Překlad',
-'Other Plugins': 'Ostatn? moduly',
+'Other Plugins': 'Ostatní moduly',
-'Other Recipes': 'Ostatn? z?suvn? moduly',
+'Other Recipes': 'Ostatní zásuvné moduly',
-'Overview': 'P?ehled',
+'Overview': 'Přehled',
-'Overwrite installed app': 'P?epsat instalovanou aplikaci',
+'Overwrite installed app': 'Přepsat instalovanou aplikaci',
 'Pack all': 'Zabalit',
-'Pack compiled': 'Zabalit zkompilovan?',
+'Pack compiled': 'Zabalit zkompilované',
+'pack plugin': 'pack plugin',
 'password': 'heslo',
 'Password': 'Heslo',
-"Password fields don't match": 'Hesla se neshoduj?',
+"Password fields don't match": 'Hesla se neshodují',
-'Please': 'Pros?m',
+'Peeking at file': 'Peeking at file',
-'plugins': 'z?suvn? moduly',
+'Please': 'Prosím',
-'Plugins': 'Z?suvn? moduly',
+'Plugin "%s" in application': 'Plugin "%s" in application',
-'Plural-Forms:': 'Mno?n? ??sla:',
+'plugins': 'zásuvné moduly',
-'Powered by': 'Poh?n?no',
+'Plugins': 'Zásuvné moduly',
-'Preface': 'P?edmluva',
+'Plural Form #%s': 'Plural Form #%s',
-'previous 100 rows': 'p?edchoz?ch 100 ??dk?',
+'Plural-Forms:': 'Množná čísla:',
-'Private files': 'Soukrom? soubory',
+'Powered by': 'Poháněno',
-'private files': 'soukrom? soubory',
+'Preface': 'Předmluva',
+'previous 100 rows': 'předchozích 100 řádků',
+'Private files': 'Soukromé soubory',
+'private files': 'soukromé soubory',
 'profile': 'profil',
-'Project Progress': 'V?voj projektu',
+'Project Progress': 'Vývoj projektu',
 'Python': 'Python',
 'Query:': 'Dotaz:',
-'Quick Examples': 'Kr?tk? p??klady',
+'Quick Examples': 'Krátké příklady',
 'RAM': 'RAM',
-'RAM Cache Keys': 'Kl??e RAM Cache',
+'RAM Cache Keys': 'Klíče RAM Cache',
-'Ram Cleared': 'RAM smaz?na',
+'Ram Cleared': 'RAM smazána',
-'Readme': 'N?pov?da',
+'Readme': 'Nápověda',
 'Recipes': 'Postupy jak na to',
-'Record': 'Z?znam',
+'Record': 'Záznam',
-'record does not exist': 'z?znam neexistuje',
+'record does not exist': 'záznam neexistuje',
-'Record ID': 'ID z?znamu',
+'Record ID': 'ID záznamu',
-'Record id': 'id z?znamu',
+'Record id': 'id záznamu',
 'refresh': 'obnovte',
 'register': 'registrovat',
 'Register': 'Zaregistrovat se',
-'Registration identifier': 'Registra?n? identifik?tor',
+'Registration identifier': 'Registrační identifikátor',
-'Registration key': 'Registra?n? kl??',
+'Registration key': 'Registrační klíč',
-'Reload routes': 'Znovu nahr?t cesty',
+'reload': 'reload',
-'Remember me (for 30 days)': 'Zapamatovat na 30 dn?',
+'Reload routes': 'Znovu nahrát cesty',
-'Remove compiled': 'Odstranit zkompilovan?',
+'Remember me (for 30 days)': 'Zapamatovat na 30 dní',
-'Removed Breakpoint on %s at line %s': 'Bod p?eru?en? smaz?n - soubor %s na ??dce %s',
+'Remove compiled': 'Odstranit zkompilované',
-'Replace': 'Zam?nit',
+'Removed Breakpoint on %s at line %s': 'Bod přerušení smazán - soubor %s na řádce %s',
-'Replace All': 'Zam?nit v?e',
+'Replace': 'Zaměnit',
-'Reset Password key': 'Reset registra?n?ho kl??e',
+'Replace All': 'Zaměnit vše',
+'request': 'request',
+'Reset Password key': 'Reset registračního klíče',
+'response': 'response',
 'restart': 'restart',
 'restore': 'obnovit',
-'Retrieve username': 'Z?skat p?ihla?ovac? jm?no',
+'Retrieve username': 'Získat přihlašovací jméno',
-'revert': 'vr?tit se k p?vodn?mu',
+'return': 'return',
+'revert': 'vrátit se k původnímu',
 'Role': 'Role',
-'Rows in Table': 'Z?znamy v tabulce',
+'Rows in Table': 'Záznamy v tabulce',
-'Rows selected': 'Z?znam? zobrazeno',
+'Rows selected': 'Záznamů zobrazeno',
-'rules are not defined': 'pravidla nejsou definov?na',
+'rules are not defined': 'pravidla nejsou definována',
-"Run tests in this file (to run all files, you may also use the button labelled 'test')": "Spust? testy v tomto souboru (ke spu?t?n? v?ech test?, pou?ijte tla??tko 'test')",
+"Run tests in this file (to run all files, you may also use the button labelled 'test')": "Spustí testy v tomto souboru (ke spuštění všech testů, použijte tlačítko 'test')",
-'Running on %s': 'B??? na %s',
+'Running on %s': 'Běží na %s',
-'Save': 'Ulo?it',
+'Save': 'Uložit',
-'Save via Ajax': 'Ulo?it pomoc? Ajaxu',
+'Save file:': 'Save file:',
-'Saved file hash:': 'hash ulo?en?ho souboru:',
+'Save via Ajax': 'Uložit pomocí Ajaxu',
+'Saved file hash:': 'hash uloženého souboru:',
 'Semantic': 'Modul semantic',
-'Services': 'Slu?by',
+'Services': 'Služby',
-'Set Breakpoint on %s at line %s: %s': 'Bod p?eru?en? nastaven v souboru %s na ??dce %s: %s',
+'session': 'session',
-'shell': 'p??kazov? ??dka',
+'session expired': 'session expired',
-'Site': 'Spr?va aplikac?',
+'Set Breakpoint on %s at line %s: %s': 'Bod přerušení nastaven v souboru %s na řádce %s: %s',
+'shell': 'příkazová řádka',
+'Singular Form': 'Singular Form',
+'Site': 'Správa aplikací',
 'Size of cache:': 'Velikost cache:',
 'skip to generate': 'skip to generate',
-'Sorry, could not find mercurial installed': 'Bohu?el mercurial nen? nainstalov?n.',
+'Sorry, could not find mercurial installed': 'Bohužel mercurial není nainstalován.',
-'Start a new app': 'Vytvo?it novou aplikaci',
+'Start a new app': 'Vytvořit novou aplikaci',
-'Start searching': 'Za??t hled?n?',
+'Start searching': 'Začít hledání',
-'Start wizard': 'Spustit pr?vodce',
+'Start wizard': 'Spustit průvodce',
 'state': 'stav',
-'static': 'statick? soubory',
+'Static': 'Static',
-'Static files': 'Statick? soubory',
+'static': 'statické soubory',
+'Static files': 'Statické soubory',
 'Statistics': 'Statistika',
 'Step': 'Step',
+'step': 'step',
+'stop': 'stop',
 'Stylesheet': 'CSS styly',
 'submit': 'odeslat',
 'Submit': 'Odeslat',
-'successful': '?sp??n?',
+'successful': 'úspěšně',
 'Support': 'Podpora',
 'Sure you want to delete this object?': 'Opravdu chcete smazat tento objekt?',
 'Table': 'tabulka',
-'Table name': 'N?zev tabulky',
+'Table name': 'Název tabulky',
-'Temporary': 'Do?asn?',
+'Temporary': 'Dočasný',
 'test': 'test',
-'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': '"Dotaz" je podm?nka, nap??klad "db.tabulka1.pole1==\'hodnota\'". Podm?nka "db.tabulka1.pole1==db.tabulka2.pole2" pak vytvo?? SQL JOIN.',
+'Testing application': 'Testing application',
-'The application logic, each URL path is mapped in one exposed function in the controller': 'Logika aplikace: ka?d? URL je mapov?na na funkci vystavovanou kontrol?rem.',
+'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': '"Dotaz" je podmínka, například "db.tabulka1.pole1==\'hodnota\'". Podmínka "db.tabulka1.pole1==db.tabulka2.pole2" pak vytvoří SQL JOIN.',
-'The Core': 'J?dro (The Core)',
+'The application logic, each URL path is mapped in one exposed function in the controller': 'Logika aplikace: každá URL je mapována na funkci vystavovanou kontrolérem.',
-'The data representation, define database tables and sets': 'Reprezentace dat: definovat tabulky datab?ze a z?znamy',
+'The Core': 'Jádro (The Core)',
-'The output of the file is a dictionary that was rendered by the view %s': 'V?stup ze souboru je slovn?k, kter? se zobrazil v pohledu %s.',
+'The data representation, define database tables and sets': 'Reprezentace dat: definovat tabulky databáze a záznamy',
-'The presentations layer, views are also known as templates': 'Prezenta?n? vrstva: pohledy ?i templaty (?ablony)',
+'The output of the file is a dictionary that was rendered by the view %s': 'Výstup ze souboru je slovník, který se zobrazil v pohledu %s.',
+'The presentations layer, views are also known as templates': 'Prezentační vrstva: pohledy či templaty (šablony)',
 'The Views': 'Pohledy (The Views)',
-'There are no plugins': '??dn? moduly nejsou instalov?ny.',
+'There are no controllers': 'There are no controllers',
-'There are no private files': '??dn? soukrom? soubory neexistuj?.',
+'There are no modules': 'There are no modules',
-'These files are not served, they are only available from within your app': 'Tyto soubory jsou klient?m nep??stupn?. K dispozici jsou pouze v r?mci aplikace.',
+'There are no plugins': 'Žádné moduly nejsou instalovány.',
-'These files are served without processing, your images go here': 'Tyto soubory jsou serv?rov?ny bez p??davn? logiky, sem pat?? nap?. obr?zky.',
+'There are no private files': 'Žádné soukromé soubory neexistují.',
+'There are no static files': 'There are no static files',
+'There are no translators, only default language is supported': 'There are no translators, only default language is supported',
+'There are no views': 'There are no views',
+'These files are not served, they are only available from within your app': 'Tyto soubory jsou klientům nepřístupné. K dispozici jsou pouze v rámci aplikace.',
+'These files are served without processing, your images go here': 'Tyto soubory jsou servírovány bez přídavné logiky, sem patří např. obrázky.',
 'This App': 'Tato aplikace',
 'This is a copy of the scaffolding application': 'Toto je kopie aplikace skelet.',
-'this page to see if a breakpoint was hit and debug interaction is required.': 'tuto str?nku, abyste uvid?li, zda se dos?hlo bodu p?eru?en?.',
+'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
+'This is the %(filename)s template': 'This is the %(filename)s template',
+'this page to see if a breakpoint was hit and debug interaction is required.': 'tuto stránku, abyste uviděli, zda se dosáhlo bodu přerušení.',
 'Ticket': 'Ticket',
-'Time in Cache (h:m:s)': '?as v Cache (h:m:s)',
+'Ticket ID': 'Ticket ID',
-'Timestamp': '?asov? raz?tko',
+'Time in Cache (h:m:s)': 'Čas v Cache (h:m:s)',
-'to  previous version.': 'k p?edchoz? verzi.',
+'Timestamp': 'Časové razítko',
-'To create a plugin, name a file/folder plugin_[name]': 'Z?suvn? modul vytvo??te tak, ?e pojmenujete soubor/adres?? plugin_[jm?no modulu]',
+'to  previous version.': 'k předchozí verzi.',
-'To emulate a breakpoint programatically, write:': 'K nastaven? bodu p?eru?en? v k?du programu, napi?te:',
+'To create a plugin, name a file/folder plugin_[name]': 'Zásuvný modul vytvoříte tak, že pojmenujete soubor/adresář plugin_[jméno modulu]',
-'to use the debugger!': ', abyste mohli lad?c? program pou??vat!',
+'To emulate a breakpoint programatically, write:': 'K nastavení bodu přerušení v kódu programu, napište:',
-'toggle breakpoint': 'vyp./zap. bod p?eru?en?',
+'to use the debugger!': ', abyste mohli ladící program používat!',
-'Toggle Fullscreen': 'Na celou obrazovku a zp?t',
+'toggle breakpoint': 'vyp./zap. bod přerušení',
-'too short': 'P??li? kr?tk?',
+'Toggle Fullscreen': 'Na celou obrazovku a zpět',
-'Translation strings for the application': 'P?eklad text? pro aplikaci',
+'too short': 'Příliš krátké',
-'Try the mobile interface': 'Zkuste rozhran? pro mobiln? za??zen?',
+'Traceback': 'Traceback',
+'Translation strings for the application': 'Překlad textů pro aplikaci',
+'try something like': 'try something like',
+'Try the mobile interface': 'Zkuste rozhraní pro mobilní zařízení',
+'try view': 'try view',
 'Twitter': 'Twitter',
-'unable to parse csv file': 'csv soubor ned? sa zpracovat',
+'Type python statement in here and hit Return (Enter) to execute it.': 'Type python statement in here and hit Return (Enter) to execute it.',
-'uncheck all': 'v?e odzna?it',
+'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
+'Unable to check for upgrades': 'Unable to check for upgrades',
+'unable to parse csv file': 'csv soubor nedá sa zpracovat',
+'uncheck all': 'vše odznačit',
 'Uninstall': 'Odinstalovat',
 'update': 'aktualizovat',
-'update all languages': 'aktualizovat v?echny jazyky',
+'update all languages': 'aktualizovat všechny jazyky',
 'Update:': 'Upravit:',
-'upload': 'nahr?t',
+'Upgrade': 'Upgrade',
-'Upload a package:': 'Nahr?t bal?k:',
+'upgrade now': 'upgrade now',
-'Upload and install packed application': 'Nahr?t a instalovat zabalenou aplikaci',
+'upgrade now to %s': 'upgrade now to %s',
-'upload file:': 'nahr?t soubor:',
+'upload': 'nahrát',
-'upload plugin file:': 'nahr?t soubor modulu:',
+'Upload': 'Upload',
-'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Pou?ijte (...)&(...) pro AND, (...)|(...) pro OR a ~(...) pro NOT pro sestaven? slo?it?j??ch dotaz?.',
+'Upload a package:': 'Nahrát balík:',
-'User %(id)s Logged-in': 'U?ivatel %(id)s p?ihl??en',
+'Upload and install packed application': 'Nahrát a instalovat zabalenou aplikaci',
-'User %(id)s Logged-out': 'U?ivatel %(id)s odhl??en',
+'upload file:': 'nahrát soubor:',
-'User %(id)s Password changed': 'U?ivatel %(id)s zm?nil heslo',
+'upload plugin file:': 'nahrát soubor modulu:',
-'User %(id)s Profile updated': 'U?ivatel %(id)s upravil profil',
+'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Použijte (...)&(...) pro AND, (...)|(...) pro OR a ~(...) pro NOT pro sestavení složitějších dotazů.',
-'User %(id)s Registered': 'U?ivatel %(id)s se zaregistroval',
+'User %(id)s Logged-in': 'Uživatel %(id)s přihlášen',
-'User %(id)s Username retrieved': 'U?ivatel %(id)s si nachal zaslat p?ihla?ovac? jm?no',
+'User %(id)s Logged-out': 'Uživatel %(id)s odhlášen',
-'User ID': 'ID u?ivatele',
+'User %(id)s Password changed': 'Uživatel %(id)s změnil heslo',
-'Username': 'P?ihla?ovac? jm?no',
+'User %(id)s Profile updated': 'Uživatel %(id)s upravil profil',
+'User %(id)s Registered': 'Uživatel %(id)s se zaregistroval',
+'User %(id)s Username retrieved': 'Uživatel %(id)s si nachal zaslat přihlašovací jméno',
+'User ID': 'ID uživatele',
+'Username': 'Přihlašovací jméno',
+'variables': 'variables',
 'Verify Password': 'Zopakujte heslo',
+'Version': 'Verze',
 'Version %s.%s.%s (%s) %s': 'Verze %s.%s.%s (%s) %s',
-'Versioning': 'Verzov?n?',
+'Versioning': 'Verzování',
 'Videos': 'Videa',
 'View': 'Pohled (View)',
 'Views': 'Pohledy',
 'views': 'pohledy',
 'Web Framework': 'Web Framework',
-'web2py is up to date': 'M?te aktu?ln? verzi web2py.',
+'web2py is up to date': 'Máte aktuální verzi web2py.',
-'web2py online debugger': 'Lad?c? online web2py program',
+'web2py online debugger': 'Ladící online web2py program',
-'web2py Recent Tweets': '?t?bet?n? na Twitteru o web2py',
+'web2py Recent Tweets': 'Štěbetání na Twitteru o web2py',
-'Welcome': 'V?tejte',
+'web2py upgrade': 'web2py upgrade',
+'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
+'Welcome': 'Vítejte',
 'Welcome to web2py': 'Vitejte ve web2py',
-'Welcome to web2py!': 'V?tejte ve web2py!',
+'Welcome to web2py!': 'Vítejte ve web2py!',
-'Which called the function %s located in the file %s': 'kter? zavolala funkci %s v souboru (kontrol?ru) %s.',
+'Which called the function %s located in the file %s': 'která zavolala funkci %s v souboru (kontroléru) %s.',
-'You are successfully running web2py': '?sp??n? jste spustili web2py.',
+'You are successfully running web2py': 'Úspěšně jste spustili web2py.',
-'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'Nastavovat a mazat body p?eru?en? je t?? mo?no v r?mci editov?n? zdrojov?ho souboru p?es tla??tko Vyp./Zap. bod p?eru?en?',
+'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'Nastavovat a mazat body přerušení je též možno v rámci editování zdrojového souboru přes tlačítko Vyp./Zap. bod přerušení',
-'You can modify this application and adapt it to your needs': 'Tuto aplikaci si m??ete upravit a p?izp?sobit ji sv?m pot?eb?m.',
+'You can modify this application and adapt it to your needs': 'Tuto aplikaci si můžete upravit a přizpůsobit ji svým potřebám.',
-'You need to set up and reach a': 'Je t?eba nejprve nastavit a doj?t a? na',
+'You need to set up and reach a': 'Je třeba nejprve nastavit a dojít až na',
-'You visited the url %s': 'Nav?t?vili jste str?nku %s,',
+'You visited the url %s': 'Navštívili jste stránku %s,',
+'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Aplikace bude blokována než se klikne na jedno z tlačítek (další, krok, pokračovat, atd.)',
+'Your can inspect variables using the console bellow': 'Níže pomocí příkazové řádky si můžete prohlédnout proměnné',
 }

applications/admin/views/default/pack_custom.html

@@ -0,0 +1,32 @@
+{{extend 'layout.html'}}
+{{import os}}
+
+{{def tree(path):}}
+    <input type="checkbox" onclick="jQuery(this).parent().find(':checkbox').attr('checked',this.checked)" checked="checked"/>
+    <a href="#" onclick="jQuery(this).next().slideToggle();return false;">
+      {{=path[len(base):] or '/%s' % app}}
+    </a>
+    <ul class="collapsible">
+      {{for file in files[path]['files']:}}
+       <li style="list-style-type: none;">
+	 {{p = os.path.relpath(os.path.join(path,file),base)}}
+	 <input type="checkbox" value="{{=p}}" name="file" checked="checked"/>
+	 {{=file}}
+       </li>
+       {{pass}}
+       {{for dir in files[path]['folders']:}}
+       <li style="list-style-type: none;">
+	 {{tree(os.path.join(path,dir))}}
+       </li>
+       {{pass}}
+    </ul> 
+    {{return}}    
+
+<form action="{{=URL(args=request.args)}}" method="POST">
+<h2>{{=T('Select Files to Package')}}</h2>
+<input type="submit" value="{{=T('Download .w2p')}}" class="btn"/>
+<div style="margin-top:20px">
+{{tree(base)}}
+</div>
+</form>
+<script>jQuery(function(){jQuery('.collapsible').hide();});</script>

applications/admin/views/default/site.html

@@ -25,6 +25,7 @@
 	      {{buttons.append((URL('errors',args=a), T("Errors")))}}
 	      {{buttons.append((URL('cleanup',args=a), T("Clean")))}}
 	      {{buttons.append((URL('pack',args=a), T("Pack all")))}}
+	      {{buttons.append((URL('pack_custom',args=a), T("Pack custom")))}}
 	      {{if not os.path.exists('applications/%s/compiled' % a):}}
                 {{buttons.append((URL('compile_app',args=a), T("Compile")))}}
 	      {{else:}}

applications/examples/controllers/appadmin.py

@@ -54,6 +54,10 @@ response.menu = [[T('design'), False, URL('admin', 'default', 'design',
 # ## auxiliary functions
 # ###########################################################
 
+if False and request.tickets_db:
+    from gluon.restricted import TicketStorage
+    ts = TicketStorage()
+    ts._get_table(request.tickets_db, ts.tablename, request.application)
 
 def get_databases(request):
     dbs = {}

applications/examples/private/content/en/default/what/whyweb2py.markmin

@@ -47,7 +47,7 @@ Here is a more complex complete application that lets the visitor upload images
 ``
 db=DAL('sqlite://storage.db')
 db.define_table('image', 
-    Field('name'),
+    Field('name', notnull=True),
     Field('file','upload'))
 ``:code_python
 
@@ -55,10 +55,10 @@ db.define_table('image',
 
 ``
 def index():
-    form = SQLFORM(db.image)
+    form = SQLFORM(db.image).process()
-    if form.process().accepted:
+    if form.accepted:
         response.flash = 'image uploaded'
-    return dict(form = form)""",counter=None,_class='boxCode')}}
+    return locals()
 ``:code_python
 
 ### In View
@@ -66,7 +66,7 @@ def index():
 ``
 {{extend 'layout.html'}}
 <h1>Image upload form</h1>
-{{form}}
+{{=form}}
 ``:code_python
    
     Uploaded images are safely renamed to avoid directory traversal vulnerabilities, stored on the filesystem (or database) and a corresponding entry is inserted in the database, linking the file. A built-in mechanism prevents involuntary double form submission. All DB IO is transaction safe by default. Any exception in the code causes the transaction to rollback.

applications/welcome/controllers/appadmin.py

@@ -54,6 +54,10 @@ response.menu = [[T('design'), False, URL('admin', 'default', 'design',
 # ## auxiliary functions
 # ###########################################################
 
+if False and request.tickets_db:
+    from gluon.restricted import TicketStorage
+    ts = TicketStorage()
+    ts._get_table(request.tickets_db, ts.tablename, request.application)
 
 def get_databases(request):
     dbs = {}

applications/welcome/languages/cs.py

@@ -3,6 +3,7 @@
 '!langcode!': 'cs-cz',
 '!langname!': 'čeština',
 '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': 'Kolonka "Upravit" je nepovinný výraz, například "pole1=\'nováhodnota\'". Výsledky databázového JOINu nemůžete mazat ani upravovat.',
+'"User Exception" debug mode. An error ticket could be issued!': '"User Exception" debug mode. An error ticket could be issued!',
 '%%{Row} in Table': '%%{řádek} v tabulce',
 '%%{Row} selected': 'označených %%{řádek}',
 '%s %%{row} deleted': '%s smazaných %%{záznam}',
@@ -11,6 +12,7 @@
 '%Y-%m-%d': '%d.%m.%Y',
 '%Y-%m-%d %H:%M:%S': '%d.%m.%Y %H:%M:%S',
 '(requires internet access)': '(vyžaduje připojení k internetu)',
+'(requires internet access, experimental)': '(requires internet access, experimental)',
 '(something like "it-it")': '(například "cs-cs")',
 '@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(soubor **gluon/contrib/plural_rules/%s.py** nenalezen)',
 '@markmin\x01Searching: **%s** %%{file}': 'Hledání: **%s** %%{soubor}',
@@ -19,15 +21,18 @@
 'Access Control': 'Řízení přístupu',
 'Add breakpoint': 'Přidat bod přerušení',
 'Additional code for your application': 'Další kód pro Vaši aplikaci',
+'Admin design page': 'Admin design page',
 'Admin language': 'jazyk rozhraní',
 'Administrative interface': 'pro administrátorské rozhraní klikněte sem',
 'Administrative Interface': 'Administrátorské rozhraní',
 'administrative interface': 'rozhraní pro správu',
 'Administrator Password:': 'Administrátorské heslo:',
 'Ajax Recipes': 'Recepty s ajaxem',
+'An error occured, please %s the page': 'An error occured, please %s the page',
 'and rename it:': 'a přejmenovat na:',
 'appadmin': 'appadmin',
 'appadmin is disabled because insecure channel': 'appadmin je zakázaná bez zabezpečeného spojení',
+'Application': 'Application',
 'application "%s" uninstalled': 'application "%s" odinstalována',
 'application compiled': 'aplikace zkompilována',
 'Application name:': 'Název aplikace:',
@@ -36,8 +41,13 @@
 'Are you sure you want to delete this object?': 'Opravdu chcete odstranit tento objekt?',
 'Are you sure you want to uninstall application "%s"?': 'Opravdu chcete odinstalovat aplikaci "%s"?',
 'arguments': 'arguments',
+'at char %s': 'at char %s',
+'at line %s': 'at line %s',
+'ATTENTION:': 'ATTENTION:',
+'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.',
 'Available Databases and Tables': 'Dostupné databáze a tabulky',
 'back': 'zpět',
+'Back to wizard': 'Back to wizard',
 'Basics': 'Basics',
 'Begin': 'Začít',
 'breakpoint': 'bod přerušení',
@@ -51,7 +61,8 @@
 'can be a git repo': 'může to být git repo',
 'Cancel': 'Storno',
 'Cannot be empty': 'Nemůže být prázdné',
-'Change admin password': 'Změnit heslo pro strávu aplikací',
+'Change Admin Password': 'Změnit heslo pro správu',
+'Change admin password': 'Změnit heslo pro správu aplikací',
 'Change password': 'Změna hesla',
 'check all': 'vše označit',
 'Check for upgrades': 'Zkusit aktualizovat',
@@ -94,6 +105,7 @@
 'data uploaded': 'data nahrána',
 'Database': 'Rozhraní databáze',
 'Database %s select': 'databáze %s výběr',
+'Database administration': 'Database administration',
 'database administration': 'správa databáze',
 'Date and Time': 'Datum a čas',
 'day': 'den',
@@ -104,6 +116,7 @@
 'Delete': 'Smazat',
 'delete': 'smazat',
 'delete all checked': 'smazat vše označené',
+'delete plugin': 'delete plugin',
 'Delete this file (you will be asked to confirm deletion)': 'Smazat tento soubor (budete požádán o potvrzení mazání)',
 'Delete:': 'Smazat:',
 'deleted after first hit': 'smazat po prvním dosažení',
@@ -114,9 +127,9 @@
 'Deployment Recipes': 'Postupy pro deployment',
 'Description': 'Popis',
 'design': 'návrh',
-'Detailed traceback description': 'Detailed traceback description',
+'Detailed traceback description': 'Podrobný výpis prostředí',
-'details': 'details',
+'details': 'podrobnosti',
-'direction: ltr': 'direction: ltr',
+'direction: ltr': 'směr: ltr',
 'Disable': 'Zablokovat',
 'DISK': 'DISK',
 'Disk Cache Keys': 'Klíče diskové cache',
@@ -132,29 +145,37 @@
 'Edit': 'Upravit',
 'edit all': 'edit all',
 'Edit application': 'Správa aplikace',
+'edit controller': 'edit controller',
 'Edit current record': 'Upravit aktuální záznam',
 'Edit Profile': 'Upravit profil',
 'edit views:': 'upravit pohled:',
 'Editing file "%s"': 'Úprava souboru "%s"',
 'Editing Language file': 'Úprava jazykového souboru',
+'Editing Plural Forms File': 'Editing Plural Forms File',
 'Email and SMS': 'Email a SMS',
 'Enable': 'Odblokovat',
 'enter a number between %(min)g and %(max)g': 'zadejte číslo mezi %(min)g a %(max)g',
 'enter an integer between %(min)g and %(max)g': 'zadejte celé číslo mezi %(min)g a %(max)g',
 'Error': 'Chyba',
 'Error logs for "%(app)s"': 'Seznam výskytu chyb pro aplikaci "%(app)s"',
-'Error snapshot': 'Error snapshot',
+'Error snapshot': 'Snapshot chyby',
-'Error ticket': 'Error ticket',
+'Error ticket': 'Ticket chyby',
 'Errors': 'Chyby',
-'Exception instance attributes': 'Exception instance attributes',
+'Exception %(extype)s: %(exvalue)s': 'Exception %(extype)s: %(exvalue)s',
+'Exception %s': 'Exception %s',
+'Exception instance attributes': 'Prvky instance výjimky',
+'Expand Abbreviation': 'Expand Abbreviation',
 'export as csv file': 'exportovat do .csv souboru',
 'exposes': 'vystavuje',
 'exposes:': 'vystavuje funkce:',
 'extends': 'rozšiřuje',
+'failed to compile file because:': 'soubor se nepodařilo zkompilovat, protože:',
 'FAQ': 'Často kladené dotazy',
 'File': 'Soubor',
 'file': 'soubor',
+'file "%(filename)s" created': 'file "%(filename)s" created',
 'file saved on %(time)s': 'soubor uložen %(time)s',
+'file saved on %s': 'soubor uložen %s',
 'Filename': 'Název souboru',
 'filter': 'filtr',
 'Find Next': 'Najít další',
@@ -165,12 +186,15 @@
 'Forms and Validators': 'Formuláře a validátory',
 'Frames': 'Frames',
 'Free Applications': 'Aplikace zdarma',
+'Functions with no doctests will result in [passed] tests.': 'Functions with no doctests will result in [passed] tests.',
 'Generate': 'Vytvořit',
 'Get from URL:': 'Stáhnout z internetu:',
 'Git Pull': 'Git Pull',
 'Git Push': 'Git Push',
 'Globals##debug': 'Globální proměnné',
 'go!': 'OK!',
+'Goto': 'Goto',
+'graph model': 'graph model',
 'Group %(group_id)s created': 'Skupina %(group_id)s vytvořena',
 'Group ID': 'ID skupiny',
 'Groups': 'Skupiny',
@@ -181,6 +205,8 @@
 'Home': 'Domovská stránka',
 'honored only if the expression evaluates to true': 'brát v potaz jen když se tato podmínka vyhodnotí kladně',
 'How did you get here?': 'Jak jste se sem vlastně dostal?',
+'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
 'import': 'import',
 'Import/Export': 'Import/Export',
 'includes': 'zahrnuje',
@@ -190,8 +216,8 @@
 'inspect attributes': 'inspect attributes',
 'Install': 'Instalovat',
 'Installed applications': 'Nainstalované aplikace',
-'Interaction at %s line %s': 'Interaction at %s line %s',
+'Interaction at %s line %s': 'Interakce v %s, na řádce %s',
-'Interactive console': 'Interactive console',
+'Interactive console': 'Interaktivní příkazová řádka',
 'Internal State': 'Vnitřní stav',
 'Introduction': 'Úvod',
 'Invalid email': 'Neplatný email',
@@ -203,6 +229,7 @@
 'It is %s %%{day} today.': 'Dnes je to %s %%{den}.',
 'Key': 'Klíč',
 'Key bindings': 'Vazby klíčů',
+'Key bindings for ZenCoding Plugin': 'Key bindings for ZenCoding Plugin',
 'languages': 'jazyky',
 'Languages': 'Jazyky',
 'Last name': 'Příjmení',
@@ -227,6 +254,7 @@
 'Lost Password': 'Zapomněl jste heslo',
 'Lost password?': 'Zapomněl jste heslo?',
 'lost password?': 'zapomněl jste heslo?',
+'Manage': 'Manage',
 'Manage Cache': 'Manage Cache',
 'Menu Model': 'Model rozbalovací nabídky',
 'Models': 'Modely',
@@ -237,6 +265,7 @@
 'modules': 'moduly',
 'My Sites': 'Správa aplikací',
 'Name': 'Jméno',
+'new application "%s" created': 'nová aplikace "%s" vytvořena',
 'New Application Wizard': 'Nový průvodce aplikací',
 'New application wizard': 'Nový průvodce aplikací',
 'New password': 'Nové heslo',
@@ -245,13 +274,16 @@
 'New simple application': 'Vytvořit primitivní aplikaci',
 'next': 'next',
 'next 100 rows': 'dalších 100 řádků',
-'No databases in this application': 'V této aplikáci nejsou žádné databáze',
+'No databases in this application': 'V této aplikaci nejsou žádné databáze',
 'No Interaction yet': 'Ještě žádná interakce nenastala',
 'No ticket_storage.txt found under /private folder': 'Soubor ticket_storage.txt v adresáři /private nenalezen',
 'Object or table name': 'Objekt či tabulka',
 'Old password': 'Původní heslo',
 'online designer': 'online návrhář',
 'Online examples': 'Příklady online',
+'Open new app in new window': 'Open new app in new window',
+'or alternatively': 'or alternatively',
+'Or Get from URL:': 'Or Get from URL:',
 'or import from csv file': 'nebo importovat z .csv souboru',
 'Origin': 'Původ',
 'Original/Translation': 'Originál/Překlad',
@@ -261,12 +293,16 @@
 'Overwrite installed app': 'Přepsat instalovanou aplikaci',
 'Pack all': 'Zabalit',
 'Pack compiled': 'Zabalit zkompilované',
+'pack plugin': 'pack plugin',
 'password': 'heslo',
 'Password': 'Heslo',
 "Password fields don't match": 'Hesla se neshodují',
+'Peeking at file': 'Peeking at file',
 'Please': 'Prosím',
+'Plugin "%s" in application': 'Plugin "%s" in application',
 'plugins': 'zásuvné moduly',
 'Plugins': 'Zásuvné moduly',
+'Plural Form #%s': 'Plural Form #%s',
 'Plural-Forms:': 'Množná čísla:',
 'Powered by': 'Poháněno',
 'Preface': 'Předmluva',
@@ -292,6 +328,7 @@
 'Register': 'Zaregistrovat se',
 'Registration identifier': 'Registrační identifikátor',
 'Registration key': 'Registrační klíč',
+'reload': 'reload',
 'Reload routes': 'Znovu nahrát cesty',
 'Remember me (for 30 days)': 'Zapamatovat na 30 dní',
 'Remove compiled': 'Odstranit zkompilované',
@@ -313,6 +350,7 @@
 "Run tests in this file (to run all files, you may also use the button labelled 'test')": "Spustí testy v tomto souboru (ke spuštění všech testů, použijte tlačítko 'test')",
 'Running on %s': 'Běží na %s',
 'Save': 'Uložit',
+'Save file:': 'Save file:',
 'Save via Ajax': 'Uložit pomocí Ajaxu',
 'Saved file hash:': 'hash uloženého souboru:',
 'Semantic': 'Modul semantic',
@@ -321,6 +359,7 @@
 'session expired': 'session expired',
 'Set Breakpoint on %s at line %s: %s': 'Bod přerušení nastaven v souboru %s na řádce %s: %s',
 'shell': 'příkazová řádka',
+'Singular Form': 'Singular Form',
 'Site': 'Správa aplikací',
 'Size of cache:': 'Velikost cache:',
 'skip to generate': 'skip to generate',
@@ -329,6 +368,7 @@
 'Start searching': 'Začít hledání',
 'Start wizard': 'Spustit průvodce',
 'state': 'stav',
+'Static': 'Static',
 'static': 'statické soubory',
 'Static files': 'Statické soubory',
 'Statistics': 'Statistika',
@@ -345,6 +385,7 @@
 'Table name': 'Název tabulky',
 'Temporary': 'Dočasný',
 'test': 'test',
+'Testing application': 'Testing application',
 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': '"Dotaz" je podmínka, například "db.tabulka1.pole1==\'hodnota\'". Podmínka "db.tabulka1.pole1==db.tabulka2.pole2" pak vytvoří SQL JOIN.',
 'The application logic, each URL path is mapped in one exposed function in the controller': 'Logika aplikace: každá URL je mapována na funkci vystavovanou kontrolérem.',
 'The Core': 'Jádro (The Core)',
@@ -352,13 +393,19 @@
 'The output of the file is a dictionary that was rendered by the view %s': 'Výstup ze souboru je slovník, který se zobrazil v pohledu %s.',
 'The presentations layer, views are also known as templates': 'Prezentační vrstva: pohledy či templaty (šablony)',
 'The Views': 'Pohledy (The Views)',
+'There are no controllers': 'There are no controllers',
+'There are no modules': 'There are no modules',
 'There are no plugins': 'Žádné moduly nejsou instalovány.',
 'There are no private files': 'Žádné soukromé soubory neexistují.',
 'There are no static files': 'There are no static files',
+'There are no translators, only default language is supported': 'There are no translators, only default language is supported',
+'There are no views': 'There are no views',
 'These files are not served, they are only available from within your app': 'Tyto soubory jsou klientům nepřístupné. K dispozici jsou pouze v rámci aplikace.',
 'These files are served without processing, your images go here': 'Tyto soubory jsou servírovány bez přídavné logiky, sem patří např. obrázky.',
 'This App': 'Tato aplikace',
 'This is a copy of the scaffolding application': 'Toto je kopie aplikace skelet.',
+'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
+'This is the %(filename)s template': 'This is the %(filename)s template',
 'this page to see if a breakpoint was hit and debug interaction is required.': 'tuto stránku, abyste uviděli, zda se dosáhlo bodu přerušení.',
 'Ticket': 'Ticket',
 'Ticket ID': 'Ticket ID',
@@ -373,16 +420,24 @@
 'too short': 'Příliš krátké',
 'Traceback': 'Traceback',
 'Translation strings for the application': 'Překlad textů pro aplikaci',
+'try something like': 'try something like',
 'Try the mobile interface': 'Zkuste rozhraní pro mobilní zařízení',
+'try view': 'try view',
 'Twitter': 'Twitter',
 'Type python statement in here and hit Return (Enter) to execute it.': 'Type python statement in here and hit Return (Enter) to execute it.',
+'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
+'Unable to check for upgrades': 'Unable to check for upgrades',
 'unable to parse csv file': 'csv soubor nedá sa zpracovat',
 'uncheck all': 'vše odznačit',
 'Uninstall': 'Odinstalovat',
 'update': 'aktualizovat',
 'update all languages': 'aktualizovat všechny jazyky',
 'Update:': 'Upravit:',
+'Upgrade': 'Upgrade',
+'upgrade now': 'upgrade now',
+'upgrade now to %s': 'upgrade now to %s',
 'upload': 'nahrát',
+'Upload': 'Upload',
 'Upload a package:': 'Nahrát balík:',
 'Upload and install packed application': 'Nahrát a instalovat zabalenou aplikaci',
 'upload file:': 'nahrát soubor:',
@@ -409,6 +464,8 @@
 'web2py is up to date': 'Máte aktuální verzi web2py.',
 'web2py online debugger': 'Ladící online web2py program',
 'web2py Recent Tweets': 'Štěbetání na Twitteru o web2py',
+'web2py upgrade': 'web2py upgrade',
+'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
 'Welcome': 'Vítejte',
 'Welcome to web2py': 'Vitejte ve web2py',
 'Welcome to web2py!': 'Vítejte ve web2py!',

applications/welcome/languages/es.py

@@ -8,23 +8,23 @@
 '%s selected': '%s seleccionado(s)',
 '%Y-%m-%d': '%Y-%m-%d',
 '%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
-'(something like "it-it")': '(algo como "it-it")',
+'(something like "it-it")': '(algo como "eso-eso")',
 'A new version of web2py is available': 'Hay una nueva versión de web2py disponible',
 'A new version of web2py is available: %s': 'Hay una nueva versión de web2py disponible: %s',
 'about': 'acerca de',
 'About': 'Acerca de',
 'About application': 'Acerca de la aplicación',
-'Access Control': 'Access Control',
+'Access Control': 'Control de Acceso',
 'additional code for your application': 'código adicional para su aplicación',
 'admin disabled because no admin password': ' por falta de contraseña',
 'admin disabled because not supported on google app engine': 'admin deshabilitado, no es soportado en GAE',
 'admin disabled because unable to access password file': 'admin deshabilitado, imposible acceder al archivo con la contraseña',
 'Admin is disabled because insecure channel': 'Admin deshabilitado, el canal no es seguro',
 'Admin is disabled because unsecure channel': 'Admin deshabilitado, el canal no es seguro',
-'Administrative Interface': 'Administrative Interface',
+'Administrative Interface': 'Interfaz Administrativa',
 'Administrative interface': 'Interfaz administrativa',
 'Administrator Password:': 'Contraseña del Administrador:',
-'Ajax Recipes': 'Ajax Recipes',
+'Ajax Recipes': 'Recetas AJAX',
 'and rename it (required):': 'y renombrela (requerido):',
 'and rename it:': ' y renombrelo:',
 'appadmin': 'appadmin',
@@ -33,37 +33,37 @@
 'application compiled': 'aplicación compilada',
 'application is compiled and cannot be designed': 'la aplicación está compilada y no puede ser modificada',
 'Are you sure you want to delete file "%s"?': '¿Está seguro que desea eliminar el archivo "%s"?',
-'Are you sure you want to delete this object?': 'Are you sure you want to delete this object?',
+'Are you sure you want to delete this object?': '¿Está seguro que desea borrar este objeto?',
 'Are you sure you want to uninstall application "%s"': '¿Está seguro que desea desinstalar la aplicación "%s"',
 'Are you sure you want to uninstall application "%s"?': '¿Está seguro que desea desinstalar la aplicación "%s"?',
 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ATENCION: Inicio de sesión requiere una conexión segura (HTTPS) o localhost.',
 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATENCION: NO EJECUTE VARIAS PRUEBAS SIMULTANEAMENTE, NO SON THREAD SAFE.',
-'ATTENTION: you cannot edit the running application!': 'ATENCION: no puede modificar la aplicación que se ejecuta!',
+'ATTENTION: you cannot edit the running application!': 'ATENCION: no puede modificar la aplicación que está ejecutandose!',
 'Authentication': 'Autenticación',
 'Available Databases and Tables': 'Bases de datos y tablas disponibles',
-'Buy this book': 'Buy this book',
+'Buy this book': 'Compra este libro',
 'cache': 'cache',
 'Cache': 'Cache',
-'Cache Keys': 'Cache Keys',
+'Cache Keys': 'Llaves de la Cache',
 'cache, errors and sessions cleaned': 'cache, errores y sesiones eliminados',
 'Cannot be empty': 'No puede estar vacío',
 'Cannot compile: there are errors in your app.        Debug it, correct errors and try again.': 'No se puede compilar: hay errores en su aplicación. Depure, corrija errores y vuelva a intentarlo.',
 'cannot create file': 'no es posible crear archivo',
 'cannot upload file "%(filename)s"': 'no es posible subir archivo "%(filename)s"',
-'Change Password': 'Cambie Contraseña',
+'Change Password': 'Cambie la contraseña',
-'change password': 'cambie contraseña',
+'change password': 'cambie la contraseña',
 'check all': 'marcar todos',
 'Check to delete': 'Marque para eliminar',
 'clean': 'limpiar',
-'Clear CACHE?': 'Clear CACHE?',
+'Clear CACHE?': '¿Limpiar CACHE?',
-'Clear DISK': 'Clear DISK',
+'Clear DISK': '¿Limpiar DISCO',
-'Clear RAM': 'Clear RAM',
+'Clear RAM': '¿Limpiar RAM',
 'click to check for upgrades': 'haga clic para buscar actualizaciones',
 'Client IP': 'IP del Cliente',
-'Community': 'Community',
+'Community': 'Comunidad',
 'compile': 'compilar',
 'compiled application removed': 'aplicación compilada removida',
-'Components and Plugins': 'Components and Plugins',
+'Components and Plugins': 'Componentes y Plugins',
 'Controller': 'Controlador',
 'Controllers': 'Controladores',
 'controllers': 'controladores',
@@ -83,24 +83,24 @@
 'database administration': 'administración base de datos',
 'Date and Time': 'Fecha y Hora',
 'db': 'db',
-'DB Model': 'Modelo "db"',
+'DB Model': 'Modelo "DB"',
 'defines tables': 'define tablas',
-'Delete': 'Elimine',
+'Delete': 'Eliminar',
 'delete': 'eliminar',
 'delete all checked': 'eliminar marcados',
-'Delete:': 'Elimine:',
+'Delete:': 'Eliminar:',
 'Demo': 'Demo',
-'Deploy on Google App Engine': 'Instale en Google App Engine',
+'Deploy on Google App Engine': 'Despliegue en Google App Engine',
-'Deployment Recipes': 'Deployment Recipes',
+'Deployment Recipes': 'Recetas de despliegue',
 'Description': 'Descripción',
 'DESIGN': 'DISEÑO',
 'design': 'modificar',
-'Design for': 'Diseño para',
+'Design for': 'Diseño por',
 'DISK': 'DISK',
-'Disk Cache Keys': 'Disk Cache Keys',
+'Disk Cache Keys': 'Llaves de Cache en Disco',
-'Disk Cleared': 'Disk Cleared',
+'Disk Cleared': 'Disco limpiado',
 'Documentation': 'Documentación',
-"Don't know what to do?": "Don't know what to do?",
+"Don't know what to do?": "¿No sabe que hacer?",
 'done!': 'listo!',
 'Download': 'Download',
 'E-mail': 'Correo electrónico',
@@ -115,9 +115,9 @@
 'Edit This App': 'Edite esta App',
 'Editing file': 'Editando archivo',
 'Editing file "%s"': 'Editando archivo "%s"',
-'Email and SMS': 'Email and SMS',
+'Email and SMS': 'Correo electrónico y SMS',
 'Error logs for "%(app)s"': 'Bitácora de errores en "%(app)s"',
-'Errors': 'Errors',
+'Errors': 'Errores',
 'errors': 'errores',
 'export as csv file': 'exportar como archivo CSV',
 'exposes': 'expone',
@@ -134,17 +134,17 @@
 'file saved on %(time)s': 'archivo guardado %(time)s',
 'file saved on %s': 'archivo guardado %s',
 'First name': 'Nombre',
-'Forms and Validators': 'Forms and Validators',
+'Forms and Validators': 'Formularios y validadores',
-'Free Applications': 'Free Applications',
+'Free Applications': 'Aplicaciones Libres',
 'Functions with no doctests will result in [passed] tests.': 'Funciones sin doctests equivalen a pruebas [aceptadas].',
 'Group ID': 'ID de Grupo',
-'Groups': 'Groups',
+'Groups': 'Groupos',
 'Hello World': 'Hola Mundo',
 'help': 'ayuda',
 'Home': 'Home',
-'How did you get here?': 'How did you get here?',
+'How did you get here?': '¿Cómo llegasta hasta allá?',
 'htmledit': 'htmledit',
-'import': 'import',
+'import': 'importar',
 'Import/Export': 'Importar/Exportar',
 'includes': 'incluye',
 'Index': 'Indice',
@@ -153,14 +153,14 @@
 'Installed applications': 'Aplicaciones instaladas',
 'internal error': 'error interno',
 'Internal State': 'Estado Interno',
-'Introduction': 'Introduction',
+'Introduction': 'Introducción',
 'Invalid action': 'Acción inválida',
-'Invalid email': 'Correo inválido',
+'Invalid email': 'Correo electrónico inválido',
 'invalid password': 'contraseña inválida',
 'Invalid Query': 'Consulta inválida',
 'invalid request': 'solicitud inválida',
 'invalid ticket': 'tiquete inválido',
-'Key': 'Key',
+'Key': 'Llave',
 'language file "%(filename)s" created/updated': 'archivo de lenguaje "%(filename)s" creado/actualizado',
 'Language files (static strings) updated': 'Archivos de lenguaje (cadenas estáticas) actualizados',
 'languages': 'lenguajes',
@@ -169,10 +169,10 @@
 'Last name': 'Apellido',
 'Last saved on:': 'Guardado en:',
 'Layout': 'Diseño de página',
-'Layout Plugins': 'Layout Plugins',
+'Layout Plugins': 'Plugins de diseño',
-'Layouts': 'Layouts',
+'Layouts': 'Diseños de páginas',
 'License for': 'Licencia para',
-'Live Chat': 'Live Chat',
+'Live Chat': 'Chat en vivo',
 'loading...': 'cargando...',
 'login': 'inicio de sesión',
 'Login': 'Inicio de sesión',
@@ -180,16 +180,16 @@
 'logout': 'fin de sesión',
 'Logout': 'Fin de sesión',
 'Lost Password': 'Contraseña perdida',
-'lost password?': '¿olvido la contraseña?',
+'lost password?': '¿Olvido la contraseña?',
 'Main Menu': 'Menú principal',
-'Manage Cache': 'Manage Cache',
+'Manage Cache': 'Manejar la Cache',
 'Menu Model': 'Modelo "menu"',
 'merge': 'combinar',
 'Models': 'Modelos',
 'models': 'modelos',
 'Modules': 'Módulos',
 'modules': 'módulos',
-'My Sites': 'My Sites',
+'My Sites': 'Mis Sitios',
 'Name': 'Nombre',
 'new application "%s" created': 'nueva aplicación "%s" creada',
 'New Record': 'Registro nuevo',
@@ -202,9 +202,9 @@
 'or provide application url:': 'o provea URL de la aplicación:',
 'Origin': 'Origen',
 'Original/Translation': 'Original/Traducción',
-'Other Plugins': 'Other Plugins',
+'Other Plugins': 'Otros Plugins',
-'Other Recipes': 'Other Recipes',
+'Other Recipes': 'Otas Recetas',
-'Overview': 'Overview',
+'Overview': 'Resumen',
 'pack all': 'empaquetar todo',
 'pack compiled': 'empaquete compiladas',
 'Password': 'Contraseña',
@@ -215,20 +215,20 @@
 'previous 100 rows': '100 filas anteriores',
 'Python': 'Python',
 'Query:': 'Consulta:',
-'Quick Examples': 'Quick Examples',
+'Quick Examples': 'Ejemplos Rápidos',
 'RAM': 'RAM',
-'RAM Cache Keys': 'RAM Cache Keys',
+'RAM Cache Keys':'Llaves de la RAM Cache',
-'Ram Cleared': 'Ram Cleared',
+'Ram Cleared': 'Ram Limpiada',
-'Recipes': 'Recipes',
+'Recipes': 'Recetas',
 'Record': 'registro',
 'record does not exist': 'el registro no existe',
 'Record ID': 'ID de Registro',
 'Record id': 'id de registro',
 'Register': 'Registrese',
 'register': 'registrese',
-'Registration key': 'Contraseña de Registro',
+'Registration key': 'Llave de Registro',
 'remove compiled': 'eliminar compiladas',
-'Reset Password key': 'Reset Password key',
+'Reset Password key': 'Restaurar LLavel de la Contraseña',
 'Resolve Conflict file': 'archivo Resolución de Conflicto',
 'restore': 'restaurar',
 'revert': 'revertir',
@@ -237,20 +237,20 @@
 'Rows selected': 'Filas seleccionadas',
 'save': 'guardar',
 'Saved file hash:': 'Hash del archivo guardado:',
-'Semantic': 'Semantic',
+'Semantic': 'Semantica',
-'Services': 'Services',
+'Services': 'Servicios',
 'session expired': 'sesión expirada',
-'shell': 'shell',
+'shell': 'terminal',
 'site': 'sitio',
-'Size of cache:': 'Size of cache:',
+'Size of cache:': 'Tamaño del Cache:',
 'some files could not be removed': 'algunos archivos no pudieron ser removidos',
 'state': 'estado',
 'static': 'estáticos',
 'Static files': 'Archivos estáticos',
-'Statistics': 'Statistics',
+'Statistics': 'Estadísticas',
 'Stylesheet': 'Hoja de estilo',
-'submit': 'submit',
+'submit': 'enviar',
-'Support': 'Support',
+'Support': 'Soporte',
 'Sure you want to delete this object?': '¿Está seguro que desea eliminar este objeto?',
 'Table': 'tabla',
 'Table name': 'Nombre de la tabla',
@@ -258,11 +258,11 @@
 'Testing application': 'Probando aplicación',
 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'La "consulta" es una condición como "db.tabla1.campo1==\'valor\'". Algo como "db.tabla1.campo1==db.tabla2.campo2" resulta en un JOIN SQL.',
 'the application logic, each URL path is mapped in one exposed function in the controller': 'la lógica de la aplicación, cada ruta URL se mapea en una función expuesta en el controlador',
-'The Core': 'The Core',
+'The Core': 'El Núcleo',
 'the data representation, define database tables and sets': 'la representación de datos, define tablas y conjuntos de base de datos',
 'The output of the file is a dictionary that was rendered by the view %s': 'La salida del archivo es un diccionario escenificado por la vista %s',
 'the presentations layer, views are also known as templates': 'la capa de presentación, las vistas también son llamadas plantillas',
-'The Views': 'The Views',
+'The Views': 'Las Vistas',
 'There are no controllers': 'No hay controladores',
 'There are no models': 'No hay modelos',
 'There are no modules': 'No hay módulos',
@@ -270,14 +270,14 @@
 'There are no translators, only default language is supported': 'No hay traductores, sólo el lenguaje por defecto es soportado',
 'There are no views': 'No hay vistas',
 'these files are served without processing, your images go here': 'estos archivos son servidos sin procesar, sus imágenes van aquí',
-'This App': 'This App',
+'This App': 'Esta Aplicación',
 'This is a copy of the scaffolding application': 'Esta es una copia de la aplicación de andamiaje',
 'This is the %(filename)s template': 'Esta es la plantilla %(filename)s',
 'Ticket': 'Tiquete',
-'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
+'Time in Cache (h:m:s)': 'Tiempo en Cache (h:m:s)',
-'Timestamp': 'Timestamp',
+'Timestamp': 'Marca de tiempo',
 'to  previous version.': 'a la versión previa.',
-'translation strings for the application': 'cadenas de caracteres de traducción para la aplicación',
+'translation strings for the application': 'cadenas de carácteres de traducción para la aplicación',
 'try': 'intente',
 'try something like': 'intente algo como',
 'Twitter': 'Twitter',
@@ -306,12 +306,12 @@
 'views': 'vistas',
 'web2py is up to date': 'web2py está actualizado',
 'web2py Recent Tweets': 'Tweets Recientes de web2py',
-'Welcome': 'Welcome',
+'Welcome': 'Bienvenido',
 'Welcome %s': 'Bienvenido %s',
 'Welcome to web2py': 'Bienvenido a web2py',
-'Welcome to web2py!': 'Welcome to web2py!',
+'Welcome to web2py!': '¡Bienvenido to web2py!',
 'Which called the function %s located in the file %s': 'La cual llamó la función %s localizada en el archivo %s',
-'YES': 'SI',
+'YES': 'SÍ',
 'You are successfully running web2py': 'Usted está ejecutando web2py exitosamente',
 'You can modify this application and adapt it to your needs': 'Usted puede modificar esta aplicación y adaptarla a sus necesidades',
 'You visited the url %s': 'Usted visitó la url %s',

applications/welcome/languages/it.py

@@ -23,7 +23,7 @@
 'Administrative Interface': 'Interfaccia Amministrativa',
 'Administrative interface': 'Interfaccia amministrativa',
 'Ajax Recipes': 'Ajax Recipes',
-'An error occured, please %s the page': "E' stato rilevato un errore, prego %s la pagina",
+'An error occured, please %s the page': "È stato rilevato un errore, prego %s la pagina",
 'And': 'E',
 'appadmin is disabled because insecure channel': 'Amministrazione (appadmin) disabilitata: comunicazione non sicura',
 'Are you sure you want to delete this object?': 'Sicuro di voler cancellare questo oggetto ?',

applications/welcome/models/menu.py

@@ -7,8 +7,7 @@
 
 response.logo = A(B('web',SPAN(2),'py'),XML('™ '),
                   _class="brand",_href="http://www.web2py.com/")
-response.title = ' '.join(
+response.title = request.application.replace('_',' ').title()
-    word.capitalize() for word in request.application.split('_'))
 response.subtitle = T('customize me!')
 
 ## read more at http://dev.w3.org/html5/markup/meta.name.html

applications/welcome/views/layout.html

@@ -91,16 +91,18 @@
 
   <div class="container">
     <!-- Masthead ================================================== -->
+    {{if response.title:}}
     <header class="mastheader row" id="header">
         <div class="span12">
             <div class="page-header">
                 <h1>
-                    {{=response.title or request.application}}
+                    {{=response.title}}
                     <small>{{=response.subtitle or ''}}</small>
                 </h1>
             </div>
         </div>
     </header>
+    {{pass}}
 
     <section id="main" class="main row">
         {{if left_sidebar_enabled:}}

gluon/admin.py

@@ -43,7 +43,7 @@ def apath(path='', r=None):
     return os.path.join(opath, path).replace('\\', '/')
 
 
-def app_pack(app, request, raise_ex=False):
+def app_pack(app, request, raise_ex=False, filenames=None):
     """
     Builds a w2p package for the application
 
@@ -60,9 +60,9 @@ def app_pack(app, request, raise_ex=False):
         filename of the w2p file or None on error
     """
     try:
-        app_cleanup(app, request)
+        if filenames is None: app_cleanup(app, request)
         filename = apath('../deposit/web2py.app.%s.w2p' % app, request)
-        w2p_pack(filename, apath(app, request))
+        w2p_pack(filename, apath(app, request), filenames=filenames)
         return filename
     except Exception, e:
         if raise_ex:

gluon/cache.py

@@ -457,7 +457,7 @@ class Cache(object):
         public: if False forces the Cache-Control to be 'private'
         valid_statuses: by default only status codes starting with 1,2,3 will be cached.
             pass an explicit list of statuses on which turn the cache on
-        quick: Session,Vars,Lang,User-agent,Public,duration:
+        quick: Session,Vars,Lang,User-agent,Public:
             fast overrides with initial strings, e.g. 'SVLP' or 'VLP', or 'VLP'
         """
         from gluon import current
@@ -512,7 +512,7 @@ class Cache(object):
                         current.response.headers['Expires'] = expires
                         current.response.headers['Cache-Control'] = cache_control
                     if cache_model and not send_headers:
-                        cache_model.clear(cache_key)
+                        cache_model(cache_key, None)
                     return rtn
                 return func()
             wrapped_f.__name__ = func.__name__

gluon/contrib/login_methods/__init__.py

@@ -0,0 +1 @@
+

gluon/contrib/login_methods/ldap_auth.py

@@ -653,7 +653,8 @@ def ldap_auth(server='ldap', port=None,
         ldap_groups_of_the_user = list()
         for group_row in group_search_result:
             group = group_row[1]
-            ldap_groups_of_the_user.extend(group[group_name_attrib])
+            if type(group) == dict and group.has_key(group_name_attrib):
+                ldap_groups_of_the_user.extend(group[group_name_attrib])
 
         con.unbind()
         logger.debug('User groups: %s' % ldap_groups_of_the_user)
@@ -662,4 +663,3 @@ def ldap_auth(server='ldap', port=None,
     if filterstr[0] == '(' and filterstr[-1] == ')':  # rfc4515 syntax
         filterstr = filterstr[1:-1]  # parens added again where used
     return ldap_auth_aux
-

gluon/contrib/login_methods/linkedin_account.py

@@ -1,4 +1,3 @@
-
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 

gluon/contrib/populate.py

@@ -75,7 +75,7 @@ def da_du_ma(n=4):
                     [random.randint(0, 11)] for i in range(n)])
 
 
-def populate(table, n, default=True, compute=False):
+def populate(table, n, default=True, compute=False, contents={}):
     ell = Learner()
     #ell.learn(open('20417.txt','r').read())
     #ell.save('frequencies.pickle')
@@ -84,7 +84,14 @@ def populate(table, n, default=True, compute=False):
     ids = {}
     for i in range(n):
         record = {}
+
+        record.update(contents) # load user supplied contents.
+
         for fieldname in table.fields:
+
+            if record.get(fieldname) is not None:
+                continue # if user supplied it, let it be.
+
             field = table[fieldname]
             if not isinstance(field.type, (str, unicode)):
                 continue

gluon/contrib/webclient.py

@@ -15,12 +15,12 @@ mostly for testing purposes
 
 Some examples at the bottom.
 """
-
 import re
 import time
 import urllib
 import urllib2
 
+
 DEFAULT_HEADERS = {
     'user-agent': 'Mozilla/4.0',  # some servers are picky
     'accept-language': 'en',
@@ -126,7 +126,11 @@ class WebClient(object):
             self.time = time.time() - t0
             self.response = error
 
-        self.status = self.response.getcode()
+        if hasattr(self.response, 'getcode'):
+            self.status = self.response.getcode()
+        else:#python2.5
+            self.status = None
+
         self.text = self.response.read()
         self.headers = dict(self.response.headers)
 

gluon/dal.py

@@ -122,6 +122,7 @@ Supported DAL URI strings:
 'google:sql' # for google app engine with sql (mysql compatible)
 'teradata://DSN=dsn;UID=user;PWD=pass; DATABASE=database' # experimental
 'imap://user:password@server:port' # experimental
+'mongodb://user:password@server:port/database' # experimental
 
 For more info:
 help(DAL)
@@ -199,7 +200,7 @@ TABLE_ARGS = set(
 
 SELECT_ARGS = set(
     ('orderby', 'groupby', 'limitby','required', 'cache', 'left',
-     'distinct', 'having', 'join','for_update', 'processor','cacheable'))
+     'distinct', 'having', 'join','for_update', 'processor','cacheable', 'orderby_on_limitby'))
 
 ogetattr = object.__getattribute__
 osetattr = object.__setattr__
@@ -1126,6 +1127,9 @@ class BaseAdapter(ConnectionPool):
     def EPOCH(self, first):
         return self.EXTRACT(first, 'epoch')
 
+    def LENGTH(self, first):
+        return "LENGTH(%s)" % self.expand(first)
+
     def AGGREGATE(self, first, what):
         return "%s(%s)" % (what, self.expand(first))
 
@@ -1251,24 +1255,15 @@ class BaseAdapter(ConnectionPool):
         return '(%s LIKE %s)' % (self.expand(first),
                                  self.expand('%'+second, 'string'))
 
-    def CONTAINS(self, first, second, case_sensitive=False):
+    def CONTAINS(self,first,second,case_sensitive=False):     
-        if isinstance(second,Expression):
+        if first.type in ('string','text', 'json'):
-            field = self.expand(first)
+            second = Expression(None,self.CONCAT('%',Expression(
-            expr = self.expand(second,'string')
+                        None,self.REPLACE(second,('%','%%'))),'%'))
-            if first.type.startswith('list:'):
+        elif first.type.startswith('list:'):
-                expr = 'CONCAT("|", %s, "|")' % expr
+            second = Expression(None,self.CONCAT('%|',Expression(None,self.REPLACE(
-            elif not first.type in ('string', 'text', 'json'):
+                        Expression(None,self.REPLACE(second,('%','%%'))),('|','||'))),'|%'))
-                raise RuntimeError("Expression Not Supported")
+        op = case_sensitive and self.LIKE or self.ILIKE
-            return 'INSTR(%s,%s)' % (field, expr)
+        return op(first,second)
-        else:
-            if first.type in ('string', 'text', 'json'):
-                key = '%'+str(second).replace('%','%%')+'%'
-            elif first.type.startswith('list:'):
-                key = '%|'+str(second).replace('|','||').replace('%','%%')+'|%'
-            else:
-                raise RuntimeError("Expression Not Supported")
-            op = case_sensitive and self.LIKE or self.ILIKE
-            return op(first,key)
 
     def EQ(self, first, second=None):
         if second is None:
@@ -1306,9 +1301,24 @@ class BaseAdapter(ConnectionPool):
         return '(%s >= %s)' % (self.expand(first),
                                self.expand(second,first.type))
 
+    def is_numerical_type(self, ftype):
+        return ftype in ('integer','boolean','double','bigint') or \
+            ftype.startswith('decimal')
+
+    def REPLACE(self, first, (second, third)):
+        return 'REPLACE(%s,%s,%s)' % (self.expand(first,'string'), 
+                                      self.expand(second,'string'),
+                                      self.expand(third,'string'))
+
+    def CONCAT(self, *items):
+        return '(%s)' % ' || '.join(self.expand(x,'string') for x in items)
+
     def ADD(self, first, second):
-        return '(%s + %s)' % (self.expand(first),
+        if self.is_numerical_type(first.type):
-                              self.expand(second, first.type))
+            return '(%s + %s)' % (self.expand(first),
+                                  self.expand(second, first.type))
+        else:
+            return self.CONCAT(first, second)
 
     def SUB(self, first, second):
         return '(%s - %s)' % (self.expand(first),
@@ -1499,6 +1509,7 @@ class BaseAdapter(ConnectionPool):
             raise SyntaxError('invalid select attribute: %s' % key)
         args_get = attributes.get
         tablenames = tables(query)
+        tablenames_for_common_filters = tablenames
         for field in fields:
             if isinstance(field, basestring) \
                     and REGEX_TABLE_DOT_FIELD.match(field):
@@ -1525,6 +1536,7 @@ class BaseAdapter(ConnectionPool):
         orderby = args_get('orderby', False)
         having = args_get('having', False)
         limitby = args_get('limitby', False)
+        orderby_on_limitby = args_get('orderby_on_limitby', True)
         for_update = args_get('for_update', False)
         if self.can_select_for_update is False and for_update is True:
             raise SyntaxError('invalid select attribute: for_update')
@@ -1562,6 +1574,8 @@ class BaseAdapter(ConnectionPool):
                     dict.fromkeys(tables(t))) for t in joinon]
             joinont = [t.first._tablename for t in joinon]
             [tables_to_merge.pop(t) for t in joinont if t in tables_to_merge]
+            tablenames_for_common_filters = [t for t in tablenames
+                        if not t in joinont ]
             important_tablenames = joint + joinont + tables_to_merge.keys()
             excluded = [t for t in tablenames
                         if not t in important_tablenames ]
@@ -1569,7 +1583,7 @@ class BaseAdapter(ConnectionPool):
             excluded = tablenames
 
         if use_common_filters(query):
-            query = self.common_filter(query,excluded)
+            query = self.common_filter(query,tablenames_for_common_filters)
         sql_w = ' WHERE ' + self.expand(query) if query else ''
 
         def alias(t):
@@ -1616,7 +1630,7 @@ class BaseAdapter(ConnectionPool):
             else:
                 sql_o += ' ORDER BY %s' % self.expand(orderby)
         if limitby:
-            if not orderby and tablenames:
+            if orderby_on_limitby and not orderby and tablenames:
                 sql_o += ' ORDER BY %s' % ', '.join(['%s.%s'%(t,x) for t in tablenames for x in (hasattr(self.db[t],'_primarykey') and self.db[t]._primarykey or [self.db[t]._id.name])])
             # oracle does not support limitby
         sql = self.select_limitby(sql_s, sql_f, sql_t, sql_w, sql_o, limitby)
@@ -1939,17 +1953,17 @@ class BaseAdapter(ConnectionPool):
         return value
 
     def parse_list_integers(self, value, field_type):
-        if not self.dbengine=='google:datastore':
+        if not isinstance(self, NoSQLAdapter):
             value = bar_decode_integer(value)
         return value
 
     def parse_list_references(self, value, field_type):
-        if not self.dbengine=='google:datastore':
+        if not isinstance(self, NoSQLAdapter):
             value = bar_decode_integer(value)
         return [self.parse_reference(r, field_type[5:]) for r in value]
 
     def parse_list_strings(self, value, field_type):
-        if not self.dbengine=='google:datastore':
+        if not isinstance(self, NoSQLAdapter):
             value = bar_decode_string(value)
         return value
 
@@ -2260,7 +2274,7 @@ class SpatiaLiteAdapter(SQLiteAdapter):
         # Linux uses libspatialite.so
         # Mac OS X uses libspatialite.dylib
         libspatialite = SPATIALLIBS[platform.system()]
-        self.execute(r'SELECT load_extension("%s");') % libspatialite
+        self.execute(r'SELECT load_extension("%s");' % libspatialite)
 
         self.connection.create_function('web2py_extract', 2,
                                         SQLiteAdapter.web2py_extract)
@@ -2410,6 +2424,9 @@ class MySQLAdapter(BaseAdapter):
     def EPOCH(self, first):
         return "UNIX_TIMESTAMP(%s)" % self.expand(first)
 
+    def CONCAT(self, *items):
+        return 'CONCAT(%s)' % ','.join(self.expand(x,'string') for x in items)
+
     def REGEXP(self,first,second):
         return '(%s REGEXP %s)' % (self.expand(first),
                                    self.expand(second,'string'))
@@ -2606,7 +2623,11 @@ class PostgreSQLAdapter(BaseAdapter):
                    "port=%s password='%s'") \
                    % (db, user, host, port, password)
         # choose diver according uri
-        self.__version__ = "%s %s" % (self.driver.__name__, self.driver.__version__)
+        if self.driver:
+            self.__version__ = "%s %s" % (self.driver.__name__,
+                                          self.driver.__version__)
+        else:
+            self.__version__ = None
         def connector(msg=msg,driver_args=driver_args):
             return self.driver.connect(msg,**driver_args)
         self.connector = connector
@@ -2661,14 +2682,6 @@ class PostgreSQLAdapter(BaseAdapter):
         return '(%s ILIKE %s)' % (self.expand(first),
                                   self.expand('%'+second,'string'))
 
-    def CONTAINS(self,first,second,case_sensitive=False):
-        if first.type in ('string','text', 'json'):
-            second = '%'+str(second).replace('%','%%')+'%'
-        elif first.type.startswith('list:'):
-            second = '%|'+str(second).replace('|','||').replace('%','%%')+'|%'
-        op = case_sensitive and self.LIKE or self.ILIKE
-        return op(first,second)
-
     # GIS functions
 
     def ST_ASGEOJSON(self, first, second):
@@ -3103,7 +3116,9 @@ class MSSQLAdapter(BaseAdapter):
             (lmin, lmax) = limitby
             sql_s += ' TOP %i' % lmax
         if 'GROUP BY' in sql_o:
-            sql_o = sql_o[:sql_o.find('ORDER BY ')]
+            orderfound = sql_o.find('ORDER BY ')
+            if orderfound >= 0:
+                sql_o = sql_o[:orderfound]
         return 'SELECT %s %s FROM %s%s%s;' % (sql_s, sql_f, sql_t, sql_w, sql_o)
 
     TRUE = 1
@@ -3193,6 +3208,9 @@ class MSSQLAdapter(BaseAdapter):
     def EPOCH(self, first):
         return "DATEDIFF(second, '1970-01-01 00:00:00', %s)" % self.expand(first)
 
+    def CONCAT(self, *items):
+        return '(%s)' % ' + '.join(self.expand(x,'string') for x in items)
+
     # GIS Spatial Extensions
 
     # No STAsGeoJSON in MSSQL
@@ -3448,18 +3466,16 @@ class FireBirdAdapter(BaseAdapter):
     def SUBSTRING(self,field,parameters):
         return 'SUBSTRING(%s from %s for %s)' % (self.expand(field), parameters[0], parameters[1])
 
-    def CONTAINING(self,first,second):
+    def LENGTH(self, first):
-        "case in-sensitive like operator"
+        return "CHAR_LENGTH(%s)" % self.expand(first)
+
+    def CONTAINS(self,first,second,case_sensitive=False):
+        if first.type.startswith('list:'):
+            second = Expression(None,self.CONCAT('|',Expression(
+                        None,self.REPLACE(second,('|','||'))),'|'))
         return '(%s CONTAINING %s)' % (self.expand(first),
                                        self.expand(second, 'string'))
 
-    def CONTAINS(self, first, second, case_sensitive=False):
-        if first.type in ('string','text'):
-            second = str(second).replace('%','%%')
-        elif first.type.startswith('list:'):
-            second = '|'+str(second).replace('|','||').replace('%','%%')+'|'
-        return self.CONTAINING(first,second)
-
     def _drop(self,table,mode):
         sequence_name = table._sequence_name
         return ['DROP TABLE %s %s;' % (table, mode), 'DROP GENERATOR %s;' % sequence_name]
@@ -4358,13 +4374,14 @@ class NoSQLAdapter(BaseAdapter):
             elif fieldtype == 'blob':
                 pass
             elif fieldtype == 'json':
-                obj = self.to_unicode(obj)
+                if isinstance(obj, basestring):
-                if have_serializers:
+                    obj = self.to_unicode(obj)
-                    obj = serializers.loads_json(obj)
+                    if have_serializers:
-                elif simplejson:
+                        obj = serializers.loads_json(obj)
-                    obj = simplejson.loads(obj)
+                    elif simplejson:
-                else:
+                        obj = simplejson.loads(obj)
-                    raise RuntimeError("missing simplejson")
+                    else:
+                        raise RuntimeError("missing simplejson")
             elif is_string and field_is_type('list:string'):
                 return map(self.to_unicode,obj)
             elif is_list:
@@ -4422,6 +4439,7 @@ class NoSQLAdapter(BaseAdapter):
     def LOWER(self,first): raise SyntaxError("Not supported")
     def UPPER(self,first): raise SyntaxError("Not supported")
     def EXTRACT(self,first,what): raise SyntaxError("Not supported")
+    def LENGTH(self, first): raise SyntaxError("Not supported")
     def AGGREGATE(self,first,what): raise SyntaxError("Not supported")
     def LEFT_JOIN(self): raise SyntaxError("Not supported")
     def RANDOM(self): raise SyntaxError("Not supported")
@@ -5181,6 +5199,7 @@ class MongoDBAdapter(NoSQLAdapter):
                                  "Requires an integer or base 16 value")
         elif isinstance(arg, self.ObjectId):
             return arg
+
         if not isinstance(arg, (int, long)):
             raise TypeError("object_id argument must be of type " +
                             "ObjectId or an objectid representable integer")
@@ -5190,8 +5209,26 @@ class MongoDBAdapter(NoSQLAdapter):
             hexvalue = hex(arg)[2:].replace("L", "")
         return self.ObjectId(hexvalue)
 
+    def parse_reference(self, value, field_type):
+        # here we have to check for ObjectID before base parse
+        if isinstance(value, self.ObjectId):
+            value = int(str(value), 16)
+        return super(MongoDBAdapter,
+                     self).parse_reference(value, field_type)
+
+    def parse_id(self, value, field_type):
+        if isinstance(value, self.ObjectId):
+            value = int(str(value), 16)
+        return super(MongoDBAdapter,
+                     self).parse_id(value, field_type)
+
     def represent(self, obj, fieldtype):
-        value = NoSQLAdapter.represent(self, obj, fieldtype)
+        # the base adatpter does not support MongoDB ObjectId
+        if isinstance(obj, self.ObjectId):
+            value = obj
+        else:
+            value = NoSQLAdapter.represent(self, obj, fieldtype)
+        # reference types must be convert to ObjectID
         if fieldtype  =='date':
             if value == None:
                 return value
@@ -5208,15 +5245,24 @@ class MongoDBAdapter(NoSQLAdapter):
             # mongodb doesn't has a  time object and so it must datetime,
             # string or integer
             return datetime.datetime.combine(d, value)
-        elif fieldtype == 'list:string' or \
+        elif (isinstance(fieldtype, basestring) and
-             fieldtype == 'list:integer' or \
+              fieldtype.startswith('list:')):
-             fieldtype == 'list:reference':
+            if fieldtype.startswith('list:reference'):
+                newval = []
+                for v in value:
+                    newval.append(self.object_id(v))
+                return newval
             return value
+        elif ((isinstance(fieldtype, basestring) and
+               fieldtype.startswith("reference")) or
+               (isinstance(fieldtype, Table))):
+            value = self.object_id(value)
+
         return value
 
     # Safe determines whether a asynchronious request is done or a
     # synchronious action is done
-    # For safety, we use by default synchronious requests
+    # For safety, we use by default synchronous requests
     def insert(self, table, fields, safe=None):
         if safe==None:
             safe = self.safe
@@ -5264,14 +5310,18 @@ class MongoDBAdapter(NoSQLAdapter):
                 if expression.first.type == 'id':
                     expression.first.name = '_id'
                 # cast to Mongo ObjectId
-                expression.second = self.object_id(expression.second)
+                if isinstance(expression.second, (tuple, list, set)):
+                    expression.second = [self.object_id(item) for
+                                         item in expression.second]
+                else:
+                    expression.second = self.object_id(expression.second)
                 result = expression.op(expression.first, expression.second)
+
         if isinstance(expression, Field):
             if expression.type=='id':
                 result = "_id"
             else:
                 result =  expression.name
-
         elif isinstance(expression, (Expression, Query)):
             if not expression.second is None:
                 result = expression.op(expression.first, expression.second)
@@ -5282,7 +5332,7 @@ class MongoDBAdapter(NoSQLAdapter):
             else:
                 result = expression.op
         elif field_type:
-            result = str(self.represent(expression,field_type))
+            result = self.represent(expression,field_type)
         elif isinstance(expression,(list,tuple)):
             result = ','.join(self.represent(item,field_type) for
                               item in expression)
@@ -5336,7 +5386,6 @@ class MongoDBAdapter(NoSQLAdapter):
         else:
             raise SyntaxError("The table name could not be found in " +
                               "the query nor from the select statement.")
-
         mongoqry_dict = self.expand(query)
         fields = fields or self.db[tablename]
         for field in fields:
@@ -5386,15 +5435,12 @@ class MongoDBAdapter(NoSQLAdapter):
                 # record id's
                 if fieldname == "id": fieldname = "_id"
                 if fieldname in record:
-                    if isinstance(record[fieldname],
+                    value = record[fieldname]
-                                  self.ObjectId):
-                        value = int(str(record[fieldname]), 16)
-                    else:
-                        value = record[fieldname]
                 else:
                     value = None
                 row.append(value)
             rows.append(row)
+
         processor = attributes.get('processor', self.parse)
         result = processor(rows, fields, newnames, False)
         return result
@@ -5494,7 +5540,7 @@ class MongoDBAdapter(NoSQLAdapter):
     def BELONGS(self, first, second):
         if isinstance(second, str):
             return {self.expand(first) : {"$in" : [ second[:-1]]} }
-        elif second==[] or second==():
+        elif second==[] or second==() or second==set():
             return {1:0}
         items = [self.expand(item, first.type) for item in second]
         return {self.expand(first) : {"$in" : items} }
@@ -8746,7 +8792,7 @@ class Expression(object):
 
     def len(self):
         db = self.db
-        return Expression(db, db._adapter.AGGREGATE, self, 'LENGTH', 'integer')
+        return Expression(db, db._adapter.LENGTH, self, None, 'integer')
 
     def avg(self):
         db = self.db
@@ -8764,6 +8810,10 @@ class Expression(object):
         db = self.db
         return Expression(db, db._adapter.UPPER, self, None, self.type)
 
+    def replace(self,a,b):
+        db = self.db
+        return Expression(db, db._adapter.REPLACE, self, (a,b), self.type)
+
     def year(self):
         db = self.db
         return Expression(db, db._adapter.EXTRACT, self, 'year', 'integer')

gluon/fileutils.py

@@ -223,19 +223,20 @@ def _extractall(filename, path='.', members=None):
     return ret
 
 
-def tar(file, dir, expression='^.+$'):
+def tar(file, dir, expression='^.+$', filenames=None):
     """
     tars dir into file, only tars file that match expression
     """
 
     tar = tarfile.TarFile(file, 'w')
     try:
-        for file in listdir(dir, expression, add_dirs=True):
+        if filenames is None:
+            filenames = listdir(dir, expression, add_dirs=True)
+        for file in filenames:
             tar.add(os.path.join(dir, file), file, False)
     finally:
         tar.close()
 
-
 def untar(file, dir):
     """
     untar file into dir
@@ -244,14 +245,14 @@ def untar(file, dir):
     _extractall(file, dir)
 
 
-def w2p_pack(filename, path, compiled=False):
+def w2p_pack(filename, path, compiled=False, filenames=None):
     filename = abspath(filename)
     path = abspath(path)
     tarname = filename + '.tar'
     if compiled:
         tar_compiled(tarname, path, '^[\w\.\-]+$')
     else:
-        tar(tarname, path, '^[\w\.\-]+$')
+        tar(tarname, path, '^[\w\.\-]+$', filenames=filenames)
     w2pfp = gzopen(filename, 'wb')
     tarfp = open(tarname, 'rb')
     w2pfp.write(tarfp.read())
@@ -366,16 +367,19 @@ def get_session(request, other_application='admin'):
     return osession
 
 
-def check_credentials(request, other_application='admin', expiration=60 * 60):
+def check_credentials(request, other_application='admin',
+                      expiration=60 * 60, gae_login=True):
     """ checks that user is authorized to access other_application"""
     if request.env.web2py_runtime_gae:
         from google.appengine.api import users
         if users.is_current_user_admin():
             return True
-        else:
+        elif gae_login:
             login_html = '<a href="%s">Sign in with your google account</a>.' \
                 % users.create_login_url(request.env.path_info)
             raise HTTP(200, '<html><body>%s</body></html>' % login_html)
+        else:
+            return False
     else:
         dt = time.time() - expiration
         s = get_session(request, other_application)

gluon/html.py

@@ -840,9 +840,8 @@ class DIV(XmlComponent):
                 c.latest = self.latest
                 c.session = self.session
                 c.formname = self.formname
-                if hideerror and not \
+                c['hideerror'] = hideerror or \
-                        self.attributes.get('hideerror', False):
+                        self.attributes.get('hideerror', False)
-                    c['hideerror'] = hideerror
                 newstatus = c._traverse(status, hideerror) and newstatus
 
         # for input, textarea, select, option

gluon/sanitizer.py

@@ -226,4 +226,3 @@ def sanitize(text, permitted_tags=[
         return str(text)
     return XssCleaner(permitted_tags=permitted_tags,
                       allowed_attributes=allowed_attributes).strip(text, escape)
-

gluon/scheduler.py

@@ -563,16 +563,18 @@ class Scheduler(MetaScheduler):
             self.die()
 
     def wrapped_assign_tasks(self, db):
+        logger.debug('Assigning tasks...')
         db.commit()  #db.commit() only for Mysql
         x = 0
         while x < 10:
             try:
                 self.assign_tasks(db)
                 db.commit()
+                logger.debug('Tasks assigned...')
                 break
             except:
                 db.rollback()
-                logger.error('TICKER: error assigning tasks')
+                logger.error('TICKER: error assigning tasks (%s)', x)
                 x += 1
                 time.sleep(0.5)
 
@@ -766,7 +768,7 @@ class Scheduler(MetaScheduler):
                     db(sw.worker_name == self.worker_name).update(
                         last_heartbeat=now, status=ACTIVE)
                     self.worker_status[1] = 1  # re-activating the process
-                    if self.worker_status[0] <> RUNNING:
+                    if self.worker_status[0] != RUNNING:
                         self.worker_status[0] = ACTIVE
 
             self.do_assign_tasks = False
@@ -786,13 +788,17 @@ class Scheduler(MetaScheduler):
                         inactive_workers._select(sw.worker_name)))(st.status == RUNNING)\
                         .update(assigned_worker_name='', status=QUEUED)
                     inactive_workers.delete()
-                    self.is_a_ticker = self.being_a_ticker()
+                    try:
+                        self.is_a_ticker = self.being_a_ticker()
+                    except:
+                        logger.error('Error coordinating TICKER')
                     if self.worker_status[0] == ACTIVE:
                         self.do_assign_tasks = True
                 except:
-                    pass
+                    logger.error('Error cleaning up')
             db.commit()
         except:
+            logger.error('Error retrieving status')
             db.rollback()
         self.adj_hibernation()
         self.sleep()
@@ -806,14 +812,16 @@ class Scheduler(MetaScheduler):
         ticker = all_active.find(lambda row: row.is_ticker is True).first()
         not_busy = self.worker_status[0] == ACTIVE
         if not ticker:
+            #if no other tickers are around
             if not_busy:
-                #only if this worker isn't busy, otherwise wait for a free one
+                #only if I'm not busy
                 db(sw.worker_name == self.worker_name).update(is_ticker=True)
                 db(sw.worker_name != self.worker_name).update(is_ticker=False)
                 logger.info("TICKER: I'm a ticker")
             else:
-                #giving up, only if I'm not alone
+                #I'm busy
-                if len(all_active) > 1:
+                if len(all_active) >= 1:
+                    #so I'll "downgrade" myself to a "poor worker"
                     db(sw.worker_name == self.worker_name).update(is_ticker=False)
                 else:
                     not_busy = True

gluon/serializers.py

@@ -160,18 +160,19 @@ def rss(feed):
     if not 'entries' in feed and 'items' in feed:
         feed['entries'] = feed['items']
     now = datetime.datetime.now()
-    rss = rss2.RSS2(title=str(feed.get('title', '(notitle)')),
+    rss = rss2.RSS2(title=str(feed.get('title', '(notitle)').encode('utf-8', 'replace')),
-                    link=str(feed.get('link', None)),
+                    link=str(feed.get('link', None).encode('utf-8', 'replace')),
-                    description=str(feed.get('description', '')),
+                    description=str(feed.get('description', '').encode('utf-8', 'replace')),
                     lastBuildDate=feed.get('created_on', now),
                     items=[rss2.RSSItem(
-                           title=str(entry.get('title', '(notitle)')),
+                           title=str(entry.get('title', '(notitle)').encode('utf-8', 'replace')),
-                           link=str(entry.get('link', None)),
+                           link=str(entry.get('link', None).encode('utf-8', 'replace')),
-                           description=str(entry.get('description', '')),
+                           description=str(entry.get('description', '').encode('utf-8', 'replace')),
                            pubDate=entry.get('created_on', now)
                            ) for entry in feed.get('entries', [])])
     return rss.to_xml(encoding='utf-8')
 
+
 def yaml(data):
     if have_yaml:
         return yamlib.dump(data)
@@ -181,4 +182,3 @@ def loads_yaml(data):
     if have_yaml:
         return yamlib.load(data)
     else: raise ImportError("No YAML serializer available")
-

gluon/sqlhtml.py

@@ -19,6 +19,7 @@ except ImportError:
     from cgi import parse_qs as psq
 import os
 from http import HTTP
+from html import XmlComponent
 from html import XML, SPAN, TAG, A, DIV, CAT, UL, LI, TEXTAREA, BR, IMG, SCRIPT
 from html import FORM, INPUT, LABEL, OPTION, SELECT, BUTTON
 from html import TABLE, THEAD, TBODY, TR, TD, TH, STYLE
@@ -349,6 +350,12 @@ class RadioWidget(OptionsWidget):
         see also: :meth:`FormWidget.widget`
         """
 
+        if isinstance(value, (list,tuple)):
+            value = str(value[0])
+        else:
+            value = str(value)
+
+
         attr = cls._attributes(field, {}, **attributes)
         attr['_class'] = attr.get('_class', 'web2py_radiowidget')
 
@@ -1174,9 +1181,10 @@ class SQLFORM(FORM):
             xfields.append(
                 (self.FIELDKEY_DELETE_RECORD + SQLFORM.ID_ROW_SUFFIX,
                  LABEL(
-                 delete_label, separator,
+                        T(delete_label), separator,
-                 _for=self.FIELDKEY_DELETE_RECORD,
+                        _for=self.FIELDKEY_DELETE_RECORD,
-                 _id=self.FIELDKEY_DELETE_RECORD + SQLFORM.ID_LABEL_SUFFIX),
+                        _id=self.FIELDKEY_DELETE_RECORD + \
+                            SQLFORM.ID_LABEL_SUFFIX),
                  widget,
                  col3.get(self.FIELDKEY_DELETE_RECORD, '')))
             self.custom.delete = self.custom.deletable = widget
@@ -1223,7 +1231,8 @@ class SQLFORM(FORM):
                 table = TABLE()
                 for id, a, b, c in xfields:
                     newrows = formstyle(id, a, b, c)
-                    self.field_parent[id] = getattr(b, 'parent', None)
+                    self.field_parent[id] = getattr(b, 'parent', None) \
+                        if isinstance(b,XmlComponent) else None
                     if type(newrows).__name__ != "tuple":
                         newrows = [newrows]
                     for newrow in newrows:
@@ -1231,7 +1240,8 @@ class SQLFORM(FORM):
             else:
                 table = formstyle(self, xfields)
                 for id, a, b, c in xfields:
-                    self.field_parent[id] = getattr(b, 'parent', None)
+                    self.field_parent[id] = getattr(b, 'parent', None) \
+                        if isinstance(b,XmlComponent) else None
         else:
             raise RuntimeError('formstyle not supported')
         return table
@@ -1581,7 +1591,7 @@ class SQLFORM(FORM):
 
         table_name = attributes.get('table_name', 'no_table')
 
-        # So it won't interfear with SQLDB.define_table
+        # So it won't interfere with SQLDB.define_table
         if 'table_name' in attributes:
             del attributes['table_name']
 
@@ -1760,6 +1770,7 @@ class SQLFORM(FORM):
              createargs={},
              editargs={},
              viewargs={},
+             selectable_submit_button='Submit',
              buttons_placement = 'right',
              links_placement = 'right',
              noconfirm=False
@@ -1892,7 +1903,7 @@ class SQLFORM(FORM):
         tablename = table._tablename
         if upload == '<default>':
             upload = lambda filename: url(args=['download', filename])
-            if len(request.args) > 1 and request.args[-2] == 'download':
+            if request.args(-2) == 'download':
                 stream = response.download(request, db)
                 raise HTTP(200, stream, **response.headers)
 
@@ -1929,7 +1940,7 @@ class SQLFORM(FORM):
         create_form = update_form = view_form = search_form = None
         sqlformargs = dict(formargs)
 
-        if create and len(request.args) > 1 and request.args[-2] == 'new':
+        if create and request.args(-2) == 'new':
             table = db[request.args[-1]]
             sqlformargs.update(createargs)
             create_form = SQLFORM(
@@ -1948,7 +1959,7 @@ class SQLFORM(FORM):
             res.search_form = search_form
             return res
 
-        elif details and len(request.args) > 2 and request.args[-3] == 'view':
+        elif details and request.args(-3) == 'view':
             table = db[request.args[-2]]
             record = table(request.args[-1]) or redirect(referrer)
             sqlformargs.update(viewargs)
@@ -1963,7 +1974,7 @@ class SQLFORM(FORM):
             res.view_form = view_form
             res.search_form = search_form
             return res
-        elif editable and len(request.args) > 2 and request.args[-3] == 'edit':
+        elif editable and request.args(-3) == 'edit':
             table = db[request.args[-2]]
             record = table(request.args[-1]) or redirect(URL('error'))
             sqlformargs.update(editargs)
@@ -1988,7 +1999,7 @@ class SQLFORM(FORM):
             res.view_form = view_form
             res.search_form = search_form
             return res
-        elif deletable and len(request.args) > 2 and request.args[-3] == 'delete':
+        elif deletable and request.args(-3) == 'delete':
             table = db[request.args[-2]]
             if ondelete:
                 ondelete(table, request.args[-1])
@@ -2111,10 +2122,15 @@ class SQLFORM(FORM):
         if subquery:
             dbset = dbset(subquery)
         try:
-            if left or groupby:
+            if groupby:
                 c = 'count(*)'
-                nrows = dbset.select(c, left=left, cacheable=True,
+                nrows = db.executesql(
-                                     groupby=groupby).first()[c]
+                    'select count(*) from (%s);' %
+                    dbset._select(c, left=left, cacheable=True,
+                                  groupby=groupby)[:-1])[0][0]
+            elif left:
+                c = 'count(*)'
+                nrows = dbset.select(c, left=left, cacheable=True).first()[c]
             elif dbset._db._adapter.dbengine=='google:datastore':
                 #if we don't set a limit, this can timeout for a large table
                 nrows = dbset.db._adapter.count(dbset.query, limit=1000)
@@ -2368,9 +2384,12 @@ class SQLFORM(FORM):
                     tr = TR(*trcols, **dict(_class=classtr))
                 tbody.append(tr)
             htmltable.append(tbody)
-            htmltable = DIV(htmltable, _style='width:100%;overflow-x:auto')
+            htmltable = DIV(
+                htmltable, _class='web2py_htmltable',
+                _style='width:100%;overflow-x:auto;-ms-overflow-x:scroll')
             if selectable:
-                htmltable = FORM(htmltable, INPUT(_type="submit"))
+                htmltable = FORM(htmltable, INPUT(
+                        _type="submit", _value=T(selectable_submit_button)))
                 if htmltable.process(formname=formname).accepted:
                     htmltable.vars.records = htmltable.vars.records or []
                     htmltable.vars.records = htmltable.vars.records if type(htmltable.vars.records) == list else [htmltable.vars.records]
@@ -2518,8 +2537,9 @@ class SQLFORM(FORM):
                     break
             if nargs > len(args) + 1:
                 query = (field == id)
-                if isinstance(linked_tables, dict):
+                # cjk
-                    linked_tables = linked_tables.get(table._tablename, [])
+                # if isinstance(linked_tables, dict):
+                #     linked_tables = linked_tables.get(table._tablename, [])
                 if linked_tables is None or referee in linked_tables:
                     field.represent = lambda id, r=None, referee=referee, rep=field.represent: A(callable(rep) and rep(id) or id, _class=trap_class(), _href=url(args=['view', referee, id]))
         except (KeyError, ValueError, TypeError):
@@ -2544,20 +2564,45 @@ class SQLFORM(FORM):
             check[rfield.tablename] = \
                 check.get(rfield.tablename, []) + [rfield.name]
         if isinstance(linked_tables, dict):
-            linked_tables = linked_tables.get(table._tablename, [])
+            for tbl in linked_tables.keys():
-        for tablename in sorted(check):
+                tb = db[tbl]
-            linked_fieldnames = check[tablename]
+                if isinstance(linked_tables[tbl], list):
-            tb = db[tablename]
+                        if len(linked_tables[tbl]) > 1:
-            multiple_links = len(linked_fieldnames) > 1
+                            t = T('%s(%s)' %(tbl, fld))
-            for fieldname in linked_fieldnames:
+                        else:
-                if linked_tables is None or tablename in linked_tables:
+                            t = T(tb._plural)
-                    t = T(tb._plural) if not multiple_links else \
+                        for fld in linked_tables[tbl]:
-                        T(tb._plural + '(' + fieldname + ')')
+                            if fld not in db[tbl].fields:
-                    args0 = tablename + '.' + fieldname
+                                raise ValueError('Field %s not in table' %fld)
+                            args0 = tbl + '.' + fld
+                            links.append(
+                                lambda row, t=t, nargs=nargs, args0=args0:
+                                A(SPAN(t), _class=trap_class(), _href=url(
+                                  args=[args0, row[id_field_name]])))
+                else:
+                    t = T(tb._plural)
+                    fld = linked_tables[tbl]
+                    if fld not in db[tbl].fields:
+                        raise ValueError('Field %s not in table' %fld)
+                    args0 = tbl + '.' + fld
                     links.append(
                         lambda row, t=t, nargs=nargs, args0=args0:
                         A(SPAN(t), _class=trap_class(), _href=url(
                           args=[args0, row[id_field_name]])))
+        else:
+            for tablename in sorted(check):
+                linked_fieldnames = check[tablename]
+                tb = db[tablename]
+                multiple_links = len(linked_fieldnames) > 1
+                for fieldname in linked_fieldnames:
+                    if linked_tables is None or tablename in linked_tables:
+                        t = T(tb._plural) if not multiple_links else \
+                            T(tb._plural + '(' + fieldname + ')')
+                        args0 = tablename + '.' + fieldname
+                        links.append(
+                            lambda row, t=t, nargs=nargs, args0=args0:
+                            A(SPAN(t), _class=trap_class(), _href=url(
+                              args=[args0, row[id_field_name]])))
 
         grid = SQLFORM.grid(query, args=request.args[:nargs], links=links,
                             links_in_grid=links_in_grid,
@@ -2635,7 +2680,7 @@ class SQLTABLE(TABLE):
     :param selectid: The id you want to select
     :param renderstyle: Boolean render the style with the table
 
-    :param extracolums = [{'label':A('Extra',_href='#'),
+    :param extracolumns = [{'label':A('Extra',_href='#'),
                     'class': '', #class name of the header
                     'width':'', #width in pixels or %
                     'content':lambda row, rc: A('Edit',_href='edit/%s'%row.id),
@@ -2657,8 +2702,8 @@ class SQLTABLE(TABLE):
                                 },
                }
 
-    table = SQLTABLE(rows, headers=headers, extracolums=extracolums)
+    table = SQLTABLE(rows, headers=headers, extracolumns=extracolumns)
-
+`<
 
     """
 

gluon/tests/__init__.py

@@ -10,4 +10,4 @@ from test_template import *
 from test_utils import *
 from test_contribs import *
 from test_markmin import *
-# from test_web import *
+from test_web import *

gluon/tests/test_dal.py

@@ -250,26 +250,26 @@ class TestSelect(unittest.TestCase):
         self.assertEqual(db.tt.insert(aa='1'), 1)
         self.assertEqual(db.tt.insert(aa='2'), 2)
         self.assertEqual(db.tt.insert(aa='3'), 3)
-        self.assertEqual(len(db(db.tt.id > 0).select()), 3)
+        self.assertEqual(db(db.tt.id > 0).count(), 3)
         self.assertEqual(db(db.tt.id > 0).select(orderby=~db.tt.aa
                           | db.tt.id)[0].aa, '3')
         self.assertEqual(len(db(db.tt.id > 0).select(limitby=(1, 2))), 1)
         self.assertEqual(db(db.tt.id > 0).select(limitby=(1, 2))[0].aa,
                          '2')
         self.assertEqual(len(db().select(db.tt.ALL)), 3)
-        self.assertEqual(len(db(db.tt.aa == None).select()), 0)
+        self.assertEqual(db(db.tt.aa == None).count(), 0)
-        self.assertEqual(len(db(db.tt.aa != None).select()), 3)
+        self.assertEqual(db(db.tt.aa != None).count(), 3)
-        self.assertEqual(len(db(db.tt.aa > '1').select()), 2)
+        self.assertEqual(db(db.tt.aa > '1').count(), 2)
-        self.assertEqual(len(db(db.tt.aa >= '1').select()), 3)
+        self.assertEqual(db(db.tt.aa >= '1').count(), 3)
-        self.assertEqual(len(db(db.tt.aa == '1').select()), 1)
+        self.assertEqual(db(db.tt.aa == '1').count(), 1)
-        self.assertEqual(len(db(db.tt.aa != '1').select()), 2)
+        self.assertEqual(db(db.tt.aa != '1').count(), 2)
-        self.assertEqual(len(db(db.tt.aa < '3').select()), 2)
+        self.assertEqual(db(db.tt.aa < '3').count(), 2)
-        self.assertEqual(len(db(db.tt.aa <= '3').select()), 3)
+        self.assertEqual(db(db.tt.aa <= '3').count(), 3)
-        self.assertEqual(len(db(db.tt.aa > '1')(db.tt.aa < '3').select()), 1)
+        self.assertEqual(db(db.tt.aa > '1')(db.tt.aa < '3').count(), 1)
-        self.assertEqual(len(db((db.tt.aa > '1') & (db.tt.aa < '3')).select()), 1)
+        self.assertEqual(db((db.tt.aa > '1') & (db.tt.aa < '3')).count(), 1)
-        self.assertEqual(len(db((db.tt.aa > '1') | (db.tt.aa < '3')).select()), 3)
+        self.assertEqual(db((db.tt.aa > '1') | (db.tt.aa < '3')).count(), 3)
-        self.assertEqual(len(db((db.tt.aa > '1') & ~(db.tt.aa > '2')).select()), 1)
+        self.assertEqual(db((db.tt.aa > '1') & ~(db.tt.aa > '2')).count(), 1)
-        self.assertEqual(len(db(~(db.tt.aa > '1') & (db.tt.aa > '2')).select()), 0)
+        self.assertEqual(db(~(db.tt.aa > '1') & (db.tt.aa > '2')).count(), 0)
         db.tt.drop()
 
 
@@ -281,15 +281,15 @@ class TestBelongs(unittest.TestCase):
         self.assertEqual(db.tt.insert(aa='1'), 1)
         self.assertEqual(db.tt.insert(aa='2'), 2)
         self.assertEqual(db.tt.insert(aa='3'), 3)
-        self.assertEqual(len(db(db.tt.aa.belongs(('1', '3'))).select()),
+        self.assertEqual(db(db.tt.aa.belongs(('1', '3'))).count(),
                          2)
-        self.assertEqual(len(db(db.tt.aa.belongs(db(db.tt.id
+        self.assertEqual(db(db.tt.aa.belongs(db(db.tt.id
-                          > 2)._select(db.tt.aa))).select()), 1)
+                          > 2)._select(db.tt.aa))).count(), 1)
-        self.assertEqual(len(db(db.tt.aa.belongs(db(db.tt.aa.belongs(('1',
+        self.assertEqual(db(db.tt.aa.belongs(db(db.tt.aa.belongs(('1',
-                         '3')))._select(db.tt.aa))).select()), 2)
+                         '3')))._select(db.tt.aa))).count(), 2)
-        self.assertEqual(len(db(db.tt.aa.belongs(db(db.tt.aa.belongs(db
+        self.assertEqual(db(db.tt.aa.belongs(db(db.tt.aa.belongs(db
                          (db.tt.aa.belongs(('1', '3')))._select(db.tt.aa)))._select(
-                         db.tt.aa))).select()),
+                         db.tt.aa))).count(),
                          2)
         db.tt.drop()
 
@@ -297,16 +297,17 @@ class TestBelongs(unittest.TestCase):
 class TestContains(unittest.TestCase):
     def testRun(self):
         db = DAL(DEFAULT_URI, check_reserved=['all'])
-        db.define_table('tt', Field('aa', 'list:string'))
+        db.define_table('tt', Field('aa', 'list:string'), Field('bb','string'))
-        self.assertEqual(db.tt.insert(aa=['aaa','bbb']), 1)
+        self.assertEqual(db.tt.insert(aa=['aaa','bbb'],bb='aaa'), 1)
-        self.assertEqual(db.tt.insert(aa=['bbb','ddd']), 2)
+        self.assertEqual(db.tt.insert(aa=['bbb','ddd'],bb='abb'), 2)
-        self.assertEqual(db.tt.insert(aa=['eee','aaa']), 3)
+        self.assertEqual(db.tt.insert(aa=['eee','aaa'],bb='acc'), 3)
-        self.assertEqual(len(db(db.tt.aa.contains('aaa')).select()),
+        self.assertEqual(db(db.tt.aa.contains('aaa')).count(), 2)
-                         2)
+        self.assertEqual(db(db.tt.aa.contains('bbb')).count(), 2)
-        self.assertEqual(len(db(db.tt.aa.contains('bbb')).select()),
+        self.assertEqual(db(db.tt.aa.contains('aa')).count(), 0)
-                         2)
+        self.assertEqual(db(db.tt.bb.contains('a')).count(), 3)
-        self.assertEqual(len(db(db.tt.aa.contains('aa')).select()),
+        self.assertEqual(db(db.tt.bb.contains('b')).count(), 1)
-                         0)
+        self.assertEqual(db(db.tt.bb.contains('d')).count(), 0)
+        self.assertEqual(db(db.tt.aa.contains(db.tt.bb)).count(), 1)
         db.tt.drop()
 
 
@@ -316,23 +317,23 @@ class TestLike(unittest.TestCase):
         db = DAL(DEFAULT_URI, check_reserved=['all'])
         db.define_table('tt', Field('aa'))
         self.assertEqual(db.tt.insert(aa='abc'), 1)
-        self.assertEqual(len(db(db.tt.aa.like('a%')).select()), 1)
+        self.assertEqual(db(db.tt.aa.like('a%')).count(), 1)
-        self.assertEqual(len(db(db.tt.aa.like('%b%')).select()), 1)
+        self.assertEqual(db(db.tt.aa.like('%b%')).count(), 1)
-        self.assertEqual(len(db(db.tt.aa.like('%c')).select()), 1)
+        self.assertEqual(db(db.tt.aa.like('%c')).count(), 1)
-        self.assertEqual(len(db(db.tt.aa.like('%d%')).select()), 0)
+        self.assertEqual(db(db.tt.aa.like('%d%')).count(), 0)
-        self.assertEqual(len(db(db.tt.aa.lower().like('A%')).select()), 1)
+        self.assertEqual(db(db.tt.aa.lower().like('A%')).count(), 1)
-        self.assertEqual(len(db(db.tt.aa.lower().like('%B%')).select()),
+        self.assertEqual(db(db.tt.aa.lower().like('%B%')).count(),
                          1)
-        self.assertEqual(len(db(db.tt.aa.lower().like('%C')).select()), 1)
+        self.assertEqual(db(db.tt.aa.lower().like('%C')).count(), 1)
-        self.assertEqual(len(db(db.tt.aa.upper().like('A%')).select()), 1)
+        self.assertEqual(db(db.tt.aa.upper().like('A%')).count(), 1)
-        self.assertEqual(len(db(db.tt.aa.upper().like('%B%')).select()),
+        self.assertEqual(db(db.tt.aa.upper().like('%B%')).count(),
                          1)
-        self.assertEqual(len(db(db.tt.aa.upper().like('%C')).select()), 1)
+        self.assertEqual(db(db.tt.aa.upper().like('%C')).count(), 1)
         db.tt.drop()
         db.define_table('tt', Field('aa', 'integer'))
         self.assertEqual(db.tt.insert(aa=1111111111), 1)
-        self.assertEqual(len(db(db.tt.aa.like('1%')).select()), 1)
+        self.assertEqual(db(db.tt.aa.like('1%')).count(), 1)
-        self.assertEqual(len(db(db.tt.aa.like('2%')).select()), 0)
+        self.assertEqual(db(db.tt.aa.like('2%')).count(), 0)
         db.tt.drop()
 
 
@@ -347,8 +348,8 @@ class TestDatetime(unittest.TestCase):
                          10, 30)), 2)
         self.assertEqual(db.tt.insert(aa=datetime.datetime(1970, 12, 21,
                          9, 30)), 3)
-        self.assertEqual(len(db(db.tt.aa == datetime.datetime(1971, 12,
+        self.assertEqual(db(db.tt.aa == datetime.datetime(1971, 12,
-                         21, 11, 30)).select()), 1)
+                         21, 11, 30)).count(), 1)
         self.assertEqual(db(db.tt.aa.year() == 1971).count(), 2)
         self.assertEqual(db(db.tt.aa.month() == 12).count(), 2)
         self.assertEqual(db(db.tt.aa.day() == 21).count(), 3)
@@ -582,6 +583,32 @@ class TestComputedFields(unittest.TestCase):
         db.tt.drop()
         db.commit()
 
+class TestCommonFilters(unittest.TestCase):
+
+    def testRun(self):
+        db = DAL(DEFAULT_URI, check_reserved=['all'])
+        db.define_table('t1', Field('aa'))
+        db.define_table('t2', Field('aa'), Field('b', db.t1))
+        i1 = db.t1.insert(aa='1')
+        i2 = db.t1.insert(aa='2')
+        i3 = db.t1.insert(aa='3')
+        db.t2.insert(aa='4', b=i1)
+        db.t2.insert(aa='5', b=i2)
+        db.t2.insert(aa='6', b=i2)
+        db.t1._common_filter = lambda q: db.t1.aa>1
+        self.assertEqual(db(db.t1).count(),2)
+        self.assertEqual(db(db.t1).count(),2)
+        q = db.t2.b==db.t1.id
+        self.assertEqual(db(q).count(),2)
+        self.assertEqual(db(q).count(),2)        
+        self.assertEqual(len(db(db.t1).select(left=db.t2.on(q))),3)
+        db.t2._common_filter = lambda q: db.t2.aa<6
+        self.assertEqual(db(q).count(),1)
+        self.assertEqual(db(q).count(),1)
+        self.assertEqual(len(db(db.t1).select(left=db.t2.on(q))),2)
+        db.t2.drop()
+        db.t1.drop()
+
 class TestImportExportFields(unittest.TestCase):
 
     def testRun(self):

gluon/tests/test_html.py

@@ -206,6 +206,12 @@ class TestBareHelpers(unittest.TestCase):
         self.assertEqual(UL('<>', _a='1', _b='2').xml(),
                          '<ul a="1" b="2"><li>&lt;&gt;</li></ul>')
 
+class TestData(unittest.TestCase):
+
+    def testAdata(self):
+        self.assertEqual(A('<>', data=dict(abc='<def?asd>', cde='standard'), _a='1', _b='2').xml(),
+                         '<a a="1" b="2" data-abc="&lt;def?asd&gt;" data-cde="standard">&lt;&gt;</a>')
+
 
 if __name__ == '__main__':
     unittest.main()

gluon/tests/test_web.py

@@ -11,11 +11,58 @@ else:
     sys.path.append(os.path.realpath('../'))
 
 import unittest
+import subprocess
+import time
+import signal
 from contrib.webclient import WebClient
 
+webserverprocess = None
 
-class TestWeb(unittest.TestCase):
+def startwebserver():
-    def testWebClient(self):
+    global webserverprocess
+    webserverprocess = subprocess.Popen([sys.executable, 'web2py.py', '-a',  'testpass'])
+    print 'Sleeping before web2py starts...'
+    for a in range(1,11):
+        time.sleep(1)
+        print a, '...'
+    print ''
+
+def terminate_process(pid):
+    #Taken from http://stackoverflow.com/questions/1064335/in-python-2-5-how-do-i-kill-a-subprocess
+    # all this shit is because we are stuck with Python 2.5 and \
+    #we cannot use Popen.terminate()
+    if sys.platform.startswith('win'):
+        import ctypes
+        PROCESS_TERMINATE = 1
+        handle = ctypes.windll.kernel32.OpenProcess(PROCESS_TERMINATE, False, pid)
+        ctypes.windll.kernel32.TerminateProcess(handle, -1)
+        ctypes.windll.kernel32.CloseHandle(handle)
+    else:
+        os.kill(pid, signal.SIGKILL)
+
+def stopwebserver():
+    global webserverprocess
+    print 'Killing webserver'
+    if sys.version_info < (2,6):
+        terminate_process(webserverprocess.pid)
+    else:
+        webserverprocess.terminate()
+
+
+class LiveTest(unittest.TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        startwebserver()
+
+    @classmethod
+    def tearDownClass(cls):
+        stopwebserver()
+
+
+
+class TestWeb(LiveTest):
+    def testRegisterAndLogin(self):
         client = WebClient('http://127.0.0.1:8000/welcome/default/')
 
         client.get('index')
@@ -40,7 +87,7 @@ class TestWeb(unittest.TestCase):
 
         # check registration and login were successful
         client.get('index')
-        print client.text
+
         self.assertTrue('Welcome Homer' in client.text)
 
         client = WebClient('http://127.0.0.1:8000/admin/default/')
@@ -48,9 +95,7 @@ class TestWeb(unittest.TestCase):
         client.get('site')
         client.get('design/welcome')
 
-
+    def testStaticCache(self):
-class TestStaticCacheControl(unittest.TestCase):
-    def testWebClient(self):
         s = WebClient('http://127.0.0.1:8000/welcome/')
         s.get('static/js/web2py.js')
         assert('expires' not in s.headers)
@@ -61,5 +106,6 @@ class TestStaticCacheControl(unittest.TestCase):
         assert('expires' in s.headers)
         assert(s.headers['cache-control'].startswith('max-age'))
 
+
 if __name__ == '__main__':
     unittest.main()

gluon/tools.py

@@ -266,8 +266,8 @@ class Mail(object):
     def send(
         self,
         to,
-        subject='None',
+        subject = '[no subject]',
-        message='None',
+        message = '[no message]',
         attachments=None,
         cc=None,
         bcc=None,
@@ -374,10 +374,14 @@ class Mail(object):
             payload_in = MIMEMultipart.MIMEMultipart('mixed')
         else:
             # no encoding configuration for raw messages
-            if isinstance(message, basestring):
+            if not isinstance(message, basestring):
+                message = message.read()
+            if isinstance(message, unicode):
+                text = message.encode('utf-8')
+            elif not encoding=='utf-8':
                 text = message.decode(encoding).encode('utf-8')
             else:
-                text = message.read().decode(encoding).encode('utf-8')
+                text = message
             # No charset passed to avoid transport encoding
             # NOTE: some unicode encoded strings will produce
             # unreadable mail contents.
@@ -397,7 +401,8 @@ class Mail(object):
             text = html = None
         elif isinstance(message, (list, tuple)):
             text, html = message
-        elif message.strip().startswith('<html') and message.strip().endswith('</html>'):
+        elif message.strip().startswith('<html') and \
+                message.strip().endswith('</html>'):
             text = self.settings.server == 'gae' and message or None
             html = message
         else:
@@ -4325,7 +4330,7 @@ class Service(object):
 
     # jsonrpc 2.0 error types.  records the following structure {code: (message,meaning)}
     jsonrpc_errors = {
-        -32700:	("Parse error. Invalid JSON was received by the server.",  "An error occurred on the server while parsing the JSON text."),
+        -32700:        ("Parse error. Invalid JSON was received by the server.",  "An error occurred on the server while parsing the JSON text."),
         -32600: ("Invalid Request", "The JSON sent is not a valid Request object."),
         -32601: ("Method not found", "The method does not exist / is not available."),
         -32602: ("Invalid params", "Invalid method parameter(s)."),
@@ -4828,14 +4833,27 @@ class PluginManager(object):
 
 
 class Expose(object):
-    def __init__(self, base=None, basename='base', extensions=None, allow_download=True):
+    def __init__(self, base=None, basename=None, extensions=None, allow_download=True):
         """
-        extensions: an optional list of file extensions for filtering displayed files:
+        Usage:
+        
+        def static():
+            return dict(files=Expose())
+
+        or
+
+        def static():
+            path = os.path.join(request.folder,'static','public')
+            return dict(files=Expose(path,basename='public'))
+
+        extensions:
+        an optional list of file extensions for filtering displayed files:
         ['.py', '.jpg']
         allow_download: whether to allow downloading selected files
         """
         current.session.forget()
         base = base or os.path.join(current.request.folder, 'static')
+        basename = basename or current.request.function
         self.basename = basename
         self.args = current.request.raw_args and \
             [arg for arg in current.request.raw_args.split('/') if arg] or []
@@ -4852,8 +4870,14 @@ class Expose(object):
                             if os.path.isdir(f) and not self.isprivate(f)]
         self.filenames = [f[len(path) - 1:] for f in sorted(glob.glob(path))
                             if not os.path.isdir(f) and not self.isprivate(f)]
+        if 'README' in self.filenames:
+            readme = open(os.path.join(filename,'README')).read()
+            self.paragraph = MARKMIN(readme)
+        else:
+            self.paragraph = None
         if extensions:
-            self.filenames = [f for f in self.filenames if os.path.splitext(f)[-1] in extensions]
+            self.filenames = [f for f in self.filenames
+                              if os.path.splitext(f)[-1] in extensions]
 
     def breadcrumbs(self, basename):
         path = []
@@ -4867,8 +4891,10 @@ class Expose(object):
 
     def table_folders(self):
         if self.folders:
-            return SPAN(H3('Folders'), TABLE(*[TR(TD(A(folder, _href=URL(args=self.args + [folder]))))
+            return SPAN(H3('Folders'), TABLE(
-                           for folder in self.folders]))
+                    *[TR(TD(A(folder, _href=URL(args=self.args + [folder]))))
+                      for folder in self.folders],
+                     **dict(_class="table")))
         return ''
 
     @staticmethod
@@ -4877,20 +4903,24 @@ class Expose(object):
 
     @staticmethod
     def isimage(f):
-        return os.path.splitext(f)[-1].lower() in ('.png', '.jpg', '.jpeg', '.gif', '.tiff')
+        return os.path.splitext(f)[-1].lower() in (
+            '.png', '.jpg', '.jpeg', '.gif', '.tiff')
 
     def table_files(self, width=160):
         if self.filenames:
-            return SPAN(H3('Files'), TABLE(*[TR(TD(A(f, _href=URL(args=self.args + [f]))),
+            return SPAN(H3('Files'),
-                          TD(IMG(_src=URL(args=self.args + [f]),
+                        TABLE(*[TR(TD(A(f, _href=URL(args=self.args + [f]))),
-                                 _style='max-width:%spx' % width)
+                                   TD(IMG(_src=URL(args=self.args + [f]),
-                                 if width and self.isimage(f) else ''))
+                                          _style='max-width:%spx' % width)
-                           for f in self.filenames]))
+                                      if width and self.isimage(f) else ''))
+                                for f in self.filenames],
+                               **dict(_class="table")))
         return ''
 
     def xml(self):
         return DIV(            
             H2(self.breadcrumbs(self.basename)),
+            self.paragraph or '',
             self.table_folders(),
             self.table_files()).xml()
 
@@ -5043,8 +5073,10 @@ class Wiki(object):
                     db.wiki_tag.insert(name=tag, wiki_page=page.id)
         db.wiki_page._after_insert.append(update_tags_insert)
         db.wiki_page._after_update.append(update_tags_update)
-        if auth.user and check_credentials(current.request) and \
+       
-                not 'wiki_editor' in auth.user_groups.values():
+        if (auth.user and
+            check_credentials(current.request, gae_login=False) and
+            not 'wiki_editor' in auth.user_groups.values()):
             group = db.auth_group(role='wiki_editor')
             gid = group.id if group else db.auth_group.insert(
                 role='wiki_editor')

gluon/validators.py

@@ -31,8 +31,8 @@ except ImportError:
     from gluon.contrib.simplejson.decoder import JSONDecodeError
     JSONErrors += (JSONDecodeError,)
 
-
 __all__ = [
+    'ANY_OF',
     'CLEANUP',
     'CRYPT',
     'IS_ALPHANUMERIC',
@@ -50,6 +50,7 @@ __all__ = [
     'IS_IN_SET',
     'IS_INT_IN_RANGE',
     'IS_IPV4',
+    'IS_IPV6',
     'IS_LENGTH',
     'IS_LIST_OF',
     'IS_LOWER',
@@ -332,7 +333,7 @@ class IS_JSON(Validator):
             requires=IS_JSON(error_message="This is not a valid json input")
 
         >>> IS_JSON()('{"a": 100}')
-        ('{"a": 100}', None)
+        ({u'a': 100}, None)
 
         >>> IS_JSON()('spam1234')
         ('spam1234', 'invalid json')
@@ -651,7 +652,7 @@ class IS_NOT_IN_DB(Validator):
             if row and any(str(row[f]) != str(id[f]) for f in id):
                 return (value, translate(self.error_message))
         else:
-            row = subset.select(table._id, limitby=(0, 1)).first()
+            row = subset.select(table._id, field, limitby=(0, 1)).first()
             if row and str(row.id) != str(id):
                 return (value, translate(self.error_message))
         return (value, None)
@@ -2208,6 +2209,17 @@ class IS_TIME(Validator):
             pass
         return (ivalue, translate(self.error_message))
 
+# A UTC class.
+class UTC(datetime.tzinfo):
+    """UTC"""
+    ZERO = datetime.timedelta(0)
+    def utcoffset(self, dt):
+        return UTC.ZERO
+    def tzname(self, dt):
+        return "UTC"
+    def dst(self, dt):
+        return UTC.ZERO
+utc = UTC()
 
 class IS_DATE(Validator):
     """
@@ -2221,6 +2233,9 @@ class IS_DATE(Validator):
     def __init__(self, format='%Y-%m-%d',
                  error_message='enter date as %(format)s',
                  timezone = None):
+        """
+        timezome must be None or a pytz.timezone("America/Chicago") object
+        """
         self.format = translate(format)
         self.error_message = str(error_message)
         self.timezone = timezone
@@ -2237,7 +2252,7 @@ class IS_DATE(Validator):
                 time.strptime(value, str(self.format))
             value = datetime.date(y, m, d)
             if self.timezone is not None:
-                value = value - datetime.timedelta(seconds=self.timezone*3600)
+                value = self.timezone.localize(value).astimezone(utc)
             return (value, None)
         except:
             self.extremes.update(IS_DATETIME.nice(self.format))
@@ -2255,7 +2270,7 @@ class IS_DATE(Validator):
             year = 2000
         d = datetime.date(year, value.month, value.day)
         if self.timezone is not None:
-            d = d + datetime.timedelta(seconds=self.timezone*3600)
+            d = d.replace(tzinfo=utc).astimezone(self.timezone)
         return d.strftime(format)
 
 
@@ -2290,6 +2305,9 @@ class IS_DATETIME(Validator):
     def __init__(self, format='%Y-%m-%d %H:%M:%S',
                  error_message='enter date and time as %(format)s',
                  timezone=None):
+        """
+        timezome must be None or a pytz.timezone("America/Chicago") object
+        """
         self.format = translate(format)
         self.error_message = str(error_message)
         self.extremes = {}
@@ -2304,7 +2322,7 @@ class IS_DATETIME(Validator):
                 time.strptime(value, str(self.format))
             value = datetime.datetime(y, m, d, hh, mm, ss)
             if self.timezone is not None:
-                value = value - datetime.timedelta(seconds=self.timezone*3600)
+                value = self.timezone.localize(value).astimezone(utc)
             return (value, None)
         except:
             self.extremes.update(IS_DATETIME.nice(self.format))
@@ -2323,7 +2341,7 @@ class IS_DATETIME(Validator):
         d = datetime.datetime(year, value.month, value.day,
                               value.hour, value.minute, value.second)
         if self.timezone is not None:
-            d = d + datetime.timedelta(seconds=self.timezone*3600)
+            d = d.replace(tzinfo=utc).astimezone(self.timezone)
         return d.strftime(format)
 
 
@@ -2339,7 +2357,7 @@ class IS_DATE_IN_RANGE(IS_DATE):
         (datetime.date(2008, 3, 3), None)
 
         >>> v('03/03/2010')
-        (datetime.date(2010, 3, 3), 'oops')
+        ('03/03/2010', 'oops')
 
         >>> v(datetime.date(2008,3,3))
         (datetime.date(2008, 3, 3), None)
@@ -2393,7 +2411,7 @@ class IS_DATETIME_IN_RANGE(IS_DATETIME):
         (datetime.datetime(2008, 3, 3, 12, 40), None)
 
         >>> v('03/03/2010 10:34')
-        (datetime.datetime(2010, 3, 3, 10, 34), 'oops')
+        ('03/03/2010 10:34', 'oops')
 
         >>> v(datetime.datetime(2008,3,3,0,0))
         (datetime.datetime(2008, 3, 3, 0, 0), None)
@@ -2575,6 +2593,38 @@ class IS_SLUG(Validator):
         return (urlify(value, self.maxlen, self.keep_underscores), None)
 
 
+class ANY_OF(Validator):
+    """
+    test if any of the validators in a list return successfully
+
+    >>> ANY_OF([IS_EMAIL(),IS_ALPHANUMERIC()])('a@b.co')
+    ('a@b.co', None)
+    >>> ANY_OF([IS_EMAIL(),IS_ALPHANUMERIC()])('abco')
+    ('abco', None)
+    >>> ANY_OF([IS_EMAIL(),IS_ALPHANUMERIC()])('@ab.co')
+    ('@ab.co', 'enter only letters, numbers, and underscore')
+    >>> ANY_OF([IS_ALPHANUMERIC(),IS_EMAIL()])('@ab.co')
+    ('@ab.co', 'enter a valid email address')
+    """
+
+    def __init__(self, subs):
+        self.subs = subs
+
+    def __call__(self, value):
+        for validator in self.subs:
+            value, error = validator(value)
+            if error == None:
+                break
+        return value, error
+
+    def formatter(self, value):
+        # Use the formatter of the first subvalidator
+        # that validates the value and has a formatter
+        for validator in self.subs:
+            if hasattr(validator, 'formatter') and validator(value)[1] != None:
+                return validator.formatter(value)
+
+
 class IS_EMPTY_OR(Validator):
     """
     dummy class for testing IS_EMPTY_OR
@@ -3371,6 +3421,147 @@ class IS_IPV4(Validator):
                 return (value, None)
         return (value, translate(self.error_message))
 
+class IS_IPV6(Validator):
+    """
+    Checks if field's value is an IP version 6 address. First attempts to
+    use the ipaddress library and falls back to contrib/ipaddr.py from Google
+    (https://code.google.com/p/ipaddr-py/)
+
+    Arguments:
+    is_private: None (default): indifferent
+                True (enforce): address must be in fc00::/7 range
+                False (forbid): address must NOT be in fc00::/7 range
+    is_link_local: Same as above but uses fe80::/10 range
+    is_reserved: Same as above but uses IETF reserved range
+    is_mulicast: Same as above but uses ff00::/8 range
+    is_routeable: Similar to above but enforces not private, link_local,
+                  reserved or multicast
+    is_6to4: Same as above but uses 2002::/16 range
+    is_teredo: Same as above but uses 2001::/32 range
+    subnets: value must be a member of at least one from list of subnets
+
+    Examples:
+
+        #Check for valid IPv6 address:
+        INPUT(_type='text', _name='name', requires=IS_IPV6())
+
+        #Check for valid IPv6 address is a link_local address:
+        INPUT(_type='text', _name='name', requires=IS_IPV6(is_link_local=True))
+
+        #Check for valid IPv6 address that is Internet routeable:
+        INPUT(_type='text', _name='name', requires=IS_IPV6(is_routeable=True))
+
+        #Check for valid IPv6 address in specified subnet:
+        INPUT(_type='text', _name='name', requires=IS_IPV6(subnets=['2001::/32'])
+
+    >>> IS_IPV6()('fe80::126c:8ffa:fe22:b3af')
+    ('fe80::126c:8ffa:fe22:b3af', None)
+    >>> IS_IPV6()('192.168.1.1')
+    ('192.168.1.1', 'enter valid IPv6 address')
+    >>> IS_IPV6(error_message='bad ip')('192.168.1.1')
+    ('192.168.1.1', 'bad ip')
+    >>> IS_IPV6(is_link_local=True)('fe80::126c:8ffa:fe22:b3af')
+    ('fe80::126c:8ffa:fe22:b3af', None)
+    >>> IS_IPV6(is_link_local=False)('fe80::126c:8ffa:fe22:b3af')
+    ('fe80::126c:8ffa:fe22:b3af', 'enter valid IPv6 address')
+    >>> IS_IPV6(is_link_local=True)('2001::126c:8ffa:fe22:b3af')
+    ('2001::126c:8ffa:fe22:b3af', 'enter valid IPv6 address')
+    >>> IS_IPV6(is_multicast=True)('2001::126c:8ffa:fe22:b3af')
+    ('2001::126c:8ffa:fe22:b3af', 'enter valid IPv6 address')
+    >>> IS_IPV6(is_multicast=True)('ff00::126c:8ffa:fe22:b3af')
+    ('ff00::126c:8ffa:fe22:b3af', None)
+    >>> IS_IPV6(is_routeable=True)('2001::126c:8ffa:fe22:b3af')
+    ('2001::126c:8ffa:fe22:b3af', None)
+    >>> IS_IPV6(is_routeable=True)('ff00::126c:8ffa:fe22:b3af')
+    ('ff00::126c:8ffa:fe22:b3af', 'enter valid IPv6 address')
+    >>> IS_IPV6(subnets='2001::/32')('2001::8ffa:fe22:b3af')
+    ('2001::8ffa:fe22:b3af', None)
+    >>> IS_IPV6(subnets='fb00::/8')('2001::8ffa:fe22:b3af')
+    ('2001::8ffa:fe22:b3af', 'enter valid IPv6 address')
+    >>> IS_IPV6(subnets=['fc00::/8','2001::/32'])('2001::8ffa:fe22:b3af')
+    ('2001::8ffa:fe22:b3af', None)
+    >>> IS_IPV6(subnets='invalidsubnet')('2001::8ffa:fe22:b3af')
+    ('2001::8ffa:fe22:b3af', 'invalid subnet provided')
+    
+    """
+
+    def __init__(
+            self,
+            is_private=None,
+            is_link_local=None,
+            is_reserved=None,
+            is_multicast=None,
+            is_routeable=None,
+            is_6to4=None,
+            is_teredo=None,
+            subnets=None,
+            error_message='enter valid IPv6 address'):
+        self.is_private = is_private
+        self.is_link_local = is_link_local
+        self.is_reserved = is_reserved
+        self.is_multicast = is_multicast
+        self.is_routeable = is_routeable
+        self.is_6to4 = is_6to4
+        self.is_teredo = is_teredo
+        self.subnets = subnets
+        self.error_message = error_message
+
+    def __call__(self, value):
+        try:
+            import ipaddress
+        except ImportError:
+            from contrib import ipaddr as ipaddress
+
+        try:
+            ip = ipaddress.IPv6Address(value)
+            ok = True
+        except ipaddress.AddressValueError:
+            return (value, translate(self.error_message))
+
+        if self.subnets:
+            # iterate through self.subnets to see if value is a member
+            ok = False
+            if isinstance(self.subnets, str):
+                self.subnets = [self.subnets]
+            for network in self.subnets:
+                try:
+                    ipnet = ipaddress.IPv6Network(network)
+                except (ipaddress.NetmaskValueError, ipaddress.AddressValueError):
+                    return (value, translate('invalid subnet provided'))
+                if ip in ipnet:
+                    ok = True
+
+        if self.is_routeable:
+            self.is_private = False
+            self.is_link_local = False
+            self.is_reserved = False
+            self.is_multicast = False
+
+        if not (self.is_private is None or self.is_private ==
+                ip.is_private):
+            ok = False
+        if not (self.is_link_local is None or self.is_link_local ==
+                ip.is_link_local):
+            ok = False
+        if not (self.is_reserved is None or self.is_reserved ==
+                ip.is_reserved):
+            ok = False
+        if not (self.is_multicast is None or self.is_multicast ==
+                ip.is_multicast):
+            ok = False
+        if not (self.is_6to4 is None or self.is_6to4 ==
+                ip.is_6to4):
+            ok = False
+        if not (self.is_teredo is None or self.is_teredo ==
+                ip.is_teredo):
+            ok = False
+
+        if ok:
+            return (value, None)
+
+        return (value, translate(self.error_message))
+
+
 if __name__ == '__main__':
     import doctest
     doctest.testmod(

gluon/widget.py

@@ -793,7 +793,7 @@ def console():
                       default=None,
                       help=msg)
 
-    msg = 'run schedulers alongside webserver'
+    msg = 'run schedulers alongside webserver, needs -K app1 and -a too'
     parser.add_option('-X',
                       '--with-scheduler',
                       action='store_true',

options_std.py

@@ -19,8 +19,8 @@ password = '<recycle>'  # ## <recycle> means use the previous password
 pid_filename = 'httpserver.pid'
 log_filename = 'httpserver.log'
 profiler_filename = None
-ssl_certificate = None  # 'ssl_certificate.pem'  # ## path to certificate file
+ssl_certificate = ''  # 'ssl_certificate.pem'  # ## path to certificate file
-ssl_private_key = None  # 'ssl_private_key.pem'  # ## path to private key file
+ssl_private_key = ''  # 'ssl_private_key.pem'  # ## path to private key file
 #numthreads = 50 # ## deprecated; remove
 minthreads = None
 maxthreads = None

scripts/access.wsgi

@@ -46,9 +46,9 @@ def allow_access(environ,host):
     filename = os.path.join(os.path.dirname(__file__),'access.wsgi.log')
     f = open(filename,'a')
     try:
-	f.write('\n'+header+'\n'+pprint+'\n')
+        f.write('\n'+header+'\n'+pprint+'\n')
     finally:
-	f.close()
+        f.close()
     app = environ['REQUEST_URI'].split('/')[1]
     keys = [key for key in environ if key.startswith('HTTP_')]
     headers = {}
@@ -58,8 +58,7 @@ def allow_access(environ,host):
     try:
         data = urllib.urlencode({'request_uri':environ['REQUEST_URI']})
         request = urllib2.Request(URL_CHECK_ACCESS % dict(app=app),data,headers)
-	response = urllib2.urlopen(request).read().strip().lower()
+        response = urllib2.urlopen(request).read().strip().lower()
-	if response.startswith('true'): return True
+        if response.startswith('true'): return True
     except: pass
     return False
-

scripts/nginx_scgi.conf

@@ -4,112 +4,112 @@ worker_processes 1;
 error_log /var/log/nginx/error_log info;
 
 events {
-	worker_connections 1024;
+        worker_connections 1024;
-	use epoll;
+        use epoll;
 }
 
 http {
-	include /etc/nginx/mime.types;
+        include /etc/nginx/mime.types;
-	default_type application/octet-stream;
+        default_type application/octet-stream;
 
-	log_format main
+        log_format main
-		'$remote_addr - $remote_user [$time_local] '
+                '$remote_addr - $remote_user [$time_local] '
-		'"$request" $status $bytes_sent '
+                '"$request" $status $bytes_sent '
-		'"$http_referer" "$http_user_agent" '
+                '"$http_referer" "$http_user_agent" '
-		'"$gzip_ratio"';
+                '"$gzip_ratio"';
 
-	client_header_timeout 10m;
+        client_header_timeout 10m;
-	client_body_timeout 10m;
+        client_body_timeout 10m;
-	send_timeout 10m;
+        send_timeout 10m;
 
-	connection_pool_size 256;
+        connection_pool_size 256;
-	client_header_buffer_size 1k;
+        client_header_buffer_size 1k;
-	large_client_header_buffers 4 2k;
+        large_client_header_buffers 4 2k;
-	request_pool_size 4k;
+        request_pool_size 4k;
 
-	gzip on;
+        gzip on;
-	gzip_min_length 1100;
+        gzip_min_length 1100;
-	gzip_buffers 4 8k;
+        gzip_buffers 4 8k;
-	gzip_types text/plain;
+        gzip_types text/plain;
 
-	output_buffers 1 32k;
+        output_buffers 1 32k;
-	postpone_output 1460;
+        postpone_output 1460;
 
-	sendfile on;
+        sendfile on;
-	tcp_nopush on;
+        tcp_nopush on;
-	tcp_nodelay on;
+        tcp_nodelay on;
 
-	keepalive_timeout 75 20;
+        keepalive_timeout 75 20;
 
-	ignore_invalid_headers on;
+        ignore_invalid_headers on;
 
-	ssl_session_cache shared:SSL:10m;
+        ssl_session_cache shared:SSL:10m;
 
-	index index.html;
+        index index.html;
 
-	server {
+        server {
-		listen 127.0.0.1;
+                listen 127.0.0.1;
-		server_name localhost;
+                server_name localhost;
 
-		access_log /var/log/nginx/localhost.access_log main;
+                access_log /var/log/nginx/localhost.access_log main;
-		error_log /var/log/nginx/localhost.error_log info;
+                error_log /var/log/nginx/localhost.error_log info;
 
-		root /var/www/localhost/htdocs;
+                root /var/www/localhost/htdocs;
-	}
+        }
 
-	# SSL example
+        # SSL example
-	server {
+        server {
-		listen 127.0.0.1:443;
+                listen 127.0.0.1:443;
-		server_name localhost;
+                server_name localhost;
 
-		ssl on;
+                ssl on;
-		ssl_certificate /etc/ssl/nginx/nginx-server.pem;
+                ssl_certificate /etc/ssl/nginx/nginx-server.pem;
-		ssl_client_certificate /etc/ssl/nginx/cacert.pem;
+                ssl_client_certificate /etc/ssl/nginx/cacert.pem;
-		ssl_certificate_key /etc/ssl/nginx/nginx.key;
+                ssl_certificate_key /etc/ssl/nginx/nginx.key;
-		ssl_verify_client optional;
+                ssl_verify_client optional;
 
-		access_log /var/log/nginx/localhost.ssl_access_log main;
+                access_log /var/log/nginx/localhost.ssl_access_log main;
-		error_log /var/log/nginx/localhost.ssl_error_log info;
+                error_log /var/log/nginx/localhost.ssl_error_log info;
 
-		root /var/www/localhost/htdocs;
+                root /var/www/localhost/htdocs;
 
-		set $web2pyroot /home/Desktop/source/michelecomitini-facebookaccess;
+                set $web2pyroot /home/Desktop/source/michelecomitini-facebookaccess;
 
 
-		location /pki/ {
+                location /pki/ {
-			 root /var/www/localhost/html;
+                         root /var/www/localhost/html;
-		}
+                }
 
 
-		location ^/(.*)/static/(.*) {
+                location ^/(.*)/static/(.*) {
-		 	 alias $web2pyroot/applications/$1/static/$2;
+                          alias $web2pyroot/applications/$1/static/$2;
-		}
+                }
 
-		location / { 
+                location / {
-			 include /etc/nginx/scgi_params;
+                         include /etc/nginx/scgi_params;
-			 scgi_pass 127.0.0.1:4000;
+                         scgi_pass 127.0.0.1:4000;
 
-			 #Module ngx_http_ssl_module supports the following built-in variables:
+                         #Module ngx_http_ssl_module supports the following built-in variables:
 
-			 #$ssl_cipher returns the cipher suite being used for the currently established SSL/TLS connection
+                         #$ssl_cipher returns the cipher suite being used for the currently established SSL/TLS connection
-			 #$ssl_client_serial returns the serial number of the client certificate for the currently established SSL/TLS connection — if applicable, i.e., if client authentication is activated in the connection
+                         #$ssl_client_serial returns the serial number of the client certificate for the currently established SSL/TLS connection — if applicable, i.e., if client authentication is activated in the connection
-			 #$ssl_client_s_dn returns the subject Distinguished Name (DN) of the client certificate for the currently established SSL/TLS connection — if applicable, i.e., if client authentication is activated in the connection
+                         #$ssl_client_s_dn returns the subject Distinguished Name (DN) of the client certificate for the currently established SSL/TLS connection — if applicable, i.e., if client authentication is activated in the connection
-			 #$ssl_client_i_dn returns the issuer DN of the client certificate for the currently established SSL/TLS connection — if applicable, i.e., if client authentication is activated in the connection
+                         #$ssl_client_i_dn returns the issuer DN of the client certificate for the currently established SSL/TLS connection — if applicable, i.e., if client authentication is activated in the connection
-			 #$ssl_protocol returns the protocol of the currently established SSL/TLS connection — depending on the configuration and client available options it's one of SSLv2, SSLv3 or TLSv1
+                         #$ssl_protocol returns the protocol of the currently established SSL/TLS connection — depending on the configuration and client available options it's one of SSLv2, SSLv3 or TLSv1
-			 #$ssl_session_id the Session ID of the established secure connection — requires Nginx version greater or equal to 0.8.20
+                         #$ssl_session_id the Session ID of the established secure connection — requires Nginx version greater or equal to 0.8.20
-			 #$ssl_client_cert
+                         #$ssl_client_cert
-			 #$ssl_client_raw_cert
+                         #$ssl_client_raw_cert
-			 #$ssl_client_verify takes the value "SUCCESS" when the client certificate is successfully verified
+                         #$ssl_client_verify takes the value "SUCCESS" when the client certificate is successfully verified
-			 scgi_param SSL_PROTOCOL $ssl_protocol;
+                         scgi_param SSL_PROTOCOL $ssl_protocol;
-			 scgi_param HTTPS on;
+                         scgi_param HTTPS on;
-			 scgi_param SSL_CIPHER $ssl_cipher;
+                         scgi_param SSL_CIPHER $ssl_cipher;
-			 scgi_param SSL_CLIENT_SERIAL $ssl_client_serial;
+                         scgi_param SSL_CLIENT_SERIAL $ssl_client_serial;
-			 scgi_param SSL_CLIENT_S_DN $ssl_client_s_dn;
+                         scgi_param SSL_CLIENT_S_DN $ssl_client_s_dn;
-			 scgi_param SSL_CLIENT_I_DN $ssl_client_i_dn;
+                         scgi_param SSL_CLIENT_I_DN $ssl_client_i_dn;
-			 scgi_param SSL_SESSION_ID $ssl_session_id;
+                         scgi_param SSL_SESSION_ID $ssl_session_id;
-			 scgi_param SSL_CLIENT_CERT $ssl_client_cert;
+                         scgi_param SSL_CLIENT_CERT $ssl_client_cert;
-			 scgi_param SSL_CLIENT_RAW_CERT $ssl_client_raw_cert;
+                         scgi_param SSL_CLIENT_RAW_CERT $ssl_client_raw_cert;
-			 scgi_param SSL_CLIENT_VERIFY $ssl_client_verify;
+                         scgi_param SSL_CLIENT_VERIFY $ssl_client_verify;
-		}
+                }
-	}
+        }
 }

scripts/setup-scheduler-centos.sh

@@ -64,4 +64,3 @@ case "$1" in
     ;;
 esac
 exit 0
-

scripts/setup-shared-hosting-2.4.sh

@@ -9,4 +9,3 @@ unzip web2py_src.zip
 cd web2py
 # start web2py using command-line script
 w2env/bin/python web2py.py -i 0.0.0.0 -p 8123 -a 'adminpasswd'
-

scripts/setup-ubuntu-12-04-redmine-unicorn-web2py-uwsgi-nginx.sh

@@ -58,8 +58,8 @@ wget http://rubyforge.org/frs/download.php/76628/redmine-2.2.0.tar.gz.md5
 md5sum --check redmine-2.2.0.tar.gz.md5 > redmine_md5_checked_successfully
 if [ -f redmine_md5_checked_successfully ]
 then
-	tar xvfz redmine-2.2.0.tar.gz
+        tar xvfz redmine-2.2.0.tar.gz
-	rm redmine_md5_checked_successfully
+        rm redmine_md5_checked_successfully
 else
     echo "Redmine md5 check sum failed..."
     exit 1
@@ -195,18 +195,18 @@ SCRIPTNAME=/etc/init.d/redmine
 #
 do_start()
 {
-	# Return
+        # Return
-	#   0 if daemon has been started
+        #   0 if daemon has been started
-	#   1 if daemon was already running
+        #   1 if daemon was already running
-	#   2 if daemon could not be started
+        #   2 if daemon could not be started
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
+        start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
-		|| return 1
+                || return 1
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
+        start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
-		$DAEMON_ARGS \
+                $DAEMON_ARGS \
-		|| return 2
+                || return 2
-	# Add code here, if necessary, that waits for the process to be ready
+        # Add code here, if necessary, that waits for the process to be ready
-	# to handle requests from services started subsequently which depend
+        # to handle requests from services started subsequently which depend
-	# on this one.  As a last resort, sleep for some time.
+        # on this one.  As a last resort, sleep for some time.
 }
 
 #
@@ -214,96 +214,96 @@ do_start()
 #
 do_stop()
 {
-	# Return
+        # Return
-	#   0 if daemon has been stopped
+        #   0 if daemon has been stopped
-	#   1 if daemon was already stopped
+        #   1 if daemon was already stopped
-	#   2 if daemon could not be stopped
+        #   2 if daemon could not be stopped
-	#   other if a failure occurred
+        #   other if a failure occurred
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
+        start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
-	RETVAL="$?"
+        RETVAL="$?"
-	[ "$RETVAL" = 2 ] && return 2
+        [ "$RETVAL" = 2 ] && return 2
-	# Wait for children to finish too if this is a daemon that forks
+        # Wait for children to finish too if this is a daemon that forks
-	# and if the daemon is only ever run from this initscript.
+        # and if the daemon is only ever run from this initscript.
-	# If the above conditions are not satisfied then add some other code
+        # If the above conditions are not satisfied then add some other code
-	# that waits for the process to drop all resources that could be
+        # that waits for the process to drop all resources that could be
-	# needed by services started subsequently.  A last resort is to
+        # needed by services started subsequently.  A last resort is to
-	# sleep for some time.
+        # sleep for some time.
-	start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
+        start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
-	[ "$?" = 2 ] && return 2
+        [ "$?" = 2 ] && return 2
-	# Many daemons don'\''t delete their pidfiles when they exit.
+        # Many daemons don'\''t delete their pidfiles when they exit.
-	rm -f $PIDFILE
+        rm -f $PIDFILE
-	return "$RETVAL"
+        return "$RETVAL"
 }
 
 #
 # Function that sends a SIGHUP to the daemon/service
 #
 do_reload() {
-	#
+        #
-	# If the daemon can reload its configuration without
+        # If the daemon can reload its configuration without
-	# restarting (for example, when it is sent a SIGHUP),
+        # restarting (for example, when it is sent a SIGHUP),
-	# then implement that here.
+        # then implement that here.
-	#
+        #
-	start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
+        start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
-	return 0
+        return 0
 }
 
 case "$1" in
   start)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+        [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
-	do_start
+        do_start
-	case "$?" in
+        case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+                0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+                2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
+        esac
-	;;
+        ;;
   stop)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+        [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
-	do_stop
+        do_stop
-	case "$?" in
+        case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+                0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+                2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
+        esac
-	;;
+        ;;
   status)
        status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
        ;;
   #reload|force-reload)
-	#
+        #
-	# If do_reload() is not implemented then leave this commented out
+        # If do_reload() is not implemented then leave this commented out
-	# and leave '\''force-reload'\'' as an alias for '\''restart'\''.
+        # and leave '\''force-reload'\'' as an alias for '\''restart'\''.
-	#
+        #
-	#log_daemon_msg "Reloading $DESC" "$NAME"
+        #log_daemon_msg "Reloading $DESC" "$NAME"
-	#do_reload
+        #do_reload
-	#log_end_msg $?
+        #log_end_msg $?
-	#;;
+        #;;
   restart|force-reload)
-	#
+        #
-	# If the "reload" option is implemented then remove the
+        # If the "reload" option is implemented then remove the
-	# '\''force-reload'\'' alias
+        # '\''force-reload'\'' alias
-	#
+        #
-	log_daemon_msg "Restarting $DESC" "$NAME"
+        log_daemon_msg "Restarting $DESC" "$NAME"
-	do_stop
+        do_stop
-	case "$?" in
+        case "$?" in
-	  0|1)
+          0|1)
-		do_start
+                do_start
-		case "$?" in
+                case "$?" in
-			0) log_end_msg 0 ;;
+                        0) log_end_msg 0 ;;
-			1) log_end_msg 1 ;; # Old process is still running
+                        1) log_end_msg 1 ;; # Old process is still running
-			*) log_end_msg 1 ;; # Failed to start
+                        *) log_end_msg 1 ;; # Failed to start
-		esac
+                esac
-		;;
+                ;;
-	  *)
+          *)
-	  	# Failed to stop
+                  # Failed to stop
-		log_end_msg 1
+                log_end_msg 1
-		;;
+                ;;
-	esac
+        esac
-	;;
+        ;;
   *)
-	#echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
+        #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
-	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
+        echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-	exit 3
+        exit 3
-	;;
+        ;;
 esac
 
 :' > /etc/init.d/redmine
@@ -360,12 +360,12 @@ server {
         root /var/www;
         ssl_certificate         /etc/nginx/ssl/self_signed.cert;
         ssl_certificate_key     /etc/nginx/ssl/self_signed.key;
-		ssl_prefer_server_ciphers on;
+                ssl_prefer_server_ciphers on;
-		ssl_session_cache shared:SSL:10m;
+                ssl_session_cache shared:SSL:10m;
-		ssl_session_timeout 10m;
+                ssl_session_timeout 10m;
-		ssl_ciphers ECDHE-RSA-AES256-SHA:DHE-RSA-AES256-SHA:DHE-DSS-AES256-SHA:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA;
+                ssl_ciphers ECDHE-RSA-AES256-SHA:DHE-RSA-AES256-SHA:DHE-DSS-AES256-SHA:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA;
-		ssl_protocols SSLv3 TLSv1;
+                ssl_protocols SSLv3 TLSv1;
-		keepalive_timeout    70;
+                keepalive_timeout    70;
         location ~^\/(?!redmine(.*)) {
             #uwsgi_pass      127.0.0.1:9001;
             uwsgi_pass      unix:///tmp/web2py.socket;
@@ -392,8 +392,8 @@ server {
 # We copy ssl files we previously created
 if [ -f /etc/nginx/ssl ]
 then
-	cp ~/self_signed.* /etc/nginx/ssl/
+        cp ~/self_signed.* /etc/nginx/ssl/
-	rm ~/self_signed.*
+        rm ~/self_signed.*
 else
     mkdir /etc/nginx/ssl
     cp ~/self_signed.* /etc/nginx/ssl/

scripts/setup-virtualenv-web2py.sh

@@ -1,33 +1,33 @@
 #
-# Author:			Christopher Steel
+# Author:                        Christopher Steel
-# Organization:	Voice of Access
+# Organization:        Voice of Access
-# Date:				2010-11-24
+# Date:                                2010-11-24
-# License:			Same as Web2py, MIT / GNU
+# License:                        Same as Web2py, MIT / GNU
-# Email:			Christopher DOT Steel AT Voice of Access DOT org
+# Email:                        Christopher DOT Steel AT Voice of Access DOT org
 #
 # This script will :
-#	download and install virtualenv
+#        download and install virtualenv
-#	start a virtual environment
+#        start a virtual environment
-#	move into the virtual environment
+#        move into the virtual environment
-#	download and install latest stable version of web2py
+#        download and install latest stable version of web2py
-#	start web2py in the virtual environment
+#        start web2py in the virtual environment
 #
 # To disactivate the virtual environment, shut down web2py
 # and type 'disactivate' at the command line.
 #
 # Testing:
-#	OS X
+#        OS X
-#	should work on POSIX systems
+#        should work on POSIX systems
 #
 # Usage:
-#	create a directory to hold your virtual environments, for example
+#        create a directory to hold your virtual environments, for example
-#		/home/user_name/virtual_environments
+#                /home/user_name/virtual_environments
-#	place this script in the directory and make it executable
+#        place this script in the directory and make it executable
-#		chmod +x web2py-install-virtualenv.sh
+#                chmod +x web2py-install-virtualenv.sh
-	customize the variables below to meet your needs
+        customize the variables below to meet your needs
-#	execute from terminal
+#        execute from terminal
-#		./web2py-install-virtualenv.sh
+#                ./web2py-install-virtualenv.sh
-#	relax...
+#        relax...
 
 ################ VARIABLES
 # Change to reflect version changes etc.
@@ -94,8 +94,3 @@ read -p "Press any key to start web2py…"
 echo 'starting web2py'
 echo '==============='
 ../bin/python2.5  web2py.py
-
-
-
-
-

scripts/setup-web2py-fedora-ami.sh

@@ -398,4 +398,3 @@ cd ${current_directory}
 
 echo " - Complete!"
 echo
-

scripts/setup-web2py-nginx-uwsgi-on-centos.sh

@@ -346,5 +346,3 @@ reboot
 
 as superuser
 "
-
-

scripts/setup-web2py-ubuntu.sh

@@ -175,4 +175,3 @@ cd /home/www-data/web2py
 sudo -u www-data python -c "from gluon.widget import console; console();"
 sudo -u www-data python -c "from gluon.main import save_password; save_password(raw_input('admin password: '),443)"
 echo "done!"
-

scripts/update-web2py.sh

@@ -13,13 +13,13 @@
 TARGET=web2py
 
 if [ ! -d $TARGET ]; then
-	# in case we're in web2py/
+        # in case we're in web2py/
-	if [ -f ../$TARGET/VERSION ]; then
+        if [ -f ../$TARGET/VERSION ]; then
-		cd ..
+                cd ..
-	# in case we're in web2py/scripts
+        # in case we're in web2py/scripts
-	elif [ -f ../../$TARGET/VERSION ]; then
+        elif [ -f ../../$TARGET/VERSION ]; then
-		cd ../..
+                cd ../..
-	fi
+        fi
 fi
 read a VERSION c < $TARGET/VERSION
 SAVE=$TARGET-$VERSION
@@ -32,14 +32,14 @@ SAVED=""
 #  but don't overwrite a previous save of the same version.
 #
 if [ -f $SAVE.zip ]; then
-	echo "Remove or rename $SAVE.zip first" >&2
+        echo "Remove or rename $SAVE.zip first" >&2
-	exit 1
+        exit 1
 fi
 if [ -d $TARGET ]; then
-	echo -n ">>Save old version: " >&2
+        echo -n ">>Save old version: " >&2
-	cat $TARGET/VERSION >&2
+        cat $TARGET/VERSION >&2
-	zip -q -r $SAVE.zip $TARGET
+        zip -q -r $SAVE.zip $TARGET
-	SAVED=$SAVE.zip
+        SAVED=$SAVE.zip
 fi
 #
 #  Download the new version.
@@ -54,6 +54,5 @@ rm $ZIP
 echo -n ">>New version: " >&2
 cat $TARGET/VERSION >&2
 if [ "$SAVED" != "" ]; then
-	echo ">>Old version saved as $SAVED"
+        echo ">>Old version saved as $SAVED"
 fi
-

scripts/web2py.archlinux.sh

@@ -2,25 +2,39 @@
 # the script should be run
 # from WEB2PY root directory
 
-prog=`basename $0`
+prog="web2py.py"
 
-cd `pwd`
 chmod +x $prog
 
 function web2py_start {
-  nohup ./$prog -a "<recycle>" 2>/dev/null &
+  nohup python2 ./$prog -a "<recycle>" >>/dev/null 2>/dev/null &
-  pid=`pgrep $prog | tail -1`
+  pid=`pgrep -f $prog | tail -1`
-  if [ $pid -ne $$ ]
+  if [ "x$pid" != "x$$" ]
   then
-    echo "WEB2PY has been started."
+      echo "WEB2PY has been started (pid $pid). Stop it with '$0 stop'"
+  else
+    echo "Failed to start WEB2PY."
   fi
 }
+
 function web2py_stop {
-  kill -15 `pgrep $prog | grep -v $$` 2>/dev/null
+  pid="`pgrep -f $prog | grep -v $$`"
-  pid=`pgrep $prog | head -1`
+  if [ "x$pid" == "x" ]
-  if [ $pid -ne $$ ]
+    then
-  then
+    echo "No WEB2PY processes to stop."
-    echo "WEB2PY has been stopped."
+  else
+    kill -15 $pid
+    # Wait for web2py to shut down gracefully.
+    sleep 2
+    pid="`pgrep -f $prog | head -1`"
+    if [ "x$pid" == "x" ]
+    then
+      echo "WEB2PY has been stopped."
+    else
+      echo "Failed to stop WEB2PY. (Possibly, only one of several web2py processes was killed.)"
+      echo "Still running:"
+      pgrep -af $prog
+    fi
   fi
 }
 
@@ -36,9 +50,8 @@ case "$1" in
     web2py_start
   ;;
   *)
-    echo "Usage: $prog [start|stop|restart]"
+    echo "Usage: $0 [start|stop|restart]"
   ;;
 esac
 
 exit 0
-

scripts/web2py.fedora.sh

@@ -28,55 +28,54 @@ PYTHON=python
 cd $DAEMON_DIR
 
 start() {
-	echo -n $"Starting $DESC ($NAME): "
+        echo -n $"Starting $DESC ($NAME): "
-	daemon --check $NAME $PYTHON $DAEMON_DIR/web2py.py -Q --nogui -a $ADMINPASS -d $PIDFILE -p $PORT &
+        daemon --check $NAME $PYTHON $DAEMON_DIR/web2py.py -Q --nogui -a $ADMINPASS -d $PIDFILE -p $PORT &
-	RETVAL=$?
+        RETVAL=$?
-	if [ $RETVAL -eq 0 ]; then
+        if [ $RETVAL -eq 0 ]; then
-		touch /var/lock/subsys/$NAME
+                touch /var/lock/subsys/$NAME
-	fi
+        fi
-	echo
+        echo
-	return $RETVAL
+        return $RETVAL
 }
 
 stop() {
-	echo -n $"Shutting down $DESC ($NAME): "
+        echo -n $"Shutting down $DESC ($NAME): "
-	killproc -p "$PIDFILE" -d 3 "$NAME"
+        killproc -p "$PIDFILE" -d 3 "$NAME"
-	echo
+        echo
-	if [ $RETVAL -eq 0 ]; then
+        if [ $RETVAL -eq 0 ]; then
-		rm -f /var/lock/subsys/$NAME
+                rm -f /var/lock/subsys/$NAME
-		rm -f $PIDFILE
+                rm -f $PIDFILE
-	fi
+        fi
-	return $RETVAL
+        return $RETVAL
 }
 
 restart() {
-	stop
+        stop
-	start
+        start
 }
 
 status() {
-	if [ -r "$PIDFILE" ]; then
+        if [ -r "$PIDFILE" ]; then
-		pid=`cat $PIDFILE`
+                pid=`cat $PIDFILE`
-	fi
+        fi
-	if [ $pid ]; then
+        if [ $pid ]; then
-		echo "$NAME (pid $pid) is running..."
+                echo "$NAME (pid $pid) is running..."
-	else
+        else
-		echo "$NAME is stopped"
+                echo "$NAME is stopped"
-	fi
+        fi
 }
 
 case "$1" in
-	start)              start;;
+        start)              start;;
-	stop)               stop;;
+        stop)               stop;;
-	status)             status;;
+        status)             status;;
-	restart)            restart;;
+        restart)            restart;;
-	condrestart)        [ -e /var/lock/subsys/$NAME ] && restart
+        condrestart)        [ -e /var/lock/subsys/$NAME ] && restart
-	                    RETVAL=$?
+                            RETVAL=$?
-	                    ;;
+                            ;;
-	*)                  echo $"Usage: $0 {start|stop|restart|condrestart|status}"
+        *)                  echo $"Usage: $0 {start|stop|restart|condrestart|status}"
-	                    RETVAL=1
+                            RETVAL=1
-	                    ;;
+                            ;;
 esac
 
 exit $RETVAL
-

scripts/web2py.ubuntu.sh

@@ -48,26 +48,26 @@ DAEMON_USER=web2py
 #
 do_start()
 {
-	# Return
+        # Return
-	#   0 if daemon has been started
+        #   0 if daemon has been started
-	#   1 if daemon was already running
+        #   1 if daemon was already running
-	#   2 if daemon could not be started
+        #   2 if daemon could not be started
 
-	# The PIDDIR should normally be created during installation. This
+        # The PIDDIR should normally be created during installation. This
-	# fixes things just in case.
+        # fixes things just in case.
-	[ -d $PIDDIR ] || mkdir -p $PIDDIR
+        [ -d $PIDDIR ] || mkdir -p $PIDDIR
         [ -n "$DAEMON_USER" ] && chown --recursive $DAEMON_USER $PIDDIR
 
-	# Check to see if the daemon is already running.
+        # Check to see if the daemon is already running.
-	start-stop-daemon --stop --test --quiet --pidfile $PIDFILE \
+        start-stop-daemon --stop --test --quiet --pidfile $PIDFILE \
-		&& return 1
+                && return 1
 
-	start-stop-daemon --start --quiet --pidfile $PIDFILE \
+        start-stop-daemon --start --quiet --pidfile $PIDFILE \
-		${DAEMON_USER:+--chuid $DAEMON_USER} --chdir $DAEMON_DIR \
+                ${DAEMON_USER:+--chuid $DAEMON_USER} --chdir $DAEMON_DIR \
-		--background --exec $DAEMON -- $DAEMON_ARGS \
+                --background --exec $DAEMON -- $DAEMON_ARGS \
-		|| return 2
+                || return 2
 
-	return 0;
+        return 0;
 }
 
 #
@@ -75,17 +75,17 @@ do_start()
 #
 do_stop()
 {
-	# Return
+        # Return
-	#   0 if daemon has been stopped
+        #   0 if daemon has been stopped
-	#   1 if daemon was already stopped
+        #   1 if daemon was already stopped
-	#   2 if daemon could not be stopped
+        #   2 if daemon could not be stopped
-	#   other if a failure occurred
+        #   other if a failure occurred
 
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
+        start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
-	RETVAL=$?
+        RETVAL=$?
-	# Many daemons don't delete their pidfiles when they exit.
+        # Many daemons don't delete their pidfiles when they exit.
-	rm -f $PIDFILE
+        rm -f $PIDFILE
-	return "$RETVAL"
+        return "$RETVAL"
 }
 
 #
@@ -93,37 +93,37 @@ do_stop()
 #
 do_restart()
 {
-	# Return
+        # Return
-	#   0 if daemon was (re-)started
+        #   0 if daemon was (re-)started
-	#   1 if daemon was not strated or re-started
+        #   1 if daemon was not strated or re-started
 
-	do_stop
+        do_stop
-	case "$?" in
+        case "$?" in
-		0|1)
+                0|1)
-			do_start
+                        do_start
-			case "$?" in
+                        case "$?" in
-				0) RETVAL=0 ;;
+                                0) RETVAL=0 ;;
-				1) RETVAL=1 ;; # Old process is still running
+                                1) RETVAL=1 ;; # Old process is still running
-				*) RETVAL=1 ;; # Failed to start
+                                *) RETVAL=1 ;; # Failed to start
-			esac
+                        esac
-			;;
+                        ;;
-		*) RETVAL=1 ;; # Failed to stop
+                *) RETVAL=1 ;; # Failed to stop
-	esac
+        esac
 
-	return "$RETVAL"
+        return "$RETVAL"
 }
 
 #
 # Function that sends a SIGHUP to the daemon/service
 #
 do_reload() {
-	#
+        #
-	# If the daemon can reload its configuration without
+        # If the daemon can reload its configuration without
-	# restarting (for example, when it is sent a SIGHUP),
+        # restarting (for example, when it is sent a SIGHUP),
-	# then implement that here.
+        # then implement that here.
-	#
+        #
-	start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE
+        start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE
-	return 0
+        return 0
 }
 
 #
@@ -131,79 +131,79 @@ do_reload() {
 #
 do_status()
 {
-	# Return
+        # Return
-	#   0 if daemon is responding and OK
+        #   0 if daemon is responding and OK
-	#   1 if daemon is not responding, but PIDFILE exists
+        #   1 if daemon is not responding, but PIDFILE exists
-	#   2 if daemon is not responding, but LOCKFILE exists
+        #   2 if daemon is not responding, but LOCKFILE exists
-	#   3 if deamon is not running
+        #   3 if deamon is not running
-	#   4 if daemon status is unknown
+        #   4 if daemon status is unknown
 
-	# Check to see if the daemon is already running.
+        # Check to see if the daemon is already running.
-	start-stop-daemon --stop --test --quiet --pidfile $PIDFILE \
+        start-stop-daemon --stop --test --quiet --pidfile $PIDFILE \
-		&& return 0
+                && return 0
-	[ -f $PIDFILE ] && return 1
+        [ -f $PIDFILE ] && return 1
-	return 3
+        return 3
 }
 
 case "$1" in
   start)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+        [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
-	do_start
+        do_start
-	RETVAL=$?
+        RETVAL=$?
-	[ "$VERBOSE" != no ] &&
+        [ "$VERBOSE" != no ] &&
-	case "$RETVAL" in
+        case "$RETVAL" in
-		0|1) log_end_msg 0 ;;
+                0|1) log_end_msg 0 ;;
-		*)   log_end_msg 1 ;;
+                *)   log_end_msg 1 ;;
-	esac
+        esac
-	exit "$RETVAL"
+        exit "$RETVAL"
-	;;
+        ;;
   stop)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+        [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
-	do_stop
+        do_stop
-	RETVAL=$?
+        RETVAL=$?
-	[ "$VERBOSE" != no ] &&
+        [ "$VERBOSE" != no ] &&
-	case "$RETVAL" in
+        case "$RETVAL" in
-		0|1) log_end_msg 0 ;;
+                0|1) log_end_msg 0 ;;
-		*)   log_end_msg 1 ;;
+                *)   log_end_msg 1 ;;
-	esac
+        esac
-	exit "$RETVAL"
+        exit "$RETVAL"
-	;;
+        ;;
   #reload|force-reload)
-	#
+        #
-	# If do_reload() is not implemented then leave this commented out
+        # If do_reload() is not implemented then leave this commented out
-	# and leave 'force-reload' as an alias for 'restart'.
+        # and leave 'force-reload' as an alias for 'restart'.
-	#
+        #
-	#[ "$VERBOSE" != no ] && log_daemon_msg "Reloading $DESC" "$NAME"
+        #[ "$VERBOSE" != no ] && log_daemon_msg "Reloading $DESC" "$NAME"
-	#do_reload
+        #do_reload
-	#RETVAL=$?
+        #RETVAL=$?
-	#[ "$VERBOSE" != no ] && log_end_msg $?
+        #[ "$VERBOSE" != no ] && log_end_msg $?
-	#exit "$RETVAL"
+        #exit "$RETVAL"
-	#;;
+        #;;
   restart|force-reload)
-	#
+        #
-	# If the "reload" option is implemented then remove the
+        # If the "reload" option is implemented then remove the
-	# 'force-reload' alias
+        # 'force-reload' alias
-	#
+        #
-	[ "$VERBOSE" != no ] && log_daemon_msg "Restarting $DESC" "$NAME"
+        [ "$VERBOSE" != no ] && log_daemon_msg "Restarting $DESC" "$NAME"
-	do_restart
+        do_restart
-	RETVAL=$?
+        RETVAL=$?
-	[ "$VERBOSE" != no ] && log_end_msg "$RETVAL"
+        [ "$VERBOSE" != no ] && log_end_msg "$RETVAL"
-	exit "$RETVAL"
+        exit "$RETVAL"
-	;;
+        ;;
   status)
     do_status
-	RETVAL=$?
+        RETVAL=$?
     [ "$VERBOSE" != no ] &&
-	case "$RETVAL" in
+        case "$RETVAL" in
-	  0) log_success_msg "$NAME is running" ;;
+          0) log_success_msg "$NAME is running" ;;
-	  *) log_failure_msg "$NAME is not running" ;;
+          *) log_failure_msg "$NAME is not running" ;;
-	esac
+        esac
     exit "$RETVAL"
-	;;
+        ;;
   *)
-	echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|status}" >&2
+        echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|status}" >&2
-	exit 3
+        exit 3
-	;;
+        ;;
 esac
 
 :
@@ -220,4 +220,3 @@ esac
 # http://refspecs.linux-foundation.org/LSB_3.2.0/LSB-Core-generic/LSB-Core-generic.pdf
 # Debian Policy SysV init: http://www.debian.org/doc/debian-policy/ch-opersys.html#s-sysvinit
 # Examine files in /usr/share/doc/sysv-rc/
-