Eoxia / wpshop

includes/modules/wps_help/wps_help.php

Spacing +9 added lines, -9 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 /**
  * WpShop Help bootstrap file
@@ -8,17 +8,17 @@ 
  * @subpackage modules
  *
  */
-DEFINE( 'WPS_HELP_VERSION', '1.0.1' );
-DEFINE( 'WPS_HELP_DIR', basename(dirname(__FILE__)));
-DEFINE( 'WPS_HELP_PATH', dirname( __FILE__ ) );
-DEFINE( 'WPS_HELP_URL', str_replace( str_replace( "\\", "/", ABSPATH), site_url() . '/', str_replace( "\\", "/", WPS_HELP_PATH ) ) );
+DEFINE('WPS_HELP_VERSION', '1.0.1');
+DEFINE('WPS_HELP_DIR', basename(dirname(__FILE__)));
+DEFINE('WPS_HELP_PATH', dirname(__FILE__));
+DEFINE('WPS_HELP_URL', str_replace(str_replace("\\", "/", ABSPATH), site_url() . '/', str_replace("\\", "/", WPS_HELP_PATH)));
 
 /**	Define the templates directories	*/
-DEFINE( 'WPS_HELP_TEMPLATES_MAIN_DIR', WPS_HELP_PATH . '/templates/');
+DEFINE('WPS_HELP_TEMPLATES_MAIN_DIR', WPS_HELP_PATH . '/templates/');
 
-require_once( WPS_HELP_PATH . '/controller/wps_help_menus_ctr.php' );
-require_once( WPS_HELP_PATH . '/controller/wps_help_bubble_ctr.php' );
-require_once( WPS_HELP_PATH . '/controller/wps_help_tabs_ctr.php' );
+require_once(WPS_HELP_PATH . '/controller/wps_help_menus_ctr.php');
+require_once(WPS_HELP_PATH . '/controller/wps_help_bubble_ctr.php');
+require_once(WPS_HELP_PATH . '/controller/wps_help_tabs_ctr.php');
 
 /**	Instanciate task management*/
 global $wps_help_menu;

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Fichier de définition du modèle des taxinomies / File for term model definition
  *

includes/modules/wps_help/controller/wps_help_tabs_ctr.php

Indentation +2 added lines, -2 removed lines

@@ -26,9 +26,9 @@
 	}
 
 	public function help_tab_static()
