| Index: trunk/extensions/QPoll/Excel/Excel_Worksheet.php |
| — | — | @@ -373,7 +373,7 @@ |
| 374 | 374 | &$url_format, &$parser) |
| 375 | 375 | { |
| 376 | 376 | // It needs to call its parent's constructor explicitly |
| 377 | | - $this->Spreadsheet_Excel_Writer_BIFFwriter(); |
| | 377 | + parent::__construct(); |
| 378 | 378 | $this->_BIFF_version = $BIFF_version; |
| 379 | 379 | $rowmax = 65536; // 16384 in Excel 5 |
| 380 | 380 | $colmax = 256; |
| Index: trunk/extensions/QPoll/Excel/Excel_Writer.php |
| — | — | @@ -53,7 +53,7 @@ |
| 54 | 54 | function __construct($filename = '') |
| 55 | 55 | { |
| 56 | 56 | $this->_filename = $filename; |
| 57 | | - $this->Spreadsheet_Excel_Writer_Workbook($filename); |
| | 57 | + parent::__construct($filename); |
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | /** |
| Index: trunk/extensions/QPoll/Excel/OLE_PPS_File.php |
| — | — | @@ -48,7 +48,7 @@ |
| 49 | 49 | function __construct($name) |
| 50 | 50 | { |
| 51 | 51 | $this->_tmp_dir = System::tmpdir(); |
| 52 | | - $this->OLE_PPS( |
| | 52 | + parent::__construct( |
| 53 | 53 | null, |
| 54 | 54 | $name, |
| 55 | 55 | OLE_PPS_TYPE_FILE, |
| Index: trunk/extensions/QPoll/Excel/OLE_PPS_Root.php |
| — | — | @@ -48,7 +48,7 @@ |
| 49 | 49 | function __construct($time_1st, $time_2nd, $raChild) |
| 50 | 50 | { |
| 51 | 51 | $this->_tmp_dir = System::tmpdir(); |
| 52 | | - $this->OLE_PPS( |
| | 52 | + parent::__construct( |
| 53 | 53 | null, |
| 54 | 54 | OLE::Asc2Ucs('Root Entry'), |
| 55 | 55 | OLE_PPS_TYPE_ROOT, |
| Index: trunk/extensions/QPoll/Excel/Excel_Workbook.php |
| — | — | @@ -180,7 +180,7 @@ |
| 181 | 181 | function __construct($filename) |
| 182 | 182 | { |
| 183 | 183 | // It needs to call its parent's constructor explicitly |
| 184 | | - $this->Spreadsheet_Excel_Writer_BIFFwriter(); |
| | 184 | + parent::__construct(); |
| 185 | 185 | |
| 186 | 186 | $this->_filename = $filename; |
| 187 | 187 | $this->_parser = new Spreadsheet_Excel_Writer_Parser($this->_byte_order, $this->_BIFF_version); |
| Index: trunk/extensions/QPoll/Excel/OLE.php |
| — | — | @@ -470,7 +470,7 @@ |
| 471 | 471 | * @param string $ascii The ASCII string to transform |
| 472 | 472 | * @return string The string in Unicode |
| 473 | 473 | */ |
| 474 | | - function Asc2Ucs($ascii) |
| | 474 | + static function Asc2Ucs($ascii) |
| 475 | 475 | { |
| 476 | 476 | $rawname = ''; |
| 477 | 477 | for ($i = 0; $i < strlen($ascii); $i++) { |
| — | — | @@ -488,7 +488,7 @@ |
| 489 | 489 | * @param integer $date A timestamp |
| 490 | 490 | * @return string The string for the OLE container |
| 491 | 491 | */ |
| 492 | | - function LocalDate2OLE($date = null) |
| | 492 | + static function LocalDate2OLE($date = null) |
| 493 | 493 | { |
| 494 | 494 | if (!isset($date)) { |
| 495 | 495 | return "\x00\x00\x00\x00\x00\x00\x00\x00"; |
| — | — | @@ -533,7 +533,7 @@ |
| 534 | 534 | * @access public |
| 535 | 535 | * @static |
| 536 | 536 | */ |
| 537 | | - function OLE2LocalDate($string) |
| | 537 | + static function OLE2LocalDate($string) |
| 538 | 538 | { |
| 539 | 539 | if (strlen($string) != 8) { |
| 540 | 540 | return new PEAR_Error("Expecting 8 byte string"); |
| Index: trunk/extensions/QPoll/Excel/System.php |
| — | — | @@ -451,7 +451,7 @@ |
| 452 | 452 | * @static |
| 453 | 453 | * @return string The temporary directory on the system |
| 454 | 454 | */ |
| 455 | | - function tmpdir() |
| | 455 | + static function tmpdir() |
| 456 | 456 | { |
| 457 | 457 | if (OS_WINDOWS) { |
| 458 | 458 | if ($var = isset($_ENV['TMP']) ? $_ENV['TMP'] : getenv('TMP')) { |
| Index: trunk/extensions/QPoll/qp_user.php |
| — | — | @@ -1236,6 +1236,7 @@ |
| 1237 | 1237 | } |
| 1238 | 1238 | |
| 1239 | 1239 | static function displayRow( $row, $rowattrs = "", $celltag = "td", $attribute_maps = null ) { |
| | 1240 | + # temporary var $tagsrow used to avoid warning in E_STRICT mode |
| 1240 | 1241 | $tagsrow = self::newRow( $row, $rowattrs, $celltag, $attribute_maps ); |
| 1241 | 1242 | return self::renderHTMLobject( $tagsrow ); |
| 1242 | 1243 | } |
| Index: trunk/extensions/QPoll/qp_question.php |
| — | — | @@ -1020,6 +1020,7 @@ |
| 1021 | 1021 | } |
| 1022 | 1022 | # fill undefined spans with the last span value |
| 1023 | 1023 | $SpanCategDelta = count( $this->mCategories ) - count( $spans[0] ); |
| | 1024 | + # temporary var $diff used to avoid warning in E_STRICT mode |
| 1024 | 1025 | $diff = array_diff( array_keys( $spans[1] ), array_keys( $spans[1], "", true ) ); |
| 1025 | 1026 | $lastDefinedSpanKey = array_pop( $diff ); |
| 1026 | 1027 | unset( $diff ); |