Changeset 1871 in subversion

Timestamp:

Sep 21, 2008 6:18:28 AM (5 years ago)

Author:

thomasb

Message:

Separate method to create iframe tags (with a list of allowed attributes)

Location:

trunk/roundcubemail/program

Files:

• include/html.php (modified) (1 diff)
• steps/addressbook/func.inc (modified) (1 diff)
• steps/mail/func.inc (modified) (2 diffs)
• steps/settings/identities.inc (modified) (1 diff)

trunk/roundcubemail/program/include/html.php

@@ -182 +182 @@
 
     /**
+     * Derrived method to create <iframe></iframe>
+     *
+     * @param mixed Hash array with tag attributes or string with frame source (src)
+     * @return string HTML code
+     * @see html::tag()
+     */
+    public static function iframe($attr = null, $cont = null)
+    {
+        if (is_string($attr)) {
+            $attr = array('src' => $attr);
+        }
+        return self::tag('iframe', $attr, $cont, array_merge(self::$common_attrib, array('src','name','width','height','border','frameborder')));
+    }
+
+    /**
      * Derrived method for line breaks
      *

trunk/roundcubemail/program/steps/addressbook/func.inc

@@ -157 +157 @@
   $OUTPUT->set_env('blankpage', $attrib['src'] ? $OUTPUT->abs_url($attrib['src']) : 'program/blank.gif');
 
-  return html::tag('iframe', $attrib);
+  return html::iframe($attrib);
   }
 

trunk/roundcubemail/program/steps/mail/func.inc

@@ -409 +409 @@
   $OUTPUT->set_env('blankpage', $attrib['src'] ? $OUTPUT->abs_url($attrib['src']) : 'program/blank.gif');
 
-  return html::tag('iframe', $attrib);
+  return html::iframe($attrib);
   }
 
@@ -1126 +1126 @@
   $ctype_primary = strtolower($part->ctype_primary);
 
-  $attrib['src'] = Q('./?'.str_replace('_frame=', ($ctype_primary=='text' ? '_show=' : '_preload='), $_SERVER['QUERY_STRING']));
-
-  return html::tag('iframe', $attrib);
+  $attrib['src'] = './?' . str_replace('_frame=', ($ctype_primary=='text' ? '_show=' : '_preload='), $_SERVER['QUERY_STRING']);
+
+  return html::iframe($attrib);
   }
 

trunk/roundcubemail/program/steps/settings/identities.inc

@@ -37 +37 @@
   $OUTPUT->set_env('contentframe', $attrib['name']);
 
-  return html::tag('iframe', $attrib);
+  return html::iframe($attrib);
   }