Changeset 5934


Ignore:
Timestamp:
01/13/12 16:39:05 (4 months ago)
Author:
vain
Message:
  • removed class comments containing ascii-trees
  • fixed loading of elements, decorators with new filenames
Location:
trunk/core
Files:
1 deleted
39 edited

Legend:

Unmodified
Added
Removed

  • trunk/core/autoload/autoloader.core.php

    r5928 r5934  
    252252        'Clansuite_Formelement_Input'         => 'viewhelper/form/elements/input.php', 
    253253        'Clansuite_Formelement_Imagebutton'   => 'viewhelper/form/elements/imagebutton.php', 
    254         'Clansuite_Formelement_Checkbox'      => 'viewhelper/form/elements/checkbox.form.php', 
     254        'Clansuite_Formelement_Checkbox'      => 'viewhelper/form/elements/checkbox.php', 
     255        'Clansuite_Formelement_Select'        => 'viewhelper/form/elements/select.php', 
    255256        'Clansuite_Array_Formgenerator'       => 'viewhelper/form/generators/array.php', 
    256257        'Clansuite_Doctrine_Formgenerator'    => 'viewhelper/form/generators/doctrine.php', 

  • trunk/core/viewhelper/form/elements/button.php

    r5932 r5934  
    3737} 
    3838 
    39 /** 
    40  *  Clansuite_Formelement 
    41  *  | 
    42  *  \- Clansuite_Formelement_Input 
    43  *     | 
    44  *     \- Clansuite_Formelement_Button 
    45  */ 
    4639class Clansuite_Formelement_Button extends Clansuite_Formelement_Input implements Clansuite_Formelement_Interface 
    4740{ 
    … …  
    4942    { 
    5043        $this->type = 'button'; 
    51     }     
     44    } 
    5245} 
    5346?> 

  • trunk/core/viewhelper/form/elements/buttonbar.php

    r5932 r5934  
    3737} 
    3838 
    39 /** 
    40  *  Clansuite_Formelement 
    41  *  | 
    42  *  \- Clansuite_Formelement_ButtonBar 
    43  */ 
    4439class Clansuite_Formelement_Buttonbar extends Clansuite_Formelement implements Clansuite_Formelement_Interface 
    4540{ 

  • trunk/core/viewhelper/form/elements/cancelbutton.php

    r5932 r5934  
    3737} 
    3838 
    39 /** 
    40  *  Clansuite_Formelement 
    41  *  | 
    42  *  \- Clansuite_Formelement_Input 
    43  *     | 
    44  *     \- Clansuite_Formelement_Cancelbutton 
    45  */ 
    4639class Clansuite_Formelement_Cancelbutton extends Clansuite_Formelement_Input implements Clansuite_Formelement_Interface 
    4740{ 

  • trunk/core/viewhelper/form/elements/captcha.php

    r5932 r5934  
    3737} 
    3838 
    39 /** 
    40  *  Clansuite_Formelement 
    41  *  | 
    42  *  \- Clansuite_Formelement_Captcha 
    43  */ 
    4439class Clansuite_Formelement_Captcha extends Clansuite_Formelement implements Clansuite_Formelement_Interface 
    4540{ 
    … …  
    8479 
    8580    /** 
    86      * @return string Name of the Captcha (without the captcha part) (like re, simple) 
     81     * @return string Name of the Captcha 
    8782     */ 
    8883    public function getCaptcha() 
    … …  
    133128        if (class_exists($classname, false) === false) 
    134129        { 
    135             include ROOT_CORE .'viewhelper/form/formelements/'. $name .'captcha.form.php'; 
     130            include ROOT_CORE .'viewhelper/form/formelements/'. $name .'captcha.php'; 
    136131        } 
    137132 

  • trunk/core/viewhelper/form/elements/checkbox.php

    r5932 r5934  
    3737} 
    3838 
    39 # conditional include of the parent class 
    40 if (false == class_exists('Clansuite_Formelement_Input',false)) 
    41 { 
    42     include __DIR__ . '/input.form.php'; 
    43 } 
    44  
    45 /** 
    46  *  Clansuite_Formelement 
    47  *  | 
    48  *  \- Clansuite_Formelement_Input 
    49  *      | 
    50  *      \- Clansuite_Formelement_Checkbox 
    51  */ 
    5239class Clansuite_Formelement_Checkbox extends Clansuite_Formelement_Input implements Clansuite_Formelement_Interface 
    5340{ 

  • trunk/core/viewhelper/form/elements/checkboxlist.php

    r5932 r5934  
    3737} 
    3838 
    39 # conditional include of the parent class 
    40 if (false == class_exists('Clansuite_Formelement_Checkbox',false)) 
    41 { 
    42     include __DIR__ . '/checkbox.form.php'; 
    43 } 
    44  
    45 /** 
    46  *  Clansuite_Formelement_Input 
    47  *  | 
    48  *  \ - Clansuite_Formelement_Checkbox 
    49  *      | 
    50  *      \- Clansuite_Formelement_Checkboxlist 
    51  */ 
    5239class Clansuite_Formelement_Checkboxlist extends Clansuite_Formelement_Checkbox implements Clansuite_Formelement_Interface 
    5340{ 

  • trunk/core/viewhelper/form/elements/confirmsubmitbutton.php

    r5932 r5934  
    3737} 
    3838 
    39 # conditional include of the parent class 
    40 if (false == class_exists('Clansuite_Formelement_Input',false)) 
    41 { 
    42     include __DIR__ . '/input.form.php'; 
    43 } 
    44  
    45 /** 
    46  *  Clansuite_Formelement 
    47  *  | 
    48  *  \- Clansuite_Formelement_Input 
    49  *     | 
    50  *     \- Clansuite_Formelement_ConfirmSubmitButton 
    51  */ 
    5239class Clansuite_Formelement_ConfirmSubmitButton extends Clansuite_Formelement_Input implements Clansuite_Formelement_Interface 
    5340{ 
    … …  
    6047        $this->class = 'ButtonGreen'; 
    6148 
    62         # Add the Form Submit Confirmation Javascript. This is a pure Javacript Return Confirm. 
    63         # to add the value of specific form.elements to the message use "+ form.elements['email'].value +" 
     49        /** 
     50         * Add the Form Submit Confirmation Javascript. 
     51         * This is a pure Javacript Return Confirm. 
     52         * To add the value of specific "form.elements" to the message 
     53         * use: "+ form.elements['email'].value +" 
     54         */ 
    6455        $this->setAdditionalAttributeAsText("onclick=\"if (confirm('Are you sure you want to submit this form?\\n\\nClick OK to submit or Cancel to abort.')) { submit(); } else { return false; } \" value=\"Submit\""); 
    6556    } 

  • trunk/core/viewhelper/form/elements/email.php

    r5932 r5934  
    3737} 
    3838 
    39 # conditional include of the parent class 
    40 if (false == class_exists('Clansuite_Formelement_Input',false)) 
    41 {  
    42     include __DIR__ . '/input.form.php'; 
    43 } 
    44  
    45 /** 
    46  *  Clansuite_Formelement 
    47  *  | 
    48  *  \- Clansuite_Formelement_Input 
    49  *      | 
    50  *      \- Clansuite_Formelement_Email 
    51  */ 
    5239class Clansuite_Formelement_Email extends Clansuite_Formelement_Input implements Clansuite_Formelement_Interface 
    5340{ 

  • trunk/core/viewhelper/form/elements/errors.php

    r5932 r5934  
    2727    * @copyright  Jens-André Koch (2005-onwards) 
    2828    * @link       http://www.clansuite.com 
    29     *  
     29    * 
    3030    * @version    SVN: $Id$ 
    3131    */ 
    … …  
    3737} 
    3838 
    39 /** 
    40  * 
    41  *  Clansuite_Form 
    42  *  | 
    43  *  \- Clansuite_Formelement_Errors 
    44  */ 
    4539class Clansuite_Formelement_Errors extends Clansuite_Formelement implements Clansuite_Formelement_Interface 
    4640{ 

  • trunk/core/viewhelper/form/elements/file.php

    r5932 r5934  
    4343} 
    4444 
    45 /** 
    46  *  Clansuite_Formelement 
    47  *  | 
    48  *  \- Clansuite_Formelement_Input 
    49  *      | 
    50  *      \- Clansuite_Formelement_File 
    51  */ 
    5245class Clansuite_Formelement_File extends Clansuite_Formelement_Input implements Clansuite_Formelement_Interface 
    5346{ 
    … …  
    5750     * There are several different formelements available to upload files: 
    5851     * 
    59      * 1) Ajaxupload    -> uploadajax.form.php 
    60      * 2) APC           -> uploadapc.form.php 
    61      * 3) Uploadify     -> uploadify.form.php 
     52     * 1) Ajaxupload    -> uploadajax.php 
     53     * 2) APC           -> uploadapc.php 
     54     * 3) Uploadify     -> uploadify.php 
    6255     * 4) Default HTML  -> this class 
    6356     * 
    … …  
    9285    public function render() 
    9386    { 
    94         /** 
    95          * Switch for uploadType 
    96          */ 
    9787        switch($this->uploadType) 
    9888        { 
    … …  
    10191                if(false === class_exists('Clansuite_Formelement_Uploadajax', false)) 
    10292                { 
    103                     include 'uploadajax.form.php'; 
     93                    include __DIR__ . '/uploadajax.php'; 
    10494                } 
    10595                return new Clansuite_Formelement_Uploadajax(); 
    … …  
    10898                if(false === class_exists('Clansuite_Formelement_Uploadapc', false)) 
    10999                { 
    110                     include 'uploadapc.form.php'; 
     100                    include __DIR__ . '/uploadapc.php'; 
    111101                } 
    112102                return new Clansuite_Formelement_Uploadapc(); 
    … …  
    115105                if(false === class_exists('Clansuite_Formelement_Uploadify', false)) 
    116106                { 
    117                     include 'uploadify.form.php'; 
     107                    include __DIR__ . '/uploadify.php'; 
    118108                } 
    119109                return new Clansuite_Formelement_Uploadify(); 
    … …  
    129119        } 
    130120    } 
    131      
     121 
    132122    /** 
    133123     * Magic-Method for rendering the subclass formelements. 
    134      *  
     124     * 
    135125     * The render method needs a bit magic to render formelement objects directly. 
    136126     * See the short returns calls like the following above: 
    137      *  
     127     * 
    138128     *      return new Clansuite_Formelement_Uploadajax(); 
    139      *  
    140      * The long form is:  
    141      *  
     129     * 
     130     * The long form is: 
     131     * 
    142132     *      $formelement = new Clansuite_Formelement_Uploadajax(); 
    143133     *      $formelement->render(); 

  • trunk/core/viewhelper/form/elements/hidden.php

    r5932 r5934  
    3737} 
    3838 
    39  
    4039class Clansuite_Formelement_Hidden extends Clansuite_Formelement_Input implements Clansuite_Formelement_Interface 
    4140{ 

  • trunk/core/viewhelper/form/elements/image.php

    r5932 r5934  
    3737} 
    3838 
    39 /** 
    40  * 
    41  *  Clansuite_Formelement 
    42  *  | 
    43  *  \- Clansuite_Formelement_Image 
    44  */ 
    4539class Clansuite_Formelement_Image extends Clansuite_Formelement implements Clansuite_Formelement_Interface 
    4640{ 
    47      
     41 
    4842    public static function render() 
    4943    { 
    50         return '<input ' . $this->renderAttributes() . '>';    
     44        return '<input ' . $this->renderAttributes() . '>'; 
    5145    } 
    5246} 

  • trunk/core/viewhelper/form/elements/imagebutton.php

    r5932 r5934  
    3737} 
    3838 
    39 # conditional include of the parent class 
    40 if (false == class_exists('Clansuite_Formelement_Input',false)) 
    41 { 
    42     include __DIR__ . '/input.form.php'; 
    43 } 
    44  
    45 /** 
    46  *  Clansuite_Formelement 
    47  *  | 
    48  *  \- Clansuite_Formelement_Input 
    49  *     | 
    50  *     \- Clansuite_Formelement_Imagebutton 
    51  */ 
    5239class Clansuite_Formelement_Imagebutton extends Clansuite_Formelement_Input implements Clansuite_Formelement_Interface 
    5340{ 

  • trunk/core/viewhelper/form/elements/input.php

    r5932 r5934  
    3838 
    3939/** 
    40  *  Clansuite_Formelement 
    41  *  | 
    42  *  \- Clansuite_Formelement_Input 
     40 * Clansuite_Formelement_Input 
    4341 * 
    4442 * @link http://www.whatwg.org/specs/web-apps/current-work/multipage/the-input-element.html 

  • trunk/core/viewhelper/form/elements/jqconfirmsubmitbutton.php

    r5932 r5934  
    3737} 
    3838 
    39 # conditional include of the parent class 
    40 if (false == class_exists('Clansuite_Formelement_Input',false)) 
    41 { 
    42     include __DIR__ . '/input.form.php'; 
    43 } 
    44  
    45 /** 
    46  *  Clansuite_Formelement 
    47  *  | 
    48  *  \- Clansuite_Formelement_Input 
    49  *     | 
    50  *     \- Clansuite_Formelement_JQConfirmSubmitButton 
    51  */ 
    5239class Clansuite_Formelement_JQConfirmSubmitButton extends Clansuite_Formelement_Input implements Clansuite_Formelement_Interface 
    5340{ 
    … …  
    6855         * Add the Form Submit Confirmation Javascript. 
    6956         * This is a jQuery UI Modal Confirm Dialog. 
    70          *  
     57         * 
    7158         * a) To add the value of specific form.elements to the message use "+ form.elements['email'].value +" 
    7259         * b) Take care, that the div dialog is present in the DOM, BEFORE you assign function to it via $('#dialog') 

  • trunk/core/viewhelper/form/elements/multiselect.php

    r5932 r5934  
    3737} 
    3838 
    39 # conditional include of the parent class 
    40 if (false == class_exists('Clansuite_Formelement_Select',false)) 
    41 {  
    42     include __DIR__ . '/select.form.php'; 
    43 } 
    44  
    45 /** 
    46  * 
    47  *  Clansuite_Form 
    48  *  | 
    49     \- Clansuite_Formelement_Select 
    50  *     | 
    51  *     \- Clansuite_Formelement_Multiselect 
    52  */ 
    5339class Clansuite_Formelement_Multiselect extends Clansuite_Formelement_Select implements Clansuite_Formelement_Interface 
    5440{ 

  • trunk/core/viewhelper/form/elements/number.php

    r5932 r5934  
    3737} 
    3838 
    39 # conditional include of the parent class 
    40 if (false == class_exists('Clansuite_Formelement_Input',false)) 
    41 {  
    42     include __DIR__ . '/input.form.php'; 
    43 } 
    44  
    45 /** 
    46  *  Clansuite_Formelement 
    47  *  | 
    48  *  \- Clansuite_Formelement_Input 
    49  *      | 
    50  *      \- Clansuite_Formelement_Number 
    51  */ 
    5239class Clansuite_Formelement_Number extends Clansuite_Formelement_Input implements Clansuite_Formelement_Interface 
    5340{ 
    … …  
    5845        return $this; 
    5946    } 
    60      
     47 
    6148    /** 
    6249     * Specifies the minimum value allowed 
    … …  
    6552    { 
    6653        $this->min = $min; 
    67          
     54 
    6855        return $this; 
    6956    } 
    70      
     57 
    7158    /** 
    7259     * Specifies the maximum value allowed 
    … …  
    7562    { 
    7663        $this->max = $max; 
    77          
     64 
    7865        return $this; 
    7966    } 
    80      
     67 
    8168    /** 
    8269     * Specifies legal number intervals (if step="2", legal numbers could be -2,0,2,4, etc) 
    … …  
    8572    { 
    8673        $this->step = $step; 
    87          
     74 
    8875        return $this; 
    8976    } 

  • trunk/core/viewhelper/form/elements/password.php

    r5932 r5934  
    3737} 
    3838 
    39 # conditional include of the parent class 
    40 if (false == class_exists('Clansuite_Formelement_Text',false)) 
    41 {  
    42     include __DIR__ . '/text.form.php'; 
    43 } 
    44  
    45 /** 
    46  * 
    47  *  Clansuite_Formelement 
    48  *  | 
    49  *  \- Clansuite_Formelement_Text 
    50  *     | 
    51  *     \- Clansuite_Formelement_Password 
    52  */ 
    5339class Clansuite_Formelement_Password extends Clansuite_Formelement_Text implements Clansuite_Formelement_Interface 
    5440{ 

  • trunk/core/viewhelper/form/elements/radio.php

    r5932 r5934  
    3737} 
    3838 
    39 # conditional include of the parent class 
    40 if (false == class_exists('Clansuite_Formelement_Input',false)) 
    41 { 
    42     include __DIR__ . '/input.form.php'; 
    43 } 
    44  
    45 /** 
    46  *  Clansuite_Formelement 
    47  *  | 
    48  *  \- Clansuite_Formelement_Input 
    49  *      | 
    50  *      \- Clansuite_Formelement_Radio 
    51  */ 
    5239class Clansuite_Formelement_Radio extends Clansuite_Formelement_Input implements Clansuite_Formelement_Interface 
    5340{ 

  • trunk/core/viewhelper/form/elements/radiolist.php

    r5932 r5934  
    3737} 
    3838 
    39 # conditional include of the parent class 
    40 if (false == class_exists('Clansuite_Formelement_Radio',false)) 
    41 { 
    42     include __DIR__ . '/radio.form.php'; 
    43 } 
    44 /** 
    45  *  Clansuite_Form 
    46  *  | 
    47  *  \- Clansuite_Formelement_Radio 
    48  *     | 
    49  *     \- Clansuite_Formelement_Radiolist 
    50  */ 
    5139class Clansuite_Formelement_Radiolist extends Clansuite_Formelement_Radio implements Clansuite_Formelement_Interface 
    5240{ 
    … …  
    8472                  ->setDescription($value) 
    8573                  ->setLabel($value); 
    86              
     74 
    8775            # check the element, if value is "active" 
    8876            if( $this->value == $key) 
    … …  
    9381            # assign it as output 
    9482            $html .= $radio; 
    95              
     83 
    9684            #Clansuite_Debug::printR($html); 
    9785 

  • trunk/core/viewhelper/form/elements/range.php

    r5932 r5934  
    3737} 
    3838 
    39 # conditional include of the parent class 
    40 if (false == class_exists('Clansuite_Formelement_Input',false)) 
    41 {  
    42     include __DIR__ . '/input.form.php'; 
    43 } 
    44  
    45 /** 
    46  *  Clansuite_Formelement 
    47  *  | 
    48  *  \- Clansuite_Formelement_Input 
    49  *      | 
    50  *      \- Clansuite_Formelement_Range 
    51  */ 
    5239class Clansuite_Formelement_Range extends Clansuite_Formelement_Input implements Clansuite_Formelement_Interface 
    5340{ 
    5441    public function __construct() 
    5542    { 
    56         $this->type = 'range'; # displays a slider  
     43        $this->type = 'range'; # displays a slider 
    5744 
    5845        return $this; 
    5946    } 
    60      
     47 
    6148    /** 
    6249     * Specifies the minimum value allowed 
    … …  
    6552    { 
    6653        $this->min = $min; 
    67          
     54 
    6855        return $this; 
    6956    } 
    70      
     57 
    7158    /** 
    7259     * Specifies the maximum value allowed 
    … …  
    7562    { 
    7663        $this->max = $max; 
    77          
     64 
    7865        return $this; 
    7966    } 
    80      
     67 
    8168    /** 
    8269     * Specifies legal number intervals (if step="2", legal numbers could be -2,0,2,4, etc) 
    … …  
    8572    { 
    8673        $this->step = $step; 
    87          
     74 
    8875        return $this; 
    8976    } 

  • trunk/core/viewhelper/form/elements/selectcountry.php

    r5932 r5934  
    3737} 
    3838 
    39 # conditional include of the parent class 
    40 if (false == class_exists('Clansuite_Formelement_Select',false)) 
    41 { 
    42     include __DIR__ . '/select.form.php'; 
    43 } 
    44  
    45 /** 
    46  * 
    47  *  Clansuite_Form 
    48  *  | 
    49  *  \- Clansuite_Formelement_Select 
    50  *     | 
    51  *     \- Clansuite_Formelement_Selectcountry 
    52  */ 
    5339class Clansuite_Formelement_Selectcountry extends Clansuite_Formelement_Select implements Clansuite_Formelement_Interface 
    5440{ 

  • trunk/core/viewhelper/form/elements/selectlocale.php

    r5932 r5934  
    3737} 
    3838 
    39 # conditional include of the parent class 
    40 if (false == class_exists('Clansuite_Formelement_Select',false)) 
    41 { 
    42     include __DIR__ . '/select.form.php'; 
    43 } 
    44  
    45 /** 
    46  *  Clansuite_Form 
    47  *  | 
    48  *  \- Clansuite_Formelement_Select 
    49  *     | 
    50  *     \- Clansuite_Formelement_Selectlocale 
    51  */ 
    5239class Clansuite_Formelement_Selectlocale extends Clansuite_Formelement_Select implements Clansuite_Formelement_Interface 
    5340{ 
    … …  
    6148        # include locale arrays 
    6249        include ROOT_CORE . 'gettext/locales.gettext.php'; 
    63                 
     50 
    6451        /** 
    6552         * prepare array structure for dropdown ( key => value ) 
    … …  
    7259             * Key is the locale name. 
    7360             * 
    74              * a locale name has the form ‘ll_CC’.  
     61             * a locale name has the form ‘ll_CC’. 
    7562             * Where ‘ll’ is an ISO 639 two-letter language code, and ‘CC’ is an ISO 3166 two-letter country code. 
    7663             * Both codes are separated by a underscore. 
    … …  
    8067             */ 
    8168            $key = $locale; 
    82              
     69 
    8370            /** 
    8471             * Value consists of a long form of the language name and the locale code with hyphen. 
    … …  
    8976             */ 
    9077            $value = $locale_array['lang-native'] . ' (' . $locale_array['lang-www'] . ')'; 
    91                          
     78 
    9279            $options[$key] = $value; 
    9380        } 
    9481 
    9582        $this->setOptions($options); 
    96          
     83 
    9784        $this->setLabel( _('Select Locale') ); 
    98          
     85 
    9986        # You will find the value of the drop down in $_POST['locale']! 
    10087        $this->setName('locale'); 

  • trunk/core/viewhelper/form/elements/selectyesno.php

    r5932 r5934  
    3737} 
    3838 
    39 # conditional include of the parent class 
    40 if (false == class_exists('Clansuite_Formelement_Select',false)) 
    41 { 
    42     include __DIR__ . '/select.form.php'; 
    43 } 
    44  
    45 /** 
    46  * 
    47  *  Clansuite_Form 
    48  *  | 
    49  *  \- Clansuite_Formelement_Select 
    50  *     | 
    51  *     \- Clansuite_Formelement_Selectyesno 
    52  */ 
    5339class Clansuite_Formelement_Selectyesno extends Clansuite_Formelement_Select implements Clansuite_Formelement_Interface 
    5440{ 

  • trunk/core/viewhelper/form/elements/submitbutton.php

    r5932 r5934  
    3737} 
    3838 
    39 # conditional include of the parent class 
    40 if (false == class_exists('Clansuite_Formelement_Input',false)) 
    41 { 
    42     include __DIR__ . '/input.form.php'; 
    43 } 
    44  
    45 /** 
    46  *  Clansuite_Formelement 
    47  *  | 
    48  *  \- Clansuite_Formelement_Input 
    49  *     | 
    50  *     \- Clansuite_Formelement_Submitbutton 
    51  */ 
    5239class Clansuite_Formelement_Submitbutton extends Clansuite_Formelement_Input implements Clansuite_Formelement_Interface 
    5340{ 

  • trunk/core/viewhelper/form/elements/text.php

    r5932 r5934  
    3737} 
    3838 
    39 # conditional include of the parent class 
    40 if (false == class_exists('Clansuite_Formelement_Input',false)) 
    41 {  
    42     include __DIR__ . '/input.form.php'; 
    43 } 
    44  
    45 /** 
    46  *  Clansuite_Formelement 
    47  *  | 
    48  *  \- Clansuite_Formelement_Input 
    49  *      | 
    50  *      \- Clansuite_Formelement_Text 
    51  */ 
    5239class Clansuite_Formelement_Text extends Clansuite_Formelement_Input implements Clansuite_Formelement_Interface 
    5340{ 

  • trunk/core/viewhelper/form/elements/textarea.php

    r5932 r5934  
    5252     * There are several different wysiwyg editor formelements available: 
    5353     * 
    54      * 1) Nicedit   -> wysiwygnicedit.form.php 
    55      * 2) TinyMCE   -> wysiwygtinymce.form.php 
    56      * 3) CKEditor  -> wysiwygckeditor.form.php 
    57      * 4) markItUp  -> wysiwygmarkItUp.form.phg 
     54     * 1) Nicedit   -> wysiwygnicedit.php 
     55     * 2) TinyMCE   -> wysiwygtinymce.php 
     56     * 3) CKEditor  -> wysiwygckeditor.php 
     57     * 4) markItUp  -> wysiwygmarkItUp.phg 
    5858     * 
    5959     * @var string 
    … …  
    8989         *  the expected config setting is [editor] type. 
    9090         *  if the configuration value is not given, use "ckeditor" as fallback. 
    91          */         
     91         */ 
    9292        if($editor == null) 
    93         {             
     93        { 
    9494            $config = Clansuite_CMS::getInjector()->instantiate('Clansuite_Config'); 
    9595            $editor = isset($config['editor']['type']) ? $config['editor']['type'] : 'ckeditor'; 
    … …  
    183183    private function editorFactory() 
    184184    { 
    185         $name = $this->getEditor();  
    186          
     185        $name = $this->getEditor(); 
     186 
    187187 
    188188        # construct classname 
    … …  
    192192        if(class_exists($classname, false) === false) 
    193193        { 
    194             include ROOT_CORE . 'viewhelper/form/formelements/wysiwyg' . $name . '.form.php'; 
     194            include ROOT_CORE . 'viewhelper/form/elements/wysiwyg' . $name . '.php'; 
    195195        } 
    196196 

  • trunk/core/viewhelper/form/elements/timetoken.php

    r5932 r5934  
    3838 
    3939/** 
    40  * 
    41  *  Clansuite_Formelement 
    42  *  | 
    43  *  \- Clansuite_Formelement_Timetoken 
     40 * Clansuite_Formelement_Timetoken 
    4441 */ 
    4542class Clansuite_Formelement_Timetoken extends Clansuite_Formelement implements Clansuite_Formelement_Interface 
    … …  
    4744    public function generateToken() 
    4845    { 
    49        # @todo consider using PHP Spam Kit Class   
     46       # @todo consider using PHP Spam Kit Class 
    5047    } 
    51      
     48 
    5249    /** 
    5350     * Inserts a hidden input field for a token. Reducing the risk of an CSRF exploit. 

  • trunk/core/viewhelper/form/elements/uploadajax.php

    r5932 r5934  
    3737} 
    3838 
    39 # conditional include of the parent class 
    40 if (false == class_exists('Clansuite_Formelement_File',false)) 
    41 { 
    42     include __DIR__ . '/file.form.php'; 
    43 } 
    44  
    45 /** 
    46  *  Clansuite_Formelement 
    47  *  | 
    48  *  \- Clansuite_Formelement_File 
    49  *      | 
    50  *      \- Clansuite_Formelement_Uploadajax 
    51  */ 
    5239class Clansuite_Formelement_Uploadajax extends Clansuite_Formelement_File implements Clansuite_Formelement_Interface 
    5340{ 

  • trunk/core/viewhelper/form/elements/uploadapc.php

    r5932 r5934  
    3737} 
    3838 
    39 # conditional include of the parent class 
    40 if (false == class_exists('Clansuite_Formelement_File',false)) 
    41 { 
    42     include __DIR__ . '/file.form.php'; 
    43 } 
    44  
    45 /** 
    46  *  Clansuite_Formelement 
    47  *  | 
    48  *  \- Clansuite_Formelement_File 
    49  *      | 
    50  *      \- Clansuite_Formelement_Uploadapc 
    51  */ 
    5239class Clansuite_Formelement_Uploadapc extends Clansuite_Formelement_File implements Clansuite_Formelement_Interface 
    5340{ 
    … …  
    156143         * c) placed before the input file element. 
    157144         */ 
    158         if (false == class_exists('Clansuite_Formelement_Hidden',false)) 
     145        if (false === class_exists('Clansuite_Formelement_Hidden',false)) 
    159146        { 
    160147            include __DIR__ . '/hidden.form.php'; 
    … …  
    169156 
    170157        # add a submit button 
    171         if (false == class_exists('Clansuite_Formelement_Submitbutton',false)) 
     158        if (false === class_exists('Clansuite_Formelement_Submitbutton',false)) 
    172159        { 
    173             include __DIR__ . '/submitbutton.form.php'; 
     160            include __DIR__ . '/submitbutton.php'; 
    174161        } 
    175162        $submit = new Clansuite_Formelement_Submitbutton(); 

  • trunk/core/viewhelper/form/elements/uploadify.php

    r5932 r5934  
    3737} 
    3838 
    39 # conditional include of the parent class 
    40 if (false == class_exists('Clansuite_Formelement_File',false)) 
    41 { 
    42     include __DIR__ . '/file.form.php'; 
    43 } 
    44  
    45 /** 
    46  *  Clansuite_Formelement 
    47  *  | 
    48  *  \- Clansuite_Formelement_File 
    49  *      | 
    50  *      \- Clansuite_Formelement_Uploadify 
    51  */ 
    5239class Clansuite_Formelement_Uploadify extends Clansuite_Formelement_File implements Clansuite_Formelement_Interface 
    5340{ 

  • trunk/core/viewhelper/form/elements/url.php

    r5932 r5934  
    3737} 
    3838 
    39 # conditional include of the parent class 
    40 if (false == class_exists('Clansuite_Formelement_Input',false)) 
    41 {  
    42     include __DIR__ . '/input.form.php'; 
    43 } 
    44  
    45 /** 
    46  *  Clansuite_Formelement 
    47  *  | 
    48  *  \- Clansuite_Formelement_Input 
    49  *      | 
    50  *      \- Clansuite_Formelement_Url 
    51  */ 
    5239class Clansuite_Formelement_Url extends Clansuite_Formelement_Input implements Clansuite_Formelement_Interface 
    5340{ 

  • trunk/core/viewhelper/form/elements/wysiwygckeditor.php

    r5932 r5934  
    3737} 
    3838 
    39 # conditional include of the parent class 
    40 if (false == class_exists('Clansuite_Formelement_Textarea',false)) 
    41 { 
    42     include __DIR__ . '/textarea.form.php'; 
    43 } 
    44  
    4539/** 
    4640 * Clansuite_Formelement_WysiwygCkeditor 
    47  *  
     41 * 
    4842 * @see http://ckeditor.com/ Official Website of CKeditor 
    4943 * @see http://docs.cksource.com/ CKEditor Documentations 
    … …  
    5650        self::checkDependencies(); 
    5751    } 
    58      
     52 
    5953    /** 
    6054     * Ensure, that the library is available, before the client requests a non-existant file. 
    … …  
    6761        } 
    6862    } 
    69      
     63 
    7064    /** 
    7165     * This renders a textarea with the WYSWIWYG editor ckeditor attached. 

  • trunk/core/viewhelper/form/elements/wysiwygmarkitup.php

    r5932 r5934  
    3737} 
    3838 
    39 # conditional include of the parent class 
    40 if (false == class_exists('Clansuite_Formelement_Textarea', false)) 
    41 { 
    42     include __DIR__ . '/textarea.form.php'; 
    43 } 
    44  
    4539/** 
    4640 * Clansuite_Formelement_Wysiwygmarkitup 
    … …  
    5448        self::checkDependencies(); 
    5549    } 
    56      
     50 
    5751    /** 
    5852     * Ensure, that the library is available, before the client requests a non-existant file. 
    5953     */ 
    6054    public static function checkDependencies() 
    61     {        
     55    { 
    6256        if (!is_file(ROOT_THEMES_CORE . 'javascript/markitup/jquery.markitup.js')) 
    6357        { 
    … …  
    6559        } 
    6660    } 
    67      
     61 
    6862    /** 
    6963     * This renders a textarea with the WYSWIWYG editor markItUp! attached. 

  • trunk/core/viewhelper/form/elements/wysiwygnicedit.php

    r5932 r5934  
    3737} 
    3838 
    39 # conditional include of the parent class 
    40 if (false == class_exists('Clansuite_Formelement_Textarea',false)) 
    41 { 
    42     include __DIR__ . '/textarea.form.php'; 
    43 } 
    44  
    4539/** 
    4640 * Clansuite_Formelement_Wysiwygnicedit 
    … …  
    5549        self::checkDependencies(); 
    5650    } 
    57      
     51 
    5852    /** 
    5953     * Ensure, that the library is available, before the client requests a non-existant file. 
    … …  
    6660        } 
    6761    } 
    68      
     62 
    6963    /** 
    7064     * This renders a textarea with the WYSWIWYG editor NicEdit attached. 

  • trunk/core/viewhelper/form/elements/wysiwygtinymce.php

    r5932 r5934  
    3737} 
    3838 
    39 # conditional include of the parent class 
    40 if (false == class_exists('Clansuite_Formelement_Textarea',false)) 
    41 { 
    42     include __DIR__ . '/textarea.form.php'; 
    43 } 
    44  
    4539/** 
    4640 * Clansuite_Formelement_Wysiwygtinymce 
    … …  
    5650        self::checkDependencies(); 
    5751    } 
    58      
     52 
    5953    /** 
    6054     * Ensure, that the library is available, before the client requests a non-existant file. 
    6155     */ 
    6256    public static function checkDependencies() 
    63     {        
     57    { 
    6458        if (!is_file(ROOT_THEMES_CORE . 'javascript/tiny_mce/tiny_mce.js')) 
    6559        { 
    … …  
    6761        } 
    6862    } 
    69      
     63 
    7064    /** 
    7165     * This renders a textarea with the WYSWIWYG editor TinyMCE attached. 

  • trunk/core/viewhelper/form/form.php

    r5925 r5934  
    11001100        if (false == class_exists($formelement_classname, false)) 
    11011101        { 
    1102             $file = ROOT_CORE . 'viewhelper/form/elements/'.$formelement.'.form.php'; 
     1102            $file = ROOT_CORE . 'viewhelper/form/elements/'.$formelement.'.php'; 
    11031103 
    11041104            if(is_file($file) === true) 
    … …  
    14061406        if(false == class_exists('Clansuite_Form_Decorator_' . $decorator, false)) 
    14071407        { 
    1408             $file = ROOT_CORE . 'viewhelper/form/decorators/form/' . $decorator . '.form.php'; 
     1408            $file = ROOT_CORE . 'viewhelper/form/decorators/form/' . $decorator . '.php'; 
    14091409 
    14101410            if(is_file($file) === true) 

  • trunk/core/viewhelper/form/formelement.php

    r5925 r5934  
    846846        if(false == class_exists($class, false)) 
    847847        { 
    848             $file = ROOT_CORE . 'viewhelper/form/decorators/formelement/' . $decorator . '.form.php'; 
     848            $file = ROOT_CORE . 'viewhelper/form/decorators/formelement/' . $decorator . '.php'; 
    849849 
    850850            if(is_file($file) === true) 
Note: See TracChangeset for help on using the changeset viewer.