From ae7027de029e28fdd3894efe919b6171b2b11eab Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 20 Aug 2012 09:32:25 +0200
Subject: Added session_path config option and unified cookies settings in
 javascript

---
 program/include/rcube_output_html.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'program/include/rcube_output_html.php')

diff --git a/program/include/rcube_output_html.php b/program/include/rcube_output_html.php
index 0a8f0e364..a071ee354 100644
--- a/program/include/rcube_output_html.php
+++ b/program/include/rcube_output_html.php
@@ -67,6 +67,11 @@ class rcube_output_html extends rcube_output
         $this->set_env('task', $task);
         $this->set_env('x_frame_options', $this->config->get('x_frame_options', 'sameorigin'));
 
+        // add cookie info
+        $this->set_env('cookie_domain', ini_get('session.cookie_domain'));
+        $this->set_env('cookie_path', ini_get('session.cookie_path'));
+        $this->set_env('cookie_secure', ini_get('session.cookie_secure'));
+
         // load the correct skin (in case user-defined)
         $skin = $this->config->get('skin');
         $this->set_skin($skin);
-- 
cgit v1.2.3


From 397cf794b975e8128a6d155957229106cd065d0c Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 28 Aug 2012 12:22:43 +0200
Subject: Don't terminate script execution when parsed template doesn't exist
 and parse was called with 3rd argument = false.

---
 program/include/rcube_output_html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'program/include/rcube_output_html.php')

diff --git a/program/include/rcube_output_html.php b/program/include/rcube_output_html.php
index a071ee354..00378d7d2 100644
--- a/program/include/rcube_output_html.php
+++ b/program/include/rcube_output_html.php
@@ -400,7 +400,7 @@ class rcube_output_html extends rcube_output
                 'line' => __LINE__,
                 'file' => __FILE__,
                 'message' => 'Error loading template for '.$realname
-                ), true, true);
+                ), true, $write);
             return false;
         }
 
-- 
cgit v1.2.3


From b7d33e35186d47dcd3609e1ef97cdb011c6f82f6 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 28 Aug 2012 12:59:29 +0200
Subject: Added template object 'frame'

---
 CHANGELOG                             |  1 +
 program/include/rcube_output_html.php | 29 +++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)

(limited to 'program/include/rcube_output_html.php')

diff --git a/CHANGELOG b/CHANGELOG
index 8e9dcb3c7..028eb196e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Added template object 'frame'
 - Fix identity selection on reply (#1488101)
 - Add option to enable HTML editor on forwarding (#1488517)
 - Add option to not include original message on reply, rename option top_posting to reply_mode (#1485149)
diff --git a/program/include/rcube_output_html.php b/program/include/rcube_output_html.php
index 00378d7d2..960002112 100644
--- a/program/include/rcube_output_html.php
+++ b/program/include/rcube_output_html.php
@@ -698,6 +698,11 @@ class rcube_output_html extends rcube_output
                 }
                 break;
 
+            // frame
+            case 'frame':
+                return $this->frame($attrib);
+                break;
+
             // show a label
             case 'label':
                 if ($attrib['name'] || $attrib['command']) {
@@ -1275,6 +1280,30 @@ class rcube_output_html extends rcube_output
     }
 
 
+    /**
+     * Returns iframe object, registers some related env variables
+     *
+     * @param array $attrib HTML attributes
+     *
+     * @return string IFRAME element
+     */
+    public function frame($attrib)
+    {
+        if (!$attrib['id']) {
+            $attrib['id'] = 'rcmframe';
+        }
+
+        if (!$attrib['name']) {
+            $attrib['name'] = $attrib['id'];
+        }
+
+        $this->set_env('contentframe', $attrib['name']);
+        $this->set_env('blankpage', $attrib['src'] ? $this->abs_url($attrib['src']) : 'program/resources/blank.gif');
+
+        return html::iframe($attrib);
+    }
+
+
     /*  ************* common functions delivering gui objects **************  */
 
 
-- 
cgit v1.2.3


From d317a59d3041223c5070ae72d3d7187ef0c089ca Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 29 Aug 2012 12:40:09 +0200
Subject: Fix frame() so frame ID is set as 'contentframe' env variable (not
 name)

---
 program/include/rcube_output_html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'program/include/rcube_output_html.php')

diff --git a/program/include/rcube_output_html.php b/program/include/rcube_output_html.php
index 960002112..2743e7705 100644
--- a/program/include/rcube_output_html.php
+++ b/program/include/rcube_output_html.php
@@ -1297,7 +1297,7 @@ class rcube_output_html extends rcube_output
             $attrib['name'] = $attrib['id'];
         }
 
-        $this->set_env('contentframe', $attrib['name']);
+        $this->set_env('contentframe', $attrib['id']);
         $this->set_env('blankpage', $attrib['src'] ? $this->abs_url($attrib['src']) : 'program/resources/blank.gif');
 
         return html::iframe($attrib);
-- 
cgit v1.2.3