Changeset 1280

Show
Ignore:
Timestamp:
09/17/08 11:50:20
Author:
liebster
Message:

Merged revisions 1210-1213,1273 via svnmerge from
http://svn.quintagroup.com/products/qPloneCaptchas/branches/plone-3.1

........

r1210 | deo | 2008-08-20 19:45:58 +0300 (Срд, 20 Сер 2008) | 1 line


Added support to Plone 3.1.
........
r1211 | deo | 2008-08-25 20:15:08 +0300 (Пнд, 25 Сер 2008) | 1 line


Whitespaces.
........
r1212 | deo | 2008-08-25 20:15:42 +0300 (Пнд, 25 Сер 2008) | 1 line


Renamed.
........
r1213 | deo | 2008-08-25 20:21:18 +0300 (Пнд, 25 Сер 2008) | 1 line


Rewrapped long lines. Added contributors section.
........
r1273 | liebster | 2008-09-17 17:52:41 +0300 (Срд, 17 Вер 2008) | 1 line


Fixed tests
........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • qPloneCaptchas/trunk

    • Property svnmerge-integrated changed from /qPloneCaptchas/branches/plone-3.1:1-1209 to /qPloneCaptchas/branches/plone-3.1:1-1279

  • qPloneCaptchas/trunk/Extensions/Install.py

    r1114 r1280  
    4444    elif plone_version.startswith('2.5'): 
    4545        plone_version = '2.5' 
    46     elif plone_version.startswith('3'): 
     46    elif plone_version.startswith('3.0'): 
    4747        plone_version = '3.0' 
     48    elif plone_version.startswith('3.1'): 
     49        plone_version = '3.1' 
    4850    else: 
    4951        raise Exception("Error - Unsupported version. Suported versions: Plone 2.0.5-3") 
    …… 
    5961    join_form_layer = '/'.join([LAYER_JOIN_FORM, plone_version]) 
    6062    Layers.append(join_form_layer) 
    61      
    62      
     63 
    6364    sendto_form_layer = '/'.join([LAYER_SENDTO_FORM, plone_version]) 
    6465    Layers.append(sendto_form_layer) 
    …… 
    9596                out.write('  Layer %s was already installed into skin %s.\n' % (layer,skin)) 
    9697        if modified: 
    97             path = string.join( path, ', ' ) 
     98            path = string.join( path, ',' ) 
    9899            skinstool.addSkinSelection( skin, path ) 
    99100 

  • qPloneCaptchas/trunk/README.txt

    r1100 r1280  
    11Plone Capchas 
    22 
    3     qPloneCaptchas is simple captchas implementation for Plone, designed for validation  
    4     human input in insecure forms. This is standalone implementation with static captcha 
    5     images, which does not depend on captchas.net services. 
     3    qPloneCaptchas is simple captchas implementation for Plone, designed 
     4    for validating human input in insecure forms. This is a standalone 
     5    implementation with static captcha images, which does not depend on 
     6    captchas.net services. 
    67 
    7     Starting from version 1.0 dynamic captchas option implemented. You can switch  
    8     captchas into dynamic mode in correspondent configlet. In this case captcha images  
    9     will be generated on the fly. 
     8    Since version 1.0, the dynamic captchas option is implemented. You can 
     9    switch captchas into dynamic mode in correspondent configlet. In this 
     10    case, captcha images will be generated on the fly. 
     11 
    1012 
    1113Supported Plone versions: 
    …… 
    1416    * 2.1.x 
    1517    * 2.5.x 
    16     * 3.0.x 
     18    * 3.x 
     19 
    1720 
    1821Dependency: 
    1922 
    2023    PIL with Jpeg and FreeType support 
     24 
    2125 
    2226Plugs to: 
    …… 
    2832Install: 
    2933 
    30     If qPloneCaptchas is expected to be used with PloneFormMailer please make sure  
    31     that qPloneCaptchas installed only after the product. Tested with PloneFormMailer 0.3. 
     34    If qPloneCaptchas is expected to be used with PloneFormMailer please 
     35    make sure that qPloneCaptchas is installed only after the product. 
     36    Tested with PloneFormMailer 0.3. 
    3237 
    3338 
    34 The product is developed by Quintagroup.com team. 
     39Authors: 
    3540 
    36     Volodymyr Cherepanyak - chervol@quintagroup.com 
    37     Mykola Kharechko - crchemist@quintagroup.com 
     41    The product is developed by Quintagroup.com team: 
     42 
     43    * Volodymyr Cherepanyak - chervol@quintagroup.com 
     44 
     45    * Mykola Kharechko - crchemist@quintagroup.com 
     46 
     47 
     48Contributors: 
     49 
     50    * Dorneles Tremea - dorneles@tremea.com 
     51 
    3852 
    3953Future features: 

  • qPloneCaptchas/trunk/tests/testCaptchaWidget.py

    r945 r1280  
    2121        self.addProduct('qPloneCaptchas') 
    2222        self.portal.invokeFactory('Document', 'index_html') 
    23         self.portal['index_html'].allow_discussion = True 
     23        self.portal['index_html'].allowDiscussion(True) 
    2424        self.absolute_url = self.portal['index_html'].absolute_url_path() 
    2525 
    …… 
    3636        path = '%s/discussion_reply_form'%self.absolute_url 
    3737        resp1 = self.publish(path, self.basic_auth, request_method='GET').getBody() 
    38         patt = re.compile('<img\s+src="%s(/getCaptchaImage/[0-9a-fA-F]+)"'%self.portal.absolute_url()) 
     38        patt = re.compile('\s+src="%s(/getCaptchaImage/[0-9a-fA-F]+)"'%self.portal.absolute_url()) 
    3939        match_obj = patt.search(resp1) 
    4040        img_url = match_obj.group(1) 

  • qPloneCaptchas/trunk/version.txt

    r1116 r1280  
    1 1.3.2 
     11.3.3