summaryrefslogtreecommitdiffstats
path: root/1.patch
blob: 3d46f22bc9efa5c32fc3862a3b8d8c48fe186508 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
From b7f1722e43c8d58f66204865952e1cd70e85ddb7 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 17 Oct 2019 15:34:44 +0200
Subject: [PATCH 1/2] fix get_magic_quotes_runtime() is deprecated

---
 lib/Horde/Pdf/Writer.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Horde/Pdf/Writer.php b/lib/Horde/Pdf/Writer.php
index 8d67c4b..cdf82db 100644
--- a/lib/Horde/Pdf/Writer.php
+++ b/lib/Horde/Pdf/Writer.php
@@ -2313,7 +2313,7 @@ public function image($file, $x, $y, $width = 0, $height = 0, $type = '',
                 $type = substr($file, $pos + 1);
             }
 
-            $mqr = get_magic_quotes_runtime();
+            $mqr = function_exists("get_magic_quotes_runtime") ? @get_magic_quotes_runtime() : 0;
             if ($mqr) { set_magic_quotes_runtime(0); }
 
             $type = Horde_String::lower($type);
@@ -2705,7 +2705,7 @@ protected function _putFonts()
             $this->_out('endobj');
         }
 
-        $mqr = get_magic_quotes_runtime();
+        $mqr = function_exists("get_magic_quotes_runtime") ? @get_magic_quotes_runtime() : 0;
         if ($mqr) { set_magic_quotes_runtime(0); }
 
         foreach ($this->_font_files as $file => $info) {

From fe2c5fb7a6dee24e8e34b793a59da0ac0bbaba67 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 17 Oct 2019 15:35:08 +0200
Subject: [PATCH 2/2] fix access syntax with curly braces is deprecated

---
 lib/Horde/Pdf/Writer.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Horde/Pdf/Writer.php b/lib/Horde/Pdf/Writer.php
index cdf82db..6b20a4a 100644
--- a/lib/Horde/Pdf/Writer.php
+++ b/lib/Horde/Pdf/Writer.php
@@ -1198,7 +1198,7 @@ public function getStringWidth($text, $pt = false)
         $width = 0;
         $length = strlen($text);
         for ($i = 0; $i < $length; $i++) {
-            $width += $this->_current_font['cw'][$text{$i}];
+            $width += $this->_current_font['cw'][$text[$i]];
         }
 
         /* Adjust for word spacing. */
@@ -2138,7 +2138,7 @@ public function write($height, $text, $link = '')
         $nl = 1;
         while ($i < $nb) {
             // Get next character.
-            $c = $s{$i};
+            $c = $s[$i];
             if ($c == "\n") {
                 // Explicit line break.
                 $this->cell($width, $height, substr($s, $j, $i - $j), 0, 2, '', 0, $link);