Changeset 14087
- Timestamp:
- 12/22/07 17:31:07 (8 months ago)
- Files:
-
- trunk/midcom/midcom.core/midcom/baseclasses/components/handler.php (modified) (4 diffs)
- trunk/midcom/midcom.core/midcom/baseclasses/components/handler/dataexport.php (modified) (9 diffs)
- trunk/midcom/midcom.core/midcom/baseclasses/components/interface.php (modified) (1 diff)
- trunk/midcom/midcom.core/midcom/baseclasses/components/request.php (modified) (13 diffs)
- trunk/midcom/midcom.core/midcom/core/manifest.php (modified) (1 diff)
- trunk/midcom/midcom.core/midcom/core/temporary_object.php (modified) (4 diffs)
- trunk/midcom/midcom.core/midcom/helper/imagefilter.php (modified) (1 diff)
- trunk/midcom/midcom.core/midcom/helper/misc.php (modified) (1 diff)
- trunk/midcom/midcom.core/midcom/helper/nav.php (modified) (10 diffs)
- trunk/midcom/midcom.core/midcom/services/auth.php (modified) (1 diff)
- trunk/midcom/midcom.core/midcom/services/auth/backend/simple.php (modified) (5 diffs)
- trunk/midcom/midcom.core/midcom/services/auth/sessionmgr.php (modified) (6 diffs)
- trunk/midcom/midcom.core/midcom/services/cache/backend.php (modified) (2 diffs)
- trunk/midcom/midcom.core/midcom/services/dbclassloader.php (modified) (4 diffs)
- trunk/midcom/midcom.core/midcom/services/i18n.php (modified) (1 diff)
- trunk/midcom/midcom.core/midcom/services/js_css_merger.php (modified) (5 diffs)
- trunk/midcom/midcom.core/midcom/services/toolbars.php (modified) (28 diffs)
- trunk/midcom/midcom.core/midcom/services/uimessages.php (modified) (23 diffs)
- trunk/midcom/midcom.helper.datamanager/widget_contactchooser.php (modified) (1 diff)
- trunk/midcom/midcom.helper.datamanager2/callback/select/grouplister.php (modified) (1 diff)
- trunk/midcom/midcom.helper.datamanager2/callback/select/personlister.php (modified) (1 diff)
- trunk/midcom/midcom.helper.datamanager2/exec/chooser_handler.php (modified) (1 diff)
- trunk/midcom/midcom.helper.datamanager2/formmanager.php (modified) (2 diffs)
- trunk/midcom/midcom.helper.datamanager2/type/image.php (modified) (11 diffs)
- trunk/midcom/midcom.helper.datamanager2/type/images.php (modified) (7 diffs)
- trunk/midcom/midcom.helper.datamanager2/type/video.php (modified) (14 diffs)
- trunk/midcom/midcom.helper.datamanager2/widget/chooser.php (modified) (1 diff)
- trunk/midcom/midcom.helper.datamanager2/widget/tags.php (modified) (1 diff)
- trunk/midcom/midcom.helper.datamanager2/widget/tinymce.php (modified) (10 diffs)
- trunk/midcom/midcom.helper.datamanager2/widget/universalchooser.php (modified) (1 diff)
- trunk/midcom/midcom.helper.imagepopup/midcom/interfaces.php (modified) (1 diff)
- trunk/midcom/midcom.helper.replicator/helpers.php (modified) (6 diffs)
- trunk/midcom/midcom.helper.replicator/transporter.php (modified) (1 diff)
- trunk/midcom/midgard.admin.asgard/handler/object/rcs.php (modified) (1 diff)
- trunk/midcom/midgard.admin.sitegroup/creation/config/config.php (modified) (2 diffs)
- trunk/midcom/net.nehmer.account/invite.php (modified) (2 diffs)
- trunk/midcom/net.nehmer.branchenbuch/handler/categories.php (modified) (3 diffs)
- trunk/midcom/net.nehmer.branchenbuch/handler/entries.php (modified) (4 diffs)
- trunk/midcom/net.nehmer.comments/midcom/interfaces.php (modified) (6 diffs)
- trunk/midcom/net.nehmer.markdown/lib/markdown.php (modified) (2 diffs)
- trunk/midcom/net.nehmer.publications/callbacks/categorylister.php (modified) (4 diffs)
- trunk/midcom/net.nemein.calendar/handler/archive.php (modified) (19 diffs)
- trunk/midcom/net.nemein.internalorders/event.php (modified) (1 diff)
- trunk/midcom/net.nemein.registrations/event.php (modified) (1 diff)
- trunk/midcom/net.nemein.registrations/midcom/interfaces.php (modified) (2 diffs)
- trunk/midcom/no.bergfald.rcs/backends/nemein_rcs_functions.php (modified) (1 diff)
- trunk/midcom/no.bergfald.rcs/handler.php (modified) (1 diff)
- trunk/midcom/no.bergfald.rcs/midcom/interfaces.php (modified) (2 diffs)
- trunk/midcom/org.maemo.calendar/calendar_midcomdba.php (modified) (1 diff)
- trunk/midcom/org.openpsa.calendar/admin.php (modified) (1 diff)
- trunk/midcom/org.openpsa.calendar/calendar_midcomdba.php (modified) (3 diffs)
- trunk/midcom/org.openpsa.calendar/event_resource.php (modified) (1 diff)
- trunk/midcom/org.openpsa.calendar/midcom/interfaces.php (modified) (1 diff)
- trunk/midcom/org.openpsa.calendar/viewer.php (modified) (1 diff)
- trunk/midcom/org.openpsa.core/acl_synchronizer.php (modified) (2 diffs)
- trunk/midcom/org.openpsa.helpers/ajax.php (modified) (1 diff)
- trunk/midcom/org.openpsa.products/admin.php (modified) (1 diff)
- trunk/midcom/org.openpsa.projects/style/show-hours-list.php (modified) (1 diff)
- trunk/midcom/org.openpsa.relatedto/main.php (modified) (1 diff)
- trunk/midcom/org.openpsa.smslib/clickatell.php (modified) (1 diff)
- trunk/midcom/org.openpsa.smslib/messto.php (modified) (1 diff)
- trunk/midcom/org.openpsa.smslib/tambur.php (modified) (1 diff)
- trunk/midcom/se.anykey.activecalendar/activecalendar.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/midcom/midcom.core/midcom/baseclasses/components/handler.php
r13625 r14087 1 1 <?php 2 3 2 /** 4 3 * @package midcom.baseclasses … … 16 15 * 17 16 * The basic idea is that you have separate instances of this type for the various 18 * operations in your main viewer class. This avoid es cluttering up the viewer class17 * operations in your main viewer class. This avoids cluttering up the viewer class 19 18 * and gives you better maintainability due to smaller code files. 20 19 * … … 25 24 * Noteworthy is the ability to export handlers for usage in other components in 26 25 * 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> 28 27 * 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> 30 29 * The configuration in this case is merged from the global defaults (constructed 31 30 * 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 of35 * 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. 36 35 * 37 36 * @package midcom.baseclasses … … 149 148 * component data storage, configuration and l10n instances. Configuration is merged 150 149 * 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> 152 151 * 153 152 * @param midcom_baseclasses_components_request $master A reference to the request class trunk/midcom/midcom.core/midcom/baseclasses/components/handler/dataexport.php
r10992 r14087 1 1 <?php 2 2 /** 3 * @package midcom 3 * @package midcom.baseclasses 4 4 * @author The Midgard Project, http://www.midgard-project.org 5 5 * @version $Id: view.php,v 1.1 2006/05/10 13:00:45 rambo Exp $ … … 11 11 * Generic CSV export handler baseclass 12 12 * 13 * @package midcom 13 * @package midcom.baseclasses 14 14 */ 15 15 class midcom_baseclasses_components_handler_dataexport extends midcom_baseclasses_components_handler 16 { 16 { 17 17 /** 18 18 * The Datamanager of the project to display. … … 22 22 */ 23 23 var $_datamanager = null; 24 24 25 25 var $_schema = null; 26 26 27 27 var $_objects = array(); 28 28 29 29 function midcom_baseclasses_components_handler_dataexport() 30 30 { 31 31 parent::midcom_baseclasses_components_handler(); 32 32 } 33 33 34 34 /** 35 35 * Simple helper which references all important members to the request data listing … … 41 41 $this->_request_data['objects'] =& $this->_objects; 42 42 } 43 43 44 44 /** 45 45 * Internal helper, loads the datamanager for the current article. Any error triggers a 500. … … 63 63 } 64 64 } 65 65 66 66 function _load_schemadb() 67 67 { … … 73 73 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 'Method "_load_data" must be overridden in implementation'); 74 74 } 75 75 76 76 function _handler_csv($handler_id, $args, &$data) 77 77 { 78 78 $_MIDCOM->auth->require_valid_user(); 79 79 80 80 //Disable limits 81 81 @ini_set('memory_limit', -1); 82 82 @ini_set('max_execution_time', 0); 83 83 84 84 $this->_load_datamanager($this->_load_schemadb()); 85 85 $this->_objects = $this->_load_data($handler_id); 86 86 87 87 $_MIDCOM->skip_page_style = true; 88 88 89 89 if ( !isset($args[0]) 90 90 || empty($args[0])) … … 95 95 // This will exit 96 96 } 97 97 98 98 $this->_init_csv_variables(); 99 99 $_MIDCOM->skip_page_style = true; … … 167 167 } 168 168 /* END: Quick'n'Dirty on-the-fly charset conversion */ 169 169 170 170 // Strings and numbers beginning with zero are quoted 171 171 if ( ( !is_numeric($data) … … 230 230 continue; 231 231 } 232 232 233 233 echo $this->_encode_csv($object->guid, true, false); 234 234 $i = 0; trunk/midcom/midcom.core/midcom/baseclasses/components/interface.php
r14085 r14087 46 46 * <b>Class parameters</b> 47 47 * 48 * TODO:Document48 * @todo Document 49 49 * 50 50 * The following options can be used to parametrize the components startup and operation. trunk/midcom/midcom.core/midcom/baseclasses/components/request.php
r14086 r14087 39 39 * - <b>int variable_args:</b> Usually, there are a number of variables in the URL, like 40 40 * 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. 42 42 * 43 43 * - <b>bool no_cache:</b> For those cases where you want to prevent a certain "type" of request … … 225 225 * It must define an additional function, called get_plugin_handlers(). It has to return 226 226 * 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), 228 228 * not to the component running the problem. You are thus completely location independent. 229 229 * The handler callback must be statically callable. 230 230 * 231 * < em>Example: Plugin handler callback</em>231 * <i>Example: Plugin handler callback</i> 232 232 * 233 233 * <code> … … 252 252 * automatically expanded to match the plugin namespace. 253 253 * 254 * < em>Example: Plugin registration</em>254 * <i>Example: Plugin registration</i> 255 255 * 256 256 * <code> … … 576 576 577 577 foreach ($this->_request_switch as $key => $request) 578 { 578 { 579 579 $fixed_args_count = count($request['fixed_args']); 580 580 $total_args_count = $fixed_args_count + $request['variable_args']; … … 593 593 } 594 594 } 595 595 596 596 // We have a match. 597 597 $this->_handler =& $this->_request_switch[$key]; … … 697 697 $_MIDCOM->cache->content->expires($this->_handler['expires']); 698 698 } 699 699 700 700 $this->_on_handled($this->_handler['id'], $this->_handler['args']); 701 701 … … 792 792 return; 793 793 } 794 794 795 795 if (empty($this->_handler['handler'])) 796 796 { … … 823 823 * 824 824 * 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 point825 * executes <i>before</i> the can_handle phase. You don't know at this point 826 826 * whether you are even able to handle the request. Thus, anything that is specific 827 827 * to your request (like HTML HEAD tag adds) must not be done here. Use _on_handle … … 835 835 /** 836 836 * Component specific initialization code for the handle phase. AIS, for example, uses 837 * this to pre apre the toolbar arrays. The name of the request handler is passed as an838 * argume t 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. 839 839 * 840 840 * If you discover that you cannot handle the request already at this stage, return false … … 858 858 return true; 859 859 } 860 860 861 861 public function _on_handled($handler, $args) 862 862 { … … 898 898 return true; 899 899 } 900 900 901 901 public function _on_shown($handler) 902 902 { … … 1131 1131 ) 1132 1132 ); 1133 1133 1134 1134 // Centralized admin panel functionalities 1135 1135 1136 1136 // Load plugins registered via component manifests 1137 1137 $manifest_plugins = array(); … … 1146 1146 $manifest_plugins["asgard_{$component}"] = $plugin_config; 1147 1147 } 1148 1148 1149 1149 $hardcoded_plugins = array 1150 1150 ( trunk/midcom/midcom.core/midcom/core/manifest.php
r14086 r14087 258 258 * prefix), values are arrays holding the global / owner privilege default. 259 259 * 260 * TODO:Complete documentation260 * @todo Complete documentation 261 261 * 262 262 * @var Array trunk/midcom/midcom.core/midcom/core/temporary_object.php
r11359 r14087 1 1 <?php 2 2 /** 3 * @package midcom .db3 * @package midcom 4 4 * @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 $6 5 * @version $Id:temporary_object.php 3765 2006-07-31 08:51:39 +0000 (Mon, 31 Jul 2006) tarjei $ 7 6 * @copyright The Midgard Project, http://www.midgard-project.org … … 101 100 $object->require_do('midgard:parameters'); 102 101 $object->require_do('midgard:attachments'); 103 102 104 103 // Copy parameters from temporary object 105 104 $parameters = $this->list_parameters(); 106 105 107 106 foreach ($parameters as $domain => $array) 108 107 { … … 112 111 } 113 112 } 114 113 115 114 // Move attachments from temporary object 116 115 $attachments = $this->list_attachments(); … … 122 121 $attachment->update(); 123 122 } 124 123 125 124 // Privileges are moved using the DBA API as well. 126 125 $privileges = $this->get_privileges(); trunk/midcom/midcom.core/midcom/helper/imagefilter.php
r14084 r14087 121 121 * MidCOM Debug Log for details. 122 122 * 123 * TODO:Use ImageMagick Identify to check for a valid image.123 * @todo Use ImageMagick Identify to check for a valid image. 124 124 * 125 125 * @param string filename The file to be edited. trunk/midcom/midcom.core/midcom/helper/misc.php
r14085 r14087 1024 1024 * anchors, and prepends a list of links to them to the start of HTML. 1025 1025 * 1026 * TODO:Parse the heading structure to create OL subtrees based on their relative levels1026 * @todo Parse the heading structure to create OL subtrees based on their relative levels 1027 1027 */ 1028 1028 function midcom_helper_toc_formatter_prefix($level) trunk/midcom/midcom.core/midcom/helper/nav.php
r14002 r14087 197 197 * @return bool True, if the node is a subnode of the root node, false otherwise. 198 198 */ 199 function is_node_in_tree ($node_id, $root_id) 199 function is_node_in_tree ($node_id, $root_id) 200 200 { 201 201 //$topic = new midcom_db_topic(); … … 204 204 $qb->add_constraint('id', '=', $node_id); 205 205 $qb->add_constraint('up', 'INTREE', $root_id); 206 206 207 207 if ($qb->count() > 0) 208 208 { 209 209 return true; 210 210 } 211 211 212 212 return false; 213 213 } … … 289 289 break; 290 290 } 291 291 292 292 if (!class_exists('midcom_helper_itemlist')) 293 293 { … … 447 447 { 448 448 $leaf = $this->get_leaf($this->get_current_leaf()); 449 449 450 450 if (isset($leaf[MIDCOM_NAV_URL])) 451 451 { … … 580 580 * either a NAP node/leaf ID or the list key set by the component for custom data. 581 581 * - 'napobject' This contains the original NAP object retrieved by the function. 582 * Just in case you need more inf romation then is available directly.582 * Just in case you need more information then is available directly. 583 583 * 584 584 * The entry of every level is indexed by its MIDCOM_NAV_ID, where custom keys preserve … … 593 593 * Custom elements are added to this array by using the MidCOM custom component context 594 594 * 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 needs595 * custom component context key <i>midcom.helper.nav.breadcrumb</i>. (This needs 596 596 * to be an array always, even if you return only one element.) 597 597 * … … 621 621 $prefix = $_MIDCOM->get_context_data($this->_contextid, MIDCOM_CONTEXT_ANCHORPREFIX); 622 622 $result = Array(); 623 623 624 624 if (! $id) 625 625 { … … 631 631 $curr_leaf = $this->get_leaf($id); 632 632 $curr_node = -1; 633 633 634 634 if (! $curr_leaf) 635 635 { … … 722 722 { 723 723 $id = "custom-{$key}"; 724 724 725 725 $url = "{$prefix}{$entry[MIDCOM_NAV_URL]}"; 726 726 if ( substr($entry[MIDCOM_NAV_URL], 0, 1) == '/' … … 729 729 $url = $entry[MIDCOM_NAV_URL]; 730 730 } 731 731 732 732 $result[$id] = Array 733 733 ( trunk/midcom/midcom.core/midcom/services/auth.php
r14086 r14087 271 271 * <b>Authentication</b> 272 272 * 273 * TODO:Fully document authentication.273 * @todo Fully document authentication. 274 274 * 275 275 * 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 15 15 * consists of the midgard person GUID. 16 16 * 17 * The validity of the cookie will be cont eolled by the configuration options18 * < 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 * 20 20 * 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. 23 23 * 24 24 * 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. 26 26 * 27 27 * @package midcom.services … … 75 75 if (count($data) != 2) 76 76 { 77 debug_push_class(__CLASS__, __FUNCTION__); 77 debug_push_class(__CLASS__, __FUNCTION__); 78 78 debug_add("The cookie data could not be parsed, assuming tampered session.", 79 79 MIDCOM_LOG_ERROR); … … 91 91 if (! $this->user) 92 92 { 93 debug_push_class(__CLASS__, __FUNCTION__); 93 debug_push_class(__CLASS__, __FUNCTION__); 94 94 debug_add("The user ID {$user_id} is invalid, could not load the user from the database, assuming tampered session.", 95 95 MIDCOM_LOG_ERROR); … … 104 104 if (! $this->session_id) 105 105 { 106 debug_push_class(__CLASS__, __FUNCTION__); 106 debug_push_class(__CLASS__, __FUNCTION__); 107 107 debug_add("The session {$this->session_id} is invalid (usually this means an expired session).", 108 108 MIDCOM_LOG_ERROR); … … 115 115 if ($reset_cookie) 116 116 { 117 debug_push_class(__CLASS__, __FUNCTION__); 117 debug_push_class(__CLASS__, __FUNCTION__); 118 118 debug_add('Re-Setting of session cookie requested, doing it', MIDCOM_LOG_INFO); 119 119 debug_pop(); trunk/midcom/midcom.core/midcom/services/auth/sessionmgr.php
r13487 r14087 21 21 * <b>Checking whether a user is online</b> 22 22 * 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> 24 24 * set on the user which he is trying to check. 25 25 * … … 48 48 */ 49 49 var $current_session_id = null; 50 50 51 51 var $auth = null; 52 52 … … 165 165 if (! $result) 166 166 { 167 debug_push_class(__CLASS__, __FUNCTION__); 167 debug_push_class(__CLASS__, __FUNCTION__); 168 168 debug_add('No login sessions have been found in the database or the query to the database failed.', MIDCOM_LOG_INFO); 169 169 debug_pop(); … … 180 180 if ($session->timestamp < $timed_out) 181 181 { 182 debug_push_class(__CLASS__, __FUNCTION__); 182 debug_push_class(__CLASS__, __FUNCTION__); 183 183 debug_add("The session {$session->guid} (#{$session->id}) has timed out.", MIDCOM_LOG_INFO); 184 184 debug_pop(); … … 191 191 && $session->clientip != $clientip) 192 192 { 193 debug_push_class(__CLASS__, __FUNCTION__); 193 debug_push_class(__CLASS__, __FUNCTION__); 194 194 debug_add("The session {$session->guid} (#{$session->id}) had mismatching client IP.", MIDCOM_LOG_INFO); 195 195 debug_add("Expected {$session->clientip}, got {$clientip}."); … … 202 202 if (! $session->delete()) 203 203 { 204 debug_push_class(__CLASS__, __FUNCTION__); 204 debug_push_class(__CLASS__, __FUNCTION__); 205 205 debug_add("Failed to delete the invalid session {$session->guid} (#{$session->id}): " . mgd_errstr(), MIDCOM_LOG_INFO); 206 206 debug_pop(); trunk/midcom/midcom.core/midcom/services/cache/backend.php
r13625 r14087 33 33 * <b>Namespacing:</b> 34 34 * 35 * Each ecache database in use has a name, which must consist only of characters valid for35 * Each cache database in use has a name, which must consist only of characters valid for 36 36 * file names on the current system. You may create any file or directory within the midcom 37 37 * cache directory as long as you use your name as a prefix. … … 40 40 * regex class [a-zA-Z0-9._-] should be used. 41 41 * 42 * <b>General configu tation directives:</b>42 * <b>General configuration directives:</b> 43 43 * 44 44 * - <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 119 119 * example the ACL system) in MidCOM to find the logical parent of an object. By default this 120 120 * 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. 122 122 * If you have a parent only conditionally (e.g. there are root level objects), return NULL to 123 123 * indicate no available parent. … … 433 433 $this->_class_definition_filename = MIDCOM_ROOT . $_MIDCOM->componentloader->path_to_snippetpath($component) . "/config/{$filename}"; 434 434 } 435 435 436 436 } 437 437 … … 1009 1009 function _on_process_query_result(&\$result) {} 1010 1010 function _on_prepare_new_collector(&\$mc) {} 1011 function _on_prepare_exec_collector(&\$mc) { return true; } 1011 function _on_prepare_exec_collector(&\$mc) { return true; } 1012 1012 function _on_process_collector_result(&\$result) {} 1013 1013 function _on_updated() {} … … 1015 1015 function _on_imported() {} 1016 1016 function _on_importing() { return true; } 1017 1017 1018 1018 // functions related to the rcs service. 1019 1019 var \$_use_rcs = true; 1020 1020 var \$_rcs_message = false; 1021 function disable_rcs() { \$this->_use_rcs = false; } 1021 function disable_rcs() { \$this->_use_rcs = false; } 1022 1022 function enable_rcs() { \$this->_use_rcs = true; } 1023 1023 function set_rcs_message(\$msg) { \$this->_rcs_message = \$msg; } 1024 1024 function get_rcs_message() { return \$this->_rcs_message; } 1025 1026 1027 1025 1026 1027 1028 1028 EOF; 1029 1029 $this->_class_string .= "\n \n"; trunk/midcom/midcom.core/midcom/services/i18n.php
r14084 r14087 199 199 * after calling this method. 200 200 * 201 * If < em>$switch_content_lang</em> is set, this call will also synchronize201 * If <i>$switch_content_lang</i> is set, this call will also synchronize 202 202 * the Midgard content language with the MidCOM language. 203 203 * trunk/midcom/midcom.core/midcom/services/js_css_merger.php
r13590 r14087 8 8 */ 9 9 10 /** 11 * @package midcom.services 12 */ 10 13 class midcom_services_js_css_merger extends midcom_baseclasses_core_object 11 14 { … … 58 61 */ 59 62 var $_can_merge_cache = array(); 60 63 61 64 /** 62 65 * Cache of local paths, keyed by given path … … 501 504 $media = 'all'; 502 505 } 503 506 504 507 debug_add("using media '{$media}' array for futher checks"); 505 508 if (!isset($this->_cssfiles[$media])) … … 508 511 } 509 512 $files_per_media =& $this->_cssfiles[$media]; 510 513 511 514 if (in_array($path, $files_per_media)) 512 515 { … … 796 799 // PONDER: Support ranges ("continue download") somehow ? 797 800 $_MIDCOM->header('Accept-Ranges: none'); 798 801 799 802 /* We want to cache these so lets override some things 800 803 $_MIDCOM->cache->content->cache_control_headers(); trunk/midcom/midcom.core/midcom/services/toolbars.php
r13424 r14087 14 14 * For each context, it provides the following set of toolbars: 15 15 * 16 * 1. The < em>Node</em> toolbar is applicable to the current16 * 1. The <i>Node</i> toolbar is applicable to the current 17 17 * node, which is usually a topic. MidCOM places the topic management operations 18 18 * into this toolbar, where applicable. 19 19 * 20 * 2. The < em>View</em> toolbar is applicable to the specific view ("url"). Usually20 * 2. The <i>View</i> toolbar is applicable to the specific view ("url"). Usually 21 21 * this maps to a single displayed object (see also the bind_to_object() member 22 22 * function). MidCOM places the object-specific management operations (like … … 29 29 * 30 30 * 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 single32 * database object (like a bound < em>View</em> toolbar). The usage of this kind of31 * 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 33 33 * toolbars is completely component-specific: It is recommended to use them only for 34 34 * cases where multiple objects are displayed simultaneously. For example, the … … 37 37 * 38 38 * 39 * < strong>Implementation notes</strong>39 * <b>Implementation notes</b> 40 40 * 41 41 * It has yet to prove if the toolbar system is yet needed for a dynamic_load environments. … … 47 47 * welcome page, each with its own management options. 48 48 * 49 * < strong>Configuration</strong>49 * <b>Configuration</b> 50 50 * See midcom_config.php for configuration options. 51 51 * … … 115 115 $_MIDCOM->add_jsfile(MIDCOM_STATIC_URL . '/jQuery/jquery.easydrag-1.3.js'); 116 116 //$_MIDCOM->add_jsfile(MIDCOM_STATIC_URL . '/midcom.helper.datamanager2/tags/jquery.bgiframe.min.js'); 117 118 117 118 119 119 $_MIDCOM->add_link_head( 120 120 array … … 126 126 ) 127 127 ); 128 129 $this->type = 'palette'; 130 128 129 $this->type = 'palette'; 130 131 131 $config = "{}"; 132 132 133 133 $script = "jQuery('body div.midcom_services_toolbars_fancy').midcom_services_toolbar({$config});"; 134 134 $_MIDCOM->add_jquery_state_script($script); … … 145 145 ) 146 146 ); 147 147 148 148 $this->type = 'normal'; 149 149 } 150 150 151 151 // We've included CSS and JS, path is clear for centralized mode 152 152 $this->_enable_centralized = true; … … 244 244 $GLOBALS['midcom_config']['toolbars_view_style_id'] 245 245 ); 246 246 247 247 $this->_toolbars[$context_id][MIDCOM_TOOLBAR_HOST] = 248 248 new midcom_helper_toolbar … … 296 296 $topic = $_MIDCOM->get_context_data($context_id, MIDCOM_CONTEXT_CONTENTTOPIC); 297 297 } 298 298 299 299 if (!$topic) 300 300 { … … 342 342 ) 343 343 ); 344 344 345 345 $toolbar->add_item 346 346 ( … … 353 353 ) 354 354 ); 355 355 356 356 $toolbar->add_item 357 357 ( … … 412 412 } 413 413 } 414 414 415 415 if ($topic->can_do('midcom.admin.folder:template_management')) 416 416 { … … 423 423 $enabled = false; 424 424 } 425 425 426 426 $toolbar->add_item 427 427 ( … … 434 434 MIDCOM_TOOLBAR_ENABLED => $enabled, 435 435 ) 436 ); 437 } 438 436 ); 437 } 438 439 439 // TEMPORARY METADATA CODE END 440 440 if ( $topic->can_do('midgard:create') … … 463 463 ));&nb
