@@ -11,64 +11,64 @@ discard block |
||
| 11 | 11 | |
| 12 | 12 | class FPDF |
| 13 | 13 | { |
| 14 | - public $page; //current page number |
|
| 15 | -public $n; //current object number |
|
| 16 | -public $offsets; //array of object offsets |
|
| 17 | -public $buffer; //buffer holding in-memory PDF |
|
| 18 | -public $pages; //array containing pages |
|
| 19 | -public $state; //current document state |
|
| 20 | -public $compress; //compression flag |
|
| 21 | -public $k; //scale factor (number of points in user unit) |
|
| 22 | -public $DefOrientation; //default orientation |
|
| 23 | -public $CurOrientation; //current orientation |
|
| 24 | -public $PageFormats; //available page formats |
|
| 25 | -public $DefPageFormat; //default page format |
|
| 26 | -public $CurPageFormat; //current page format |
|
| 27 | -public $PageSizes; //array storing non-default page sizes |
|
| 14 | + public $page; //current page number |
|
| 15 | +public $n; //current object number |
|
| 16 | +public $offsets; //array of object offsets |
|
| 17 | +public $buffer; //buffer holding in-memory PDF |
|
| 18 | +public $pages; //array containing pages |
|
| 19 | +public $state; //current document state |
|
| 20 | +public $compress; //compression flag |
|
| 21 | +public $k; //scale factor (number of points in user unit) |
|
| 22 | +public $DefOrientation; //default orientation |
|
| 23 | +public $CurOrientation; //current orientation |
|
| 24 | +public $PageFormats; //available page formats |
|
| 25 | +public $DefPageFormat; //default page format |
|
| 26 | +public $CurPageFormat; //current page format |
|
| 27 | +public $PageSizes; //array storing non-default page sizes |
|
| 28 | 28 | public $wPt; |
| 29 | - public $hPt; //dimensions of current page in points |
|
| 29 | + public $hPt; //dimensions of current page in points |
|
| 30 | 30 | public $w; |
| 31 | - public $h; //dimensions of current page in user unit |
|
| 32 | -public $lMargin; //left margin |
|
| 33 | -public $tMargin; //top margin |
|
| 34 | -public $rMargin; //right margin |
|
| 35 | -public $bMargin; //page break margin |
|
| 36 | -public $cMargin; //cell margin |
|
| 31 | + public $h; //dimensions of current page in user unit |
|
| 32 | +public $lMargin; //left margin |
|
| 33 | +public $tMargin; //top margin |
|
| 34 | +public $rMargin; //right margin |
|
| 35 | +public $bMargin; //page break margin |
|
| 36 | +public $cMargin; //cell margin |
|
| 37 | 37 | public $x; |
| 38 | - public $y; //current position in user unit |
|
| 39 | -public $lasth; //height of last printed cell |
|
| 40 | -public $LineWidth; //line width in user unit |
|
| 41 | -public $CoreFonts; //array of standard font names |
|
| 42 | -public $fonts; //array of used fonts |
|
| 43 | -public $FontFiles; //array of font files |
|
| 44 | -public $diffs; //array of encoding differences |
|
| 45 | -public $FontFamily; //current font family |
|
| 46 | -public $FontStyle; //current font style |
|
| 47 | -public $underline; //underlining flag |
|
| 48 | -public $CurrentFont; //current font info |
|
| 49 | -public $FontSizePt; //current font size in points |
|
| 50 | -public $FontSize; //current font size in user unit |
|
| 51 | -public $DrawColor; //commands for drawing color |
|
| 52 | -public $FillColor; //commands for filling color |
|
| 53 | -public $TextColor; //commands for text color |
|
| 54 | -public $ColorFlag; //indicates whether fill and text colors are different |
|
| 55 | -public $ws; //word spacing |
|
| 56 | -public $images; //array of used images |
|
| 57 | -public $PageLinks; //array of links in pages |
|
| 58 | -public $links; //array of internal links |
|
| 59 | -public $AutoPageBreak; //automatic page breaking |
|
| 60 | -public $PageBreakTrigger; //threshold used to trigger page breaks |
|
| 61 | -public $InHeader; //flag set when processing header |
|
| 62 | -public $InFooter; //flag set when processing footer |
|
| 63 | -public $ZoomMode; //zoom display mode |
|
| 64 | -public $LayoutMode; //layout display mode |
|
| 65 | -public $title; //title |
|
| 66 | -public $subject; //subject |
|
| 67 | -public $author; //author |
|
| 68 | -public $keywords; //keywords |
|
| 69 | -public $creator; //creator |
|
| 70 | -public $AliasNbPages; //alias for total number of pages |
|
| 71 | -public $PDFVersion; //PDF version number |
|
| 38 | + public $y; //current position in user unit |
|
| 39 | +public $lasth; //height of last printed cell |
|
| 40 | +public $LineWidth; //line width in user unit |
|
| 41 | +public $CoreFonts; //array of standard font names |
|
| 42 | +public $fonts; //array of used fonts |
|
| 43 | +public $FontFiles; //array of font files |
|
| 44 | +public $diffs; //array of encoding differences |
|
| 45 | +public $FontFamily; //current font family |
|
| 46 | +public $FontStyle; //current font style |
|
| 47 | +public $underline; //underlining flag |
|
| 48 | +public $CurrentFont; //current font info |
|
| 49 | +public $FontSizePt; //current font size in points |
|
| 50 | +public $FontSize; //current font size in user unit |
|
| 51 | +public $DrawColor; //commands for drawing color |
|
| 52 | +public $FillColor; //commands for filling color |
|
| 53 | +public $TextColor; //commands for text color |
|
| 54 | +public $ColorFlag; //indicates whether fill and text colors are different |
|
| 55 | +public $ws; //word spacing |
|
| 56 | +public $images; //array of used images |
|
| 57 | +public $PageLinks; //array of links in pages |
|
| 58 | +public $links; //array of internal links |
|
| 59 | +public $AutoPageBreak; //automatic page breaking |
|
| 60 | +public $PageBreakTrigger; //threshold used to trigger page breaks |
|
| 61 | +public $InHeader; //flag set when processing header |
|
| 62 | +public $InFooter; //flag set when processing footer |
|
| 63 | +public $ZoomMode; //zoom display mode |
|
| 64 | +public $LayoutMode; //layout display mode |
|
| 65 | +public $title; //title |
|
| 66 | +public $subject; //subject |
|
| 67 | +public $author; //author |
|
| 68 | +public $keywords; //keywords |
|
| 69 | +public $creator; //creator |
|
| 70 | +public $AliasNbPages; //alias for total number of pages |
|
| 71 | +public $PDFVersion; //PDF version number |
|
| 72 | 72 | |
| 73 | 73 | /******************************************************************************* |
| 74 | 74 | * * |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | $this->k = 72 / 2.54; |
| 118 | 118 | } elseif ($unit == 'in') { |
| 119 | 119 | $this->k = 72; |
| 120 | - } else { |
|
| 120 | + }else { |
|
| 121 | 121 | $this->Error('Incorrect unit: '.$unit); |
| 122 | 122 | } |
| 123 | 123 | //Page format |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | $this->DefOrientation = 'L'; |
| 139 | 139 | $this->w = $this->DefPageFormat[1]; |
| 140 | 140 | $this->h = $this->DefPageFormat[0]; |
| 141 | - } else { |
|
| 141 | + }else { |
|
| 142 | 142 | $this->Error('Incorrect orientation: '.$orientation); |
| 143 | 143 | } |
| 144 | 144 | $this->CurOrientation = $this->DefOrientation; |
@@ -206,12 +206,12 @@ discard block |
||
| 206 | 206 | //Set display mode in viewer |
| 207 | 207 | if ($zoom == 'fullpage' || $zoom == 'fullwidth' || $zoom == 'real' || $zoom == 'default' || !is_string($zoom)) { |
| 208 | 208 | $this->ZoomMode = $zoom; |
| 209 | - } else { |
|
| 209 | + }else { |
|
| 210 | 210 | $this->Error('Incorrect zoom display mode: '.$zoom); |
| 211 | 211 | } |
| 212 | 212 | if ($layout == 'single' || $layout == 'continuous' || $layout == 'two' || $layout == 'default') { |
| 213 | 213 | $this->LayoutMode = $layout; |
| 214 | - } else { |
|
| 214 | + }else { |
|
| 215 | 215 | $this->Error('Incorrect layout display mode: '.$layout); |
| 216 | 216 | } |
| 217 | 217 | } |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | //Set page compression |
| 222 | 222 | if (function_exists('gzcompress')) { |
| 223 | 223 | $this->compress = $compress; |
| 224 | - } else { |
|
| 224 | + }else { |
|
| 225 | 225 | $this->compress = false; |
| 226 | 226 | } |
| 227 | 227 | } |
@@ -399,7 +399,7 @@ discard block |
||
| 399 | 399 | //Set color for all stroking operations |
| 400 | 400 | if (($r == 0 && $g == 0 && $b == 0) || $g === null) { |
| 401 | 401 | $this->DrawColor = sprintf('%.3F G', $r / 255); |
| 402 | - } else { |
|
| 402 | + }else { |
|
| 403 | 403 | $this->DrawColor = sprintf('%.3F %.3F %.3F RG', $r / 255, $g / 255, $b / 255); |
| 404 | 404 | } |
| 405 | 405 | if ($this->page > 0) { |
@@ -412,7 +412,7 @@ discard block |
||
| 412 | 412 | //Set color for all filling operations |
| 413 | 413 | if (($r == 0 && $g == 0 && $b == 0) || $g === null) { |
| 414 | 414 | $this->FillColor = sprintf('%.3F g', $r / 255); |
| 415 | - } else { |
|
| 415 | + }else { |
|
| 416 | 416 | $this->FillColor = sprintf('%.3F %.3F %.3F rg', $r / 255, $g / 255, $b / 255); |
| 417 | 417 | } |
| 418 | 418 | $this->ColorFlag = ($this->FillColor != $this->TextColor); |
@@ -426,7 +426,7 @@ discard block |
||
| 426 | 426 | //Set color for text |
| 427 | 427 | if (($r == 0 && $g == 0 && $b == 0) || $g === null) { |
| 428 | 428 | $this->TextColor = sprintf('%.3F g', $r / 255); |
| 429 | - } else { |
|
| 429 | + }else { |
|
| 430 | 430 | $this->TextColor = sprintf('%.3F %.3F %.3F rg', $r / 255, $g / 255, $b / 255); |
| 431 | 431 | } |
| 432 | 432 | $this->ColorFlag = ($this->FillColor != $this->TextColor); |
@@ -468,7 +468,7 @@ discard block |
||
| 468 | 468 | $op = 'f'; |
| 469 | 469 | } elseif ($style == 'FD' || $style == 'DF') { |
| 470 | 470 | $op = 'B'; |
| 471 | - } else { |
|
| 471 | + }else { |
|
| 472 | 472 | $op = 'S'; |
| 473 | 473 | } |
| 474 | 474 | $this->_out(sprintf('%.2F %.2F %.2F %.2F re %s', $x * $this->k, ($this->h - $y) * $this->k, $w * $this->k, -$h * $this->k, $op)); |
@@ -517,7 +517,7 @@ discard block |
||
| 517 | 517 | if ($file) { |
| 518 | 518 | if ($type == 'TrueType') { |
| 519 | 519 | $this->FontFiles[$file] = ['length1'=>$originalsize]; |
| 520 | - } else { |
|
| 520 | + }else { |
|
| 521 | 521 | $this->FontFiles[$file] = ['length1'=>$size1, 'length2'=>$size2]; |
| 522 | 522 | } |
| 523 | 523 | } |
@@ -541,7 +541,7 @@ discard block |
||
| 541 | 541 | if (strpos($style, 'U') !== false) { |
| 542 | 542 | $this->underline = true; |
| 543 | 543 | $style = str_replace('U', '', $style); |
| 544 | - } else { |
|
| 544 | + }else { |
|
| 545 | 545 | $this->underline = false; |
| 546 | 546 | } |
| 547 | 547 | if ($style == 'IB') { |
@@ -574,7 +574,7 @@ discard block |
||
| 574 | 574 | $name = $this->CoreFonts[$fontkey]; |
| 575 | 575 | $cw = $fpdf_charwidths[$fontkey]; |
| 576 | 576 | $this->fonts[$fontkey] = ['i'=>$i, 'type'=>'core', 'name'=>$name, 'up'=>-100, 'ut'=>50, 'cw'=>$cw]; |
| 577 | - } else { |
|
| 577 | + }else { |
|
| 578 | 578 | $this->Error('Undefined font: '.$family.' '.$style); |
| 579 | 579 | } |
| 580 | 580 | } |
@@ -674,7 +674,7 @@ discard block |
||
| 674 | 674 | if ($fill || $border == 1) { |
| 675 | 675 | if ($fill) { |
| 676 | 676 | $op = ($border == 1) ? 'B' : 'f'; |
| 677 | - } else { |
|
| 677 | + }else { |
|
| 678 | 678 | $op = 'S'; |
| 679 | 679 | } |
| 680 | 680 | $s = sprintf('%.2F %.2F %.2F %.2F re %s ', $this->x * $k, ($this->h - $this->y) * $k, $w * $k, -$h * $k, $op); |
@@ -700,7 +700,7 @@ discard block |
||
| 700 | 700 | $dx = $w - $this->cMargin - $this->GetStringWidth($txt); |
| 701 | 701 | } elseif ($align == 'C') { |
| 702 | 702 | $dx = ($w - $this->GetStringWidth($txt)) / 2; |
| 703 | - } else { |
|
| 703 | + }else { |
|
| 704 | 704 | $dx = $this->cMargin; |
| 705 | 705 | } |
| 706 | 706 | if ($this->ColorFlag) { |
@@ -728,7 +728,7 @@ discard block |
||
| 728 | 728 | if ($ln == 1) { |
| 729 | 729 | $this->x = $this->lMargin; |
| 730 | 730 | } |
| 731 | - } else { |
|
| 731 | + }else { |
|
| 732 | 732 | $this->x += $w; |
| 733 | 733 | } |
| 734 | 734 | } |
@@ -752,7 +752,7 @@ discard block |
||
| 752 | 752 | $border = 'LTRB'; |
| 753 | 753 | $b = 'LRT'; |
| 754 | 754 | $b2 = 'LR'; |
| 755 | - } else { |
|
| 755 | + }else { |
|
| 756 | 756 | $b2 = ''; |
| 757 | 757 | if (strpos($border, 'L') !== false) { |
| 758 | 758 | $b2 .= 'L'; |
@@ -807,7 +807,7 @@ discard block |
||
| 807 | 807 | $this->_out('0 Tw'); |
| 808 | 808 | } |
| 809 | 809 | $this->Cell($w, $h, substr($s, $j, $i - $j), $b, 2, $align, $fill); |
| 810 | - } else { |
|
| 810 | + }else { |
|
| 811 | 811 | if ($align == 'J') { |
| 812 | 812 | $this->ws = ($ns > 1) ? ($wmax - $ls) / 1000 * $this->FontSize / ($ns - 1) : 0; |
| 813 | 813 | $this->_out(sprintf('%.3F Tw', $this->ws * $this->k)); |
@@ -823,7 +823,7 @@ discard block |
||
| 823 | 823 | if ($border && $nl == 2) { |
| 824 | 824 | $b = $b2; |
| 825 | 825 | } |
| 826 | - } else { |
|
| 826 | + }else { |
|
| 827 | 827 | $i++; |
| 828 | 828 | } |
| 829 | 829 | } |
@@ -891,7 +891,7 @@ discard block |
||
| 891 | 891 | $i++; |
| 892 | 892 | } |
| 893 | 893 | $this->Cell($w, $h, substr($s, $j, $i - $j), 0, 2, '', 0, $link); |
| 894 | - } else { |
|
| 894 | + }else { |
|
| 895 | 895 | $this->Cell($w, $h, substr($s, $j, $sep - $j), 0, 2, '', 0, $link); |
| 896 | 896 | $i = $sep + 1; |
| 897 | 897 | } |
@@ -904,7 +904,7 @@ discard block |
||
| 904 | 904 | $wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize; |
| 905 | 905 | } |
| 906 | 906 | $nl++; |
| 907 | - } else { |
|
| 907 | + }else { |
|
| 908 | 908 | $i++; |
| 909 | 909 | } |
| 910 | 910 | } |
@@ -920,7 +920,7 @@ discard block |
||
| 920 | 920 | $this->x = $this->lMargin; |
| 921 | 921 | if ($h === null) { |
| 922 | 922 | $this->y += $this->lasth; |
| 923 | - } else { |
|
| 923 | + }else { |
|
| 924 | 924 | $this->y += $h; |
| 925 | 925 | } |
| 926 | 926 | } |
@@ -948,7 +948,7 @@ discard block |
||
| 948 | 948 | $info = $this->$mtd($file); |
| 949 | 949 | $info['i'] = count($this->images) + 1; |
| 950 | 950 | $this->images[$file] = $info; |
| 951 | - } else { |
|
| 951 | + }else { |
|
| 952 | 952 | $info = $this->images[$file]; |
| 953 | 953 | } |
| 954 | 954 | //Automatic width and height calculation if needed |
@@ -992,7 +992,7 @@ discard block |
||
| 992 | 992 | //Set x position |
| 993 | 993 | if ($x >= 0) { |
| 994 | 994 | $this->x = $x; |
| 995 | - } else { |
|
| 995 | + }else { |
|
| 996 | 996 | $this->x = $this->w + $x; |
| 997 | 997 | } |
| 998 | 998 | } |
@@ -1009,7 +1009,7 @@ discard block |
||
| 1009 | 1009 | $this->x = $this->lMargin; |
| 1010 | 1010 | if ($y >= 0) { |
| 1011 | 1011 | $this->y = $y; |
| 1012 | - } else { |
|
| 1012 | + }else { |
|
| 1013 | 1013 | $this->y = $this->h + $y; |
| 1014 | 1014 | } |
| 1015 | 1015 | } |
@@ -1032,7 +1032,7 @@ discard block |
||
| 1032 | 1032 | if ($name == '') { |
| 1033 | 1033 | $name = 'doc.pdf'; |
| 1034 | 1034 | $dest = 'I'; |
| 1035 | - } else { |
|
| 1035 | + }else { |
|
| 1036 | 1036 | $dest = 'F'; |
| 1037 | 1037 | } |
| 1038 | 1038 | } |
@@ -1143,12 +1143,12 @@ discard block |
||
| 1143 | 1143 | //Check page size |
| 1144 | 1144 | if ($orientation == '') { |
| 1145 | 1145 | $orientation = $this->DefOrientation; |
| 1146 | - } else { |
|
| 1146 | + }else { |
|
| 1147 | 1147 | $orientation = strtoupper($orientation[0]); |
| 1148 | 1148 | } |
| 1149 | 1149 | if ($format == '') { |
| 1150 | 1150 | $format = $this->DefPageFormat; |
| 1151 | - } else { |
|
| 1151 | + }else { |
|
| 1152 | 1152 | if (is_string($format)) { |
| 1153 | 1153 | $format = $this->_getpageformat($format); |
| 1154 | 1154 | } |
@@ -1158,7 +1158,7 @@ discard block |
||
| 1158 | 1158 | if ($orientation == 'P') { |
| 1159 | 1159 | $this->w = $format[0]; |
| 1160 | 1160 | $this->h = $format[1]; |
| 1161 | - } else { |
|
| 1161 | + }else { |
|
| 1162 | 1162 | $this->w = $format[1]; |
| 1163 | 1163 | $this->h = $format[0]; |
| 1164 | 1164 | } |
@@ -1214,7 +1214,7 @@ discard block |
||
| 1214 | 1214 | $c2 = ord($s[$i++]); |
| 1215 | 1215 | $res .= chr(($c1 & 0x1C) >> 2); |
| 1216 | 1216 | $res .= chr((($c1 & 0x03) << 6) + ($c2 & 0x3F)); |
| 1217 | - } else { |
|
| 1217 | + }else { |
|
| 1218 | 1218 | //Single-byte character |
| 1219 | 1219 | $res .= "\0".chr($c1); |
| 1220 | 1220 | } |
@@ -1247,7 +1247,7 @@ discard block |
||
| 1247 | 1247 | $colspace = 'DeviceRGB'; |
| 1248 | 1248 | } elseif ($a['channels'] == 4) { |
| 1249 | 1249 | $colspace = 'DeviceCMYK'; |
| 1250 | - } else { |
|
| 1250 | + }else { |
|
| 1251 | 1251 | $colspace = 'DeviceGray'; |
| 1252 | 1252 | } |
| 1253 | 1253 | $bpc = isset($a['bits']) ? $a['bits'] : 8; |
@@ -1291,7 +1291,7 @@ discard block |
||
| 1291 | 1291 | $colspace = 'DeviceRGB'; |
| 1292 | 1292 | } elseif ($ct == 3) { |
| 1293 | 1293 | $colspace = 'Indexed'; |
| 1294 | - } else { |
|
| 1294 | + }else { |
|
| 1295 | 1295 | $this->Error('Alpha channel not supported: '.$file); |
| 1296 | 1296 | } |
| 1297 | 1297 | if (ord($this->_readstream($f, 1)) != 0) { |
@@ -1323,7 +1323,7 @@ discard block |
||
| 1323 | 1323 | $trns = [ord(substr($t, 1, 1))]; |
| 1324 | 1324 | } elseif ($ct == 2) { |
| 1325 | 1325 | $trns = [ord(substr($t, 1, 1)), ord(substr($t, 3, 1)), ord(substr($t, 5, 1))]; |
| 1326 | - } else { |
|
| 1326 | + }else { |
|
| 1327 | 1327 | $pos = strpos($t, chr(0)); |
| 1328 | 1328 | if ($pos !== false) { |
| 1329 | 1329 | $trns = [$pos]; |
@@ -1336,7 +1336,7 @@ discard block |
||
| 1336 | 1336 | $this->_readstream($f, 4); |
| 1337 | 1337 | } elseif ($type == 'IEND') { |
| 1338 | 1338 | break; |
| 1339 | - } else { |
|
| 1339 | + }else { |
|
| 1340 | 1340 | $this->_readstream($f, $n + 4); |
| 1341 | 1341 | } |
| 1342 | 1342 | } while ($n); |
@@ -1423,7 +1423,7 @@ discard block |
||
| 1423 | 1423 | //Add a line to the document |
| 1424 | 1424 | if ($this->state == 2) { |
| 1425 | 1425 | $this->pages[$this->page] .= $s."\n"; |
| 1426 | - } else { |
|
| 1426 | + }else { |
|
| 1427 | 1427 | $this->buffer .= $s."\n"; |
| 1428 | 1428 | } |
| 1429 | 1429 | } |
@@ -1440,7 +1440,7 @@ discard block |
||
| 1440 | 1440 | if ($this->DefOrientation == 'P') { |
| 1441 | 1441 | $wPt = $this->DefPageFormat[0] * $this->k; |
| 1442 | 1442 | $hPt = $this->DefPageFormat[1] * $this->k; |
| 1443 | - } else { |
|
| 1443 | + }else { |
|
| 1444 | 1444 | $wPt = $this->DefPageFormat[1] * $this->k; |
| 1445 | 1445 | $hPt = $this->DefPageFormat[0] * $this->k; |
| 1446 | 1446 | } |
@@ -1462,7 +1462,7 @@ discard block |
||
| 1462 | 1462 | $annots .= '<</Type /Annot /Subtype /Link /Rect ['.$rect.'] /Border [0 0 0] '; |
| 1463 | 1463 | if (is_string($pl[4])) { |
| 1464 | 1464 | $annots .= '/A <</S /URI /URI '.$this->_textstring($pl[4]).'>>>>'; |
| 1465 | - } else { |
|
| 1465 | + }else { |
|
| 1466 | 1466 | $l = $this->links[$pl[4]]; |
| 1467 | 1467 | $h = isset($this->PageSizes[$l[0]]) ? $this->PageSizes[$l[0]][1] : $hPt; |
| 1468 | 1468 | $annots .= sprintf('/Dest [%d 0 R /XYZ 0 %.2F null]>>', 1 + 2 * $l[0], $h - $l[1] * $this->k); |
@@ -1568,7 +1568,7 @@ discard block |
||
| 1568 | 1568 | if ($font['enc']) { |
| 1569 | 1569 | if (isset($font['diff'])) { |
| 1570 | 1570 | $this->_out('/Encoding '.($nf + $font['diff']).' 0 R'); |
| 1571 | - } else { |
|
| 1571 | + }else { |
|
| 1572 | 1572 | $this->_out('/Encoding /WinAnsiEncoding'); |
| 1573 | 1573 | } |
| 1574 | 1574 | } |
@@ -1595,7 +1595,7 @@ discard block |
||
| 1595 | 1595 | } |
| 1596 | 1596 | $this->_out($s.'>>'); |
| 1597 | 1597 | $this->_out('endobj'); |
| 1598 | - } else { |
|
| 1598 | + }else { |
|
| 1599 | 1599 | //Allow for additional types |
| 1600 | 1600 | $mtd = '_put'.strtolower($type); |
| 1601 | 1601 | if (!method_exists($this, $mtd)) { |
@@ -1619,7 +1619,7 @@ discard block |
||
| 1619 | 1619 | $this->_out('/Height '.$info['h']); |
| 1620 | 1620 | if ($info['cs'] == 'Indexed') { |
| 1621 | 1621 | $this->_out('/ColorSpace [/Indexed /DeviceRGB '.(strlen($info['pal']) / 3 - 1).' '.($this->n + 1).' 0 R]'); |
| 1622 | - } else { |
|
| 1622 | + }else { |
|
| 1623 | 1623 | $this->_out('/ColorSpace /'.$info['cs']); |
| 1624 | 1624 | if ($info['cs'] == 'DeviceCMYK') { |
| 1625 | 1625 | $this->_out('/Decode [1 0 1 0 1 0 1 0]'); |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | </tr> |
| 139 | 139 | <tr> |
| 140 | 140 | <td> Reported By* </td><td> : </td> |
| 141 | - <td> <?php echo $user['fullname'];?> <input type='hidden' size='50' name='reportedby' value="<?php echo $user['fullname'];?>" maxlength="50"> </td> |
|
| 141 | + <td> <?php echo $user['fullname']; ?> <input type='hidden' size='50' name='reportedby' value="<?php echo $user['fullname']; ?>" maxlength="50"> </td> |
|
| 142 | 142 | </tr> |
| 143 | 143 | <tr> |
| 144 | 144 | <td> Urgency (SLA)*</td><td> : </td> |
@@ -177,8 +177,8 @@ discard block |
||
| 177 | 177 | <td> </td> |
| 178 | 178 | <td> </td> |
| 179 | 179 | <td> <br/> |
| 180 | - <?php $assignee = $users->get_user_random_by_level('Admin');?>
|
|
| 181 | - <input type="hidden" name="idassignee" value="<?php echo $assignee['id'];?>"/> |
|
| 180 | + <?php $assignee = $users->get_user_random_by_level('Admin'); ?>
|
|
| 181 | + <input type="hidden" name="idassignee" value="<?php echo $assignee['id']; ?>"/> |
|
| 182 | 182 | <input type='submit' name='submit' value=' Submit '> |
| 183 | 183 | <input type='reset' name='reset' value=' Reset '> |
| 184 | 184 | </td> |
@@ -22,7 +22,7 @@ |
||
| 22 | 22 | <li><a href="myticketbyresolver.php" target="contentFrame">My Resolution</a></li> |
| 23 | 23 | <li><a href="myticketwaitforclosed.php" target="contentFrame">Waiting for Close</a></li> |
| 24 | 24 | <li><a href="ticketlistuser.php" target="contentFrame">View All Opened Tickets</a></li> |
| 25 | - <?php endif;?> |
|
| 25 | + <?php endif; ?> |
|
| 26 | 26 | </ul> |
| 27 | 27 | </div> |
| 28 | 28 | <?php |
@@ -19,10 +19,10 @@ discard block |
||
| 19 | 19 | $rows = $query->fetchColumn(); |
| 20 | 20 | if ($rows == 1) { |
| 21 | 21 | return true; |
| 22 | - } else { |
|
| 22 | + }else { |
|
| 23 | 23 | return false; |
| 24 | 24 | } |
| 25 | - } catch (PDOException $e) { |
|
| 25 | + }catch (PDOException $e) { |
|
| 26 | 26 | die($e->getMessage()); |
| 27 | 27 | } |
| 28 | 28 | } |
@@ -37,10 +37,10 @@ discard block |
||
| 37 | 37 | $rows = $query->fetchColumn(); |
| 38 | 38 | if ($rows == 1) { |
| 39 | 39 | return true; |
| 40 | - } else { |
|
| 40 | + }else { |
|
| 41 | 41 | return false; |
| 42 | 42 | } |
| 43 | - } catch (PDOException $e) { |
|
| 43 | + }catch (PDOException $e) { |
|
| 44 | 44 | die($e->getMessage()); |
| 45 | 45 | } |
| 46 | 46 | } |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | |
| 66 | 66 | try { |
| 67 | 67 | $query->execute(); |
| 68 | - } catch (PDOException $e) { |
|
| 68 | + }catch (PDOException $e) { |
|
| 69 | 69 | die($e->getMessage()); |
| 70 | 70 | } |
| 71 | 71 | } |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | |
| 91 | 91 | try { |
| 92 | 92 | $query->execute(); |
| 93 | - } catch (PDOException $e) { |
|
| 93 | + }catch (PDOException $e) { |
|
| 94 | 94 | die($e->getMessage()); |
| 95 | 95 | } |
| 96 | 96 | } |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | |
| 105 | 105 | try { |
| 106 | 106 | $query->execute(); |
| 107 | - } catch (PDOException $e) { |
|
| 107 | + }catch (PDOException $e) { |
|
| 108 | 108 | die($e->getMessage()); |
| 109 | 109 | } |
| 110 | 110 | } |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | |
| 118 | 118 | try { |
| 119 | 119 | $query->execute(); |
| 120 | - } catch (PDOException $e) { |
|
| 120 | + }catch (PDOException $e) { |
|
| 121 | 121 | die($e->getMessage()); |
| 122 | 122 | } |
| 123 | 123 | } |
@@ -139,10 +139,10 @@ discard block |
||
| 139 | 139 | $query_2->execute(); |
| 140 | 140 | |
| 141 | 141 | return true; |
| 142 | - } else { |
|
| 142 | + }else { |
|
| 143 | 143 | return false; |
| 144 | 144 | } |
| 145 | - } catch (PDOException $e) { |
|
| 145 | + }catch (PDOException $e) { |
|
| 146 | 146 | die($e->getMessage()); |
| 147 | 147 | } |
| 148 | 148 | } |
@@ -158,10 +158,10 @@ discard block |
||
| 158 | 158 | $rows = $query->fetchColumn(); |
| 159 | 159 | if ($rows == 1) { |
| 160 | 160 | return true; |
| 161 | - } else { |
|
| 161 | + }else { |
|
| 162 | 162 | return false; |
| 163 | 163 | } |
| 164 | - } catch (PDOException $e) { |
|
| 164 | + }catch (PDOException $e) { |
|
| 165 | 165 | die($e->getMessage()); |
| 166 | 166 | } |
| 167 | 167 | } |
@@ -178,10 +178,10 @@ discard block |
||
| 178 | 178 | $id = $data['id']; |
| 179 | 179 | if ($stored_password === sha1($password)) { |
| 180 | 180 | return $id; |
| 181 | - } else { |
|
| 181 | + }else { |
|
| 182 | 182 | return false; |
| 183 | 183 | } |
| 184 | - } catch (PDOException $e) { |
|
| 184 | + }catch (PDOException $e) { |
|
| 185 | 185 | die($e->getMessage()); |
| 186 | 186 | } |
| 187 | 187 | } |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | $query->execute(); |
| 196 | 196 | |
| 197 | 197 | return $query->fetch(); |
| 198 | - } catch (PDOException $e) { |
|
| 198 | + }catch (PDOException $e) { |
|
| 199 | 199 | die($e->getMessage()); |
| 200 | 200 | } |
| 201 | 201 | } |
@@ -209,7 +209,7 @@ discard block |
||
| 209 | 209 | $query->execute(); |
| 210 | 210 | |
| 211 | 211 | return $query->fetch(); |
| 212 | - } catch (PDOException $e) { |
|
| 212 | + }catch (PDOException $e) { |
|
| 213 | 213 | die($e->getMessage()); |
| 214 | 214 | } |
| 215 | 215 | } |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | |
| 222 | 222 | try { |
| 223 | 223 | $query->execute(); |
| 224 | - } catch (PDOException $e) { |
|
| 224 | + }catch (PDOException $e) { |
|
| 225 | 225 | die($e->getMessage()); |
| 226 | 226 | } |
| 227 | 227 | |
@@ -235,7 +235,7 @@ discard block |
||
| 235 | 235 | |
| 236 | 236 | try { |
| 237 | 237 | $query->execute(); |
| 238 | - } catch (PDOException $e) { |
|
| 238 | + }catch (PDOException $e) { |
|
| 239 | 239 | die($e->getMessage()); |
| 240 | 240 | } |
| 241 | 241 | |
@@ -248,7 +248,7 @@ discard block |
||
| 248 | 248 | |
| 249 | 249 | try { |
| 250 | 250 | $query->execute(); |
| 251 | - } catch (PDOException $e) { |
|
| 251 | + }catch (PDOException $e) { |
|
| 252 | 252 | die($e->getMessage()); |
| 253 | 253 | } |
| 254 | 254 | |
@@ -269,7 +269,7 @@ discard block |
||
| 269 | 269 | |
| 270 | 270 | try { |
| 271 | 271 | $query->execute(); |
| 272 | - } catch (PDOException $e) { |
|
| 272 | + }catch (PDOException $e) { |
|
| 273 | 273 | die($e->getMessage()); |
| 274 | 274 | } |
| 275 | 275 | } |
@@ -280,7 +280,7 @@ discard block |
||
| 280 | 280 | |
| 281 | 281 | try { |
| 282 | 282 | $query->execute(); |
| 283 | - } catch (PDOException $e) { |
|
| 283 | + }catch (PDOException $e) { |
|
| 284 | 284 | die($e->getMessage()); |
| 285 | 285 | } |
| 286 | 286 | |
@@ -5,7 +5,7 @@ discard block |
||
| 5 | 5 | $user = $users->userdata($_SESSION['loginid']); |
| 6 | 6 | if ($user['level'] == 'Admin' || $user['level'] == 'Manager') {
|
| 7 | 7 | $akses = true; |
| 8 | -} else {
|
|
| 8 | +}else {
|
|
| 9 | 9 | $akses = false; |
| 10 | 10 | } |
| 11 | 11 | if ($akses = false) {
|
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | } elseif ($currenttime >= $slawarningtime) {
|
| 78 | 78 | $slabgcolor = '#FFFF00'; |
| 79 | 79 | $slatxtcolor = '#000000'; |
| 80 | - } else {
|
|
| 80 | + }else {
|
|
| 81 | 81 | $slabgcolor = '#00FF00'; |
| 82 | 82 | $slatxtcolor = '#000000'; |
| 83 | 83 | } |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | |
| 32 | 32 | try { |
| 33 | 33 | $query->execute(); |
| 34 | - } catch (PDOException $e) { |
|
| 34 | + }catch (PDOException $e) { |
|
| 35 | 35 | die($e->getMessage()); |
| 36 | 36 | } |
| 37 | 37 | } |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | |
| 62 | 62 | try { |
| 63 | 63 | $query->execute(); |
| 64 | - } catch (PDOException $e) { |
|
| 64 | + }catch (PDOException $e) { |
|
| 65 | 65 | die($e->getMessage()); |
| 66 | 66 | } |
| 67 | 67 | } |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | |
| 75 | 75 | try { |
| 76 | 76 | $query->execute(); |
| 77 | - } catch (PDOException $e) { |
|
| 77 | + }catch (PDOException $e) { |
|
| 78 | 78 | die($e->getMessage()); |
| 79 | 79 | } |
| 80 | 80 | } |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | $query->execute(); |
| 89 | 89 | |
| 90 | 90 | return $query->fetch(); |
| 91 | - } catch (PDOException $e) { |
|
| 91 | + }catch (PDOException $e) { |
|
| 92 | 92 | die($e->getMessage()); |
| 93 | 93 | } |
| 94 | 94 | } |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | |
| 100 | 100 | try { |
| 101 | 101 | $query->execute(); |
| 102 | - } catch (PDOException $e) { |
|
| 102 | + }catch (PDOException $e) { |
|
| 103 | 103 | die($e->getMessage()); |
| 104 | 104 | } |
| 105 | 105 | |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | |
| 113 | 113 | try { |
| 114 | 114 | $query->execute(); |
| 115 | - } catch (PDOException $e) { |
|
| 115 | + }catch (PDOException $e) { |
|
| 116 | 116 | die($e->getMessage()); |
| 117 | 117 | } |
| 118 | 118 | |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | |
| 126 | 126 | try { |
| 127 | 127 | $query->execute(); |
| 128 | - } catch (PDOException $e) { |
|
| 128 | + }catch (PDOException $e) { |
|
| 129 | 129 | die($e->getMessage()); |
| 130 | 130 | } |
| 131 | 131 | |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | |
| 140 | 140 | try { |
| 141 | 141 | $query->execute(); |
| 142 | - } catch (PDOException $e) { |
|
| 142 | + }catch (PDOException $e) { |
|
| 143 | 143 | die($e->getMessage()); |
| 144 | 144 | } |
| 145 | 145 | |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | |
| 154 | 154 | try { |
| 155 | 155 | $query->execute(); |
| 156 | - } catch (PDOException $e) { |
|
| 156 | + }catch (PDOException $e) { |
|
| 157 | 157 | die($e->getMessage()); |
| 158 | 158 | } |
| 159 | 159 | |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | |
| 168 | 168 | try { |
| 169 | 169 | $query->execute(); |
| 170 | - } catch (PDOException $e) { |
|
| 170 | + }catch (PDOException $e) { |
|
| 171 | 171 | die($e->getMessage()); |
| 172 | 172 | } |
| 173 | 173 | |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | |
| 183 | 183 | try { |
| 184 | 184 | $query->execute(); |
| 185 | - } catch (PDOException $e) { |
|
| 185 | + }catch (PDOException $e) { |
|
| 186 | 186 | die($e->getMessage()); |
| 187 | 187 | } |
| 188 | 188 | |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | |
| 197 | 197 | try { |
| 198 | 198 | $query->execute(); |
| 199 | - } catch (PDOException $e) { |
|
| 199 | + }catch (PDOException $e) { |
|
| 200 | 200 | die($e->getMessage()); |
| 201 | 201 | } |
| 202 | 202 | |
@@ -211,7 +211,7 @@ discard block |
||
| 211 | 211 | |
| 212 | 212 | try { |
| 213 | 213 | $query->execute(); |
| 214 | - } catch (PDOException $e) { |
|
| 214 | + }catch (PDOException $e) { |
|
| 215 | 215 | die($e->getMessage()); |
| 216 | 216 | } |
| 217 | 217 | |
@@ -224,7 +224,7 @@ discard block |
||
| 224 | 224 | |
| 225 | 225 | try { |
| 226 | 226 | $query->execute(); |
| 227 | - } catch (PDOException $e) { |
|
| 227 | + }catch (PDOException $e) { |
|
| 228 | 228 | die($e->getMessage()); |
| 229 | 229 | } |
| 230 | 230 | |
@@ -238,7 +238,7 @@ discard block |
||
| 238 | 238 | |
| 239 | 239 | try { |
| 240 | 240 | $query->execute(); |
| 241 | - } catch (PDOException $e) { |
|
| 241 | + }catch (PDOException $e) { |
|
| 242 | 242 | die($e->getMessage()); |
| 243 | 243 | } |
| 244 | 244 | |
@@ -252,7 +252,7 @@ discard block |
||
| 252 | 252 | |
| 253 | 253 | try { |
| 254 | 254 | $query->execute(); |
| 255 | - } catch (PDOException $e) { |
|
| 255 | + }catch (PDOException $e) { |
|
| 256 | 256 | die($e->getMessage()); |
| 257 | 257 | } |
| 258 | 258 | |
@@ -267,7 +267,7 @@ discard block |
||
| 267 | 267 | $query->execute(); |
| 268 | 268 | |
| 269 | 269 | return $query->fetch(); |
| 270 | - } catch (PDOException $e) { |
|
| 270 | + }catch (PDOException $e) { |
|
| 271 | 271 | die($e->getMessage()); |
| 272 | 272 | } |
| 273 | 273 | } |
@@ -315,7 +315,7 @@ discard block |
||
| 315 | 315 | |
| 316 | 316 | try { |
| 317 | 317 | $query->execute(); |
| 318 | - } catch (PDOException $e) { |
|
| 318 | + }catch (PDOException $e) { |
|
| 319 | 319 | die($e->getMessage()); |
| 320 | 320 | } |
| 321 | 321 | } |
@@ -327,7 +327,7 @@ discard block |
||
| 327 | 327 | |
| 328 | 328 | try { |
| 329 | 329 | $query->execute(); |
| 330 | - } catch (PDOException $e) { |
|
| 330 | + }catch (PDOException $e) { |
|
| 331 | 331 | die($e->getMessage()); |
| 332 | 332 | } |
| 333 | 333 | |
@@ -15,6 +15,6 @@ |
||
| 15 | 15 | $users = new Users($db); |
| 16 | 16 | $tickets = new Tickets($db); |
| 17 | 17 | $slas = new SLA($db); |
| 18 | -} catch (Exception $e) { |
|
| 19 | - echo 'Caught exception: ', $e->getMessage(), "\n"; |
|
| 18 | +}catch (Exception $e) { |
|
| 19 | + echo 'Caught exception: ', $e->getMessage(), "\n"; |
|
| 20 | 20 | } |
@@ -47,7 +47,7 @@ |
||
| 47 | 47 | $tickets->log_tickets($id, $sla, $reporteddate, $reportedby, $telp, $email, $problemsummary, $problemdetail, $ticketstatus, $assignee, $assigneddate, $pendingby, $pendingdate, $resolution, $resolvedby, $resolveddate, $closedby, $closeddate, $changes, $changeby); |
| 48 | 48 | if ($user['level'] == 'Admin') {
|
| 49 | 49 | header('Location: ticketlist.php');
|
| 50 | - } else {
|
|
| 50 | + }else {
|
|
| 51 | 51 | header('Location: myticketbyassignee.php');
|
| 52 | 52 | } |
| 53 | 53 | } |
@@ -5,7 +5,7 @@ discard block |
||
| 5 | 5 | $user = $users->userdata($_SESSION['loginid']); |
| 6 | 6 | if ($user['level'] == 'Admin' || $user['level'] == 'Manager') {
|
| 7 | 7 | $akses = true; |
| 8 | -} else {
|
|
| 8 | +}else {
|
|
| 9 | 9 | $akses = false; |
| 10 | 10 | } |
| 11 | 11 | if ($akses = false) {
|
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | } elseif ($currenttime >= $slawarningtime) {
|
| 78 | 78 | $slabgcolor = '#FFFF00'; |
| 79 | 79 | $slatxtcolor = '#000000'; |
| 80 | - } else {
|
|
| 80 | + }else {
|
|
| 81 | 81 | $slabgcolor = '#00FF00'; |
| 82 | 82 | $slatxtcolor = '#000000'; |
| 83 | 83 | } |