Fixed some errors. See #263.

lpaulsen93 · Feb 14, 2021 · 40d14f4 · 40d14f4
1 parent 0fca0a6
commit 40d14f4
Show file tree

Hide file tree

Showing 17 changed files with 38 additions and 35 deletions.
diff --git a/ODT/ODTDocument.php b/ODT/ODTDocument.php
@@ -899,7 +899,7 @@ public function doPageFormatChange ($parent = NULL) {
 
         // It is iassumed the proper media selector has been set by calling setMediaSelector()
         if (($this->CSSUsage == 'basic' || $this->CSSUsage == 'full') && $this->importnew != NULL) {
-            ODTImport::set_page_properties ($this->params, $style_obj);
+            ODTImport::set_page_properties($this->params, $style_obj);
         }
 
         // Save style data in page style array, in common styles and set current page format

diff --git a/ODT/ODTImport.php b/ODT/ODTImport.php
@@ -709,24 +709,28 @@ static protected function importStyle(ODTInternalParams $params, cssdocument $ht
 
     static public function import_styles_from_css (ODTInternalParams $params, $media_sel=NULL, $registrations=NULL, $listAlign='right') {
         if ( $params->import != NULL ) {
-            $save = $params->import->getMedia ();
-            $params->import->setMedia ($media_sel);
+            if (!empty($media_sel)) {
+                $save = $params->import->getMedia();
+                $params->import->setMedia($media_sel);
+            }
 
             // Make a copy of the stack to be sure we do not leave anything behind after import.
             $stack = clone $params->htmlStack;
-            $stack->restoreToRoot ();
+            $stack->restoreToRoot();
 
-            self::import_styles_from_css_internal ($params, $stack, $registrations, $listAlign);
+            self::import_styles_from_css_internal($params, $stack, $registrations, $listAlign);
 
-            $params->import->setMedia ($save);
+            if (!empty($media_sel)) {
+                $params->import->setMedia($save);
+            }
         }
     }
 
-    static public function set_page_properties (ODTInternalParams $params, ODTPageLayoutStyle $pageStyle, $media_sel=NULL) {
+    static public function set_page_properties(ODTInternalParams $params, ODTPageLayoutStyle $pageStyle, $media_sel=NULL) {
         if ( $params->import != NULL ) {
-            if ($media_sel != NULL ) {
+            if (!empty($media_sel)) {
                 $save = $params->import->getMedia ();
-                $params->import->setMedia ($media_sel);
+                $params->import->setMedia($media_sel);
             }
 
             $stack = clone $params->htmlStack;
@@ -745,7 +749,7 @@ static public function set_page_properties (ODTInternalParams $params, ODTPageLa
                 }
             }
 
-            if ($media_sel != NULL ) {
+            if (!empty($media_sel)) {
                 $params->import->setMedia ($save);
             }
         }
@@ -802,8 +806,8 @@ static protected function importFootnoteStyle(ODTInternalParams $params) {
         $disabled ['padding-right'] = 1;
         $disabled ['padding-bottom'] = 1;
         $disabled ['padding-left'] = 1;
-        
-        $styleName = $params->styleset->getStyleName (footnote);
+
+        $styleName = $params->styleset->getStyleName('footnote');
         $footnote = $params->styleset->getStyle($styleName);
         if ($footnote != NULL && $body != NULL) {
             ODTParagraphStyle::copyLayoutProperties ($body, $footnote, $disabled);
@@ -815,7 +819,7 @@ static protected function import_styles_from_css_internal(ODTInternalParams $par
         $name = $params->styleset->getStyleName('first page');
         $first_page = $params->styleset->getStyle($name);
         if ($first_page != NULL) {
-            self::set_page_properties ($params, $first_page, $htmlStack, NULL);
+            self::set_page_properties($params, $first_page);
         }
 
         // Import styles which only require a simple import based on element name and attributes

diff --git a/ODT/ODTUtility.php b/ODT/ODTUtility.php
@@ -810,8 +810,8 @@ public static function generateODTfromHTMLCode(ODTInternalParams $params, $HTMLC
 
         // Set new media selector (remember old one)
         $media = $params->import->getMedia ();
-        if (!empty($options ['media_selector'])) {
-            $params->import->setMedia ($options ['media_selector']);
+        if (!empty($options['media_selector'])) {
+            $params->import->setMedia($options['media_selector']);
         }
 
         if (!empty($options ['element'])) {

diff --git a/ODT/css/cssimportnew.php b/ODT/css/cssimportnew.php
@@ -779,10 +779,9 @@ public function toString () {
      * @param    string               $media       Media selector to match
      * @return   boolean
      */
-    public function matches (iElementCSSMatchable $element, &$specificity, $media = NULL) {
-
-        $media = trim ($media);
-        if ( !empty($this->media) && $media != $this->media ) {
+    public function matches(iElementCSSMatchable $element, &$specificity, $media = NULL) {
+        $media = trim($media);
+        if ( !empty($this->media) && $media !== $this->media ) {
             // Wrong media
             //print ("\nNo-Match ".$this->media."==".$media); //Debuging
             return false;
@@ -923,7 +922,7 @@ protected function deleteComments (&$contents) {
      * 
      * @param    string      $media
      */
-    public function setMedia ($media) {
+    public function setMedia($media) {
         $this->media = $media;
     }
 
@@ -932,7 +931,7 @@ public function setMedia ($media) {
      * 
      * @return    string
      */
-    public function getMedia () {
+    public function getMedia() {
         return $this->media;
     }
 
@@ -1060,7 +1059,7 @@ public function getPropertyForElement ($name, iElementCSSMatchable $element) {
         $value = NULL;
         $highest = 0;
         foreach ($this->rules as $rule) {
-            $matched = $rule->matches ($element, $specificity, $this->media);
+            $matched = $rule->matches($element, $specificity, $this->media);
             if ( $matched !== false ) {
                 $current = $rule->getProperty ($name);
 

diff --git a/ODT/styles/ODTMasterPageStyle.php b/ODT/styles/ODTMasterPageStyle.php
@@ -55,7 +55,7 @@ public function getElementName() {
      * @param  $properties Properties to be imported
      * @param  $disabled Properties to be ignored
      */
-    public function importProperties($properties, $disabled) {
+    public function importProperties($properties, $disabled=array()) {
         $this->importPropertiesInternal(self::$master_fields, $properties, $disabled, $this->master_style);
     }
 

diff --git a/ODT/styles/ODTPageLayoutStyle.php b/ODT/styles/ODTPageLayoutStyle.php
@@ -132,7 +132,7 @@ public function getElementName() {
      * @param  $properties Properties to be imported
      * @param  $disabled Properties to be ignored
      */
-    public function importProperties($properties, $disabled) {
+    public function importProperties($properties, $disabled=array()) {
         $this->importPropertiesInternal(self::$page_layout_fields, $properties, $disabled, $this->page_layout_style);
         $this->importPropertiesInternal(self::$layout_props_fields, $properties, $disabled, $this->layout_props);
         $this->importPropertiesInternal(self::$bgi_fields, $properties, $disabled, $this->bgi_props);

diff --git a/ODT/styles/ODTParagraphStyle.php b/ODT/styles/ODTParagraphStyle.php
@@ -102,7 +102,7 @@ public function __construct() {
      * @param  $properties Properties to be imported
      * @param  $disabled Properties to be ignored
      */
-    public function importProperties($properties, $disabled) {
+    public function importProperties($properties, $disabled=array()) {
         foreach ($properties as $property => $value) {
             if ($disabled [$property] == 0) {
                 $this->setProperty($property, $value);

diff --git a/ODT/styles/ODTStyle.php b/ODT/styles/ODTStyle.php
@@ -44,7 +44,7 @@ abstract public function getElementName();
      * @param  $properties Properties to be imported
      * @param  $disabled Properties to be ignored
      */
-    abstract public function importProperties($properties, $disabled);
+    abstract public function importProperties($properties, $disabled=array());
 
     /**
      * Check if a style is a common style.

diff --git a/ODT/styles/ODTTableCellStyle.php b/ODT/styles/ODTTableCellStyle.php
@@ -81,7 +81,7 @@ public function __construct() {
      * @param  $properties Properties to be imported
      * @param  $disabled Properties to be ignored
      */
-    public function importProperties($properties, $disabled) {
+    public function importProperties($properties, $disabled=array()) {
         $this->importPropertiesInternal(ODTStyleStyle::getStyleProperties (), $properties, $disabled);
         $this->importPropertiesInternal(ODTTextStyle::getTextProperties (), $properties, $disabled);
         $this->importPropertiesInternal(ODTParagraphStyle::getParagraphProperties (), $properties, $disabled);

diff --git a/ODT/styles/ODTTableColumnStyle.php b/ODT/styles/ODTTableColumnStyle.php
@@ -39,7 +39,7 @@ public function __construct() {
      * @param  $properties Properties to be imported
      * @param  $disabled Properties to be ignored
      */
-    public function importProperties($properties, $disabled) {
+    public function importProperties($properties, $disabled=array()) {
         $this->importPropertiesInternal(ODTStyleStyle::getStyleProperties (), $properties, $disabled);
         $this->importPropertiesInternal(self::$table_column_fields, $properties, $disabled);
         $this->setProperty('style-family', $this->getFamily());

diff --git a/ODT/styles/ODTTableRowStyle.php b/ODT/styles/ODTTableRowStyle.php
@@ -58,7 +58,7 @@ public function __construct() {
      * @param    $properties    Properties to be imported
      * @param    $disabled      Properties to be ignored
      */
-    public function importProperties($properties, $disabled) {
+    public function importProperties($properties, $disabled=array()) {
         $this->importPropertiesInternal(ODTStyleStyle::getStyleProperties (), $properties, $disabled);
         $this->importPropertiesInternal(self::$table_row_fields, $properties, $disabled);
         $this->setProperty('style-family', $this->getFamily());

diff --git a/ODT/styles/ODTTableStyle.php b/ODT/styles/ODTTableStyle.php
@@ -68,7 +68,7 @@ public function __construct() {
      * @param    $properties    Properties to be imported
      * @param    $disabled      Properties to be ignored
      */
-    public function importProperties($properties, $disabled) {
+    public function importProperties($properties, $disabled=array()) {
         $this->importPropertiesInternal(ODTStyleStyle::getStyleProperties (), $properties, $disabled);
         $this->importPropertiesInternal(self::$table_fields, $properties, $disabled);
         $this->setProperty('style-family', $this->getFamily());

diff --git a/ODT/styles/ODTTextListStyle.php b/ODT/styles/ODTTextListStyle.php
@@ -93,7 +93,7 @@ public function getElementName() {
      * @param  $properties Properties to be imported
      * @param  $disabled Properties to be ignored
      */
-    public function importProperties($properties, $disabled) {
+    public function importProperties($properties, $disabled=array()) {
         $this->importPropertiesInternal(ODTTextStyle::getTextProperties (), $properties, $disabled);
         $this->importPropertiesInternal(self::$list_fields, $properties, $disabled);
     }

diff --git a/ODT/styles/ODTTextOutlineStyle.php b/ODT/styles/ODTTextOutlineStyle.php
@@ -64,7 +64,7 @@ public function getElementName() {
      * @param  $properties Properties to be imported
      * @param  $disabled Properties to be ignored
      */
-    public function importProperties($properties, $disabled) {
+    public function importProperties($properties, $disabled=array()) {
         $this->importPropertiesInternal(ODTTextStyle::getTextProperties (), $properties, $disabled);
         $this->importPropertiesInternal(self::$outline_fields, $properties, $disabled);
     }

diff --git a/ODT/styles/ODTTextStyle.php b/ODT/styles/ODTTextStyle.php
@@ -131,7 +131,7 @@ public function __construct() {
      * @param  $properties Properties to be imported
      * @param  $disabled Properties to be ignored
      */
-    public function importProperties($properties, $disabled) {
+    public function importProperties($properties, $disabled=array()) {
         $this->importPropertiesInternal(ODTStyleStyle::getStyleProperties (), $properties, $disabled);
         $this->importPropertiesInternal(self::$text_fields, $properties, $disabled);
         $this->setProperty('style-family', $this->getFamily());

diff --git a/ODT/styles/ODTUnknownStyle.php b/ODT/styles/ODTUnknownStyle.php
@@ -55,7 +55,7 @@ public function setElementName($element_name) {
      * @param  $properties Properties to be imported
      * @param  $disabled Properties to be ignored
      */
-    public function importProperties($properties, $disabled) {
+    public function importProperties($properties, $disabled=array()) {
     }
 
     /**

diff --git a/renderer/page.php b/renderer/page.php
@@ -116,7 +116,7 @@ protected function load_css() {
                 $this->document->setCSSUsage('off');
                 break;
         }
-        $this->document->setMediaSelector ($this->config->getParam('media_sel'));
+        $this->document->setMediaSelector($this->config->getParam('media_sel'));
 
         // Put some root element on the HTML stack which should always
         // be present for our CSS matching