Eoxia / wpshop

includes/modules/wps_cart/templates/frontend/cart/button-add-to-cart.php

Braces +7 added lines, -2 removed lines

@@ -1,5 +1,10 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
- if ( !defined( 'ABSPATH' ) ) exit; ?>
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
+ if ( !defined( 'ABSPATH' ) ) {
+ 	exit;
+ }
+ ?>
 
 <div class="wps-product-section">
 	<label><?php _e('Quantity', 'wpshop'); ?></label>

Spacing +7 added lines, -7 removed lines

@@ -1,17 +1,17 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
- if ( !defined( 'ABSPATH' ) ) exit; ?>
+<?php if (!defined('ABSPATH')) exit;
+ if (!defined('ABSPATH')) exit; ?>
 
 <div class="wps-product-section">
 	<label><?php _e('Quantity', 'wpshop'); ?></label>
 	<div class="wps-productQtyForm">
-		<?php if ( $use_button ): ?>
-			<a class="wps-bton-icon-minus-small wps-cart-reduce-product-qty" data-nonce="<?php echo wp_create_nonce( 'ajax_wpshop_set_qty_for_product_into_cart' ); ?>" href=""></a>
+		<?php if ($use_button): ?>
+			<a class="wps-bton-icon-minus-small wps-cart-reduce-product-qty" data-nonce="<?php echo wp_create_nonce('ajax_wpshop_set_qty_for_product_into_cart'); ?>" href=""></a>
 		<?php endif; ?>
 		<span class="wps-form"><input id="wps-cart-product-qty-<?php echo $args['pid']; ?>" class="wpshop_product_qty_input" type="text" value="1" /></span>
-		<?php if ( $use_button): ?>
-			<a class="wps-bton-icon-plus-small wps-cart-add-product-qty" data-nonce="<?php echo wp_create_nonce( 'ajax_wpshop_set_qty_for_product_into_cart' ); ?>" href=""></a>
+		<?php if ($use_button): ?>
+			<a class="wps-bton-icon-plus-small wps-cart-add-product-qty" data-nonce="<?php echo wp_create_nonce('ajax_wpshop_set_qty_for_product_into_cart'); ?>" href=""></a>
 		<?php endif; ?>
 	</div>
 </div>
 
-<button itemprop="availability" content="in_stock" id="wpshop_add_to_cart_<?php echo $args['pid']; ?>" data-nonce="<?php echo wp_create_nonce( 'ajax_pos_product_variation_selection' ); ?>" class="wpshop_add_to_cart_button wps-bton-first-mini-rounded"><i class="wps-icon-basket"></i><?php echo $button_text; ?></button>
+<button itemprop="availability" content="in_stock" id="wpshop_add_to_cart_<?php echo $args['pid']; ?>" data-nonce="<?php echo wp_create_nonce('ajax_pos_product_variation_selection'); ?>" class="wpshop_add_to_cart_button wps-bton-first-mini-rounded"><i class="wps-icon-basket"></i><?php echo $button_text; ?></button>

includes/modules/wps_cart/wps_cart.php

Spacing +5 added lines, -5 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 /**
  * WpShop Cart bootstrap file
@@ -11,13 +11,13 @@ 
 
 /** Template Global vars **/
 DEFINE('WPS_CART_DIR', basename(dirname(__FILE__)));
-DEFINE('WPS_CART_PATH', str_replace( "\\", "/", str_replace( WPS_CART_DIR, "", dirname( __FILE__ ) ) ) );
-DEFINE('WPS_CART_URL', str_replace( str_replace( "\\", "/", ABSPATH), site_url() . '/', WPS_CART_PATH ) );
+DEFINE('WPS_CART_PATH', str_replace("\\", "/", str_replace(WPS_CART_DIR, "", dirname(__FILE__))));
+DEFINE('WPS_CART_URL', str_replace(str_replace("\\", "/", ABSPATH), site_url() . '/', WPS_CART_PATH));
 
-DEFINE('WPS_CART_TPL_DIR', WPS_CART_PATH . WPS_CART_DIR . "/templates/" );
+DEFINE('WPS_CART_TPL_DIR', WPS_CART_PATH . WPS_CART_DIR . "/templates/");
 
 // Include Controller
-include( plugin_dir_path( __FILE__ ).'controller/wps_cart_ctr.php' );
+include(plugin_dir_path(__FILE__) . 'controller/wps_cart_ctr.php');
 
 // Init Controller
 $wps_cart = new wps_cart();

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /**
  * WpShop Cart bootstrap file

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;
+}
 
 /**
  * WpShop Help bootstrap file

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;
+}
 class wps_help_tabs_ctr
 {
 	private $help_tabs;

includes/modules/wps_help/templates/backend/help-container.php

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 ?>
 <script type="text/javascript">
 	//<![CDATA[

Spacing +3 added lines, -3 removed lines

@@ -1,10 +1,10 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 ?>
 <script type="text/javascript">
 	//<![CDATA[
 	jQuery(document).ready( function($) {
     	$('<?php echo $help_case['pointer_id']; ?>').pointer({
-	        content: '<?php echo str_replace( "'", "&#039;", $pointer_content ); ?>',
+	        content: '<?php echo str_replace("'", "&#039;", $pointer_content); ?>',
 	        position : {
 		        edge : '<?php echo $help_case['edge']; ?>',
 				at : '<?php echo $help_case['at']; ?>',
@@ -14,7 +14,7 @@ 
 	        close: function() {
 	        	var data = {
 					action: "close_wps_help_window",
-					_wpnonce: '<?php echo wp_create_nonce( "wps_ajax_close_wps_help_window" ); ?>',
+					_wpnonce: '<?php echo wp_create_nonce("wps_ajax_close_wps_help_window"); ?>',
 					pointer_id : '<?php echo $help_id; ?>'
 				};
 				jQuery.post(ajaxurl, data, function(response) {}, 'json');

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 style="text-align: center;"><i><?php _e( 'Help of plugin WPShop', 'wpshop' )?></i></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_help/assets/js/header.js.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 ?>
 <script type="text/javascript">
 

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 ?>
 <script type="text/javascript">
 

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();
             }
         }