Changeset 655 in subversion

Timestamp:

Jul 30, 2007 7:04:40 AM (6 years ago)

Author:

till

Message:

# func.inc:

• needed to reference rcmail_search_form to class rc_main

+ rcmail_template:

• implemented calls so handlers can be static methods from classes
• so we can OO roundcube completely

• mail.html
  • removed a linebreak

Location:

branches/devel-vnext

Files:

• program/include/rcmail_template.inc (modified) (1 diff)
• program/steps/mail/func.inc (modified) (1 diff)
• skins/default/templates/mail.html (modified) (1 diff)

branches/devel-vnext/program/include/rcmail_template.inc

@@ -524 +524 @@
                     return call_user_func($this->object_handlers[$object], $attrib);
                 }
+                else {
+                    // we are calling a class/method
+                    if ($this->object_handlers[$object] && is_array($this->object_handlers[$object])) {
+                        if (class_exists($this->object_handlers[$object][0])) {
+                            return call_user_func($this->object_handlers[$object], $attrib);
+                        }
+                        rc_main::tfk_debug('Unknown handler: ' . var_export($this->object_handlers[$object], true));
+                    }
+                }
                 if ($object=='productname') {
                     $name = !empty($this->config['product_name']) ? $this->config['product_name'] : 'RoundCube Webmail';

branches/devel-vnext/program/steps/mail/func.inc

@@ -1853 +1853 @@
   'messagepartframe' => 'rcmail_message_part_frame',
   'messagepartcontrols' => 'rcmail_message_part_controls',
-  'searchform' => 'rcmail_search_form'
+  'searchform' => array('rc_main', 'rcmail_search_form')
 ));
 

branches/devel-vnext/skins/default/templates/mail.html

@@ -22 +22 @@
 
 <div id="quicksearchbar">
-<roundcube:object name="searchform" type="search" results="5" id="quicksearchbox" /><roundcube:button command="reset-search" id="searchreset" image="/images/icons/reset.gif" title="resetsearch" />
+<roundcube:object name="searchform" type="search" results="5" id="quicksearchbox" />
+<roundcube:button command="reset-search" id="searchreset" image="/images/icons/reset.gif" title="resetsearch" />
 </div>