Changeset 11907
- Timestamp:
- 08/30/07 19:32:15 (1 year ago)
- Files:
-
- trunk/midcom/midcom.core/midcom/baseclasses/components/request_admin.php (modified) (2 diffs)
- trunk/midcom/midcom.core/midcom/exec/config-test.php (modified) (1 diff)
- trunk/midcom/midcom.core/midcom/exec/convert_legacy_metadata.php (modified) (3 diffs)
- trunk/midcom/midcom.core/midcom/exec/index-legacy-attachments.php (modified) (5 diffs)
- trunk/midcom/midcom.core/midcom/helper/configuration.php (modified) (1 diff)
- trunk/midcom/midcom.core/midcom/helper/itemlist.php (modified) (1 diff)
- trunk/midcom/midcom.core/midcom/helper/itemlist/articlesfirst.php (modified) (2 diffs)
- trunk/midcom/midcom.core/midcom/helper/itemlist/score.php (modified) (1 diff)
- trunk/midcom/midcom.core/midcom/helper/itemlist/topicsfirst.php (modified) (2 diffs)
- trunk/midcom/midcom.core/midcom/helper/mailtemplate.php (modified) (1 diff)
- trunk/midcom/midcom.core/midcom/helper/toolbar.php (modified) (3 diffs)
- trunk/midcom/midcom.core/midcom/services/_i18n_l10n.php (modified) (9 diffs)
- trunk/midcom/midcom.core/midcom/services/cache/backend/dba.php (modified) (7 diffs)
- trunk/midcom/midcom.core/midcom/services/cache/backend/flatfile.php (modified) (2 diffs)
- trunk/midcom/midcom.core/midcom/services/cache/module.php (modified) (3 diffs)
- trunk/midcom/midcom.core/midcom/services/indexer/backend/XMLCommClient.php (modified) (2 diffs)
- trunk/midcom/midcom.core/midcom/services/indexer/backend/xmlshell.php (modified) (2 diffs)
- trunk/midcom/midcom.core/midcom/services/indexer/document.php (modified) (1 diff)
- trunk/midcom/midcom.core/midcom/services/indexer/document/datamanager.php (modified) (1 diff)
- trunk/midcom/midcom.core/midcom/services/indexer/filter/date.php (modified) (1 diff)
- trunk/midcom/midcom.core/midcom/services/rcs/tests/test_backend_rcs.php (modified) (1 diff)
- trunk/midcom/midcom.core/midcom/services/rcs/tests/test_rcs.php (modified) (2 diffs)
- trunk/midcom/midcom.helper.datamanager/datamanager.php (modified) (10 diffs)
- trunk/midcom/midcom.helper.datamanager/datatype_blob.php (modified) (3 diffs)
- trunk/midcom/midcom.helper.datamanager/datatype_communityhtml.php (modified) (1 diff)
- trunk/midcom/midcom.helper.datamanager/datatype_mailtemplate.php (modified) (4 diffs)
- trunk/midcom/midcom.helper.datamanager/helpers_select_lists.php (modified) (2 diffs)
- trunk/midcom/midcom.helper.datamanager/widget.php (modified) (1 diff)
- trunk/midcom/midcom.helper.datamanager/widget_communityhtml.php (modified) (1 diff)
- trunk/midcom/midcom.helper.datamanager/widget_date.php (modified) (2 diffs)
- trunk/midcom/midcom.helper.datamanager/widget_html.php (modified) (3 diffs)
- trunk/midcom/midcom.helper.datamanager/widget_mailtemplate.php (modified) (1 diff)
- trunk/midcom/midcom.helper.datamanager/widget_schemaselect.php (modified) (1 diff)
- trunk/midcom/midcom.helper.datamanager/widget_tinymce.php (modified) (1 diff)
- trunk/midcom/midcom.helper.search/viewer.php (modified) (1 diff)
- trunk/midcom/net.nemein.bookmarks/admin.php (modified) (19 diffs)
- trunk/midcom/net.nemein.bookmarks/navigation.php (modified) (3 diffs)
- trunk/midcom/net.nemein.bookmarks/viewer.php (modified) (11 diffs)
- trunk/midcom/net.nemein.calendar/functions.php (modified) (1 diff)
- trunk/midcom/net.nemein.internalorders/handler/edit.php (modified) (17 diffs)
- trunk/midcom/net.nemein.internalorders/handler/own.php (modified) (2 diffs)
- trunk/midcom/net.nemein.internalorders/handler/products.php (modified) (4 diffs)
- trunk/midcom/net.nemein.internalorders/handler/receive.php (modified) (8 diffs)
- trunk/midcom/net.nemein.internalorders/handler/reports.php (modified) (19 diffs)
- trunk/midcom/net.nemein.internalorders/handler/search.php (modified) (2 diffs)
- trunk/midcom/net.nemein.internalorders/viewer.php (modified) (7 diffs)
- trunk/midcom/net.nemein.lastupdates/handler/index.php (modified) (1 diff)
- trunk/midcom/net.nemein.payment/factory.php (modified) (3 diffs)
- trunk/midcom/net.nemein.payment/handler.php (modified) (1 diff)
- trunk/midcom/net.nemein.payment/handler/nordea.php (modified) (5 diffs)
- trunk/midcom/net.nemein.personnel/admin.php (modified) (4 diffs)
- trunk/midcom/net.nemein.personnel/viewer.php (modified) (9 diffs)
- trunk/midcom/net.nemein.supportview/admin.php (modified) (4 diffs)
- trunk/midcom/net.nemein.supportview/navigation.php (modified) (1 diff)
- trunk/midcom/net.nemein.supportview/viewer.php (modified) (2 diffs)
- trunk/midcom/net.nemein.updatenotification/handler/admin.php (modified) (1 diff)
- trunk/midcom/org.openpsa.calendar/navigation.php (modified) (1 diff)
- trunk/midcom/org.openpsa.calendar/viewer.php (modified) (2 diffs)
- trunk/midcom/org.openpsa.calendarwidget/documentation/example.txt (modified) (1 diff)
- trunk/midcom/org.openpsa.contacts/group_handler.php (modified) (3 diffs)
- trunk/midcom/org.openpsa.contacts/person_handler.php (modified) (3 diffs)
- trunk/midcom/org.openpsa.contacts/viewer.php (modified) (1 diff)
- trunk/midcom/org.openpsa.directmarketing/navigation.php (modified) (1 diff)
- trunk/midcom/org.openpsa.documents/metadata_handler.php (modified) (3 diffs)
- trunk/midcom/org.openpsa.documents/navigation.php (modified) (1 diff)
- trunk/midcom/org.openpsa.documents/viewer.php (modified) (2 diffs)
- trunk/midcom/org.openpsa.imp/navigation.php (modified) (1 diff)
- trunk/midcom/org.openpsa.jabber/navigation.php (modified) (1 diff)
- trunk/midcom/org.openpsa.jabber/viewer.php (modified) (1 diff)
- trunk/midcom/org.openpsa.mypage/navigation.php (modified) (1 diff)
- trunk/midcom/org.openpsa.mypage/viewer.php (modified) (1 diff)
- trunk/midcom/org.openpsa.projects/handler/hours/action.php (modified) (1 diff)
- trunk/midcom/org.openpsa.projects/hours_widget.php (modified) (1 diff)
- trunk/midcom/org.openpsa.projects/navigation.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) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/midcom/midcom.core/midcom/baseclasses/components/request_admin.php
r3766 r11907 164 164 { 165 165 // Load the datamanager, then create an instance. 166 $ GLOBALS['midcom']->load_library('midcom.helper.datamanager');166 $_MIDCOM->load_library('midcom.helper.datamanager'); 167 167 $data['datamanager'] = new midcom_helper_datamanager($this->_handler['schemadb']); 168 168 169 169 if ($data['datamanager'] == false) 170 170 { 171 $ GLOBALS['midcom']->generate_error(MIDCOM_ERRCRIT, 'Failed to instantinate configuration datamanager.');171 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 'Failed to instantinate configuration datamanager.'); 172 172 // This will exit. 173 173 } … … 180 180 debug_add('Failed to initialize the datamanager.', MIDCOM_LOG_CRIT); 181 181 debug_print_r('Topic object we tried was:', $this->_config_topic); 182 $ GLOBALS['midcom']->generate_error(MIDCOM_ERRCRIT, 'Failed to initialize configuration datamanager.');182 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 'Failed to initialize configuration datamanager.'); 183 183 // This will exit. 184 184 } trunk/midcom/midcom.core/midcom/exec/config-test.php
r6121 r11907 147 147 148 148 // Some helpers 149 $i18n =& $ GLOBALS['midcom']->get_service('i18n');149 $i18n =& $_MIDCOM->get_service('i18n'); 150 150 151 151 $version = phpversion(); trunk/midcom/midcom.core/midcom/exec/convert_legacy_metadata.php
r3766 r11907 23 23 if (! $midgard->admin) 24 24 { 25 $ GLOBALS['midcom']->generate_error(MIDCOM_ERRAUTH, "This script requires admin privileges to run.");25 $_MIDCOM->generate_error(MIDCOM_ERRAUTH, "This script requires admin privileges to run."); 26 26 // This will exit. 27 27 } … … 342 342 { 343 343 echo "</pre>\n"; 344 $ GLOBALS['midcom']->generate_error(MIDCOM_ERRCRIT, "Failed to list the child nodes of {$nodeid}. Aborting.");344 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Failed to list the child nodes of {$nodeid}. Aborting."); 345 345 } 346 346 $nodes = array_merge($nodes, $childs); … … 352 352 echo "\n\nData Conversion complete.\n\n"; 353 353 echo "\n\nInvalidating the Content Cache...\n\n"; 354 $ GLOBALS['midcom']->cache->invalidate_all();354 $_MIDCOM->cache->invalidate_all(); 355 355 echo '</pre>'; 356 356 trunk/midcom/midcom.core/midcom/exec/index-legacy-attachments.php
r11359 r11907 33 33 if (! $midgard->admin) 34 34 { 35 $ GLOBALS['midcom']->generate_error(MIDCOM_ERRAUTH, 'This script requires admin privileges to run.');35 $_MIDCOM->generate_error(MIDCOM_ERRAUTH, 'This script requires admin privileges to run.'); 36 36 // This will exit. 37 37 } … … 39 39 if ($GLOBALS['midcom_config']['indexer_backend'] === false) 40 40 { 41 $ GLOBALS['midcom']->generate_error(MIDCOM_ERRCRIT, 'No indexer backend has been defined. Aborting.');41 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 'No indexer backend has been defined. Aborting.'); 42 42 } 43 43 … … 89 89 $nodes = Array(); 90 90 $nodeid = $nap->get_root_node(); 91 $indexer =& $ GLOBALS['midcom']->get_service('indexer');91 $indexer =& $_MIDCOM->get_service('indexer'); 92 92 93 93 while (! is_null($nodeid)) … … 112 112 { 113 113 debug_pop(); 114 $ GLOBALS['midcom']->generate_error(MIDCOM_ERRCRIT, "Failed to list the leaves of {$nodeid}. Aborting.");114 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Failed to list the leaves of {$nodeid}. Aborting."); 115 115 } 116 116 foreach($leaves as $leafid) … … 136 136 { 137 137 debug_pop(); 138 $ GLOBALS['midcom']->generate_error(MIDCOM_ERRCRIT, "Failed to list the child nodes of {$nodeid}. Aborting.");138 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Failed to list the child nodes of {$nodeid}. Aborting."); 139 139 } 140 140 $nodes = array_merge($nodes, $childs); trunk/midcom/midcom.core/midcom/helper/configuration.php
r11900 r11907 104 104 else 105 105 { 106 $ GLOBALS['midcom']->generate_error(MIDCOM_ERRCRIT, 'midcom_helper_configuration: Default constructor not allowed.');106 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 'midcom_helper_configuration: Default constructor not allowed.'); 107 107 } 108 108 } trunk/midcom/midcom.core/midcom/helper/itemlist.php
r3789 r11907 127 127 $sortclass->_init($_basicnav, $parent_topic); 128 128 } else { 129 $ GLOBALS['midcom']->generate_error("Tried to load sorting helper class for order {$sorting}, but the class was undefined.", MIDCOM_LOG_WARN);129 $_MIDCOM->generate_error("Tried to load sorting helper class for order {$sorting}, but the class was undefined.", MIDCOM_LOG_WARN); 130 130 } 131 131 trunk/midcom/midcom.core/midcom/helper/itemlist/articlesfirst.php
r3766 r11907 23 23 if ($nodes_list === false) 24 24 { 25 $ GLOBALS['midcom']->generate_error(MIDCOM_LOG_ERROR,25 $_MIDCOM->generate_error(MIDCOM_LOG_ERROR, 26 26 "Could not retrieve the subnode listing, this is fatal."); 27 27 // This will exit. … … 31 31 if ($leaves_list === false) 32 32 { 33 $ GLOBALS['midcom']->generate_error(MIDCOM_LOG_ERROR,33 $_MIDCOM->generate_error(MIDCOM_LOG_ERROR, 34 34 "Could not retrieve the leaf listing, this is fatal."); 35 35 // This will exit. trunk/midcom/midcom.core/midcom/helper/itemlist/score.php
r1068 r11907 44 44 if (! usort($result, array ("midcom_helper_itemlist_score", "sort_cmp") ) ) 45 45 { 46 $ GLOBALS['midcom']->generate_error("ARG");46 $_MIDCOM->generate_error("ARG"); 47 47 } 48 48 return $result; trunk/midcom/midcom.core/midcom/helper/itemlist/topicsfirst.php
r3766 r11907 23 23 if ($nodes_list === false) 24 24 { 25 $ GLOBALS['midcom']->generate_error(MIDCOM_LOG_ERROR,25 $_MIDCOM->generate_error(MIDCOM_LOG_ERROR, 26 26 "Could not retrieve the subnode listing, this is fatal."); 27 27 // This will exit. … … 31 31 if ($leaves_list === false) 32 32 { 33 $ GLOBALS['midcom']->generate_error(MIDCOM_LOG_ERROR,33 $_MIDCOM->generate_error(MIDCOM_LOG_ERROR, 34 34 "Could not retrieve the leaf listing, this is fatal."); 35 35 // This will exit. trunk/midcom/midcom.core/midcom/helper/mailtemplate.php
r11359 r11907 247 247 $this->_body = ""; 248 248 $this->_parsed = false; 249 $this->_i18n =& $ GLOBALS['midcom']->get_service('i18n');249 $this->_i18n =& $_MIDCOM->get_service('i18n'); 250 250 251 251 $this->_mail_mime = new Mail_mime("\n"); trunk/midcom/midcom.core/midcom/helper/toolbar.php
r11370 r11907 452 452 if ($index == 0) 453 453 { 454 $ GLOBALS['midcom']->generate_error(MIDCOM_ERRCRIT,454 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 455 455 'Cannot move the top element upwards.'); 456 456 // This will exit() … … 473 473 if ($index == (count($this->items) - 1)) 474 474 { 475 $ GLOBALS['midcom']->generate_error(MIDCOM_ERRCRIT,475 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 476 476 'Cannot move the bottom element downwards.'); 477 477 // This will exit() … … 564 564 debug_add("toolbar:update_item_url: We have an relative URL, transformig it..."); 565 565 $this->items[$index][MIDCOM_TOOLBAR_URL] = 566 $ GLOBALS['midcom']->get_context_data(MIDCOM_CONTEXT_ANCHORPREFIX)566 $_MIDCOM->get_context_data(MIDCOM_CONTEXT_ANCHORPREFIX) 567 567 . $url; 568 568 } trunk/midcom/midcom.core/midcom/services/_i18n_l10n.php
r11197 r11907 205 205 if (! $file) 206 206 { 207 $ GLOBALS['midcom']->generate_error(MIDCOM_ERRCRIT,207 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 208 208 "Failed to open the file '{$this->_library_filename}.{$lang}.txt' for writing."); 209 209 // This will exit() … … 275 275 { 276 276 $line++; // Array is 0-indexed 277 $ GLOBALS['midcom']->generate_error(MIDCOM_ERRCRIT,277 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 278 278 "L10n DB SYNTAX ERROR: An incorrect command was detected at {$filename}:{$line}"); 279 279 // This will exit … … 300 300 { 301 301 $line++; // Array is 0-indexed 302 $ GLOBALS['midcom']->generate_error(MIDCOM_ERRCRIT,302 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 303 303 "L10n DB SYNTAX ERROR: A second VERSION tag has been detected at {$filename}:{$line}"); 304 304 // This will exit … … 311 311 { 312 312 $line++; // Array is 0-indexed 313 $ GLOBALS['midcom']->generate_error(MIDCOM_ERRCRIT,313 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 314 314 "L10n DB SYNTAX ERROR: A second LANGUAGE tag has been detected at {$filename}:{$line}"); 315 315 // This will exit … … 326 326 default: 327 327 $line++; // Array is 0-indexed 328 $ GLOBALS['midcom']->generate_error(MIDCOM_ERRCRIT,328 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 329 329 "L10n DB SYNTAX ERROR: Unknown command '{$command}' at {$filename}:{$line}"); 330 330 // This will exit … … 334 334 { 335 335 $line++; // Array is 0-indexed 336 $ GLOBALS['midcom']->generate_error(MIDCOM_ERRCRIT,336 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 337 337 "L10n DB SYNTAX ERROR: Invalid line at {$filename}:{$line}"); 338 338 // This will exit … … 363 363 if ($instring) 364 364 { 365 $ GLOBALS['midcom']->generate_error(MIDCOM_ERRCRIT,365 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 366 366 "L10n DB SYNTAX ERROR: String constant exceeds end of file."); 367 367 // This will exit … … 369 369 if (version_compare($version, $this->_version, "<")) 370 370 { 371 $ GLOBALS['midcom']->generate_error(MIDCOM_ERRCRIT,371 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 372 372 "L10n DB ERROR: File format version of $filename is too old, no update available at the moment."); 373 373 // This will exit … … 375 375 if ($lang != $language) 376 376 { 377 $ GLOBALS['midcom']->generate_error(MIDCOM_ERRCRIT,377 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 378 378 "L10n DB ERROR: The DB language version {$language} did not match the requested {$lang}."); 379 379 // This will exit trunk/midcom/midcom.core/midcom/services/cache/backend/dba.php
r4575 r11907 111 111 if ($handle === false) 112 112 { 113 $ GLOBALS['midcom']->generate_error(MIDCOM_ERRCRIT,113 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 114 114 "dba cache handler: Failed to open the database {$this->_filename} for creation."); 115 115 // This will exit. … … 143 143 if ($handle === false) 144 144 { 145 $ GLOBALS['midcom']->generate_error(MIDCOM_ERRCRIT,145 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 146 146 "dba cache handler: Failed to open the database {$this->_filename} (Write-mode: {$write}): {$php_errormsg}"); 147 147 // This will exit. … … 166 166 if (! $this->_exists($key)) 167 167 { 168 $ GLOBALS['midcom']->generate_error(MIDCOM_ERRCRIT,168 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 169 169 "dba cache handler: Failed to read key {$key} from the database {$this->_filename}: The key does not exist."); 170 170 // This will exit. … … 174 174 { 175 175 // Note: Appearantly not php error here, so no php_errormsg as well. 176 $ GLOBALS['midcom']->generate_error(MIDCOM_ERRCRIT,176 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 177 177 "dba cache handler: Failed to read key {$key} from the database {$this->_filename}: {$php_errormsg}"); 178 178 // This will exit. … … 185 185 if (! @dba_replace($key, $data, $this->_handle)) 186 186 { 187 $ GLOBALS['midcom']->generate_error(MIDCOM_ERRCRIT,187 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 188 188 "dba cache handler: Failed to write key {$key} to the database {$this->_filename}: {$php_errormsg}"); 189 189 // This will exit. … … 200 200 if (! @dba_delete($key, $this->_handle)) 201 201 { 202 $ GLOBALS['midcom']->generate_error(MIDCOM_ERRCRIT,202 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 203 203 "dba cache handler: Failed to remove key {$key} from the database {$this->_filename}: {$php_errormsg}"); 204 204 // This will exit. … … 212 212 if ($handle === false) 213 213 { 214 $ GLOBALS['midcom']->generate_error(MIDCOM_ERRCRIT,214 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 215 215 "dba cache handler: Failed to truncate the database {$this->_filename}: {$php_errormsg}"); 216 216 // This will exit. trunk/midcom/midcom.core/midcom/services/cache/backend/flatfile.php
r6136 r11907 61 61 if (! $this->exists($key)) 62 62 { 63 $ GLOBALS['midcom']->generate_error(MIDCOM_ERRCRIT,63 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 64 64 "flatfile cache handler: Failed to read key {$key} from the database {$this->_dirname}: File does not exist."); 65 65 // This will exit. … … 78 78 if ($handle === false) 79 79 { 80 $ GLOBALS['midcom']->generate_error(MIDCOM_ERRCRIT,80 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 81 81 "flatfile cache handler: Failed to create key {$key} in the database {$this->_dirname}: File does already exist."); 82 82 // This will exit. trunk/midcom/midcom.core/midcom/services/cache/module.php
r3766 r11907 102 102 if (array_key_exists($name, $this->_backends)) 103 103 { 104 $ GLOBALS['midcom']->generate_error(MIDCOM_ERRCRIT,104 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 105 105 "Cannot create backend driver instance {$name}: A backend with this name does already exist."); 106 106 // This will exit. … … 109 109 if (! array_key_exists('driver', $config)) 110 110 { 111 $ GLOBALS['midcom']->generate_error(MIDCOM_ERRCRIT,111 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 112 112 "Cannot create backend driver instance {$name}: The driver class is not specified in the configuration."); 113 113 // This will exit. … … 119 119 if (! class_exists($classname)) 120 120 { 121 $ GLOBALS['midcom']->generate_error(MIDCOM_ERRCRIT,121 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 122 122 "Cannot create backend driver instance {$name}: The class {$classname} was not found in the file {$filename}."); 123 123 // This will exit. trunk/midcom/midcom.core/midcom/services/indexer/backend/XMLCommClient.php
r3766 r11907 489 489 { 490 490 $msg = "The MidCOM Indexer failed critically:\n{$this->_current_data}"; 491 // $ GLOBALS['midcom']->generate_error(MIDCOM_ERRCRIT, $msg);491 // $_MIDCOM->generate_error(MIDCOM_ERRCRIT, $msg); 492 492 // This will exit. 493 493 debug_add($msg, MIDCOM_LOG_ERROR); … … 511 511 { 512 512 $msg = "The XML Parser failed crticially:\n" . $result->toString(); 513 // $ GLOBALS['midcom']->generate_error(MIDCOM_ERRCRIT, $msg);513 // $_MIDCOM->generate_error(MIDCOM_ERRCRIT, $msg); 514 514 // This will exit. 515 515 debug_add($msg, MIDCOM_LOG_ERROR); trunk/midcom/midcom.core/midcom/services/indexer/backend/xmlshell.php
r3766 r11907 156 156 debug_print_r('Global config was:', $GLOBALS['midcom_config']); 157 157 debug_pop(); 158 $ GLOBALS['midcom']->generate_error(MIDCOM_ERRCRIT, 'Failed to execute the indexer process.');158 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 'Failed to execute the indexer process.'); 159 159 // This will exit. 160 160 } … … 257 257 { 258 258 debug_pop(); 259 $ GLOBALS['midcom']->generate_error(MIDCOM_ERRCRIT,259 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 260 260 "The xmlshell indexer executable returned {$return}, this is critical. Check the Debug Log."); 261 261 // This will exit. trunk/midcom/midcom.core/midcom/services/indexer/document.php
r11359 r11907 267 267 function midcom_services_indexer_document() 268 268 { 269 $this->_i18n =& $ GLOBALS['midcom']->get_service('i18n');269 $this->_i18n =& $_MIDCOM->get_service('i18n'); 270 270 } 271 271 trunk/midcom/midcom.core/midcom/services/indexer/document/datamanager.php
r3766 r11907 225 225 default: 226 226 debug_pop(); 227 $ GLOBALS['midcom']->generate_error(MIDCOM_ERRCRIT,227 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 228 228 "Datamanager Indexer Document: Unknown indexing method {$field['index_method']} for field {$name} discovered, aborting."); 229 229 // This will exit. trunk/midcom/midcom.core/midcom/services/indexer/filter/date.php
r3766 r11907 55 55 if ($start == 0 && $end == 0) 56 56 { 57 $ GLOBALS['midcom']->generate_error(MIDCOM_ERRCRIT, 'Both start and end of a datefilter must not be 0.');57 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 'Both start and end of a datefilter must not be 0.'); 58 58 // This will exit. 59 59 } trunk/midcom/midcom.core/midcom/services/rcs/tests/test_backend_rcs.php
r5528 r11907 37 37 { 38 38 $_MIDCOM = new MockMidCOM(); 39 $ GLOBALS['midcom']= &$_MIDCOM;39 $_MIDCOM = &$_MIDCOM; 40 40 $this->midcom = &$_MIDCOM; 41 41 trunk/midcom/midcom.core/midcom/services/rcs/tests/test_rcs.php
r3887 r11907 31 31 { 32 32 $_MIDCOM = new MockMidCOM(); 33 $ GLOBALS['midcom']= &$_MIDCOM;33 $_MIDCOM = &$_MIDCOM; 34 34 $this->midcom = &$_MIDCOM; 35 35 … … 72 72 $this->basicSetUp(); 73 73 $_MIDCOM = new MockMidCOM(); 74 $ GLOBALS['midcom']= &$_MIDCOM;74 $_MIDCOM = &$_MIDCOM; 75 75 76 76 } trunk/midcom/midcom.helper.datamanager/datamanager.php
r11370 r11907 561 561 $this->_ourlock = null; 562 562 563 $i18n =& $ GLOBALS["midcom"]->get_service("i18n");563 $i18n =& $_MIDCOM->get_service("i18n"); 564 564 $this->_l10n = $i18n->get_l10n("midcom.helper.datamanager"); 565 565 $this->_l10n_midcom = $i18n->get_l10n("midcom"); … … 721 721 else 722 722 { 723 $comp = $ GLOBALS['midcom']->get_context_data(MIDCOM_CONTEXT_COMPONENT);724 } 725 726 $i18n =& $ GLOBALS['midcom']->get_service('i18n');723 $comp = $_MIDCOM->get_context_data(MIDCOM_CONTEXT_COMPONENT); 724 } 725 726 $i18n =& $_MIDCOM->get_service('i18n'); 727 727 $this->_l10n_schema = $i18n->get_l10n($comp); 728 728 … … 1031 1031 $nav = new midcom_helper_nav(); 1032 1032 $node = $nav->get_node($nav->get_current_node()); 1033 $ GLOBALS['midcom']->cache->invalidate($node[MIDCOM_NAV_GUID]);1033 $_MIDCOM->cache->invalidate($node[MIDCOM_NAV_GUID]); 1034 1034 1035 1035 /* Ok, we do now have a storage object to work with. Note, that … … 1132 1132 { 1133 1133 $this->_update_nemein_rcs(); 1134 $ GLOBALS["midcom"]->cache->invalidate($this->_storage->guid());1134 $_MIDCOM->cache->invalidate($this->_storage->guid()); 1135 1135 debug_add("Invalidated Midcom Cache."); 1136 1136 } … … 1277 1277 debug_push ("midcom_helper_datamanager::display_form"); 1278 1278 1279 $i18n =& $ GLOBALS["midcom"]->get_service("i18n");1279 $i18n =& $_MIDCOM->get_service("i18n"); 1280 1280 $l10n_midcom = $i18n->get_l10n("midcom"); 1281 1281 … … 1317 1317 $can_break = false; 1318 1318 1319 $midgard = $ GLOBALS["midcom"]->get_midgard();1319 $midgard = $_MIDCOM->get_midgard(); 1320 1320 $user = mgd_get_person($midgard->user); 1321 1321 … … 1765 1765 { 1766 1766 debug_print_type("Got this type as layout database:", $source); 1767 $ GLOBALS['midcom']->generate_error(MIDCOM_ERRCRIT, 'Layout database was not found, aborting.');1767 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 'Layout database was not found, aborting.'); 1768 1768 // this will exit() 1769 1769 } … … 1973 1973 } 1974 1974 1975 $midgard = $ GLOBALS["midcom"]->get_midgard();1975 $midgard = $_MIDCOM->get_midgard(); 1976 1976 $user = mgd_get_person($midgard->user); 1977 1977 … … 1988 1988 $locker = mgd_get_person($lock["user"]); 1989 1989 if (! $locker) 1990 $ GLOBALS["MIDCOM"]->generate_error("CRITICAL FAILURE: Locker person record does not exist: "1990 $_MIDCOM->generate_error("CRITICAL FAILURE: Locker person record does not exist: " 1991 1991 . mgd_errstr(), MIDCOM_ERRCRIT); 1992 1992 $this->_lock["user_name"] = $locker->name; … … 2121 2121 } 2122 2122 2123 $midgard = $ GLOBALS["midcom"]->get_midgard();2123 $midgard = $_MIDCOM->get_midgard(); 2124 2124 $user = mgd_get_person($midgard->user); 2125 2125 if ($midgard->admin) { trunk/midcom/midcom.helper.datamanager/datatype_blob.php
r1866 r11907 23 23 if (!array_key_exists("datatype_blob_anchorprefix", $field)) 24 24 { 25 $midgard = $ GLOBALS["midcom"]->get_midgard();25 $midgard = $_MIDCOM->get_midgard(); 26 26 $field["datatype_blob_anchorprefix"] = $midgard->self; 27 27 } … … 292 292 if ($this->_field['datatype_blob_autoindex']) 293 293 { 294 $indexer =& $ GLOBALS['midcom']->get_service('indexer');294 $indexer =& $_MIDCOM->get_service('indexer'); 295 295 $indexer->delete($guid); 296 296 } … … 453 453 { 454 454 $document = new midcom_services_indexer_document_attachment($this->_value["object"], $this->_storage); 455 $indexer =& $ GLOBALS['midcom']->get_service('indexer');455 $indexer =& $_MIDCOM->get_service('indexer'); 456 456 $indexer->index($document); 457 457 } trunk/midcom/midcom.helper.datamanager/datatype_communityhtml.php
r2467 r11907 56 56 $result = strip_tags(trim($this->_value)); 57 57 58 $midgard = $ GLOBALS["midcom"]->get_midgard();58 $midgard = $_MIDCOM->get_midgard(); 59 59 60 60 foreach ($this->_smileys as $tag => $url) trunk/midcom/midcom.helper.datamanager/datatype_mailtemplate.php
r1080 r11907 19 19 $field["widget"] = "mailtemplate"; 20 20 $this->_data = $this->get_empty_value(); 21 $this->_i18n =& $ GLOBALS['midcom']->get_service('i18n');21 $this->_i18n =& $_MIDCOM->get_service('i18n'); 22 22 23 23 parent::_constructor ($datamanager, $storage, $field); … … 71 71 function get_empty_value() 72 72 { 73 $i18n =& $ GLOBALS['midcom']->get_service('i18n');73 $i18n =& $_MIDCOM->get_service('i18n'); 74 74 return Array( 75 75 "from" => "", … … 122 122 function _convert_to_site_charset($data) 123 123 { 124 $i18n =& $ GLOBALS["midcom"]->get_service("i18n");124 $i18n =& $_MIDCOM->get_service("i18n"); 125 125 $dest = $i18n->get_current_charset(); 126 126 $source = $this->_data["charset"]; … … 131 131 function _convert_to_data_charset($data) 132 132 { 133 $i18n =& $ GLOBALS["midcom"]->get_service("i18n");133 $i18n =& $_MIDCOM->get_service("i18n"); 134 134 $source = $i18n->get_current_charset(); 135 135 $dest = $this->_data["charset"]; trunk/midcom/midcom.helper.datamanager/helpers_select_lists.php
r3038 r11907 84 84 function midcom_helper_datamanager_selectlist_allgroups() 85 85 { 86 $midgard = $ GLOBALS["midcom"]->get_midgard();87 $i18n =& $ GLOBALS["midcom"]->get_service("i18n");86
