@@ -14,7 +14,7 @@ |
||
| 14 | 14 | $HTTP_RAW_POST_DATA = file_get_contents('php://input'); |
| 15 | 15 | |
| 16 | 16 | $options = array('prefix' => 'cms.', |
| 17 | - 'encoding' => 'utf-8'); |
|
| 17 | + 'encoding' => 'utf-8'); |
|
| 18 | 18 | |
| 19 | 19 | $server = XML_RPC2_Server::create(new Intraface_XMLRPC_CMS_Server0300(), $options); |
| 20 | 20 | $server->handleCall(); |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | |
| 13 | 13 | $HTTP_RAW_POST_DATA = file_get_contents('php://input'); |
| 14 | 14 | $options = array('prefix' => 'cms.', |
| 15 | - 'encoding' => 'iso-8859-1'); |
|
| 15 | + 'encoding' => 'iso-8859-1'); |
|
| 16 | 16 | |
| 17 | 17 | XML_RPC2_Backend::setBackend('php'); |
| 18 | 18 | $server = XML_RPC2_Server::create(new Intraface_XMLRPC_CMS_Server(), $options); |
@@ -41,7 +41,7 @@ |
||
| 41 | 41 | private function getCredentials() |
| 42 | 42 | { |
| 43 | 43 | return array("private_key" => $this->context->getPrivateKey(), |
| 44 | - "session_id" => md5($this->session()->sessionId())); |
|
| 44 | + "session_id" => md5($this->session()->sessionId())); |
|
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | private function intranetHasOnlinePaymentAccess() |
@@ -227,20 +227,20 @@ |
||
| 227 | 227 | { |
| 228 | 228 | return array( |
| 229 | 229 | 1 => array( |
| 230 | - 'label' => 'system', |
|
| 231 | - 'dir' => '/system/', |
|
| 230 | + 'label' => 'system', |
|
| 231 | + 'dir' => '/system/', |
|
| 232 | 232 | 'name' => 'Web 2.0', |
| 233 | 233 | 'description' => 'Spr�lsk, vildt og pastel.' |
| 234 | 234 | ), |
| 235 | 235 | 2 => array( |
| 236 | - 'label' => 'newsystem', |
|
| 237 | - 'dir' => '/newsystem/', |
|
| 236 | + 'label' => 'newsystem', |
|
| 237 | + 'dir' => '/newsystem/', |
|
| 238 | 238 | 'name' => 'Standard', |
| 239 | 239 | 'description' => 'Standard.' |
| 240 | 240 | ), |
| 241 | 241 | 3 => array( |
| 242 | - 'label' => 'black', |
|
| 243 | - 'dir' => '/black/', |
|
| 242 | + 'label' => 'black', |
|
| 243 | + 'dir' => '/black/', |
|
| 244 | 244 | 'name' => 'Den sorte ridder', |
| 245 | 245 | 'description' => 'Det gamle tema. Nydeligt og kedeligt.' |
| 246 | 246 | ) |
@@ -131,7 +131,7 @@ |
||
| 131 | 131 | public function __construct($kernel, $id = 0) |
| 132 | 132 | { |
| 133 | 133 | $options = array( |
| 134 | - 'extra_db_condition' => array('intranet_id = '.$kernel->intranet->get('id')) |
|
| 134 | + 'extra_db_condition' => array('intranet_id = '.$kernel->intranet->get('id')) |
|
| 135 | 135 | ); |
| 136 | 136 | |
| 137 | 137 | $db = MDB2::singleton(DB_DSN); |
@@ -88,7 +88,7 @@ |
||
| 88 | 88 | $result = $this->db->exec("UPDATE user SET session_id = " . $this->db->quote('', 'text') . " WHERE session_id = " . $this->db->quote($this->session_id, 'text')); |
| 89 | 89 | |
| 90 | 90 | if (PEAR::isError($result)) { |
| 91 | - throw new Exception('could not log user out ' . $result->getUserInfo()); |
|
| 91 | + throw new Exception('could not log user out ' . $result->getUserInfo()); |
|
| 92 | 92 | } |
| 93 | 93 | return true; |
| 94 | 94 | } |
@@ -60,10 +60,10 @@ discard block |
||
| 60 | 60 | private $numObj=0; |
| 61 | 61 | |
| 62 | 62 | /** |
| 63 | - * this array contains all of the pdf objects, ready for final assembly |
|
| 64 | - * |
|
| 65 | - * @var array |
|
| 66 | - */ |
|
| 63 | + * this array contains all of the pdf objects, ready for final assembly |
|
| 64 | + * |
|
| 65 | + * @var array |
|
| 66 | + */ |
|
| 67 | 67 | private $objects = array(); |
| 68 | 68 | |
| 69 | 69 | /** |
@@ -76,10 +76,10 @@ discard block |
||
| 76 | 76 | private $objectHashes = array(); |
| 77 | 77 | |
| 78 | 78 | /** |
| 79 | - * the objectId (number within the objects array) of the document catalog |
|
| 80 | - * |
|
| 81 | - * @var integer |
|
| 82 | - */ |
|
| 79 | + * the objectId (number within the objects array) of the document catalog |
|
| 80 | + * |
|
| 81 | + * @var integer |
|
| 82 | + */ |
|
| 83 | 83 | private $catalogId; |
| 84 | 84 | |
| 85 | 85 | |
@@ -139,10 +139,10 @@ discard block |
||
| 139 | 139 | private $fonts = array(); |
| 140 | 140 | |
| 141 | 141 | /** |
| 142 | - * a record of the current font |
|
| 143 | - * |
|
| 144 | - * @var string |
|
| 145 | - */ |
|
| 142 | + * a record of the current font |
|
| 143 | + * |
|
| 144 | + * @var string |
|
| 145 | + */ |
|
| 146 | 146 | private $currentFont=''; |
| 147 | 147 | |
| 148 | 148 | /** |
@@ -153,10 +153,10 @@ discard block |
||
| 153 | 153 | private $currentBaseFont=''; |
| 154 | 154 | |
| 155 | 155 | /** |
| 156 | - * the number of the current font within the font array |
|
| 157 | - * |
|
| 158 | - * @var integer |
|
| 159 | - */ |
|
| 156 | + * the number of the current font within the font array |
|
| 157 | + * |
|
| 158 | + * @var integer |
|
| 159 | + */ |
|
| 160 | 160 | private $currentFontNum=0; |
| 161 | 161 | |
| 162 | 162 | /** |
@@ -165,20 +165,20 @@ discard block |
||
| 165 | 165 | private $currentNode; |
| 166 | 166 | |
| 167 | 167 | /** |
| 168 | - * object number of the current page |
|
| 169 | - * |
|
| 170 | - * @var integer |
|
| 171 | - */ |
|
| 168 | + * object number of the current page |
|
| 169 | + * |
|
| 170 | + * @var integer |
|
| 171 | + */ |
|
| 172 | 172 | private $currentPage; |
| 173 | 173 | |
| 174 | 174 | /** |
| 175 | - * object number of the currently active contents block |
|
| 176 | - */ |
|
| 175 | + * object number of the currently active contents block |
|
| 176 | + */ |
|
| 177 | 177 | private $currentContents; |
| 178 | 178 | |
| 179 | 179 | /** |
| 180 | - * number of fonts within the system |
|
| 181 | - */ |
|
| 180 | + * number of fonts within the system |
|
| 181 | + */ |
|
| 182 | 182 | private $numFonts = 0; |
| 183 | 183 | |
| 184 | 184 | /** |
@@ -192,14 +192,14 @@ discard block |
||
| 192 | 192 | private $currentStrokeColour = array('r' => -1, 'g' => -1, 'b' => -1); |
| 193 | 193 | |
| 194 | 194 | /** |
| 195 | - * current style that lines are drawn in |
|
| 196 | - */ |
|
| 195 | + * current style that lines are drawn in |
|
| 196 | + */ |
|
| 197 | 197 | private $currentLineStyle=''; |
| 198 | 198 | |
| 199 | 199 | /** |
| 200 | - * an array which is used to save the state of the document, mainly the colours and styles |
|
| 201 | - * it is used to temporarily change to another state, the change back to what it was before |
|
| 202 | - */ |
|
| 200 | + * an array which is used to save the state of the document, mainly the colours and styles |
|
| 201 | + * it is used to temporarily change to another state, the change back to what it was before |
|
| 202 | + */ |
|
| 203 | 203 | private $stateStack = array(); |
| 204 | 204 | |
| 205 | 205 | /** |
@@ -234,37 +234,37 @@ discard block |
||
| 234 | 234 | private $addLooseObjects=array(); |
| 235 | 235 | |
| 236 | 236 | /** |
| 237 | - * the objectId of the information object for the document |
|
| 238 | - * this contains authorship, title etc. |
|
| 239 | - */ |
|
| 237 | + * the objectId of the information object for the document |
|
| 238 | + * this contains authorship, title etc. |
|
| 239 | + */ |
|
| 240 | 240 | private $infoObject=0; |
| 241 | 241 | |
| 242 | 242 | /** |
| 243 | - * number of images being tracked within the document |
|
| 244 | - */ |
|
| 243 | + * number of images being tracked within the document |
|
| 244 | + */ |
|
| 245 | 245 | private $numImages=0; |
| 246 | 246 | |
| 247 | 247 | /** |
| 248 | - * some additional options while generation |
|
| 249 | - * currently used for compression only |
|
| 250 | - * Default: 'compression' => -1 which will set gzcompress to the default level of 6 |
|
| 251 | - */ |
|
| 248 | + * some additional options while generation |
|
| 249 | + * currently used for compression only |
|
| 250 | + * Default: 'compression' => -1 which will set gzcompress to the default level of 6 |
|
| 251 | + */ |
|
| 252 | 252 | public $options=array('compression'=>-1); |
| 253 | 253 | |
| 254 | 254 | /** |
| 255 | - * the objectId of the first page of the document |
|
| 256 | - */ |
|
| 255 | + * the objectId of the first page of the document |
|
| 256 | + */ |
|
| 257 | 257 | private $firstPageId; |
| 258 | 258 | |
| 259 | 259 | /** |
| 260 | - * used to track the last used value of the inter-word spacing, this is so that it is known |
|
| 261 | - * when the spacing is changed. |
|
| 262 | - */ |
|
| 260 | + * used to track the last used value of the inter-word spacing, this is so that it is known |
|
| 261 | + * when the spacing is changed. |
|
| 262 | + */ |
|
| 263 | 263 | private $wordSpaceAdjust=0; |
| 264 | 264 | |
| 265 | 265 | /** |
| 266 | - * track if the current font is bolded or italicised |
|
| 267 | - */ |
|
| 266 | + * track if the current font is bolded or italicised |
|
| 267 | + */ |
|
| 268 | 268 | private $currentTextState = ''; |
| 269 | 269 | |
| 270 | 270 | /** |
@@ -359,7 +359,7 @@ discard block |
||
| 359 | 359 | $this->newDocument($pageSize); |
| 360 | 360 | |
| 361 | 361 | if (in_array('Windows-1252', mb_list_encodings())) { |
| 362 | - $this->targetEncoding = 'Windows-1252'; |
|
| 362 | + $this->targetEncoding = 'Windows-1252'; |
|
| 363 | 363 | } |
| 364 | 364 | |
| 365 | 365 | // font familys are already known in $this->fontFamilies |
@@ -393,7 +393,7 @@ discard block |
||
| 393 | 393 | switch ($action) { |
| 394 | 394 | case 'new': |
| 395 | 395 | $this->objects[$id]=array('t'=>'destination','info'=>array()); |
| 396 | - $tmp = ''; |
|
| 396 | + $tmp = ''; |
|
| 397 | 397 | switch ($options['type']) { |
| 398 | 398 | case 'XYZ': |
| 399 | 399 | case 'FitR': |
@@ -816,7 +816,7 @@ discard block |
||
| 816 | 816 | $res = "\n$id 0 obj\n<</Type /Font /Subtype /Type0 /BaseFont /".$o['info']['name'].""; |
| 817 | 817 | // The horizontal identity mapping for 2-byte CIDs; may be used |
| 818 | 818 | // with CIDFonts using any Registry, Ordering, and Supplement values. |
| 819 | - $res.= " /Encoding /Identity-H /DescendantFonts [".$o['info']['cidFont']." 0 R] /ToUnicode ".$o['info']['toUnicode']." 0 R >>\n"; |
|
| 819 | + $res.= " /Encoding /Identity-H /DescendantFonts [".$o['info']['cidFont']." 0 R] /ToUnicode ".$o['info']['toUnicode']." 0 R >>\n"; |
|
| 820 | 820 | $res.= "endobj"; |
| 821 | 821 | } else { |
| 822 | 822 | $res="\n".$id." 0 obj\n<< /Type /Font /Subtype /".$o['info']['SubType']." "; |
@@ -953,7 +953,7 @@ discard block |
||
| 953 | 953 | switch ($action) { |
| 954 | 954 | case 'new': |
| 955 | 955 | $this->objects[$id] = array('t' => 'fontDescendentCID', 'info' => $options); |
| 956 | - // and a CID to GID map |
|
| 956 | + // and a CID to GID map |
|
| 957 | 957 | if ($this->embedFont) { |
| 958 | 958 | $cidToGidMapId = ++$this->numObj; |
| 959 | 959 | $this->o_fontGIDtoCIDMap($cidToGidMapId, 'new', $options); |
@@ -974,20 +974,20 @@ discard block |
||
| 974 | 974 | case 'FontDescriptor': |
| 975 | 975 | case 'SubType': |
| 976 | 976 | $this->debug("o_fontDescendentCID $k : $v", E_USER_NOTICE); |
| 977 | - $o['info'][$k] = $v; |
|
| 977 | + $o['info'][$k] = $v; |
|
| 978 | 978 | break; |
| 979 | 979 | } |
| 980 | 980 | } |
| 981 | 981 | |
| 982 | - // pass values down to cid to gid map |
|
| 982 | + // pass values down to cid to gid map |
|
| 983 | 983 | if ($this->embedFont) { |
| 984 | - $this->o_fontGIDtoCIDMap($o['info']['cidToGidMap'], 'add', $options); |
|
| 984 | + $this->o_fontGIDtoCIDMap($o['info']['cidToGidMap'], 'add', $options); |
|
| 985 | 985 | } |
| 986 | 986 | break; |
| 987 | 987 | |
| 988 | 988 | case 'out': |
| 989 | 989 | $res = "\n$id 0 obj\n"; |
| 990 | - $res.= "<</Type /Font /Subtype /CIDFontType2 /BaseFont /".$o['info']['name']." /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >>"; |
|
| 990 | + $res.= "<</Type /Font /Subtype /CIDFontType2 /BaseFont /".$o['info']['name']." /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >>"; |
|
| 991 | 991 | if (isset($o['info']['FontDescriptor'])) { |
| 992 | 992 | $res.= " /FontDescriptor ".$o['info']['FontDescriptor']." 0 R"; |
| 993 | 993 | } |
@@ -1006,19 +1006,19 @@ discard block |
||
| 1006 | 1006 | } |
| 1007 | 1007 | |
| 1008 | 1008 | if ($this->embedFont) { |
| 1009 | - $res.= " /CIDToGIDMap ".$o['info']['cidToGidMap']." 0 R"; |
|
| 1009 | + $res.= " /CIDToGIDMap ".$o['info']['cidToGidMap']." 0 R"; |
|
| 1010 | 1010 | } |
| 1011 | - $res.= " >>\n"; |
|
| 1012 | - $res.= "endobj"; |
|
| 1011 | + $res.= " >>\n"; |
|
| 1012 | + $res.= "endobj"; |
|
| 1013 | 1013 | |
| 1014 | 1014 | return $res; |
| 1015 | 1015 | } |
| 1016 | 1016 | } |
| 1017 | 1017 | |
| 1018 | 1018 | /** |
| 1019 | - * a font glyph to character map, needed for unicode fonts |
|
| 1020 | - * @access private |
|
| 1021 | - */ |
|
| 1019 | + * a font glyph to character map, needed for unicode fonts |
|
| 1020 | + * @access private |
|
| 1021 | + */ |
|
| 1022 | 1022 | private function o_fontGIDtoCIDMap($id, $action, $options = '') |
| 1023 | 1023 | { |
| 1024 | 1024 | if ($action !== 'new') { |
@@ -1032,8 +1032,8 @@ discard block |
||
| 1032 | 1032 | |
| 1033 | 1033 | case 'out': |
| 1034 | 1034 | $res = "\n$id 0 obj\n"; |
| 1035 | - $fontFileName = $o['info']['fontFileName']; |
|
| 1036 | - $tmp = $this->fonts[$fontFileName]['CIDtoGID'] = base64_decode($this->fonts[$fontFileName]['CIDtoGID']); |
|
| 1035 | + $fontFileName = $o['info']['fontFileName']; |
|
| 1036 | + $tmp = $this->fonts[$fontFileName]['CIDtoGID'] = base64_decode($this->fonts[$fontFileName]['CIDtoGID']); |
|
| 1037 | 1037 | |
| 1038 | 1038 | if (isset($o['raw'])) { |
| 1039 | 1039 | $res.= $tmp; |
@@ -1048,7 +1048,7 @@ discard block |
||
| 1048 | 1048 | $res.= " /Length ".mb_strlen($tmp, '8bit') .">>\nstream\n$tmp\nendstream"; |
| 1049 | 1049 | } |
| 1050 | 1050 | |
| 1051 | - $res.= "\nendobj"; |
|
| 1051 | + $res.= "\nendobj"; |
|
| 1052 | 1052 | return $res; |
| 1053 | 1053 | } |
| 1054 | 1054 | } |
@@ -1936,7 +1936,7 @@ discard block |
||
| 1936 | 1936 | } |
| 1937 | 1937 | |
| 1938 | 1938 | if (!isset($data['MissingWidth']) && $c == -1 && $n === '.notdef') { |
| 1939 | - $data['MissingWidth'] = $width; |
|
| 1939 | + $data['MissingWidth'] = $width; |
|
| 1940 | 1940 | } |
| 1941 | 1941 | } |
| 1942 | 1942 | break; |
@@ -1957,7 +1957,7 @@ discard block |
||
| 1957 | 1957 | |
| 1958 | 1958 | if ($c >= 0) { |
| 1959 | 1959 | if ($c >= 0 && $c < 0xFFFF && $glyph) { |
| 1960 | - $cidtogid[$c*2] = chr($glyph >> 8); |
|
| 1960 | + $cidtogid[$c*2] = chr($glyph >> 8); |
|
| 1961 | 1961 | $cidtogid[$c*2 + 1] = chr($glyph & 0xFF); |
| 1962 | 1962 | } |
| 1963 | 1963 | if ($c != hexdec($n)) { |
@@ -1969,7 +1969,7 @@ discard block |
||
| 1969 | 1969 | } |
| 1970 | 1970 | |
| 1971 | 1971 | if (!isset($data['MissingWidth']) && $c == -1 && $n === '.notdef') { |
| 1972 | - $data['MissingWidth'] = $width; |
|
| 1972 | + $data['MissingWidth'] = $width; |
|
| 1973 | 1973 | } |
| 1974 | 1974 | } |
| 1975 | 1975 | break; |
@@ -2167,8 +2167,8 @@ discard block |
||
| 2167 | 2167 | |
| 2168 | 2168 | // setup the basic properties for o_font output |
| 2169 | 2169 | $tmp = array('BaseFont'=>$adobeFontName,'Widths'=>$widthid |
| 2170 | - ,'FirstChar'=>$firstChar,'LastChar'=>$lastChar |
|
| 2171 | - ,'FontDescriptor'=>$fontDescriptorId); |
|
| 2170 | + ,'FirstChar'=>$firstChar,'LastChar'=>$lastChar |
|
| 2171 | + ,'FontDescriptor'=>$fontDescriptorId); |
|
| 2172 | 2172 | |
| 2173 | 2173 | // binary content of pfb or ttf file |
| 2174 | 2174 | $pfbid = ++$this->numObj; |
@@ -2662,18 +2662,18 @@ discard block |
||
| 2662 | 2662 | } |
| 2663 | 2663 | |
| 2664 | 2664 | /** |
| 2665 | - * return array containing codepoints (UTF-8 character values) for the |
|
| 2666 | - * string passed in. |
|
| 2667 | - * |
|
| 2668 | - * based on the excellent TCPDF code by Nicola Asuni and the |
|
| 2669 | - * RFC for UTF-8 at http://www.faqs.org/rfcs/rfc3629.html |
|
| 2670 | - * |
|
| 2671 | - * @access private |
|
| 2672 | - * @author Orion Richardson |
|
| 2673 | - * @since January 5, 2008 |
|
| 2674 | - * @param string $text UTF-8 string to process |
|
| 2675 | - * @return array UTF-8 codepoints array for the string |
|
| 2676 | - */ |
|
| 2665 | + * return array containing codepoints (UTF-8 character values) for the |
|
| 2666 | + * string passed in. |
|
| 2667 | + * |
|
| 2668 | + * based on the excellent TCPDF code by Nicola Asuni and the |
|
| 2669 | + * RFC for UTF-8 at http://www.faqs.org/rfcs/rfc3629.html |
|
| 2670 | + * |
|
| 2671 | + * @access private |
|
| 2672 | + * @author Orion Richardson |
|
| 2673 | + * @since January 5, 2008 |
|
| 2674 | + * @param string $text UTF-8 string to process |
|
| 2675 | + * @return array UTF-8 codepoints array for the string |
|
| 2676 | + */ |
|
| 2677 | 2677 | private function utf8toCodePointsArray(&$text) |
| 2678 | 2678 | { |
| 2679 | 2679 | $length = mb_strlen($text, '8bit'); // http://www.php.net/manual/en/function.mb-strlen.php#77040 |
@@ -2733,20 +2733,20 @@ discard block |
||
| 2733 | 2733 | return $unicode; |
| 2734 | 2734 | } |
| 2735 | 2735 | |
| 2736 | - /** |
|
| 2737 | - * convert UTF-8 to UTF-16 with an additional byte order marker |
|
| 2738 | - * at the front if required. |
|
| 2739 | - * |
|
| 2740 | - * based on the excellent TCPDF code by Nicola Asuni and the |
|
| 2741 | - * RFC for UTF-8 at http://www.faqs.org/rfcs/rfc3629.html |
|
| 2742 | - * |
|
| 2743 | - * @access private |
|
| 2744 | - * @author Orion Richardson |
|
| 2745 | - * @since January 5, 2008 |
|
| 2746 | - * @param string $text UTF-8 string to process |
|
| 2747 | - * @param boolean $bom whether to add the byte order marker |
|
| 2748 | - * @return string UTF-16 result string |
|
| 2749 | - */ |
|
| 2736 | + /** |
|
| 2737 | + * convert UTF-8 to UTF-16 with an additional byte order marker |
|
| 2738 | + * at the front if required. |
|
| 2739 | + * |
|
| 2740 | + * based on the excellent TCPDF code by Nicola Asuni and the |
|
| 2741 | + * RFC for UTF-8 at http://www.faqs.org/rfcs/rfc3629.html |
|
| 2742 | + * |
|
| 2743 | + * @access private |
|
| 2744 | + * @author Orion Richardson |
|
| 2745 | + * @since January 5, 2008 |
|
| 2746 | + * @param string $text UTF-8 string to process |
|
| 2747 | + * @param boolean $bom whether to add the byte order marker |
|
| 2748 | + * @return string UTF-16 result string |
|
| 2749 | + */ |
|
| 2750 | 2750 | private function utf8toUtf16BE(&$text, $bom = true) |
| 2751 | 2751 | { |
| 2752 | 2752 | $cf = $this->currentFont; |
@@ -3031,7 +3031,7 @@ discard block |
||
| 3031 | 3031 | if ($start < $len) { |
| 3032 | 3032 | $part = substr($text, $start); |
| 3033 | 3033 | $place_text = $this->filterText($part, false); |
| 3034 | - // modify unicode text so that extra word spacing is manually implemented (bug #) |
|
| 3034 | + // modify unicode text so that extra word spacing is manually implemented (bug #) |
|
| 3035 | 3035 | $cf = $this->currentFont; |
| 3036 | 3036 | if ($this->fonts[$cf]['isUnicode'] && $wordSpaceAdjust != 0) { |
| 3037 | 3037 | $space_scale = 1000 / $size; |
@@ -3346,15 +3346,15 @@ discard block |
||
| 3346 | 3346 | } |
| 3347 | 3347 | |
| 3348 | 3348 | /** |
| 3349 | - * open an existing object for editing |
|
| 3350 | - * @access public |
|
| 3351 | - */ |
|
| 3349 | + * open an existing object for editing |
|
| 3350 | + * @access public |
|
| 3351 | + */ |
|
| 3352 | 3352 | public function reopenObject($id) |
| 3353 | 3353 | { |
| 3354 | 3354 | $this->nStack++; |
| 3355 | 3355 | $this->stack[$this->nStack]=array('c'=>$this->currentContents,'p'=>$this->currentPage); |
| 3356 | 3356 | $this->currentContents=$id; |
| 3357 | - // also if this object is the primary contents for a page, then set the current page to its parent |
|
| 3357 | + // also if this object is the primary contents for a page, then set the current page to its parent |
|
| 3358 | 3358 | if (isset($this->objects[$id]['onPage'])) { |
| 3359 | 3359 | $this->currentPage = $this->objects[$id]['onPage']; |
| 3360 | 3360 | } |
@@ -3723,7 +3723,7 @@ discard block |
||
| 3723 | 3723 | } |
| 3724 | 3724 | |
| 3725 | 3725 | $options = array('label'=>$label,'data'=>$iChunk['idata'],'bitsPerComponent'=>$iChunk['info']['bitDepth'],'pdata'=>$iChunk['pdata'] |
| 3726 | - ,'iw'=>$iChunk['info']['width'],'ih'=>$iChunk['info']['height'],'type'=>'png','color'=>$color,'ncolor'=>$ncolor); |
|
| 3726 | + ,'iw'=>$iChunk['info']['width'],'ih'=>$iChunk['info']['height'],'type'=>'png','color'=>$color,'ncolor'=>$ncolor); |
|
| 3727 | 3727 | if (isset($iChunk['transparency'])) { |
| 3728 | 3728 | $options['transparency']=$iChunk['transparency']; |
| 3729 | 3729 | } |
@@ -3815,18 +3815,18 @@ discard block |
||
| 3815 | 3815 | $this->addJpegFromFile($tmpName, $x, $y, $w, $h); |
| 3816 | 3816 | } |
| 3817 | 3817 | |
| 3818 | - /** |
|
| 3819 | - * add an image into the document, from a GD object |
|
| 3820 | - * this function is not all that reliable, and I would probably encourage people to use |
|
| 3821 | - * the file based functions |
|
| 3822 | - * @param $img - gd image resource |
|
| 3823 | - * @param $x coord x |
|
| 3824 | - * @param $y coord y |
|
| 3825 | - * @param $w width |
|
| 3826 | - * @param $h height |
|
| 3827 | - * @param $quality image quality |
|
| 3828 | - * @access protected |
|
| 3829 | - */ |
|
| 3818 | + /** |
|
| 3819 | + * add an image into the document, from a GD object |
|
| 3820 | + * this function is not all that reliable, and I would probably encourage people to use |
|
| 3821 | + * the file based functions |
|
| 3822 | + * @param $img - gd image resource |
|
| 3823 | + * @param $x coord x |
|
| 3824 | + * @param $y coord y |
|
| 3825 | + * @param $w width |
|
| 3826 | + * @param $h height |
|
| 3827 | + * @param $quality image quality |
|
| 3828 | + * @access protected |
|
| 3829 | + */ |
|
| 3830 | 3830 | protected function addImage(&$img, $x, $y, $w = 0, $h = 0, $quality = 75) |
| 3831 | 3831 | { |
| 3832 | 3832 | // add a new image into the current location, as an external object |
@@ -58,7 +58,7 @@ |
||
| 58 | 58 | } |
| 59 | 59 | echo '<li style="display: inline; margin-left: 20px;"><label for="keyword_'.$value['id'].'"><input type="checkbox" name="keyword[]" value="'.$value['id'].'" id="keyword_'.$value['id'].'" '.$checked.' /> '.$value['keyword'].'</label></li>'; |
| 60 | 60 | } |
| 61 | - echo '</ul></div>'; |
|
| 61 | + echo '</ul></div>'; |
|
| 62 | 62 | } |
| 63 | 63 | ?> |
| 64 | 64 | |
@@ -67,7 +67,7 @@ |
||
| 67 | 67 | } else { |
| 68 | 68 | $checked = ""; |
| 69 | 69 | } |
| 70 | - echo '<li style="display: inline; margin-left: 20px;"><label for="keyword_'.$value['id'].'"><input type="checkbox" name="keyword[]" value="'.$value['id'].'" id="keyword_'.$value['id'].'" '.$checked.' /> '.$value['keyword'].'</label></li>'; |
|
| 70 | + echo '<li style="display: inline; margin-left: 20px;"><label for="keyword_'.$value['id'].'"><input type="checkbox" name="keyword[]" value="'.$value['id'].'" id="keyword_'.$value['id'].'" '.$checked.' /> '.$value['keyword'].'</label></li>'; |
|
| 71 | 71 | } |
| 72 | 72 | echo '</ul></div>'; |
| 73 | 73 | } |