some php 5.3 changes

Elexy · Jul 12, 2010 · 7dedde5 · 7dedde5
1 parent a467761
commit 7dedde5
Show file tree

Hide file tree

Showing 7 changed files with 271 additions and 269 deletions.
diff --git a/procedureel/common.php b/procedureel/common.php
@@ -248,7 +248,7 @@ function printheader($title = "Iwex controlecenter", $pagename = "IwexMain", $us
   ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <HTML><HEAD>
-    <TITLE><?phpecho $title ?></TITLE>
+    <TITLE><?php echo $title ?></TITLE>
     <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
     <META content="Iwex Sylvia" name=GENERATOR>
     <link rel="stylesheet" type="text/css" href="<?php echo docroot . STYLESHEET; ?>">
@@ -281,7 +281,7 @@ function printemailheader($title = "Iwex controlecenter")
   ?>
   <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
   <HTML><HEAD>
-      <TITLE><?phpecho $title ?></TITLE>
+      <TITLE><?php echo $title ?></TITLE>
       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
       <META content="Dev-PHP 2.0.6" name=GENERATOR>
       <STYLE type="text/css">
@@ -583,7 +583,7 @@ function printIwexNav($bl_use_DHTML_menu = TRUE)
                </script>";
   } else
   {
-    echo '<a href="<?phpecho docroot; ?>/logout.php" class="menubar">Logout</a>';
+    echo '<a href="<?php echo docroot; ?>/logout.php" class="menubar">Logout</a>';
   }
   ?>
     </td>
@@ -796,26 +796,28 @@ function PrintCreditStatus($int_customer_id)
  *                bl_color, True when the invoice should 
  *                          be color. False for B&W.
  *********************************************************/
-function PrintInvoiceID($int_invoiceID, 
+function PrintInvoiceID(
+    $int_invoiceID,
     $bl_orig = FALSE,
     $str_format = "pdf",
     $int_print = 0,
     $bl_color = FALSE)
 {
   global $_GLOBAL;
   $int_shipID = GetField("SELECT shipmentID FROM invoices WHERE InvoiceID = '$int_invoiceID'");
-
   if ($int_shipID)
   {
     PrintInvoice($int_shipID,
         $bl_orig,
         $str_format,
         $int_print,
         $bl_color);
-  } else
-  {
+  }
+  else
+  { //no shipment so this is an admin order
+    $strOriginal = $bl_orig ? '&original=1' : '';
     $int_order_id = GetField("SELECT orderID FROM invoices WHERE InvoiceID = '$int_invoiceID'");
-    echo "<script>location.replace('".$_GLOBAL["str_backdir"].ORDERCOMFIRM."?orderID=$int_order_id&format=".FORMAT_PDF."&invoice=1');</script>";
+    echo "<script>location.replace('".$_GLOBAL["str_backdir"].ORDERCOMFIRM."?orderID=$int_order_id&format=".FORMAT_PDF."&invoice=1".$strOriginal."');</script>";
   }
 }
 
@@ -1296,6 +1298,7 @@ function PrintInvoice($int_shipID,
     $str_tempname = "tempinvoice",
     $bl_Protection = FALSE)
 {
+  $bl_orig;
   global $db_iwex;
   $bl_returnvalue = FALSE;
   $int_invoiceID = GetInvoiceID($int_shipID);

diff --git a/procedureel/inbox.php b/procedureel/inbox.php
@@ -802,7 +802,7 @@ function refreshmail() {
 ?>
     </tr>
     <tr valign="middle" height="20"><td style="border-top:1pt solid <?php$COLORSET[$COLORS][LINE]?>"><table cellspacing="0" cellpadding="0" width="100%" height="100%" border="0"><tr valign="middle">
-      <td> <b>Mailbox: <?phpecho $_SESSION['EMAIL']; ?></b></td>
+      <td> <b>Mailbox: <?php echo $_SESSION['EMAIL']; ?></b></td>
 	  <td align="right"><b>
       Colorset: <select name="colorset" onChange="javascript:window.location='<?php$WIZ?>?op=<?phpisset($_REQUEST['op'])?$_REQUEST['op']:''?>&id=<?phpisset($_REQUEST['id'])?$_REQUEST['id']:''?>&colorset='+this.value"><?phpforeach($COLORSET as $cs_n=>$cs_d) echo("<option value='$cs_n' ".(($cs_n==$COLORS)?"selected":"").">$cs_n</option>\n"); ?></select> &nbsp; | &nbsp;
       Font size: <select name="fontsize" onChange="javascript:window.location='<?php$WIZ?>?op=<?phpisset($_REQUEST['op'])?$_REQUEST['op']:''?>&id=<?phpisset($_REQUEST['id'])?$_REQUEST['id']:''?>&fontsize='+this.value"><?phpfor($i=7;$i<16;$i++) echo("<option value='$i' ".(($i==$_SESSION[FONTSIZE])?"selected":"").">$i pt</option>\n"); ?></select> &nbsp; | &nbsp;

diff --git a/procedureel/includes/pdf_functions.php b/procedureel/includes/pdf_functions.php
@@ -1486,7 +1486,7 @@ class PurchaseOrderPDF extends IwexTemplatePDF
 {
   function PurchaseOrderPDF($orientation='P',$unit='mm',$format='A4')
   {
-    parent::IwexTemplatePDF($orientation, $unit ,$format);
+    parent::__construct($orientation, $unit ,$format);
     $this->bl_purchase_order = TRUE;
   }
 }

diff --git a/procedureel/index.php b/procedureel/index.php
@@ -97,8 +97,8 @@
      <hr>
      <table cellpadding="0" cellspacing="0" border="0" width="100%">
       <tr>
-       <td>Pagina vernieuwd op: <?phpecho date("d-m-Y G:i:s");?></td>
-       <td align="right"><?phpecho date("Y");?> &copy; <a href="mailto:<?phpecho $GLOBALS["ary_config"]["email.info"] . ">".COMPANYNAME."</A> K.V.K. " . KVK ."</td>"; ?>
+       <td>Pagina vernieuwd op: <?php echo date("d-m-Y G:i:s");?></td>
+       <td align="right"><?php echo date("Y");?> &copy; <a href="mailto:<?php echo $GLOBALS["ary_config"]["email.info"] . ">".COMPANYNAME."</A> K.V.K. " . KVK ."</td>"; ?>
       </tr>
      </table>