-    {
+	{
 		ob_start();
-    	require( wpshop_tools::get_template_part( WPS_HELP_DIR, WPS_HELP_TEMPLATES_MAIN_DIR, "backend", "wps_tabs_static_tpl") );
+		require( wpshop_tools::get_template_part( WPS_HELP_DIR, WPS_HELP_TEMPLATES_MAIN_DIR, "backend", "wps_tabs_static_tpl") );
 		$result .= ob_get_contents();
 		ob_end_clean();
 		return $result;

Spacing +17 added lines, -17 removed lines

@@ -1,25 +1,25 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_help_tabs_ctr
 {
 	private $help_tabs;
 
 	public function __construct() {
-		add_action( "load-{$GLOBALS['pagenow']}", array( $this, 'create_help_tabs' ), 20 );
+		add_action("load-{$GLOBALS['pagenow']}", array($this, 'create_help_tabs'), 20);
 	}
 
 	public function create_help_tabs()
 	{
-		if( is_array( $this->help_tabs ) ) {
+		if (is_array($this->help_tabs)) {
 			$screen = get_current_screen();
-			foreach ( $this->help_tabs as $id => $data )
+			foreach ($this->help_tabs as $id => $data)
 			{
-				if( is_array($data['pages']) && in_array( $screen->id, $data['pages'] ) ) {
-					$screen->add_help_tab( array(
+				if (is_array($data['pages']) && in_array($screen->id, $data['pages'])) {
+					$screen->add_help_tab(array(
 						'id'        => $id
 						,'title'    => $data['title']
 						,'content'  => $this->help_tab_static()
-						,'callback' => array( $this, 'help_tab_content' )
-					) );
+						,'callback' => array($this, 'help_tab_content')
+					));
 				}
 			}
 		}
@@ -28,23 +28,23 @@ 
 	public function help_tab_static()
     {
 		ob_start();
-    	require( wpshop_tools::get_template_part( WPS_HELP_DIR, WPS_HELP_TEMPLATES_MAIN_DIR, "backend", "wps_tabs_static_tpl") );
+    	require(wpshop_tools::get_template_part(WPS_HELP_DIR, WPS_HELP_TEMPLATES_MAIN_DIR, "backend", "wps_tabs_static_tpl"));
 		$result .= ob_get_contents();
 		ob_end_clean();
 		return $result;
 	}
 	
-	public function help_tab_content( $screen, $tab )
+	public function help_tab_content($screen, $tab)
 	{
 		$id = $tab['id'];
-		$title = $tab['callback'][0]->help_tabs[ $tab['id'] ]['title'];
-		$content = $tab['callback'][0]->help_tabs[ $tab['id'] ]['content'];
-		$pages = $tab['callback'][0]->help_tabs[ $tab['id'] ]['pages'];
-		require( wpshop_tools::get_template_part( WPS_HELP_DIR, WPS_HELP_TEMPLATES_MAIN_DIR, "backend", "wps_tab_content_tpl") );
+		$title = $tab['callback'][0]->help_tabs[$tab['id']]['title'];
+		$content = $tab['callback'][0]->help_tabs[$tab['id']]['content'];
+		$pages = $tab['callback'][0]->help_tabs[$tab['id']]['pages'];
+		require(wpshop_tools::get_template_part(WPS_HELP_DIR, WPS_HELP_TEMPLATES_MAIN_DIR, "backend", "wps_tab_content_tpl"));
 	}
 	
-	public function set_help_tab( $ID, $title, $content, $pages ) {
-		$this->help_tabs[$ID] = array( 'title' => $title, 'content' => $content, 'pages' => $pages );
+	public function set_help_tab($ID, $title, $content, $pages) {
+		$this->help_tabs[$ID] = array('title' => $title, 'content' => $content, 'pages' => $pages);
 	}
 	
 	/**
@@ -52,7 +52,7 @@ 
 	 * @return string
 	 */
 	public static function display_current_id_page() {
-		add_action( "load-{$GLOBALS['pagenow']}", array( 'wps_help_tabs_ctr', 'get_current_id_page' ), 20 );
+		add_action("load-{$GLOBALS['pagenow']}", array('wps_help_tabs_ctr', 'get_current_id_page'), 20);
 	}
 	public static function get_current_id_page() {
 		$screen = get_current_screen();

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Fichier de définition du modèle des taxinomies / File for term model definition
  *

includes/modules/wps_help/templates/backend/wps_tabs_static_tpl.php

Spacing +2 added lines, -2 removed lines

@@ -1,3 +1,3 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 ?>
-<p style="text-align: center;"><i><?php _e( 'Help of plugin WPShop', 'wpshop' )?></i></p>
\ No newline at end of file
+<p style="text-align: center;"><i><?php _e('Help of plugin WPShop', 'wpshop')?></i></p>
\ No newline at end of file

Braces +3 added lines, -1 removed lines

@@ -1,3 +1,5 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 ?>
 <p><?php echo $content; ?></p>
\ No newline at end of file

includes/modules/wps_help/templates/backend/wps_tab_content_tpl.php

Spacing +1 added lines, -1 removed lines

@@ -1,3 +1,3 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 ?>
 <p><?php echo $content; ?></p>
\ No newline at end of file

Braces +3 added lines, -1 removed lines

@@ -1,3 +1,5 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 ?>
 <p><?php echo $content; ?></p>
\ No newline at end of file

includes/modules/wps_barcode/librairies/odtphp/Segment.php

Indentation +191 added lines, -191 removed lines

@@ -19,210 +19,210 @@
  */
 class Segment implements IteratorAggregate, Countable
 {
-    protected $xml;
-    protected $xmlParsed = '';
-    protected $name;
-    protected $children = array();
-    protected $vars = array();
-    public $manif_vars = array();
+	protected $xml;
+	protected $xmlParsed = '';
+	protected $name;
+	protected $children = array();
+	protected $vars = array();
+	public $manif_vars = array();
 	protected $images = array();
 	protected $odf;
 	protected $file;
-    /**
-     * Constructor
-     *
-     * @param string $name name of the segment to construct
-     * @param string $xml XML tree of the segment
-     */
-    public function __construct($name, $xml, $odf)
-    {
-        $this->name = (string) $name;
-        $this->xml = (string) $xml;
+	/**
+	 * Constructor
+	 *
+	 * @param string $name name of the segment to construct
+	 * @param string $xml XML tree of the segment
+	 */
+	public function __construct($name, $xml, $odf)
+	{
+		$this->name = (string) $name;
+		$this->xml = (string) $xml;
 		$this->odf = $odf;
-        $zipHandler = $this->odf->getConfig('ZIP_PROXY');
-        $this->file = new $zipHandler();	
-        $this->_analyseChildren($this->xml);
-    }
-    /**
-     * Returns the name of the segment
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-    /**
-     * Does the segment have children ?
-     *
-     * @return bool
-     */
-    public function hasChildren()
-    {
-        return $this->getIterator()->hasChildren();
-    }
-    /**
-     * Countable interface
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->children);
-    }
-    /**
-     * IteratorAggregate interface
-     *
-     * @return Iterator
-     */
-    public function getIterator()
-    {
-        return new RecursiveIteratorIterator(new SegmentIterator($this->children), 1);
-    }
-    /**
-     * Replace variables of the template in the XML code
-     * All the children are also called
-     *
-     * @return string
-     */
-    public function merge()
-    {
-        $this->xmlParsed .= str_replace(array_keys($this->vars), array_values($this->vars), $this->xml);
-        if ($this->hasChildren()) {
-            foreach ($this->children as $child) {
-                $this->xmlParsed = str_replace($child->xml, ($child->xmlParsed=="")?$child->merge():$child->xmlParsed, $this->xmlParsed);
-                $child->xmlParsed = '';
-                //Store all image names used in child segments in current segment array 
+		$zipHandler = $this->odf->getConfig('ZIP_PROXY');
+		$this->file = new $zipHandler();	
+		$this->_analyseChildren($this->xml);
+	}
+	/**
+	 * Returns the name of the segment
+	 *
+	 * @return string
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
+	/**
+	 * Does the segment have children ?
+	 *
+	 * @return bool
+	 */
+	public function hasChildren()
+	{
+		return $this->getIterator()->hasChildren();
+	}
+	/**
+	 * Countable interface
+	 *
+	 * @return int
+	 */
+	public function count()
+	{
+		return count($this->children);
+	}
+	/**
+	 * IteratorAggregate interface
+	 *
+	 * @return Iterator
+	 */
+	public function getIterator()
+	{
+		return new RecursiveIteratorIterator(new SegmentIterator($this->children), 1);
+	}
+	/**
+	 * Replace variables of the template in the XML code
+	 * All the children are also called
+	 *
+	 * @return string
+	 */
+	public function merge()
+	{
+		$this->xmlParsed .= str_replace(array_keys($this->vars), array_values($this->vars), $this->xml);
+		if ($this->hasChildren()) {
+			foreach ($this->children as $child) {
+				$this->xmlParsed = str_replace($child->xml, ($child->xmlParsed=="")?$child->merge():$child->xmlParsed, $this->xmlParsed);
+				$child->xmlParsed = '';
+				//Store all image names used in child segments in current segment array 
 				foreach ($child->manif_vars as $file) 
-                $this->manif_vars[] = $file; 
-                $child->manif_vars=array();
-            }
-        }
-        $reg = "/\[!--\sBEGIN\s$this->name\s--\](.*)\[!--\sEND\s$this->name\s--\]/smU";
-        $this->xmlParsed = preg_replace($reg, '$1', $this->xmlParsed);
-        $this->file->open($this->odf->getTmpfile());
-        foreach ($this->images as $imageKey => $imageValue) {
+				$this->manif_vars[] = $file; 
+				$child->manif_vars=array();
+			}
+		}
+		$reg = "/\[!--\sBEGIN\s$this->name\s--\](.*)\[!--\sEND\s$this->name\s--\]/smU";
+		$this->xmlParsed = preg_replace($reg, '$1', $this->xmlParsed);
+		$this->file->open($this->odf->getTmpfile());
+		foreach ($this->images as $imageKey => $imageValue) {
 			if ($this->file->getFromName('Pictures/' . $imageValue) === false) {
 				$this->file->addFile($imageKey, 'Pictures/' . $imageValue);
 			}
-        }
+		}
 
-        $this->file->close();		
-        return $this->xmlParsed;
-    }
-    /**
-     * Analyse the XML code in order to find children
-     *
-     * @param string $xml
-     * @return Segment
-     */
-    protected function _analyseChildren($xml)
-    {
-        // $reg2 = "#\[!--\sBEGIN\s([\S]*)\s--\](?:<\/text:p>)?(.*)(?:<text:p\s.*>)?\[!--\sEND\s(\\1)\s--\]#sm";
-        $reg2 = "#\[!--\sBEGIN\s([\S]*)\s--\](.*)\[!--\sEND\s(\\1)\s--\]#smU";
-        preg_match_all($reg2, $xml, $matches);
-        for ($i = 0, $size = count($matches[0]); $i < $size; $i++) {
-            if ($matches[1][$i] != $this->name) {
-                $this->children[$matches[1][$i]] = new self($matches[1][$i], $matches[0][$i], $this->odf);
-            } else {
-                $this->_analyseChildren($matches[2][$i]);
-            }
-        }
-        return $this;
-    }
-    /**
-     * Assign a template variable to replace
-     *
-     * @param string $key
-     * @param string $value
-     * @throws SegmentException
-     * @return Segment
-     */
-    public function setVars($key, $value, $encode = true, $charset = 'ISO-8859')
-    {
-        if (strpos($this->xml, $this->odf->getConfig('DELIMITER_LEFT') . $key . $this->odf->getConfig('DELIMITER_RIGHT')) === false) {
-            throw new SegmentException("var $key not found in {$this->getName()}");
-        }
+		$this->file->close();		
+		return $this->xmlParsed;
+	}
+	/**
+	 * Analyse the XML code in order to find children
+	 *
+	 * @param string $xml
+	 * @return Segment
+	 */
+	protected function _analyseChildren($xml)
+	{
+		// $reg2 = "#\[!--\sBEGIN\s([\S]*)\s--\](?:<\/text:p>)?(.*)(?:<text:p\s.*>)?\[!--\sEND\s(\\1)\s--\]#sm";
+		$reg2 = "#\[!--\sBEGIN\s([\S]*)\s--\](.*)\[!--\sEND\s(\\1)\s--\]#smU";
+		preg_match_all($reg2, $xml, $matches);
+		for ($i = 0, $size = count($matches[0]); $i < $size; $i++) {
+			if ($matches[1][$i] != $this->name) {
+				$this->children[$matches[1][$i]] = new self($matches[1][$i], $matches[0][$i], $this->odf);
+			} else {
+				$this->_analyseChildren($matches[2][$i]);
+			}
+		}
+		return $this;
+	}
+	/**
+	 * Assign a template variable to replace
+	 *
+	 * @param string $key
+	 * @param string $value
+	 * @throws SegmentException
+	 * @return Segment
+	 */
+	public function setVars($key, $value, $encode = true, $charset = 'ISO-8859')
+	{
+		if (strpos($this->xml, $this->odf->getConfig('DELIMITER_LEFT') . $key . $this->odf->getConfig('DELIMITER_RIGHT')) === false) {
+			throw new SegmentException("var $key not found in {$this->getName()}");
+		}
 		$value = $encode ? htmlspecialchars($value) : $value;
 		$value = ($charset == 'ISO-8859') ? utf8_encode($value) : $value;
-        $this->vars[$this->odf->getConfig('DELIMITER_LEFT') . $key . $this->odf->getConfig('DELIMITER_RIGHT')] = str_replace("\n", "<text:line-break/>", $value);
-        return $this;
-    }
-    /**
-     * Assign a template variable as a picture
-     *
-     * @param string $key name of the variable within the template
-     * @param string $value path to the picture
-     * @param string $page anchor to page number (or -1 if anchor-type is aschar)
-     * @param string $width width of picture (keep original if null)
-     * @param string $height height of picture (keep original if null)
-     * @param string $offsetX offset by horizontal (not used if $page = -1)
-     * @param string $offsetY offset by vertical (not used if $page = -1)
-     * @throws OdfException
-     * @return Segment
-     */
-    public function setImage($key, $value, $page=null, $width=null, $height=null, $offsetX=null, $offsetY=null)
-    {
-        $filename = strtok(strrchr($value, '/'), '/.');
-        $file = substr(strrchr($value, '/'), 1);
-        $size = @getimagesize($value);
-        if ($size === false) {
-            throw new OdfException("Invalid image");
-        }
-        if (!$width && !$height) {
-            list ($width, $height) = $size;
-            $width *= Odf::PIXEL_TO_CM;
-            $height *= Odf::PIXEL_TO_CM;
-        }
-        $anchor = $page == -1 ? 'text:anchor-type="aschar"' : "text:anchor-type=\"page\" text:anchor-page-number=\"{$page}\" svg:x=\"{$offsetX}cm\" svg:y=\"{$offsetY}cm\"";
-        $xml = <<<IMG
+		$this->vars[$this->odf->getConfig('DELIMITER_LEFT') . $key . $this->odf->getConfig('DELIMITER_RIGHT')] = str_replace("\n", "<text:line-break/>", $value);
+		return $this;
+	}
+	/**
+	 * Assign a template variable as a picture
+	 *
+	 * @param string $key name of the variable within the template
+	 * @param string $value path to the picture
+	 * @param string $page anchor to page number (or -1 if anchor-type is aschar)
+	 * @param string $width width of picture (keep original if null)
+	 * @param string $height height of picture (keep original if null)
+	 * @param string $offsetX offset by horizontal (not used if $page = -1)
+	 * @param string $offsetY offset by vertical (not used if $page = -1)
+	 * @throws OdfException
+	 * @return Segment
+	 */
+	public function setImage($key, $value, $page=null, $width=null, $height=null, $offsetX=null, $offsetY=null)
+	{
+		$filename = strtok(strrchr($value, '/'), '/.');
+		$file = substr(strrchr($value, '/'), 1);
+		$size = @getimagesize($value);
+		if ($size === false) {
+			throw new OdfException("Invalid image");
+		}
+		if (!$width && !$height) {
+			list ($width, $height) = $size;
+			$width *= Odf::PIXEL_TO_CM;
+			$height *= Odf::PIXEL_TO_CM;
+		}
+		$anchor = $page == -1 ? 'text:anchor-type="aschar"' : "text:anchor-type=\"page\" text:anchor-page-number=\"{$page}\" svg:x=\"{$offsetX}cm\" svg:y=\"{$offsetY}cm\"";
+		$xml = <<<IMG
 <draw:frame draw:style-name="fr1" draw:name="$filename" {$anchor} svg:width="{$width}cm" svg:height="{$height}cm" draw:z-index="3"><draw:image xlink:href="Pictures/$file" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/></draw:frame>
 IMG;
-        $this->images[$value] = $file;
-        $this->manif_vars[] = $file;	//save image name as array element
-        $this->setVars($key, $xml, false);
-        return $this;
-    }	
-    /**
-     * Shortcut to retrieve a child
-     *
-     * @param string $prop
-     * @return Segment
-     * @throws SegmentException
-     */
-    public function __get($prop)
-    {
-        if (array_key_exists($prop, $this->children)) {
-            return $this->children[$prop];
-        } else {
-            throw new SegmentException('child ' . $prop . ' does not exist');
-        }
-    }
-    /**
-     * Proxy for setVars
-     *
-     * @param string $meth
-     * @param array $args
-     * @return Segment
-     */
-    public function __call($meth, $args)
-    {
-        try {
-            array_unshift($args,$meth);
-            return call_user_func_array(array($this,'setVars'),$args);
-        } catch (SegmentException $e) {
-            throw new SegmentException("method $meth nor var $meth exist");
-        }
-    }
-    /**
-     * Returns the parsed XML
-     *
-     * @return string
-     */
-    public function getXmlParsed()
-    {
-        return $this->xmlParsed;
-    }
+		$this->images[$value] = $file;
+		$this->manif_vars[] = $file;	//save image name as array element
+		$this->setVars($key, $xml, false);
+		return $this;
+	}	
+	/**
+	 * Shortcut to retrieve a child
+	 *
+	 * @param string $prop
+	 * @return Segment
+	 * @throws SegmentException
+	 */
+	public function __get($prop)
+	{
+		if (array_key_exists($prop, $this->children)) {
+			return $this->children[$prop];
+		} else {
+			throw new SegmentException('child ' . $prop . ' does not exist');
+		}
+	}
+	/**
+	 * Proxy for setVars
+	 *
+	 * @param string $meth
+	 * @param array $args
+	 * @return Segment
+	 */
+	public function __call($meth, $args)
+	{
+		try {
+			array_unshift($args,$meth);
+			return call_user_func_array(array($this,'setVars'),$args);
+		} catch (SegmentException $e) {
+			throw new SegmentException("method $meth nor var $meth exist");
+		}
+	}
+	/**
+	 * Returns the parsed XML
+	 *
+	 * @return string
+	 */
+	public function getXmlParsed()
+	{
+		return $this->xmlParsed;
+	}
 }
 
 ?>

Spacing +9 added lines, -9 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 require 'SegmentIterator.php';
 class SegmentException extends Exception
 {}
@@ -36,8 +36,8 @@ 
      */
     public function __construct($name, $xml, $odf)
     {
-        $this->name = (string) $name;
-        $this->xml = (string) $xml;
+        $this->name = (string)$name;
+        $this->xml = (string)$xml;
 		$this->odf = $odf;
         $zipHandler = $this->odf->getConfig('ZIP_PROXY');
         $this->file = new $zipHandler();	
@@ -90,12 +90,12 @@ 
         $this->xmlParsed .= str_replace(array_keys($this->vars), array_values($this->vars), $this->xml);
         if ($this->hasChildren()) {
             foreach ($this->children as $child) {
-                $this->xmlParsed = str_replace($child->xml, ($child->xmlParsed=="")?$child->merge():$child->xmlParsed, $this->xmlParsed);
+                $this->xmlParsed = str_replace($child->xml, ($child->xmlParsed == "") ? $child->merge() : $child->xmlParsed, $this->xmlParsed);
                 $child->xmlParsed = '';
                 //Store all image names used in child segments in current segment array 
 				foreach ($child->manif_vars as $file) 
                 $this->manif_vars[] = $file; 
-                $child->manif_vars=array();
+                $child->manif_vars = array();
             }
         }
         $reg = "/\[!--\sBEGIN\s$this->name\s--\](.*)\[!--\sEND\s$this->name\s--\]/smU";
@@ -161,7 +161,7 @@ 
      * @throws OdfException
      * @return Segment
      */
-    public function setImage($key, $value, $page=null, $width=null, $height=null, $offsetX=null, $offsetY=null)
+    public function setImage($key, $value, $page = null, $width = null, $height = null, $offsetX = null, $offsetY = null)
     {
         $filename = strtok(strrchr($value, '/'), '/.');
         $file = substr(strrchr($value, '/'), 1);
@@ -179,7 +179,7 @@ 
 <draw:frame draw:style-name="fr1" draw:name="$filename" {$anchor} svg:width="{$width}cm" svg:height="{$height}cm" draw:z-index="3"><draw:image xlink:href="Pictures/$file" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/></draw:frame>
 IMG;
         $this->images[$value] = $file;
-        $this->manif_vars[] = $file;	//save image name as array element
+        $this->manif_vars[] = $file; //save image name as array element
         $this->setVars($key, $xml, false);
         return $this;
     }	
@@ -208,8 +208,8 @@ 
     public function __call($meth, $args)
     {
         try {
-            array_unshift($args,$meth);
-            return call_user_func_array(array($this,'setVars'),$args);
+            array_unshift($args, $meth);
+            return call_user_func_array(array($this, 'setVars'), $args);
         } catch (SegmentException $e) {
             throw new SegmentException("method $meth nor var $meth exist");
         }

Braces +6 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 require 'SegmentIterator.php';
 class SegmentException extends Exception
 {}
@@ -93,8 +95,9 @@ 
                 $this->xmlParsed = str_replace($child->xml, ($child->xmlParsed=="")?$child->merge():$child->xmlParsed, $this->xmlParsed);
                 $child->xmlParsed = '';
                 //Store all image names used in child segments in current segment array 
-				foreach ($child->manif_vars as $file) 
-                $this->manif_vars[] = $file; 
+				foreach ($child->manif_vars as $file) {
+				                $this->manif_vars[] = $file;
+				}
                 $child->manif_vars=array();
             }
         }

includes/modules/wps_barcode/librairies/odtphp/zip/PhpZipProxy.php

Indentation +5 added lines, -5 removed lines

@@ -21,11 +21,11 @@
 {
 	protected $zipArchive;
 	protected $filename;
-    /**
-     * Class constructor
-     *
-     * @throws PhpZipProxyException
-     */	
+	/**
+	 * Class constructor
+	 *
+	 * @throws PhpZipProxyException
+	 */	
 	public function __construct()
 	{
 		if (! class_exists('ZipArchive')) {

Spacing +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 require_once 'ZipInterface.php';
 class PhpZipProxyException extends Exception
 { }
@@ -28,7 +28,7 @@ 
      */	
 	public function __construct()
 	{
-		if (! class_exists('ZipArchive')) {
+		if (!class_exists('ZipArchive')) {
 			throw new PhpZipProxyException('Zip extension not loaded - check your php settings, PHP5.2 minimum with zip extension
 			 is required for using PhpZipProxy'); ;
 		}

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Fichier de définition du modèle des taxinomies / File for term model definition
  *

includes/modules/wps_barcode/librairies/odtphp/odf.php

Indentation +278 added lines, -278 removed lines

@@ -20,115 +20,115 @@ 
  */
 class Odf
 {
-    protected $config = array(
-    	'ZIP_PROXY' => 'PclZipProxy',
-    	'DELIMITER_LEFT' => '{',
-    	'DELIMITER_RIGHT' => '}',
+	protected $config = array(
+		'ZIP_PROXY' => 'PclZipProxy',
+		'DELIMITER_LEFT' => '{',
+		'DELIMITER_RIGHT' => '}',
 		'PATH_TO_TMP' => null
    	);
-    protected $file;
-    protected $contentXml;
-    protected $manifestXml;		// To store content of manifest.xml file
-    protected $tmpfile;
-    protected $images = array();
-    protected $vars = array();
-    protected $manif_vars = array(); // array to store image names
-    protected $segments = array();
-    const PIXEL_TO_CM = 0.026458333;
-    /**
-     * Class constructor
-     *
-     * @param string $filename the name of the odt file
-     * @throws OdfException
-     */
-    public function __construct($filename, $config = array())
-    {
-    	if (! is_array($config)) {
-    		throw new OdfException('Configuration data must be provided as array');
-    	}
-    	foreach ($config as $configKey => $configValue) {
-    		if (array_key_exists($configKey, $this->config)) {
-    			$this->config[$configKey] = $configValue;
-    		}
-    	}
-        if (! class_exists($this->config['ZIP_PROXY'])) {
-            throw new OdfException($this->config['ZIP_PROXY'] . ' class not found - check your php settings');
-        }
-        $zipHandler = $this->config['ZIP_PROXY'];
-        $this->file = new $zipHandler();
-        if ($this->file->open($filename) !== true) {
-            throw new OdfException("Error while Opening the file '$filename' - Check your odt file");
-        }
-        if (($this->contentXml = $this->file->getFromName('content.xml')) === false) {
-            throw new OdfException("Nothing to parse - check that the content.xml file is correctly formed");
-        }
-        if (($this->manifestXml = $this->file->getFromName('META-INF/manifest.xml')) === false) {
-        	throw new OdfException("Something is wrong with META-INF/manifest.xm in source file '$filename'");
-        }
+	protected $file;
+	protected $contentXml;
+	protected $manifestXml;		// To store content of manifest.xml file
+	protected $tmpfile;
+	protected $images = array();
+	protected $vars = array();
+	protected $manif_vars = array(); // array to store image names
+	protected $segments = array();
+	const PIXEL_TO_CM = 0.026458333;
+	/**
+	 * Class constructor
+	 *
+	 * @param string $filename the name of the odt file
+	 * @throws OdfException
+	 */
+	public function __construct($filename, $config = array())
+	{
+		if (! is_array($config)) {
+			throw new OdfException('Configuration data must be provided as array');
+		}
+		foreach ($config as $configKey => $configValue) {
+			if (array_key_exists($configKey, $this->config)) {
+				$this->config[$configKey] = $configValue;
+			}
+		}
+		if (! class_exists($this->config['ZIP_PROXY'])) {
+			throw new OdfException($this->config['ZIP_PROXY'] . ' class not found - check your php settings');
+		}
+		$zipHandler = $this->config['ZIP_PROXY'];
+		$this->file = new $zipHandler();
+		if ($this->file->open($filename) !== true) {
+			throw new OdfException("Error while Opening the file '$filename' - Check your odt file");
+		}
+		if (($this->contentXml = $this->file->getFromName('content.xml')) === false) {
+			throw new OdfException("Nothing to parse - check that the content.xml file is correctly formed");
+		}
+		if (($this->manifestXml = $this->file->getFromName('META-INF/manifest.xml')) === false) {
+			throw new OdfException("Something is wrong with META-INF/manifest.xm in source file '$filename'");
+		}
 
-        $this->file->close();
+		$this->file->close();
         
-        $tmp = tempnam($this->config['PATH_TO_TMP'], md5(uniqid()));
-        copy($filename, $tmp);
-        $this->tmpfile = $tmp;
-        $this->_moveRowSegments();
-    }
-    /**
-     * Assing a template variable
-     *
-     * @param string $key name of the variable within the template
-     * @param string $value replacement value
-     * @param bool $encode if true, special XML characters are encoded
-     * @throws OdfException
-     * @return odf
-     */
-    public function setVars($key, $value, $encode = true, $charset = 'ISO-8859')
-    {
-        if (strpos($this->contentXml, $this->config['DELIMITER_LEFT'] . $key . $this->config['DELIMITER_RIGHT']) === false) {
-            throw new OdfException("var $key not found in the document");
-        }
-        $value = $encode ? htmlspecialchars($value) : $value;
-        $value = ($charset == 'ISO-8859') ? utf8_encode($value) : $value;
-        $this->vars[$this->config['DELIMITER_LEFT'] . $key . $this->config['DELIMITER_RIGHT']] = str_replace("\n", "<text:line-break/>", $value);
-        return $this;
-    }
-    /**
-     * Assign a template variable as a picture
-     *
-     * @param string $key name of the variable within the template
-     * @param string $value path to the picture
-     * @throws OdfException
-     * @return odf
-     */
-    public function setImage($key, $value)
-    {
-        $filename = strtok(strrchr($value, '/'), '/.');
-        $file = substr(strrchr($value, '/'), 1);
-        $size = @getimagesize($value);
-        if ($size === false) {
-            throw new OdfException("Invalid image");
-        }
-        list ($width, $height) = $size;
-        $width *= self::PIXEL_TO_CM;
-        $height *= self::PIXEL_TO_CM;
-        $xml = <<<IMG
+		$tmp = tempnam($this->config['PATH_TO_TMP'], md5(uniqid()));
+		copy($filename, $tmp);
+		$this->tmpfile = $tmp;
+		$this->_moveRowSegments();
+	}
+	/**
+	 * Assing a template variable
+	 *
+	 * @param string $key name of the variable within the template
+	 * @param string $value replacement value
+	 * @param bool $encode if true, special XML characters are encoded
+	 * @throws OdfException
+	 * @return odf
+	 */
+	public function setVars($key, $value, $encode = true, $charset = 'ISO-8859')
+	{
+		if (strpos($this->contentXml, $this->config['DELIMITER_LEFT'] . $key . $this->config['DELIMITER_RIGHT']) === false) {
+			throw new OdfException("var $key not found in the document");
+		}
+		$value = $encode ? htmlspecialchars($value) : $value;
+		$value = ($charset == 'ISO-8859') ? utf8_encode($value) : $value;
+		$this->vars[$this->config['DELIMITER_LEFT'] . $key . $this->config['DELIMITER_RIGHT']] = str_replace("\n", "<text:line-break/>", $value);
+		return $this;
+	}
+	/**
+	 * Assign a template variable as a picture
+	 *
+	 * @param string $key name of the variable within the template
+	 * @param string $value path to the picture
+	 * @throws OdfException
+	 * @return odf
+	 */
+	public function setImage($key, $value)
+	{
+		$filename = strtok(strrchr($value, '/'), '/.');
+		$file = substr(strrchr($value, '/'), 1);
+		$size = @getimagesize($value);
+		if ($size === false) {
+			throw new OdfException("Invalid image");
+		}
+		list ($width, $height) = $size;
+		$width *= self::PIXEL_TO_CM;
+		$height *= self::PIXEL_TO_CM;
+		$xml = <<<IMG
 <draw:frame draw:style-name="fr1" draw:name="$filename" text:anchor-type="char" svg:width="{$width}cm" svg:height="{$height}cm" draw:z-index="3"><draw:image xlink:href="Pictures/$file" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/></draw:frame>
 IMG;
-        $this->images[$value] = $file;
-        $this->manif_vars[] = $file;    //save image name as array element
-        $this->setVars($key, $xml, false);
-        return $this;
-    }
-    /**
-     * Move segment tags for lines of tables
-     * Called automatically within the constructor
-     *
-     * @return void
-     */    
-    private function _moveRowSegments()
-    {
-    	// Search all possible rows in the document
-    	$reg1 = "#<table:table-row[^>]*>(.*)</table:table-row>#smU";
+		$this->images[$value] = $file;
+		$this->manif_vars[] = $file;    //save image name as array element
+		$this->setVars($key, $xml, false);
+		return $this;
+	}
+	/**
+	 * Move segment tags for lines of tables
+	 * Called automatically within the constructor
+	 *
+	 * @return void
+	 */    
+	private function _moveRowSegments()
+	{
+		// Search all possible rows in the document
+		$reg1 = "#<table:table-row[^>]*>(.*)</table:table-row>#smU";
 		preg_match_all($reg1, $this->contentXml, $matches);
 		for ($i = 0, $size = count($matches[0]); $i < $size; $i++) {
 			// Check if the current row contains a segment row.*
@@ -146,189 +146,189 @@ 
 				$this->contentXml = str_replace($matches[0][$i], $replacedXML, $this->contentXml);
 			}
 		}
-    }
-    /**
-     * Merge template variables
-     * Called automatically for a save
-     *
-     * @return void
-     */
-    private function _parse()
-    {
-        $this->contentXml = str_replace(array_keys($this->vars), array_values($this->vars), $this->contentXml);
-    }
-    /**
-     * Add the merged segment to the document
-     *
-     * @param Segment $segment
-     * @throws OdfException
-     * @return odf
-     */
-    public function mergeSegment(Segment $segment)
-    {
-        if (! array_key_exists($segment->getName(), $this->segments)) {
-            throw new OdfException($segment->getName() . 'cannot be parsed, has it been set yet ?');
-        }
-        $string = $segment->getName();
+	}
+	/**
+	 * Merge template variables
+	 * Called automatically for a save
+	 *
+	 * @return void
+	 */
+	private function _parse()
+	{
+		$this->contentXml = str_replace(array_keys($this->vars), array_values($this->vars), $this->contentXml);
+	}
+	/**
+	 * Add the merged segment to the document
+	 *
+	 * @param Segment $segment
+	 * @throws OdfException
+	 * @return odf
+	 */
+	public function mergeSegment(Segment $segment)
+	{
+		if (! array_key_exists($segment->getName(), $this->segments)) {
+			throw new OdfException($segment->getName() . 'cannot be parsed, has it been set yet ?');
+		}
+		$string = $segment->getName();
 		// $reg = '@<text:p[^>]*>\[!--\sBEGIN\s' . $string . '\s--\](.*)\[!--.+END\s' . $string . '\s--\]<\/text:p>@smU';
 		$reg = '@\[!--\sBEGIN\s' . $string . '\s--\](.*)\[!--.+END\s' . $string . '\s--\]@smU';
-        $this->contentXml = preg_replace($reg, $segment->getXmlParsed(), $this->contentXml);
-        return $this;
-    }
-    /**
-     * Display all the current template variables
-     * 
-     * @return string
-     */
-    public function printVars()
-    {
-        return print_r('<pre>' . print_r($this->vars, true) . '</pre>', true);
-    }
-    /**
-     * Display the XML content of the file from odt document
-     * as it is at the moment
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->contentXml;
-    }
-    /**
-     * Display loop segments declared with setSegment()
-     * 
-     * @return string
-     */
-    public function printDeclaredSegments()
-    {
-        return '<pre>' . print_r(implode(' ', array_keys($this->segments)), true) . '</pre>';
-    }
-    /**
-     * Declare a segment in order to use it in a loop
-     *
-     * @param string $segment
-     * @throws OdfException
-     * @return Segment
-     */
-    public function setSegment($segment)
-    {
-        if (array_key_exists($segment, $this->segments)) {
-            return $this->segments[$segment];
-        }
-        // $reg = "#\[!--\sBEGIN\s$segment\s--\]<\/text:p>(.*)<text:p\s.*>\[!--\sEND\s$segment\s--\]#sm";
-        $reg = "#\[!--\sBEGIN\s$segment\s--\](.*)\[!--\sEND\s$segment\s--\]#sm";
-        if (preg_match($reg, html_entity_decode($this->contentXml), $m) == 0) {
-            throw new OdfException("'$segment' segment not found in the document");
-        }
-        $this->segments[$segment] = new Segment($segment, $m[1], $this);
-        return $this->segments[$segment];
-    }
-    /**
-     * Save the odt file on the disk
-     * 
-     * @param string $file name of the desired file
-     * @throws OdfException
-     * @return void
-     */
-    public function saveToDisk($file = null)
-    {
-        if ($file !== null && is_string($file)) {
-        	if (file_exists($file) && !(is_file($file) && is_writable($file))) {
-            	throw new OdfException('Permission denied : can\'t create ' . $file);
-        	}
-            $this->_save();
-            copy($this->tmpfile, $file);     
-        } else {
-            $this->_save();
-        }
-    }
-    /**
-     * Internal save
-     *
-     * @throws OdfException
-     * @return void
-     */
-    private function _save()
-    {
-    	$this->file->open($this->tmpfile);
-    	$this->_parse();
-    	if (! $this->file->addFromString('content.xml', $this->contentXml) ) {
-    		throw new OdfException('Error during file export addFromString');
-    	}
+		$this->contentXml = preg_replace($reg, $segment->getXmlParsed(), $this->contentXml);
+		return $this;
+	}
+	/**
+	 * Display all the current template variables
+	 * 
+	 * @return string
+	 */
+	public function printVars()
+	{
+		return print_r('<pre>' . print_r($this->vars, true) . '</pre>', true);
+	}
+	/**
+	 * Display the XML content of the file from odt document
+	 * as it is at the moment
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->contentXml;
+	}
+	/**
+	 * Display loop segments declared with setSegment()
+	 * 
+	 * @return string
+	 */
+	public function printDeclaredSegments()
+	{
+		return '<pre>' . print_r(implode(' ', array_keys($this->segments)), true) . '</pre>';
+	}
+	/**
+	 * Declare a segment in order to use it in a loop
+	 *
+	 * @param string $segment
+	 * @throws OdfException
+	 * @return Segment
+	 */
+	public function setSegment($segment)
+	{
+		if (array_key_exists($segment, $this->segments)) {
+			return $this->segments[$segment];
+		}
+		// $reg = "#\[!--\sBEGIN\s$segment\s--\]<\/text:p>(.*)<text:p\s.*>\[!--\sEND\s$segment\s--\]#sm";
+		$reg = "#\[!--\sBEGIN\s$segment\s--\](.*)\[!--\sEND\s$segment\s--\]#sm";
+		if (preg_match($reg, html_entity_decode($this->contentXml), $m) == 0) {
+			throw new OdfException("'$segment' segment not found in the document");
+		}
+		$this->segments[$segment] = new Segment($segment, $m[1], $this);
+		return $this->segments[$segment];
+	}
+	/**
+	 * Save the odt file on the disk
+	 * 
+	 * @param string $file name of the desired file
+	 * @throws OdfException
+	 * @return void
+	 */
+	public function saveToDisk($file = null)
+	{
+		if ($file !== null && is_string($file)) {
+			if (file_exists($file) && !(is_file($file) && is_writable($file))) {
+				throw new OdfException('Permission denied : can\'t create ' . $file);
+			}
+			$this->_save();
+			copy($this->tmpfile, $file);     
+		} else {
+			$this->_save();
+		}
+	}
+	/**
+	 * Internal save
+	 *
+	 * @throws OdfException
+	 * @return void
+	 */
+	private function _save()
+	{
+		$this->file->open($this->tmpfile);
+		$this->_parse();
+		if (! $this->file->addFromString('content.xml', $this->contentXml) ) {
+			throw new OdfException('Error during file export addFromString');
+		}
     	
-    	$lastpos=strrpos($this->manifestXml, "\n", -15); //find second last newline in the manifest.xml file
-    	$manifdata = "";
+		$lastpos=strrpos($this->manifestXml, "\n", -15); //find second last newline in the manifest.xml file
+		$manifdata = "";
     
-    	//Enter all images description in $manifdata variable
+		//Enter all images description in $manifdata variable
     
-    	foreach ($this->manif_vars as $val)
-    	{
-    		$ext = substr(strrchr($val, '.'), 1);
-    		$manifdata = $manifdata.'<manifest:file-entry manifest:media-type="image/'.$ext.'" manifest:full-path="Pictures/'.$val.'"/>'."\n";
-    	}
-    	//Place content of $manifdata variable in manifest.xml file at appropriate place
-    	$this->manifestXml = substr_replace($this->manifestXml, "\n".$manifdata, $lastpos+1, 0);
+		foreach ($this->manif_vars as $val)
+		{
+			$ext = substr(strrchr($val, '.'), 1);
+			$manifdata = $manifdata.'<manifest:file-entry manifest:media-type="image/'.$ext.'" manifest:full-path="Pictures/'.$val.'"/>'."\n";
+		}
+		//Place content of $manifdata variable in manifest.xml file at appropriate place
+		$this->manifestXml = substr_replace($this->manifestXml, "\n".$manifdata, $lastpos+1, 0);
     
-    	if (! $this->file->addFromString('META-INF/manifest.xml', $this->manifestXml)) {
-    		throw new OdfException('Error during manifest file export');
-    	}
-    	foreach ($this->images as $imageKey => $imageValue) {
-    		$this->file->addFile($imageKey, 'Pictures/' . $imageValue);
-    	}
-    	$this->file->close(); // seems to bug on windows CLI sometimes
-    }
-    /**
-     * Export the file as attached file by HTTP
-     *
-     * @param string $name (optionnal)
-     * @throws OdfException
-     * @return void
-     */
-    public function exportAsAttachedFile($name="")
-    {
-        $this->_save();
-        if (headers_sent($filename, $linenum)) {
-            throw new OdfException("headers already sent ($filename at $linenum)");
-        }
+		if (! $this->file->addFromString('META-INF/manifest.xml', $this->manifestXml)) {
+			throw new OdfException('Error during manifest file export');
+		}
+		foreach ($this->images as $imageKey => $imageValue) {
+			$this->file->addFile($imageKey, 'Pictures/' . $imageValue);
+		}
+		$this->file->close(); // seems to bug on windows CLI sometimes
+	}
+	/**
+	 * Export the file as attached file by HTTP
+	 *
+	 * @param string $name (optionnal)
+	 * @throws OdfException
+	 * @return void
+	 */
+	public function exportAsAttachedFile($name="")
+	{
+		$this->_save();
+		if (headers_sent($filename, $linenum)) {
+			throw new OdfException("headers already sent ($filename at $linenum)");
+		}
         
-        if( $name == "" )
-        {
-        		$name = md5(uniqid()) . ".odt";
-        }
+		if( $name == "" )
+		{
+				$name = md5(uniqid()) . ".odt";
+		}
         
-        header('Content-type: application/vnd.oasis.opendocument.text');
-        header('Content-Disposition: attachment; filename="'.$name.'"');
-        readfile($this->tmpfile);
-    }
-    /**
-     * Returns a variable of configuration 
-     * 
-     * @return string The requested variable of configuration
-     */
-    public function getConfig($configKey)
-    {
-    	if (array_key_exists($configKey, $this->config)) {
-    		return $this->config[$configKey];
-    	}
-    	return false;
-    }
-    /**
-     * Returns the temporary working file
-     * 
-     * @return string le chemin vers le fichier temporaire de travail
-     */
-    public function getTmpfile()
-    {
-    	return $this->tmpfile;
-    }
-    /**
-     * Delete the temporary file when the object is destroyed
-     */    
-    public function __destruct() {
-          if (file_exists($this->tmpfile)) {
-        	unlink($this->tmpfile);
-        }
-    }
+		header('Content-type: application/vnd.oasis.opendocument.text');
+		header('Content-Disposition: attachment; filename="'.$name.'"');
+		readfile($this->tmpfile);
+	}
+	/**
+	 * Returns a variable of configuration 
+	 * 
+	 * @return string The requested variable of configuration
+	 */
+	public function getConfig($configKey)
+	{
+		if (array_key_exists($configKey, $this->config)) {
+			return $this->config[$configKey];
+		}
+		return false;
+	}
+	/**
+	 * Returns the temporary working file
+	 * 
+	 * @return string le chemin vers le fichier temporaire de travail
+	 */
+	public function getTmpfile()
+	{
+		return $this->tmpfile;
+	}
+	/**
+	 * Delete the temporary file when the object is destroyed
+	 */    
+	public function __destruct() {
+		  if (file_exists($this->tmpfile)) {
+			unlink($this->tmpfile);
+		}
+	}
 }
 
 ?>
\ No newline at end of file

Spacing +14 added lines, -14 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 require 'zip/PclZipProxy.php';
 require 'zip/PhpZipProxy.php';
 require 'Segment.php';
@@ -28,7 +28,7 @@ 
    	);
     protected $file;
     protected $contentXml;
-    protected $manifestXml;		// To store content of manifest.xml file
+    protected $manifestXml; // To store content of manifest.xml file
     protected $tmpfile;
     protected $images = array();
     protected $vars = array();
@@ -43,7 +43,7 @@ 
      */
     public function __construct($filename, $config = array())
     {
-    	if (! is_array($config)) {
+    	if (!is_array($config)) {
     		throw new OdfException('Configuration data must be provided as array');
     	}
     	foreach ($config as $configKey => $configValue) {
@@ -51,7 +51,7 @@ 
     			$this->config[$configKey] = $configValue;
     		}
     	}
-        if (! class_exists($this->config['ZIP_PROXY'])) {
+        if (!class_exists($this->config['ZIP_PROXY'])) {
             throw new OdfException($this->config['ZIP_PROXY'] . ' class not found - check your php settings');
         }
         $zipHandler = $this->config['ZIP_PROXY'];
@@ -115,7 +115,7 @@ 
 <draw:frame draw:style-name="fr1" draw:name="$filename" text:anchor-type="char" svg:width="{$width}cm" svg:height="{$height}cm" draw:z-index="3"><draw:image xlink:href="Pictures/$file" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/></draw:frame>
 IMG;
         $this->images[$value] = $file;
-        $this->manif_vars[] = $file;    //save image name as array element
+        $this->manif_vars[] = $file; //save image name as array element
         $this->setVars($key, $xml, false);
         return $this;
     }
@@ -166,7 +166,7 @@ 
      */
     public function mergeSegment(Segment $segment)
     {
-        if (! array_key_exists($segment->getName(), $this->segments)) {
+        if (!array_key_exists($segment->getName(), $this->segments)) {
             throw new OdfException($segment->getName() . 'cannot be parsed, has it been set yet ?');
         }
         $string = $segment->getName();
@@ -252,11 +252,11 @@ 
     {
     	$this->file->open($this->tmpfile);
     	$this->_parse();
-    	if (! $this->file->addFromString('content.xml', $this->contentXml) ) {
+    	if (!$this->file->addFromString('content.xml', $this->contentXml)) {
     		throw new OdfException('Error during file export addFromString');
     	}
     	
-    	$lastpos=strrpos($this->manifestXml, "\n", -15); //find second last newline in the manifest.xml file
+    	$lastpos = strrpos($this->manifestXml, "\n", -15); //find second last newline in the manifest.xml file
     	$manifdata = "";
     
     	//Enter all images description in $manifdata variable
@@ -264,12 +264,12 @@ 
     	foreach ($this->manif_vars as $val)
     	{
     		$ext = substr(strrchr($val, '.'), 1);
-    		$manifdata = $manifdata.'<manifest:file-entry manifest:media-type="image/'.$ext.'" manifest:full-path="Pictures/'.$val.'"/>'."\n";
+    		$manifdata = $manifdata . '<manifest:file-entry manifest:media-type="image/' . $ext . '" manifest:full-path="Pictures/' . $val . '"/>' . "\n";
     	}
     	//Place content of $manifdata variable in manifest.xml file at appropriate place
-    	$this->manifestXml = substr_replace($this->manifestXml, "\n".$manifdata, $lastpos+1, 0);
+    	$this->manifestXml = substr_replace($this->manifestXml, "\n" . $manifdata, $lastpos + 1, 0);
     
-    	if (! $this->file->addFromString('META-INF/manifest.xml', $this->manifestXml)) {
+    	if (!$this->file->addFromString('META-INF/manifest.xml', $this->manifestXml)) {
     		throw new OdfException('Error during manifest file export');
     	}
     	foreach ($this->images as $imageKey => $imageValue) {
@@ -284,20 +284,20 @@ 
      * @throws OdfException
      * @return void
      */
-    public function exportAsAttachedFile($name="")
+    public function exportAsAttachedFile($name = "")
     {
         $this->_save();
         if (headers_sent($filename, $linenum)) {
             throw new OdfException("headers already sent ($filename at $linenum)");
         }
         
-        if( $name == "" )
+        if ($name == "")
         {
         		$name = md5(uniqid()) . ".odt";
         }
         
         header('Content-type: application/vnd.oasis.opendocument.text');
-        header('Content-Disposition: attachment; filename="'.$name.'"');
+        header('Content-Disposition: attachment; filename="' . $name . '"');
         readfile($this->tmpfile);
     }
     /**

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Fichier de définition du modèle des taxinomies / File for term model definition
  *

includes/modules/wps_barcode/librairies/odtphp/SegmentIterator.php

Indentation +36 added lines, -36 removed lines

@@ -15,42 +15,42 @@
  */
 class SegmentIterator implements RecursiveIterator
 {
-    private $ref;
-    private $key;
-    public function __construct(array $ref)
-    {
-        $this->ref = $ref;
-        $this->key = 0;
-        $this->keys = array_keys($this->ref);
-    }
-    public function hasChildren()
-    {
-        return $this->valid() && $this->current() instanceof Segment;
-    }
-    public function current()
-    {
-        return $this->ref[$this->keys[$this->key]];
-    }
-    function getChildren()
-    {
-        return new self($this->current()->children);
-    }
-    public function key()
-    {
-        return $this->key;
-    }
-    public function valid()
-    {
-        return array_key_exists($this->key, $this->keys);
-    }
-    public function rewind()
-    {
-        $this->key = 0;
-    }
-    public function next()
-    {
-        $this->key ++;
-    }
+	private $ref;
+	private $key;
+	public function __construct(array $ref)
+	{
+		$this->ref = $ref;
+		$this->key = 0;
+		$this->keys = array_keys($this->ref);
+	}
+	public function hasChildren()
+	{
+		return $this->valid() && $this->current() instanceof Segment;
+	}
+	public function current()
+	{
+		return $this->ref[$this->keys[$this->key]];
+	}
+	function getChildren()
+	{
+		return new self($this->current()->children);
+	}
+	public function key()
+	{
+		return $this->key;
+	}
+	public function valid()
+	{
+		return array_key_exists($this->key, $this->keys);
+	}
+	public function rewind()
+	{
+		$this->key = 0;
+	}
+	public function next()
+	{
+		$this->key ++;
+	}
 }
 
 ?>
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * Segments iterator
  * You need PHP 5.2 at least
@@ -49,7 +49,7 @@ 
     }
     public function next()
     {
-        $this->key ++;
+        $this->key++;
     }
 }
 

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Fichier de définition du modèle des taxinomies / File for term model definition
  *

includes/modules/wps_barcode/wps_barcode.php

Spacing +15 added lines, -15 removed lines

@@ -1,31 +1,31 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * Author: Christophe DALOZ DE LOS RIOS - Eoxia dev team <dev@eoxia.com>
  */
 
-if ( extension_loaded('gd') ) {
+if (extension_loaded('gd')) {
 	global $ajax;
 
 	$upload_dir = wp_upload_dir();
 
-	DEFINE( 'WPS_BARCODE_VERSION', 1.0 );
-	DEFINE( 'WPS_BARCODE_PATH', str_replace( "\\", "/", plugin_dir_path( __FILE__ ) ) );
-	DEFINE( 'WPS_BARCODE_URL', str_replace( str_replace( "\\", "/", ABSPATH),
-		site_url() . '/', WPS_BARCODE_PATH ) );
-	DEFINE( 'WPS_BARCODE_JSCRIPTS', plugins_url('/assets/js', __FILE__) );
-	DEFINE( 'WPS_BARCODE_FONTS', WPS_BARCODE_PATH.'assets/fonts' );
-	DEFINE( 'WPS_BARCODE_UPLOAD', $upload_dir[ 'basedir' ] . '/wps_barcode/');
+	DEFINE('WPS_BARCODE_VERSION', 1.0);
+	DEFINE('WPS_BARCODE_PATH', str_replace("\\", "/", plugin_dir_path(__FILE__)));
+	DEFINE('WPS_BARCODE_URL', str_replace(str_replace("\\", "/", ABSPATH),
+		site_url() . '/', WPS_BARCODE_PATH));
+	DEFINE('WPS_BARCODE_JSCRIPTS', plugins_url('/assets/js', __FILE__));
+	DEFINE('WPS_BARCODE_FONTS', WPS_BARCODE_PATH . 'assets/fonts');
+	DEFINE('WPS_BARCODE_UPLOAD', $upload_dir['basedir'] . '/wps_barcode/');
 
 	/**	Load plugin translation	*/
-	load_plugin_textdomain( 'wps_barcode', false, dirname( plugin_basename( __FILE__ ) ).'/languages/' );
+	load_plugin_textdomain('wps_barcode', false, dirname(plugin_basename(__FILE__)) . '/languages/');
 
 	/**	Define the templates directories	*/
-	DEFINE( 'WPS_BARCODE_TEMPLATES_TPL_DIR', WPS_BARCODE_PATH . '/templates/');
+	DEFINE('WPS_BARCODE_TEMPLATES_TPL_DIR', WPS_BARCODE_PATH . '/templates/');
 
-	require_once( WPS_BARCODE_PATH . 'controller/wps_barcode.ctr.php' );
-	require_once( WPS_BARCODE_PATH . 'controller/wps_barcode_settings.ctr.php' );
-	require_once( WPS_BARCODE_PATH . 'controller/wps_barcode_metabox.ctr.php' );
-	require_once( WPS_BARCODE_PATH . 'controller/wps_barcode_ajax.ctr.php' );
+	require_once(WPS_BARCODE_PATH . 'controller/wps_barcode.ctr.php');
+	require_once(WPS_BARCODE_PATH . 'controller/wps_barcode_settings.ctr.php');
+	require_once(WPS_BARCODE_PATH . 'controller/wps_barcode_metabox.ctr.php');
+	require_once(WPS_BARCODE_PATH . 'controller/wps_barcode_ajax.ctr.php');
 
 	new wps_barcode();
 	new wps_barcode_settings();

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Fichier de définition du modèle des taxinomies / File for term model definition
  *