Changeset 14087

Show
Ignore:
Timestamp:
12/22/07 17:31:07 (8 months ago)
Author:
flack
Message:

last round of phpdoc fixes for now

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/midcom/midcom.core/midcom/baseclasses/components/handler.php

    r13625 r14087  
    11<?php 
    2  
    32/** 
    43 * @package midcom.baseclasses 
     
    1615 * 
    1716 * The basic idea is that you have separate instances of this type for the various 
    18  * operations in your main viewer class. This avoides cluttering up the viewer class 
     17 * operations in your main viewer class. This avoids cluttering up the viewer class 
    1918 * and gives you better maintainability due to smaller code files. 
    2019 * 
     
    2524 * Noteworthy is the ability to export handlers for usage in other components in 
    2625 * both libraries and full components. To make the exported handler work correctly, 
    27  * you need to set $this->_component to the corresponding value of the <em>exporting</em
     26 * you need to set $this->_component to the corresponding value of the <i>exporting</i
    2827 * component. In this case, the startup code will take the main l10n instance, the 
    29  * component data storage and the configuration <em>from the exporting component.</em
     28 * component data storage and the configuration <i>from the exporting component.</i
    3029 * The configuration in this case is merged from the global defaults (constructed 
    3130 * during component/library startup) and the configuration parameters set on the topic 
    32  * <em>where it is invoked.</em
    33  * 
    34  * Note, that the export "mode" is only invoked <em>if and only if</em> the component of 
    35  * the handler is <em>different</em> of the component of the main request class. 
     31 * <i>where it is invoked.</i
     32 * 
     33 * Note, that the export "mode" is only invoked <i>if and only if</i> the component of 
     34 * the handler is <i>different</i> of the component of the main request class. 
    3635 * 
    3736 * @package midcom.baseclasses 
     
    149148     * component data storage, configuration and l10n instances. Configuration is merged 
    150149     * during runtime based on the system defaults and all parameters attached to the 
    151      * topic <em>we're currently operating on.</em
     150     * topic <i>we're currently operating on.</i
    152151     * 
    153152     * @param midcom_baseclasses_components_request $master A reference to the request class 
  • trunk/midcom/midcom.core/midcom/baseclasses/components/handler/dataexport.php

    r10992 r14087  
    11<?php 
    22/** 
    3  * @package midcom 
     3 * @package midcom.baseclasses 
    44 * @author The Midgard Project, http://www.midgard-project.org 
    55 * @version $Id: view.php,v 1.1 2006/05/10 13:00:45 rambo Exp $ 
     
    1111 * Generic CSV export handler baseclass 
    1212 * 
    13  * @package midcom 
     13 * @package midcom.baseclasses 
    1414 */ 
    1515class midcom_baseclasses_components_handler_dataexport extends midcom_baseclasses_components_handler 
    16 {     
     16{ 
    1717    /** 
    1818     * The Datamanager of the project to display. 
     
    2222     */ 
    2323    var $_datamanager = null; 
    24      
     24 
    2525    var $_schema = null; 
    26      
     26 
    2727    var $_objects = array(); 
    28      
     28 
    2929    function midcom_baseclasses_components_handler_dataexport() 
    3030    { 
    3131        parent::midcom_baseclasses_components_handler(); 
    3232    } 
    33      
     33 
    3434    /** 
    3535     * Simple helper which references all important members to the request data listing 
     
    4141        $this->_request_data['objects'] =& $this->_objects; 
    4242    } 
    43      
     43 
    4444    /** 
    4545     * Internal helper, loads the datamanager for the current article. Any error triggers a 500. 
     
    6363        } 
    6464    } 
    65      
     65 
    6666    function _load_schemadb() 
    6767    { 
     
    7373        $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 'Method "_load_data" must be overridden in implementation'); 
    7474    } 
    75      
     75 
    7676    function _handler_csv($handler_id, $args, &$data) 
    7777    { 
    7878        $_MIDCOM->auth->require_valid_user(); 
    79              
     79 
    8080        //Disable limits 
    8181        @ini_set('memory_limit', -1); 
    8282        @ini_set('max_execution_time', 0); 
    83              
     83 
    8484        $this->_load_datamanager($this->_load_schemadb()); 
    8585        $this->_objects = $this->_load_data($handler_id); 
    86          
     86 
    8787        $_MIDCOM->skip_page_style = true; 
    88          
     88 
    8989        if (   !isset($args[0]) 
    9090            || empty($args[0])) 
     
    9595            // This will exit 
    9696        } 
    97          
     97 
    9898        $this->_init_csv_variables(); 
    9999        $_MIDCOM->skip_page_style = true; 
     
    167167        } 
    168168        /* END: Quick'n'Dirty on-the-fly charset conversion */ 
    169          
     169 
    170170        // Strings and numbers beginning with zero are quoted 
    171171        if (   (   !is_numeric($data) 
     
    230230                continue; 
    231231            } 
    232              
     232 
    233233            echo $this->_encode_csv($object->guid, true, false); 
    234234            $i = 0; 
  • trunk/midcom/midcom.core/midcom/baseclasses/components/interface.php

    r14085 r14087  
    4646 * <b>Class parameters</b> 
    4747 * 
    48  * TODO: Document 
     48 * @todo Document 
    4949 * 
    5050 * The following options can be used to parametrize the components startup and operation. 
  • trunk/midcom/midcom.core/midcom/baseclasses/components/request.php

    r14086 r14087  
    3939 * - <b>int variable_args:</b> Usually, there are a number of variables in the URL, like 
    4040 *   article IDs, or article names. This can be 0, indicating that no variable arguments are 
    41  *   required, which is the default. For an unlimmited number of variable_args set it to -1.  
     41 *   required, which is the default. For an unlimmited number of variable_args set it to -1. 
    4242 * 
    4343 * - <b>bool no_cache:</b> For those cases where you want to prevent a certain "type" of request 
     
    225225 * It must define an additional function, called get_plugin_handlers(). It has to return 
    226226 * an array of standard request handler declarations. Both handler identifiers and 
    227  * argument lists are <em>relative</em> to the base URL of the plugin (see below), 
     227 * argument lists are <i>relative</i> to the base URL of the plugin (see below), 
    228228 * not to the component running the problem. You are thus completely location independent. 
    229229 * The handler callback must be statically callable. 
    230230 * 
    231  * <em>Example: Plugin handler callback</em
     231 * <i>Example: Plugin handler callback</i
    232232 * 
    233233 * <code> 
     
    252252 * automatically expanded to match the plugin namespace. 
    253253 * 
    254  * <em>Example: Plugin registration</em
     254 * <i>Example: Plugin registration</i
    255255 * 
    256256 * <code> 
     
    576576 
    577577        foreach ($this->_request_switch as $key => $request) 
    578         {    
     578        { 
    579579            $fixed_args_count = count($request['fixed_args']); 
    580580            $total_args_count = $fixed_args_count + $request['variable_args']; 
     
    593593                } 
    594594            } 
    595              
     595 
    596596            // We have a match. 
    597597            $this->_handler =& $this->_request_switch[$key]; 
     
    697697            $_MIDCOM->cache->content->expires($this->_handler['expires']); 
    698698        } 
    699          
     699 
    700700        $this->_on_handled($this->_handler['id'], $this->_handler['args']); 
    701701 
     
    792792            return; 
    793793        } 
    794          
     794 
    795795        if (empty($this->_handler['handler'])) 
    796796        { 
     
    823823     * 
    824824     * You should not do anything else then general startup work, as this callback 
    825      * executes <em>before</em> the can_handle phase. You don't know at this point 
     825     * executes <i>before</i> the can_handle phase. You don't know at this point 
    826826     * whether you are even able to handle the request. Thus, anything that is specific 
    827827     * to your request (like HTML HEAD tag adds) must not be done here. Use _on_handle 
     
    835835    /** 
    836836     * Component specific initialization code for the handle phase. AIS, for example, uses 
    837      * this to preapre the toolbar arrays. The name of the request handler is passed as an 
    838      * argumet to the event handler. 
     837     * this to prepare the toolbar arrays. The name of the request handler is passed as an 
     838     * argument to the event handler. 
    839839     * 
    840840     * If you discover that you cannot handle the request already at this stage, return false 
     
    858858        return true; 
    859859    } 
    860      
     860 
    861861    public function _on_handled($handler, $args) 
    862862    { 
     
    898898        return true; 
    899899    } 
    900      
     900 
    901901    public function _on_shown($handler) 
    902902    { 
     
    11311131            ) 
    11321132        ); 
    1133          
     1133 
    11341134        // Centralized admin panel functionalities 
    1135          
     1135 
    11361136        // Load plugins registered via component manifests 
    11371137        $manifest_plugins = array(); 
     
    11461146            $manifest_plugins["asgard_{$component}"] = $plugin_config; 
    11471147        } 
    1148          
     1148 
    11491149        $hardcoded_plugins = array 
    11501150        ( 
  • trunk/midcom/midcom.core/midcom/core/manifest.php

    r14086 r14087  
    258258     * prefix), values are arrays holding the global / owner privilege default. 
    259259     * 
    260      * TODO: Complete documentation 
     260     * @todo Complete documentation 
    261261     * 
    262262     * @var Array 
  • trunk/midcom/midcom.core/midcom/core/temporary_object.php

    r11359 r14087  
    11<?php 
    22/** 
    3  * @package midcom.db 
     3 * @package midcom 
    44 * @author The Midgard Project, http://www.midgard-project.org 
    5  * @version $Id:temporary_object.php 3765 2006-07-31 08:51:39 +0000 (Mon, 31 Jul 2006) tarjei $ 
    65 * @version $Id:temporary_object.php 3765 2006-07-31 08:51:39 +0000 (Mon, 31 Jul 2006) tarjei $ 
    76 * @copyright The Midgard Project, http://www.midgard-project.org 
     
    101100        $object->require_do('midgard:parameters'); 
    102101        $object->require_do('midgard:attachments'); 
    103          
     102 
    104103        // Copy parameters from temporary object 
    105104        $parameters = $this->list_parameters(); 
    106          
     105 
    107106        foreach ($parameters as $domain => $array) 
    108107        { 
     
    112111            } 
    113112        } 
    114          
     113 
    115114        // Move attachments from temporary object 
    116115        $attachments = $this->list_attachments(); 
     
    122121            $attachment->update(); 
    123122        } 
    124          
     123 
    125124        // Privileges are moved using the DBA API as well. 
    126125        $privileges = $this->get_privileges(); 
  • trunk/midcom/midcom.core/midcom/helper/imagefilter.php

    r14084 r14087  
    121121     * MidCOM Debug Log for details. 
    122122     * 
    123      * TODO: Use ImageMagick Identify to check for a valid image. 
     123     * @todo Use ImageMagick Identify to check for a valid image. 
    124124     * 
    125125     * @param string filename The file to be edited. 
  • trunk/midcom/midcom.core/midcom/helper/misc.php

    r14085 r14087  
    10241024     * anchors, and prepends a list of links to them to the start of HTML. 
    10251025     * 
    1026      * TODO: Parse the heading structure to create OL subtrees based on their relative levels 
     1026     * @todo Parse the heading structure to create OL subtrees based on their relative levels 
    10271027     */ 
    10281028    function midcom_helper_toc_formatter_prefix($level) 
  • trunk/midcom/midcom.core/midcom/helper/nav.php

    r14002 r14087  
    197197     * @return bool                             True, if the node is a subnode of the root node, false otherwise. 
    198198     */ 
    199     function is_node_in_tree ($node_id, $root_id)  
     199    function is_node_in_tree ($node_id, $root_id) 
    200200    { 
    201201        //$topic = new midcom_db_topic(); 
     
    204204        $qb->add_constraint('id', '=', $node_id); 
    205205        $qb->add_constraint('up', 'INTREE', $root_id); 
    206          
     206 
    207207        if ($qb->count() > 0) 
    208208        { 
    209209            return true; 
    210210        } 
    211          
     211 
    212212        return false; 
    213213    } 
     
    289289                break; 
    290290        } 
    291          
     291 
    292292        if (!class_exists('midcom_helper_itemlist')) 
    293293        { 
     
    447447        { 
    448448            $leaf = $this->get_leaf($this->get_current_leaf()); 
    449              
     449 
    450450            if (isset($leaf[MIDCOM_NAV_URL])) 
    451451            { 
     
    580580     *   either a NAP node/leaf ID or the list key set by the component for custom data. 
    581581     * - 'napobject' This contains the original NAP object retrieved by the function. 
    582      *   Just in case you need more infromation then is available directly. 
     582     *   Just in case you need more information then is available directly. 
    583583     * 
    584584     * The entry of every level is indexed by its MIDCOM_NAV_ID, where custom keys preserve 
     
    593593     * Custom elements are added to this array by using the MidCOM custom component context 
    594594     * at this time. You need to add a list with the same structure as above into the 
    595      * custom component context key <em>midcom.helper.nav.breadcrumb</em>. (This needs 
     595     * custom component context key <i>midcom.helper.nav.breadcrumb</i>. (This needs 
    596596     * to be an array always, even if you return only one element.) 
    597597     * 
     
    621621        $prefix = $_MIDCOM->get_context_data($this->_contextid, MIDCOM_CONTEXT_ANCHORPREFIX); 
    622622        $result = Array(); 
    623          
     623 
    624624        if (! $id) 
    625625        { 
     
    631631            $curr_leaf = $this->get_leaf($id); 
    632632            $curr_node = -1; 
    633              
     633 
    634634            if (! $curr_leaf) 
    635635            { 
     
    722722            { 
    723723                $id = "custom-{$key}"; 
    724                  
     724 
    725725                $url = "{$prefix}{$entry[MIDCOM_NAV_URL]}"; 
    726726                if (   substr($entry[MIDCOM_NAV_URL], 0, 1) == '/' 
     
    729729                    $url = $entry[MIDCOM_NAV_URL]; 
    730730                } 
    731                  
     731 
    732732                $result[$id] = Array 
    733733                ( 
  • trunk/midcom/midcom.core/midcom/services/auth.php

    r14086 r14087  
    271271 * <b>Authentication</b> 
    272272 * 
    273  * TODO: Fully document authentication. 
     273 * @todo Fully document authentication. 
    274274 * 
    275275 * Whenever the system successfully creates a new login session (during auth service startup), 
  • trunk/midcom/midcom.core/midcom/services/auth/backend/simple.php

    r13314 r14087  
    1515 * consists of the midgard person GUID. 
    1616 * 
    17  * The validity of the cookie will be conteolled by the configuration options 
    18  * <em>auth_backend_simple_cookie_path</em> and <em>auth_backend_simple_cookie_domain</em>: 
    19  *  
     17 * The validity of the cookie will be controlled by the configuration options 
     18 * <i>auth_backend_simple_cookie_path</i> and <i>auth_backend_simple_cookie_domain</i>: 
     19 * 
    2020 * The path defaults to $_MIDGARD['self']. If the domain is set to null (the default), 
    21  * no domain is specified in the cookie, making it a traditional site-specific session  
    22  * cookie. If it is set, the domain parameter of the cookie will be set accordingly.  
     21 * no domain is specified in the cookie, making it a traditional site-specific session 
     22 * cookie. If it is set, the domain parameter of the cookie will be set accordingly. 
    2323 * 
    2424 * The basic cookie id (username prefix) is taken from the config option 
    25  * <em>auth_backend_simple_cookie_id</em>, which defaults to the current host GUID. 
     25 * <i>auth_backend_simple_cookie_id</i>, which defaults to the current host GUID. 
    2626 * 
    2727 * @package midcom.services 
     
    7575        if (count($data) != 2) 
    7676        { 
    77             debug_push_class(__CLASS__, __FUNCTION__);         
     77            debug_push_class(__CLASS__, __FUNCTION__); 
    7878            debug_add("The cookie data could not be parsed, assuming tampered session.", 
    7979                MIDCOM_LOG_ERROR); 
     
    9191        if (! $this->user) 
    9292        { 
    93             debug_push_class(__CLASS__, __FUNCTION__);         
     93            debug_push_class(__CLASS__, __FUNCTION__); 
    9494            debug_add("The user ID {$user_id} is invalid, could not load the user from the database, assuming tampered session.", 
    9595                MIDCOM_LOG_ERROR); 
     
    104104        if (! $this->session_id) 
    105105        { 
    106             debug_push_class(__CLASS__, __FUNCTION__);         
     106            debug_push_class(__CLASS__, __FUNCTION__); 
    107107            debug_add("The session {$this->session_id} is invalid (usually this means an expired session).", 
    108108                MIDCOM_LOG_ERROR); 
     
    115115        if ($reset_cookie) 
    116116        { 
    117             debug_push_class(__CLASS__, __FUNCTION__);         
     117            debug_push_class(__CLASS__, __FUNCTION__); 
    118118            debug_add('Re-Setting of session cookie requested, doing it', MIDCOM_LOG_INFO); 
    119119            debug_pop(); 
  • trunk/midcom/midcom.core/midcom/services/auth/sessionmgr.php

    r13487 r14087  
    2121 * <b>Checking whether a user is online</b> 
    2222 * 
    23  * The is-user-online check requires the user to have the privilege <em>midcom:isonline</em
     23 * The is-user-online check requires the user to have the privilege <i>midcom:isonline</i
    2424 * set on the user which he is trying to check. 
    2525 * 
     
    4848     */ 
    4949    var $current_session_id = null; 
    50      
     50 
    5151    var $auth = null; 
    5252 
     
    165165        if (! $result) 
    166166        { 
    167             debug_push_class(__CLASS__, __FUNCTION__);         
     167            debug_push_class(__CLASS__, __FUNCTION__); 
    168168            debug_add('No login sessions have been found in the database or the query to the database failed.', MIDCOM_LOG_INFO); 
    169169            debug_pop(); 
     
    180180            if ($session->timestamp < $timed_out) 
    181181            { 
    182                 debug_push_class(__CLASS__, __FUNCTION__);             
     182                debug_push_class(__CLASS__, __FUNCTION__); 
    183183                debug_add("The session {$session->guid} (#{$session->id}) has timed out.", MIDCOM_LOG_INFO); 
    184184                debug_pop(); 
     
    191191                && $session->clientip != $clientip) 
    192192            { 
    193                 debug_push_class(__CLASS__, __FUNCTION__);             
     193                debug_push_class(__CLASS__, __FUNCTION__); 
    194194                debug_add("The session {$session->guid} (#{$session->id}) had mismatching client IP.", MIDCOM_LOG_INFO); 
    195195                debug_add("Expected {$session->clientip}, got {$clientip}."); 
     
    202202                if (! $session->delete()) 
    203203                { 
    204                     debug_push_class(__CLASS__, __FUNCTION__);                 
     204                    debug_push_class(__CLASS__, __FUNCTION__); 
    205205                    debug_add("Failed to delete the invalid session {$session->guid} (#{$session->id}): " . mgd_errstr(), MIDCOM_LOG_INFO); 
    206206                    debug_pop(); 
  • trunk/midcom/midcom.core/midcom/services/cache/backend.php

    r13625 r14087  
    3333 * <b>Namespacing:</b> 
    3434 *  
    35  * Eache cache database in use has a name, which must consist only of characters valid for  
     35 * Each cache database in use has a name, which must consist only of characters valid for  
    3636 * file names on the current system. You may create any file or directory within the midcom 
    3737 * cache directory as long as you use your name as a prefix.  
     
    4040 * regex class [a-zA-Z0-9._-] should be used.  
    4141 *  
    42  * <b>General configutation directives:</b> 
     42 * <b>General configuration directives:</b> 
    4343 *  
    4444 * - <i>string directory</i>: The subdirectory in the cache's base directory to use by this 
  • trunk/midcom/midcom.core/midcom/services/dbclassloader.php

    r13625 r14087  
    119119 * example the ACL system) in MidCOM to find the logical parent of an object. By default this 
    120120 * method directly returns null indicating that there is no parent. You should override it 
    121  * whereve you have a tree-like content structure so that MidCOM can correctly climb upwards. 
     121 * wherever you have a tree-like content structure so that MidCOM can correctly climb upwards. 
    122122 * If you have a parent only conditionally (e.g. there are root level objects), return NULL to 
    123123 * indicate no available parent. 
     
    433433            $this->_class_definition_filename = MIDCOM_ROOT . $_MIDCOM->componentloader->path_to_snippetpath($component) . "/config/{$filename}"; 
    434434        } 
    435          
     435 
    436436    } 
    437437 
     
    10091009    function _on_process_query_result(&\$result) {} 
    10101010    function _on_prepare_new_collector(&\$mc) {} 
    1011     function _on_prepare_exec_collector(&\$mc) { return true; }     
     1011    function _on_prepare_exec_collector(&\$mc) { return true; } 
    10121012    function _on_process_collector_result(&\$result) {} 
    10131013    function _on_updated() {} 
     
    10151015    function _on_imported() {} 
    10161016    function _on_importing() { return true; } 
    1017      
     1017 
    10181018    // functions related to the rcs service. 
    10191019    var \$_use_rcs = true; 
    10201020    var \$_rcs_message = false; 
    1021     function disable_rcs() { \$this->_use_rcs = false; }      
     1021    function disable_rcs() { \$this->_use_rcs = false; } 
    10221022    function enable_rcs() { \$this->_use_rcs  = true; } 
    10231023    function set_rcs_message(\$msg) { \$this->_rcs_message = \$msg; } 
    10241024    function get_rcs_message() { return \$this->_rcs_message; } 
    1025      
    1026      
    1027      
     1025 
     1026 
     1027 
    10281028EOF; 
    10291029        $this->_class_string .= "\n    \n"; 
  • trunk/midcom/midcom.core/midcom/services/i18n.php

    r14084 r14087  
    199199     * after calling this method. 
    200200     * 
    201      * If <em>$switch_content_lang</em> is set, this call will also synchronize 
     201     * If <i>$switch_content_lang</i> is set, this call will also synchronize 
    202202     * the Midgard content language with the MidCOM language. 
    203203     * 
  • trunk/midcom/midcom.core/midcom/services/js_css_merger.php

    r13590 r14087  
    88 */ 
    99 
     10/** 
     11 * @package midcom.services 
     12 */ 
    1013class midcom_services_js_css_merger extends midcom_baseclasses_core_object 
    1114{ 
     
    5861     */ 
    5962    var $_can_merge_cache = array(); 
    60      
     63 
    6164    /** 
    6265     * Cache of local paths, keyed by given path 
     
    501504            $media = 'all'; 
    502505        } 
    503          
     506 
    504507        debug_add("using media '{$media}' array for futher checks"); 
    505508        if (!isset($this->_cssfiles[$media])) 
     
    508511        } 
    509512        $files_per_media =& $this->_cssfiles[$media]; 
    510          
     513 
    511514        if (in_array($path, $files_per_media)) 
    512515        { 
     
    796799        // PONDER: Support ranges ("continue download") somehow ? 
    797800        $_MIDCOM->header('Accept-Ranges: none'); 
    798          
     801 
    799802        /* We want to cache these so lets override some things 
    800803        $_MIDCOM->cache->content->cache_control_headers(); 
  • trunk/midcom/midcom.core/midcom/services/toolbars.php

    r13424 r14087  
    1414 * For each context, it provides the following set of toolbars: 
    1515 * 
    16  * 1. The <em>Node</em> toolbar is applicable to the current 
     16 * 1. The <i>Node</i> toolbar is applicable to the current 
    1717 *    node, which is usually a topic. MidCOM places the topic management operations 
    1818 *    into this toolbar, where applicable. 
    1919 * 
    20  * 2. The <em>View</em> toolbar is applicable to the specific view ("url"). Usually 
     20 * 2. The <i>View</i> toolbar is applicable to the specific view ("url"). Usually 
    2121 *    this maps to a single displayed object (see also the bind_to_object() member 
    2222 *    function). MidCOM places the object-specific management operations (like 
     
    2929 * 
    3030 * In addition, components my retrieve a third kind of toolbars, which are not under 
    31  * the general control of MidCOM, the <em>Object</em> toolbars. They apply to a single 
    32  * database object (like a bound <em>View</em> toolbar). The usage of this kind of 
     31 * the general control of MidCOM, the <i>Object</i> toolbars. They apply to a single 
     32 * database object (like a bound <i>View</i> toolbar). The usage of this kind of 
    3333 * toolbars is completely component-specific: It is recommended to use them only for 
    3434 * cases where multiple objects are displayed simultaneously. For example, the 
     
    3737 * 
    3838 * 
    39  * <strong>Implementation notes</strong
     39 * <b>Implementation notes</b
    4040 * 
    4141 * It has yet to prove if the toolbar system is yet needed for a dynamic_load environments. 
     
    4747 * welcome page, each with its own management options. 
    4848 * 
    49  * <strong>Configuration</strong
     49 * <b>Configuration</b
    5050 * See midcom_config.php for configuration options. 
    5151 * 
     
    115115            $_MIDCOM->add_jsfile(MIDCOM_STATIC_URL . '/jQuery/jquery.easydrag-1.3.js'); 
    116116            //$_MIDCOM->add_jsfile(MIDCOM_STATIC_URL . '/midcom.helper.datamanager2/tags/jquery.bgiframe.min.js'); 
    117              
    118              
     117 
     118 
    119119            $_MIDCOM->add_link_head( 
    120120                array 
     
    126126                ) 
    127127            ); 
    128              
    129             $this->type = 'palette';             
    130              
     128 
     129            $this->type = 'palette'; 
     130 
    131131            $config = "{}"; 
    132              
     132 
    133133            $script = "jQuery('body div.midcom_services_toolbars_fancy').midcom_services_toolbar({$config});"; 
    134134            $_MIDCOM->add_jquery_state_script($script); 
     
    145145                ) 
    146146            ); 
    147              
     147 
    148148            $this->type = 'normal'; 
    149149        } 
    150          
     150 
    151151        // We've included CSS and JS, path is clear for centralized mode 
    152152        $this->_enable_centralized = true; 
     
    244244                $GLOBALS['midcom_config']['toolbars_view_style_id'] 
    245245            ); 
    246              
     246 
    247247        $this->_toolbars[$context_id][MIDCOM_TOOLBAR_HOST] = 
    248248            new midcom_helper_toolbar 
     
    296296            $topic = $_MIDCOM->get_context_data($context_id, MIDCOM_CONTEXT_CONTENTTOPIC); 
    297297        } 
    298          
     298 
    299299        if (!$topic) 
    300300        { 
     
    342342                ) 
    343343            ); 
    344              
     344 
    345345            $toolbar->add_item 
    346346            ( 
     
    353353                ) 
    354354            ); 
    355              
     355 
    356356            $toolbar->add_item 
    357357            ( 
     
    412412            } 
    413413        } 
    414          
     414 
    415415        if ($topic->can_do('midcom.admin.folder:template_management')) 
    416416        { 
     
    423423                $enabled = false; 
    424424            } 
    425              
     425 
    426426            $toolbar->add_item 
    427427            ( 
     
    434434                    MIDCOM_TOOLBAR_ENABLED => $enabled, 
    435435                ) 
    436             );             
    437         } 
    438          
     436            ); 
     437        } 
     438 
    439439        // TEMPORARY METADATA CODE END 
    440440        if (   $topic->can_do('midgard:create') 
     
    463463            ));&nb