Changeset 13625

Show
Ignore:
Timestamp:
11/25/07 12:00:49 (11 months ago)
Author:
flack
Message:

fixed a few spelling errors (neccessary and other) and corrected some typos the spell checker caught

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/midcom/com.magnettechnologies.contactgrabber/lib/gmail/libgmailer.php

    r12590 r13625  
    44244424                    array("id"   => "error", 
    44254425                         "name"  => "libgmailer Error", 
    4426                          "email" => "libgmailer@error.nonexistant", 
     4426                         "email" => "libgmailer@error.nonexistent", 
    44274427                         "is_group" => 0, 
    44284428                         "notes" => "libgmailer could not find the Contacts information " 
  • trunk/midcom/midcom.core/documentation/CHANGES

    r13624 r13625  
    6464    $this->_midcom =& $GLOBALS['midcom']; to use the $_MIDCOM autoglobal 
    6565    instead. 
    66   + Added support for automatically instantinated classes to the request base 
     66  + Added support for automatically instantiated classes to the request base 
    6767    classes. This introduced a new base class as well. 
    6868  + Added support for skipping the page style during the handle phase, mainly 
     
    167167 
    168168- Datamanager 
    169   - Activated ENT_QUOTES mode for htmlspecialchars where neccessary. 
     169  - Activated ENT_QUOTES mode for htmlspecialchars where necessary. 
    170170  - Fixed several typos for the smiley configuration of the 
    171171    communityhtml datatype 
     
    191191- Core 
    192192  + Added support for the can_handle phase to the request base class. 
    193   + Added support for dynamically instantinated handler classes to the 
     193  + Added support for dynamically instantiated handler classes to the 
    194194    request base class. 
    195195 
     
    645645    see the datatype's documentation for details. 
    646646  + Added a Mailtemplate datatype and widget. They store all 
    647     information neccessary to dynamically build an E-Mail. 
     647    information necessary to dynamically build an E-Mail. 
    648648    See the datatype_mailtemplate for details. There is no 
    649649    configurability whatsoever, so datatype=>"mailtemplate" should 
     
    918918    changed the inline JavaScript code to serve-snippet calls. 
    919919  - Image Datatype now removes any ICC color profile in any generated 
    920     files (thumbs and, where neccessary, fullscale images), as they can 
     920    files (thumbs and, where necessary, fullscale images), as they can 
    921921    get quite big if they are present. 
    922922  - Fixed a bug in the image datatype not honoring the jpeg thumbnail 
     
    955955  - Fixed Bug #292, missing global declaration of $midcom_errstr. 
    956956  - Core now checks for missing root content topic upon 
    957     instantination of midcom_application. This fixes bug #227. 
     957    instantiation of midcom_application. This fixes bug #227. 
    958958  - Caching engine can be disabled now by setting the global variable 
    959959    midcom_helper__cache_disable to true prior MidCOM initialization. 
     
    10771077    $view-Array at the index "_schema". This solves feature request 
    10781078    #463. 
    1079   - BLOB-Datatype: Supressed error messages from getimagesize call 
     1079  - BLOB-Datatype: Suppressed error messages from getimagesize call 
    10801080    as this is handled by MidCOM properly. 
    10811081  ! BLOB-Datatype: Moved all parameters to the same domain. Everything 
     
    11351135    + show_simple_nav is a method that allows you to build a 
    11361136      complete navigation system from scratch, using a simple 
    1137       config array. It will create you everything neccessary, and 
     1137      config array. It will create you everything necessary, and 
    11381138      also features a negative indenting to support multiline 
    11391139      navigation entries. See the snippet documentation of 
  • trunk/midcom/midcom.core/midcom.php

    r13572 r13625  
    164164//mgd_debug_start(); 
    165165///////////////////////////////////// 
    166 // Instantinate the MidCOM main class 
     166// Instantiate the MidCOM main class 
    167167require('midcom/application.php'); 
    168168 
  • trunk/midcom/midcom.core/midcom/application.php

    r13590 r13625  
    1919 * - Provide some very basic Helper Functions for snippet loading and error-page 
    2020 *   generation 
    21  * - Evaluate the URL and activate the requiered components. 
    22  * - Provide a mechanism to dynmaically load a second component during a page 
     21 * - Evaluate the URL and activate the required components. 
     22 * - Provide a mechanism to dynamically load a second component during a page 
    2323 *   run. 
    24  * - Provide a specialized mechanism to dynamically invocate a component's 
     24 * - Provide a specialized mechanism to dynamically invoke a component's 
    2525 *   Administration Interface. 
    2626 * - Provide a basic context mechanism that allows each independant component 
     
    723723        } 
    724724 
    725         // Parser Init: Generate arguments and instantinate it. 
     725        // Parser Init: Generate arguments and instantiate it. 
    726726        $this->_parser = $this->serviceloader->load('midcom_core_service_urlparser'); 
    727727        $argv = $this->_parser->tokenize($url); 
     
    784784     * Exit from the framework, execute after all output has been made. 
    785785     * 
    786      * Does all neccessary clean-up work. Must be called after output is completed as 
     786     * Does all necessary clean-up work. Must be called after output is completed as 
    787787     * the last call of any MidCOM Page. Best Practice: call it at the end of the ROOT 
    788788     * style element. 
     
    831831     * Details: The logic will traverse the node tree and for each node it will load 
    832832     * the component that is responsible for it. This component gets the chance to 
    833      * acceppt the request (this is encaspulated in the _can_handle call), which is 
     833     * accept the request (this is encaspulated in the _can_handle call), which is 
    834834     * basically a call to can_handle. If the component declares to be able to handle 
    835835     * the call, its handle function is executed. Depending if the handle was successful 
     
    10921092        else 
    10931093        { 
    1094             debug_add("_process finished sucessfully", MIDCOM_LOG_DEBUG); 
     1094            debug_add("_process finished successfully", MIDCOM_LOG_DEBUG); 
    10951095            $this->_status = MIDCOM_STATUS_CONTENT; 
    10961096            debug_pop(); 
     
    13881388    /** 
    13891389     * Return the prefix required to build relative links on the current site. 
    1390      * This includes the http[s] prefix, the hosts port (if neccessary) and the 
     1390     * This includes the http[s] prefix, the hosts port (if necessary) and the 
    13911391     * base url of the Midgard Page. Be aware, that this does *not* point to the 
    13921392     * base host of the site, which is an important distinction for example in AIS. 
     
    14091409    /** 
    14101410     * Return the prefix required to build relative links on the current site. 
    1411      * This includes the http[s] prefix, the hosts port (if neccessary) and the 
    1412      * base url of the main host. This is not neccessarily the currently active 
     1411     * This includes the http[s] prefix, the hosts port (if necessary) and the 
     1412     * base url of the main host. This is not necessarily the currently active 
    14131413     * MidCOM Page however, use the get_page_prefix() function for that. 
    14141414     * 
     
    14611461     * since you mostly will access it in context 0, the default. Only the AIS 
    14621462     * currently uses different context IDs. The problem is, that this is not 100% 
    1463      * efficient: If you instantinate two different NAP Classes in different contexts 
     1463     * efficient: If you instantiate two different NAP Classes in different contexts 
    14641464     * both referring to the same root node, you will get two different instances. 
    14651465     * 
     
    20492049     * generate_error     - Generate HTTP Error 
    20502050     * load_snippet       - Load a snippet with error-checking 
    2051      * serve_snippet      - Serves snippet including all neccessary headers 
    2052      * serve_attachment   - Serves attachment including all neccessary headers 
     2051     * serve_snippet      - Serves snippet including all necessary headers 
     2052     * serve_attachment   - Serves attachment including all necessary headers 
    20532053     * get_midgard        - Returns mgd_get_midgard with updated "self" member 
    20542054     * _l10n_edit_wrapper - Invoces the l10n string editor 
     
    22812281            $expire = (int) $expire; 
    22822282        } 
    2283         // This is neccessary, as the internal date representation is not HTTP 
     2283        // This is necessary, as the internal date representation is not HTTP 
    22842284        // standard compilant. :-( 
    22852285        $lastmod = strtotime($snippet->revised); 
     
    23552355        $etag = md5("{$last_modified}{$attachment->name}{$attachment->mimetype}{$attachment->guid}"); 
    23562356 
    2357         // Check etag and return 304 if neccessary 
     2357        // Check etag and return 304 if necessary 
    23582358        if (   $expires <> 0 
    23592359            && $this->cache->content->_check_not_modified($last_modified, $etag)) 
  • trunk/midcom/midcom.core/midcom/baseclasses/components/cron_handler.php

    r12418 r13625  
    6161 
    6262    /** 
    63      * This is a reference to the Component Interface class. It is loaded during class instantination 
     63     * This is a reference to the Component Interface class. It is loaded during class instantiation 
    6464     * and only available for baseclass driven component interfaces, not for legacy classes. 
    6565     * 
  • trunk/midcom/midcom.core/midcom/baseclasses/components/handler.php

    r11910 r13625  
    143143    /** 
    144144     * Initializes the request handler class, called by the component interface after 
    145      * instantination. Required to allow safe $this references during startup. 
     145     * instantiation. Required to allow safe $this references during startup. 
    146146     * 
    147147     * Be aware that it is possible that a handler can come from a different component 
  • trunk/midcom/midcom.core/midcom/baseclasses/components/interface.php

    r13590 r13625  
    524524    /** 
    525525     * Configures the component for usage. The configuration is merged, and, 
    526      * if neccessary, an existing handler object is purged. 
     526     * if necessary, an existing handler object is purged. 
    527527     * 
    528528     * @param mixed $configuration A configuration data list, suitable for merging with a 
     
    930930     * This is an event handler, called after the basic component initialization has been done 
    931931     * just before the initialize call will return to MidCOM. 
    932      * It should prepare all neccessary information to start processing requests. 
     932     * It should prepare all necessary information to start processing requests. 
    933933     * 
    934934     * Unless you need more functionality then snippet and library loading, configuration merging 
  • trunk/midcom/midcom.core/midcom/baseclasses/components/navigation.php

    r13590 r13625  
    99 
    1010/** 
    11  * Base class to encaspulate a NAP interface. Does all the neccessary work for 
     11 * Base class to encaspulate a NAP interface. Does all the necessary work for 
    1212 * setting the object to the right topic. you just have to fill the gaps for 
    1313 * getting the leaves and node data. 
  • trunk/midcom/midcom.core/midcom/baseclasses/components/request.php

    r13590 r13625  
    4848 * - <b>mixed handler:</b> This is a definition of what method should be invoked to 
    4949 *   handle the request. You have two options here. First you can refer to a method of this 
    50  *   request handler class, in that case you just supply the name of the method. Alternativly, 
     50 *   request handler class, in that case you just supply the name of the method. Alternatively, 
    5151 *   you can refer to an external class for request processing using an array syntax. The 
    5252 *   first array member must either contain the name of an existing class or a reference to 
     
    6868 *     'handler' => 'view_registration' 
    6969 *     // 
    70  *     // Alternative, use a class with automatic instantination: 
     70 *     // Alternative, use a class with automatic instantiation: 
    7171 *     // 'handler' => Array('net_nemein_registrations_regadmin', 'view') 
    7272 *     // 
     
    161161 * 
    162162 * The data array can also be accessed by using the $_request_data member of this class, 
    163  * which is the orignal data storage location for the request data. 
     163 * which is the original data storage location for the request data. 
    164164 * 
    165165 * Note, that the request data, for ease of use, already contains references to the L10n 
     
    175175 * 
    176176 * 
    177  * <b>Automatic handler class instantination</b> 
     177 * <b>Automatic handler class instantiation</b> 
    178178 * 
    179179 * If you specify a class name instead of a class isntance as an exec handler, MidCOM will 
     
    468468    /** 
    469469     * Initializes the request handler class, called by the component interface after 
    470      * instantination. Required to allow safe $this references during startup. 
     470     * instantiation. Required to allow safe $this references during startup. 
    471471     * 
    472472     * @param string $component The name of the component. 
     
    869869     * this phase to load plugins that need registering in the request switch on demand. 
    870870     * 
    871      * The advantage of this is that it is not neccessary, to load all plugins completely, 
     871     * The advantage of this is that it is not necessary, to load all plugins completely, 
    872872     * you just have to know the "root" URL space (f.x. "/plugins/$name/"). 
    873873     * 
     
    980980 
    981981    /** 
    982      * Loads the file/snippet neccessary for a given plugin, according to its configuration. 
     982     * Loads the file/snippet necessary for a given plugin, according to its configuration. 
    983983     * 
    984984     * @param string $namespace The plugin namespace to use. 
     
    10411041 
    10421042    /** 
    1043      * Prepares the actual plugin by adding all neccessary information to the request 
     1043     * Prepares the actual plugin by adding all necessary information to the request 
    10441044     * switch. 
    10451045     * 
  • trunk/midcom/midcom.core/midcom/baseclasses/components/request_admin.php

    r13424 r13625  
    169169        if ($data['datamanager'] == false) 
    170170        { 
    171             $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 'Failed to instantinate configuration datamanager.'); 
     171            $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 'Failed to instantiate configuration datamanager.'); 
    172172            // This will exit. 
    173173        } 
     
    190190    /** 
    191191     * Event handler, called after the configuration datamanager instance has been created but not yet 
    192      * initialized. Use this hook to modify the schema where neccessary. 
     192     * initialized. Use this hook to modify the schema where necessary. 
    193193     * 
    194194     * @param midcom_helper_datamanager $datamanager A reference(!) to the datamanager handling the request. 
     
    232232        if (! $this->_handler['disable_return_to_topic']) 
    233233        { 
    234             /* Add the toolbar items, if neccessary */ 
     234            /* Add the toolbar items, if necessary */ 
    235235            $this->_local_toolbar->add_item(Array( 
    236236                MIDCOM_TOOLBAR_URL => '', 
  • trunk/midcom/midcom.core/midcom/baseclasses/core/dbobject.php

    r13590 r13625  
    380380        // END WORKAROUND 
    381381 
    382         // Now assign all midgard privileges to the creator, this is neccessary to get 
     382        // Now assign all midgard privileges to the creator, this is necessary to get 
    383383        // an owner like scheme to work by default. 
    384384        // TODO: Check if there is a better solution like this. 
     
    12721272     * No event handlers are called here yet. 
    12731273     * 
    1274      * In case of a complete query, the result will be an acciociative array indexed 
     1274     * In case of a complete query, the result will be an associative array indexed 
    12751275     * by the domain name and containing another array with parameter name/value pairs. 
    12761276     * For example: 
  • trunk/midcom/midcom.core/midcom/baseclasses/database/article.php

    r13424 r13625  
    112112     * Statically callable method to get parent guid when object guid is given 
    113113     *  
    114      * Uses midgard_collector to avoid unneccessary full object loads 
     114     * Uses midgard_collector to avoid unnecessary full object loads 
    115115     * 
    116116     * @param guid $guid guid of topic to get the parent for 
  • trunk/midcom/midcom.core/midcom/baseclasses/database/topic.php

    r13424 r13625  
    4242     * Statically callable method to get parent guid when object guid is given 
    4343     *  
    44      * Uses midgard_collector to avoid unneccessary full object loads 
     44     * Uses midgard_collector to avoid unnecessary full object loads 
    4545     * 
    4646     * @todo when 1.8.1 is released convert to use single collector with linked guid property 
  • trunk/midcom/midcom.core/midcom/core/collector.php

    r13590 r13625  
    595595     * be kept in mind that this is a preliminary number, not a final one. 
    596596     * 
    597      * Use this function with care. The information you obtain in general is neglible, but a creative 
     597     * Use this function with care. The information you obtain in general is negligible, but a creative 
    598598     * mind might nevertheless be able to take advantage of it. 
    599599     * 
  • trunk/midcom/midcom.core/midcom/core/handler/configdm.php

    r13424 r13625  
    110110        if ($data['datamanager'] == false) 
    111111        { 
    112             $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 'Failed to instantinate configuration datamanager.'); 
     112            $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 'Failed to instantiate configuration datamanager.'); 
    113113            // This will exit. 
    114114        } 
     
    131131    /** 
    132132     * Event handler, called after the configuration datamanager instance has been created but not yet 
    133      * initialized. Use this hook to modify the schema where neccessary. 
     133     * initialized. Use this hook to modify the schema where necessary. 
    134134     * 
    135135     * @param midcom_helper_datamanager $datamanager A reference(!) to the datamanager handling the request. 
     
    171171        $this->_handler_configdm_prepare($handler_id, $data); 
    172172 
    173         // Add the toolbar items, if neccessary 
     173        // Add the toolbar items, if necessary 
    174174        $this->_view_toolbar->add_item 
    175175        ( 
  • trunk/midcom/midcom.core/midcom/core/manifest.php

    r13590 r13625  
    1414 * <b>The Component Manifest</b> 
    1515 * 
    16  * The Manifest contains all neccessary information to deal with a component without 
     16 * The Manifest contains all necessary information to deal with a component without 
    1717 * actually having to load them. Originally, all of this information has been included 
    1818 * in the component interface class itself, but this provides to be a rather slow 
     
    158158 * 
    159159 * The class is always intialized using a component name. It will load the components' 
    160  * manifest from disk, executing any post-processing neccessary at that point (like 
     160 * manifest from disk, executing any post-processing necessary at that point (like 
    161161 * the completion of the privilege names). 
    162162 * 
     
    179179 * <b>History</b> 
    180180 * 
    181  * Originally, MidCOM did retrieve all neccessary information about a component by using 
     181 * Originally, MidCOM did retrieve all necessary information about a component by using 
    182182 * the main Component Interface Class, nowadays this is usually a subclass of 
    183183 * midcom_baseclasses_components_interface. While this was certainly an easy solution, 
     
    187187 * By the time of the implementation of this manifest, many places of the system (particular 
    188188 * DBA and ACL) requires all components to be loaded to have access to class names, 
    189  * defined ACL privileges and similar things. This was rather time consuming and unneccessary. 
     189 * defined ACL privileges and similar things. This was rather time consuming and unnecessary. 
    190190 * Hence the Manifest was introduced to be able to handle components without actually loading 
    191191 * their interfaces. 
     
    204204 
    205205    /**#@+ 
    206      * Component meta-information, read and post-processed from the mainfest 
     206     * Component meta-information, read and post-processed from the manifest 
    207207     * file. 
    208208     * 
     
    289289     * the file is accessed directly. 
    290290     * 
    291      * @param string $filename The name of the mainfest file to load. 
     291     * @param string $filename The name of the manifest file to load. 
    292292     * @param array $values the values the manifest uses. 
    293293     */ 
     
    303303     * This internal helper loads and evaluates the given manifest file. 
    304304     * 
    305      * @param string $filename The name of the mainfest file to load. 
     305     * @param string $filename The name of the manifest file to load. 
    306306     * @return bool True if the manifest was successfully loaded, false otherwise. 
    307307     * @access protected 
  • trunk/midcom/midcom.core/midcom/core/privilege.php

    r13590 r13625  
    446446     * 
    447447     * It is used by get_all_privileges in case that there is no cache hit. It will query the 
    448      * database and construct all neccessary objects out of it. 
     448     * database and construct all necessary objects out of it. 
    449449     * 
    450450     * @access protected 
  • trunk/midcom/midcom.core/midcom/core/querybuilder.php

    r13590 r13625  
    868868     * be kept in mind that this is a preliminary number, not a final one. 
    869869     * 
    870      * Use this function with care. The information you obtain in general is neglible, but a creative 
     870     * Use this function with care. The information you obtain in general is negligible, but a creative 
    871871     * mind might nevertheless be able to take advantage of it. 
    872872     * 
  • trunk/midcom/midcom.core/midcom/debug.php

    r5031 r13625  
    2525 * - MIDCOM_LOG_CRIT 
    2626 * 
    27  * This snippet does automatically instantinate $midcom_debugger, and it declares 
     27 * This snippet does automatically instantiate $midcom_debugger, and it declares 
    2828 * shortcuts called debug_add, debug_push and debug_pop (see below). 
    2929 * 
  • trunk/midcom/midcom.core/midcom/helper/_basicnav.php

    r13424 r13625  
    2828 * the topic of the component that declared to be able to handle the request. 
    2929 * 
    30  * The class will load the neccessary information on demand to minimize 
     30 * The class will load the necessary information on demand to minimize 
    3131 * database traffic. 
    3232 *