projects
/
fa-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6c40a3b
)
Fixed more php 8.2 deprecation bugs.
author
Joe
<joe.hunt.consulting@gmail.com>
Thu, 18 Jan 2024 09:17:02 +0000
(10:17 +0100)
committer
Joe
<joe.hunt.consulting@gmail.com>
Thu, 18 Jan 2024 09:17:02 +0000
(10:17 +0100)
frontaccounting.php
patch
|
blob
|
history
reporting/includes/Workbook.php
patch
|
blob
|
history
reporting/includes/excel_report.inc
patch
|
blob
|
history
sales/sales_order_entry.php
patch
|
blob
|
history
diff --git
a/frontaccounting.php
b/frontaccounting.php
index a7432037aba8eb77f494bd1a9294d13be90a4bb3..0b3361dae0e40e935398e9ae342d2e60ce113926 100644
(file)
--- a/
frontaccounting.php
+++ b/
frontaccounting.php
@@
-28,6
+28,7
@@
if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
var $settings;
var $applications;
var $selected_application;
var $settings;
var $applications;
var $selected_application;
+ var $renderer = null;
var $menu;
var $menu;
diff --git
a/reporting/includes/Workbook.php
b/reporting/includes/Workbook.php
index 89573820d7d1d293988b0e4a4536bd21ddc3aaeb..eea99e047e0c31f21085aa99853961d6daaf148e 100644
(file)
--- a/
reporting/includes/Workbook.php
+++ b/
reporting/includes/Workbook.php
@@
-942,6
+942,7
@@
class Spreadsheet_Excel_Writer_BIFFwriter
* @see _addContinue()
*/
var $_limit;
* @see _addContinue()
*/
var $_limit;
+ var $_offset;
/**
* Constructor
/**
* Constructor
@@
-1462,6
+1463,10
@@
class Spreadsheet_Excel_Writer_Format
*/
var $_right_color;
*/
var $_right_color;
+ // Dynamic members must be here (php 8.2)
+ var $_BIFF_version;
+ var $_diag;
+ var $_diag_color;
/**
* Constructor
*
/**
* Constructor
*
@@
-2381,6
+2386,9
@@
class Spreadsheet_Excel_Writer_Parser
*/
var $_BIFF_version;
*/
var $_BIFF_version;
+ // The Excel ptg indices. Dynamic members must be here (php 8.2)
+ var $ptg;
+ var $_functions;
/**
* The class constructor
*
/**
* The class constructor
*
@@
-4131,6
+4139,24
@@
class Spreadsheet_Excel_Writer_Worksheet extends Spreadsheet_Excel_Writer_BIFFwr
* @var string
*/
var $_input_encoding;
* @var string
*/
var $_input_encoding;
+ // Dynamic members must be here (php8.2)
+ var $activesheet;
+ var $firstsheet;
+ var $title_colmax;
+ var $_print_gridlines;
+ var $_screen_gridlines;
+ var $_print_headers;
+ var $_hbreaks;
+ var $_vbreaks;
+ var $_protect;
+ var $_password;
+ var $col_sizes;
+ var $_row_sizes;
+ var $_zoom;
+ var $_print_scale;
+ var $_rtl;
+ var $_dv;
+
/**
* Constructor
/**
* Constructor
@@
-7406,6
+7432,12
@@
class Spreadsheet_Excel_Writer_Workbook extends Spreadsheet_Excel_Writer_BIFFwri
*/
var $_string_sizeinfo_size;
*/
var $_string_sizeinfo_size;
+ // Dynamic members must be here (php8.2)
+ var $_string_sizeinfo;
+ var $_str_total;
+ var $_str_unique;
+ var $_str_table;
+ //var $_offset;
/**
* Class constructor
*
/**
* Class constructor
*
@@
-7765,7
+7797,7
@@
class Spreadsheet_Excel_Writer_Workbook extends Spreadsheet_Excel_Writer_BIFFwri
// Add BOUNDSHEET records
for ($i = 0; $i < $total_worksheets; $i++) {
// Add BOUNDSHEET records
for ($i = 0; $i < $total_worksheets; $i++) {
- $this->_storeBoundsheet($this->_worksheets[$i]->name,$this->_worksheets[$i]->offset);
+ $this->_storeBoundsheet($this->_worksheets[$i]->name,$this->_worksheets[$i]->
_
offset);
}
if ($this->_country_code != -1) {
}
if ($this->_country_code != -1) {
@@
-7865,7
+7897,7
@@
class Spreadsheet_Excel_Writer_Workbook extends Spreadsheet_Excel_Writer_BIFFwri
$offset += $EOF;
for ($i = 0; $i < $total_worksheets; $i++) {
$offset += $EOF;
for ($i = 0; $i < $total_worksheets; $i++) {
- $this->_worksheets[$i]->offset = $offset;
+ $this->_worksheets[$i]->
_
offset = $offset;
$offset += $this->_worksheets[$i]->_datasize;
}
$this->_biffsize = $offset;
$offset += $this->_worksheets[$i]->_datasize;
}
$this->_biffsize = $offset;
diff --git
a/reporting/includes/excel_report.inc
b/reporting/includes/excel_report.inc
index 1ee91c703076d348a48c0b99ba502bb0fbd45898..da26d5592c408dc7c795a103d90999e696366613 100644
(file)
--- a/
reporting/includes/excel_report.inc
+++ b/
reporting/includes/excel_report.inc
@@
-56,6
+56,12
@@
class FrontReport extends Spreadsheet_Excel_Writer_Workbook
var $formatHeaderRight;
var $formatFooter;
var $formatAmount = array();
var $formatHeaderRight;
var $formatFooter;
var $formatAmount = array();
+ var $formatRight;
+ var $formatLeft;
+ var $formatTopHeaderLeft;
+ var $formatBottomHeaderLeft;
+ var $formatTopHeaderRight;
+ var $formatBottomHeaderRight;
var $headerFunc;
var $sheet;
var $headerFunc;
var $sheet;
diff --git
a/sales/sales_order_entry.php
b/sales/sales_order_entry.php
index 362723d7845af2967281eac6e8a38790d721e0fe..85985fb11a7c1b9cbed5188bc92879d04dc7fa20 100644
(file)
--- a/
sales/sales_order_entry.php
+++ b/
sales/sales_order_entry.php
@@
-264,7
+264,7
@@
function copy_to_cart()
{
$cart = &$_SESSION['Items'];
{
$cart = &$_SESSION['Items'];
- $cart->reference =
$_POST['ref']
;
+ $cart->reference =
get_post('ref')
;
$cart->Comments = $_POST['Comments'];
$cart->Comments = $_POST['Comments'];