Changeset 13378
- Timestamp:
- 11/11/07 18:49:16 (1 year ago)
- Files:
-
- trunk/midcom/midcom.core/autoload.php (modified) (2 diffs)
- trunk/midcom/midcom.core/midcom/application.php (modified) (2 diffs)
- trunk/midcom/midcom.core/midcom/baseclasses/components/request.php (modified) (3 diffs)
- trunk/midcom/midcom.core/midcom/baseclasses/components/request_admin.php (modified) (1 diff)
- trunk/midcom/midcom.core/midcom/core/user.php (modified) (2 diffs)
- trunk/midcom/midcom.core/midcom/helper/metadata.php (modified) (2 diffs)
- trunk/midcom/midcom.core/midcom/helper/toolbars.php (modified) (1 diff)
- trunk/midcom/midcom.core/midcom/services/_sessioning.php (modified) (2 diffs)
- trunk/midcom/midcom.core/midcom/services/i18n.php (modified) (1 diff)
- trunk/midcom/midcom.core/midcom/services/indexer/document.php (modified) (2 diffs)
- trunk/midcom/midcom.core/midcom/services/session.php (modified) (2 diffs)
- trunk/midcom/midcom.helper.datamanager/datamanager.php (modified) (3 diffs)
- trunk/midcom/net.nemein.bookmarks/viewer.php (modified) (2 diffs)
- trunk/midcom/net.nemein.payment/factory.php (modified) (2 diffs)
- trunk/midcom/net.nemein.personnel/viewer.php (modified) (2 diffs)
- trunk/midcom/org.openpsa.calendar/viewer.php (modified) (1 diff)
- trunk/midcom/org.openpsa.contacts/viewer.php (modified) (1 diff)
- trunk/midcom/org.openpsa.directmarketing/viewer.php (modified) (1 diff)
- trunk/midcom/org.openpsa.documents/viewer.php (modified) (1 diff)
- trunk/midcom/org.openpsa.imp/viewer.php (modified) (1 diff)
- trunk/midcom/org.openpsa.invoices/handler/delete.php (modified) (1 diff)
- trunk/midcom/org.openpsa.invoices/handler/edit.php (modified) (1 diff)
- trunk/midcom/org.openpsa.projects/handler/hours/action.php (modified) (1 diff)
- trunk/midcom/org.openpsa.projects/viewer.php (modified) (1 diff)
- trunk/midcom/org.openpsa.reports/reports_handler_base.php (modified) (1 diff)
- trunk/midcom/org.openpsa.sales/handler/edit.php (modified) (1 diff)
- trunk/midcom/org.openpsa.sales/handler/list.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/midcom/midcom.core/autoload.php
r11824 r13378 144 144 145 145 /** 146 * The static sing elton instance146 * The static singleton instance 147 147 */ 148 148 private static $soleInstance = FALSE; … … 163 163 } 164 164 /** 165 * Sing elton factory166 * Remember: Sing eltons are hidden GLOBALS!165 * Singleton factory 166 * Remember: Singletons are hidden GLOBALS! 167 167 * @todo: register autoloader instead 168 168 */ trunk/midcom/midcom.core/midcom/application.php
r13355 r13378 562 562 { 563 563 debug_push_class(__CLASS__, __FUNCTION__); 564 debug_add('URL Parser is not instanti nated, bailing out.', MIDCOM_LOG_ERROR);564 debug_add('URL Parser is not instantiated, bailing out.', MIDCOM_LOG_ERROR); 565 565 debug_pop(); 566 566 $this->generate_error(MIDCOM_ERRCRIT, $GLOBALS['midcom_errstr']); … … 720 720 if (!$this->_parser) 721 721 { 722 debug_add("URL Parser could not be instanti nated: $midcom_errstr", MIDCOM_LOG_ERROR);722 debug_add("URL Parser could not be instantiated: $midcom_errstr", MIDCOM_LOG_ERROR); 723 723 debug_pop(); 724 $this->generate_error(MIDCOM_ERRCRIT, "URL Parser could not be instanti nated: {$GLOBALS['midcom_errstr']}");724 $this->generate_error(MIDCOM_ERRCRIT, "URL Parser could not be instantiated: {$GLOBALS['midcom_errstr']}"); 725 725 } 726 726 trunk/midcom/midcom.core/midcom/baseclasses/components/request.php
r13129 r13378 10 10 11 11 /** 12 * Base class to encaspulate a request to the component, instanti nated by the MidCOM12 * Base class to encaspulate a request to the component, instantiated by the MidCOM 13 13 * component interface. 14 14 * … … 22 22 * request handle decision ("Can Handle Phase"), one for the 23 23 * request handling ("Handle Phase") and one for output ("Output Phase"). These handlers can 24 * either be contained in this class or refer to another class which gets instanti nated, if24 * either be contained in this class or refer to another class which gets instantiated, if 25 25 * neccesary. 26 26 * … … 51 51 * you can refer to an external class for request processing using an array syntax. The 52 52 * first array member must either contain the name of a existing class or a reference to 53 * an already instanti nated class. This value has53 * an already instantiated class. This value has 54 54 * no default and must be set. The actual methods called will have either an _handle_ or _show_ 55 55 * prefixed to the exec_handler value, respecitvly. See below for automatic handler instances, trunk/midcom/midcom.core/midcom/baseclasses/components/request_admin.php
r13129 r13378 10 10 11 11 /** 12 * Base class to encaspulate a admin request to the component, instanti nated by the MidCOM12 * Base class to encaspulate a admin request to the component, instantiated by the MidCOM 13 13 * component interface. 14 14 * trunk/midcom/midcom.core/midcom/core/user.php
r12322 r13378 170 170 * in normal operations regarding persons. 171 171 * 172 * @param mixed $id This is either an Midgard Person ID or GUID, a midcom_user ID or an already instanti nated midgard_person.172 * @param mixed $id This is either an Midgard Person ID or GUID, a midcom_user ID or an already instantiated midgard_person. 173 173 * @access protected 174 174 */ … … 198 198 * member. 199 199 * 200 * @param mixed $id This is either an Midgard Person ID or GUID, a midcom_user ID or an already instanti nated midgard_person.200 * @param mixed $id This is either an Midgard Person ID or GUID, a midcom_user ID or an already instantiated midgard_person. 201 201 * @return bool Indicating success. 202 202 */ trunk/midcom/midcom.core/midcom/helper/metadata.php
r13129 r13378 10 10 /** 11 11 * This class is an interface to the metadata of MidCOM objects. It is not to 12 * be instanti nated directly, as a cache is in place to avoideduplicate metadata13 * objects for the same Midgard Object. So, basically, each of these object is14 * a sing elton.12 * be instantiated directly, as a cache is in place to avoid duplicate metadata 13 * objects for the same Midgard Object. So, basically, each of these objects is 14 * a singleton. 15 15 * 16 16 * It will use an internal mechanism to cache repeated accesses to the same … … 378 378 } 379 379 break; 380 380 381 381 // Group property 382 382 case 'owner': trunk/midcom/midcom.core/midcom/helper/toolbars.php
r13303 r13378 128 128 129 129 /** 130 * Singelton interface, returns the factory instance.130 * singleton interface, returns the factory instance. 131 131 * 132 132 * @return midcom_admin_toolbar Factory instance trunk/midcom/midcom.core/midcom/services/_sessioning.php
r13307 r13378 9 9 10 10 /** 11 * Base sing elton class of the MidCOM sessioning service.12 * 13 * This is a sing elton class, that is accessible through the MidCOM Service11 * Base singleton class of the MidCOM sessioning service. 12 * 13 * This is a singleton class, that is accessible through the MidCOM Service 14 14 * infrastructure. It manages session data of MidCOM driven applications. 15 15 * … … 43 43 * Do <b>never</b> create an instance of this class directly. This is handled 44 44 * by the framework. Instead use midcocm_service_session which ensures the 45 * sing elton pattern.45 * singleton pattern. 46 46 * 47 47 * Do <b>never</b> work directly with the $_SESSION["midcom_session_data"] trunk/midcom/midcom.core/midcom/services/i18n.php
r13260 r13378 84 84 85 85 /** 86 * Cache of all instanti nated localization classes. They are delivered86 * Cache of all instantiated localization classes. They are delivered 87 87 * by reference to all clients. 88 88 * trunk/midcom/midcom.core/midcom/services/indexer/document.php
r12941 r13378 25 25 * - <i>text</i> is stored, indexed and tokenized. 26 26 * 27 * This class should not be instanti nated directly, a new instance of this class27 * This class should not be instantiated directly, a new instance of this class 28 28 * can be obtained using the midcom_service_indexer class. 29 29 * … … 259 259 * Return true if the document is visible, false otherwise. 260 260 * - 'class:$class_name': Like above, but using a class instead. The class must provide a statically callable <i>get_instance()</i> method, which 261 * returns a usable instance of the class (mostly, this should be a sing elton, for performance reasons). The instance returned is assigned261 * returns a usable instance of the class (mostly, this should be a singleton, for performance reasons). The instance returned is assigned 262 262 * by-reference. On that object, the method check_document_permissions, whose signature must be identical to the function callback. 263 263 * trunk/midcom/midcom.core/midcom/services/session.php
r11906 r13378 35 35 * <b>Implementation Notes:</b> 36 36 * 37 * This is a simple wrapper that provides access to the sessioning sing elton.37 * This is a simple wrapper that provides access to the sessioning singleton. 38 38 * It has the same public member functions as midcom_service__sessioning, refer 39 39 * to this class for a detailed documentation. … … 48 48 49 49 /** 50 * Sessioning sing elton.50 * Sessioning singleton. 51 51 * 52 52 * @var midcom_service__sessioning trunk/midcom/midcom.helper.datamanager/datamanager.php
r13129 r13378 410 410 411 411 /** 412 * Pointer to a RuleRegistry sing eltonobject.412 * Pointer to a RuleRegistry singletonobject. 413 413 * 414 414 * @var ??? … … 608 608 * 609 609 * The datamanager loads the object and 610 * initializes all local fields accordingly. All datatypes get instanti nated610 * initializes all local fields accordingly. All datatypes get instantiated 611 611 * and the data array gets populated. If the object has no schema associated with 612 612 * it, it defaults to the first layout in the database. … … 2169 2169 /** 2170 2170 * Call this function if you no longer need the DM instance. It will drop 2171 * all instanti nated classes and resolve the cyclic references which prevent2171 * all instantiated classes and resolve the cyclic references which prevent 2172 2172 * a DM instance to be garbage collected by PHP. 2173 2173 */ trunk/midcom/net.nemein.bookmarks/viewer.php
r11907 r13378 320 320 if (! $layout) 321 321 { 322 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Layout class could not be instanti nated.");322 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Layout class could not be instantiated."); 323 323 } 324 324 … … 361 361 if (! $layout) 362 362 { 363 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Layout class could not be instanti nated.");363 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Layout class could not be instantiated."); 364 364 } 365 365 trunk/midcom/net.nemein.payment/factory.php
r11907 r13378 32 32 * Constructor, initialize base class. 33 33 * 34 * Do not call this directly, this class is a sing elton, use get_instance()34 * Do not call this directly, this class is a singleton, use get_instance() 35 35 * instead. 36 36 * … … 151 151 152 152 /** 153 * Sing elton interface, returns the factory instance.153 * Singleton interface, returns the factory instance. 154 154 * 155 155 * @return net_nemein_payment_factory Factory instance trunk/midcom/net.nemein.personnel/viewer.php
r11907 r13378 463 463 $this->_layout = new midcom_helper_datamanager($GLOBALS["net_nemein_personnel_layouts"]); 464 464 if (!$this->_layout) { 465 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Datamanager could not be instanti nated.");465 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Datamanager could not be instantiated."); 466 466 // This will exit. 467 467 } … … 694 694 if (! $this->_layout) 695 695 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 696 "Datamanager class could not be instanti nated.");696 "Datamanager class could not be instantiated."); 697 697 698 698 if (! $this->_layout->init($this->_person)) trunk/midcom/org.openpsa.calendar/viewer.php
r12014 r13378 40 40 41 41 if (!$this->_datamanager) { 42 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Datamanager could not be instanti nated.");42 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Datamanager could not be instantiated."); 43 43 // This will exit. 44 44 } trunk/midcom/org.openpsa.contacts/viewer.php
r12480 r13378 309 309 310 310 if (!$this->_datamanagers[$type]) { 311 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Datamanager could not be instanti nated.");311 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Datamanager could not be instantiated."); 312 312 // This will exit. 313 313 } trunk/midcom/org.openpsa.directmarketing/viewer.php
r12364 r13378 335 335 if (!$this->_datamanagers[$type]) { 336 336 debug_pop(); 337 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Datamanager could not be instanti nated.");337 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Datamanager could not be instantiated."); 338 338 // This will exit. 339 339 } trunk/midcom/org.openpsa.documents/viewer.php
r11907 r13378 117 117 118 118 if (!$this->_datamanagers[$type]) { 119 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Datamanager could not be instanti nated.");119 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Datamanager could not be instantiated."); 120 120 // This will exit. 121 121 } trunk/midcom/org.openpsa.imp/viewer.php
r4794 r13378 246 246 if (!$this->_request_data['datamanager']) { 247 247 debug_pop(); 248 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Datamanager could not be instanti nated.");248 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Datamanager could not be instantiated."); 249 249 // This will exit. 250 250 } trunk/midcom/org.openpsa.invoices/handler/delete.php
r4794 r13378 29 29 30 30 if (!$this->_datamanager) { 31 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Datamanager could not be instanti nated.");31 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Datamanager could not be instantiated."); 32 32 // This will exit. 33 33 } trunk/midcom/org.openpsa.invoices/handler/edit.php
r12140 r13378 29 29 30 30 if (!$this->_datamanager) { 31 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Datamanager could not be instanti nated.");31 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Datamanager could not be instantiated."); 32 32 // This will exit. 33 33 } trunk/midcom/org.openpsa.projects/handler/hours/action.php
r12014 r13378 37 37 38 38 if (!$this->_datamanagers[$type]) { 39 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Datamanager could not be instanti nated.");39 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Datamanager could not be instantiated."); 40 40 // This will exit. 41 41 } trunk/midcom/org.openpsa.projects/viewer.php
r11907 r13378 324 324 325 325 if (!$this->_datamanagers[$type]) { 326 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Datamanager could not be instanti nated.");326 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Datamanager could not be instantiated."); 327 327 // This will exit. 328 328 } trunk/midcom/org.openpsa.reports/reports_handler_base.php
r12014 r13378 68 68 if (!$this->_datamanagers[$type]) { 69 69 debug_pop(); 70 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Datamanager could not be instanti nated.");70 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Datamanager could not be instantiated."); 71 71 // This will exit. 72 72 } trunk/midcom/org.openpsa.sales/handler/edit.php
r12014 r13378 44 44 if (!$this->_datamanagers[$type]) { 45 45 debug_pop(); 46 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Datamanager could not be instanti nated.");46 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Datamanager could not be instantiated."); 47 47 // This will exit. 48 48 } trunk/midcom/org.openpsa.sales/handler/list.php
r4794 r13378 234 234 { 235 235 debug_pop(); 236 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Datamanager could not be instanti nated.");236 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Datamanager could not be instantiated."); 237 237 // This will exit. 238 238 }
