Merge lp:~julien-breux/automne/410a into lp:~automne-team/automne/trunk

[Julien Breux]

Fixed error loading images ;-)

[Sébastien Pauchet (sebastien-pauchet)]

In file automne/admin/js/ext/MultiSelect.js
imagePath:"img/multiselect/", should use the variable Automne.context.path to calculate image path because it can be used from automne/admin/modules/.../ directories.

review: Disapprove

[Julien Breux (julien-breux)]

> In file automne/admin/js/ext/MultiSelect.js
> imagePath:"img/multiselect/", should use the variable Automne.context.path to
> calculate image path because it can be used from automne/admin/modules/.../
> directories.

In this context, it's unable to use "Automne" object.

How do I ?

FN: It's same problem with "automne/admin/js/ext/conf.js", "Automne" object is undefined or not declared.

review: Needs Information

[Sébastien Pauchet (sebastien-pauchet)]

You should use Automne.context.path directly in onRender method instead.

[Sébastien Pauchet (sebastien-pauchet)]

In file automne/admin/js/ext/MultiSelect.js you mistakenly remove the following line (arround line 322) :
this.iconUp = this.imagePath + (this.iconUp || 'up2.gif');

All other changes are good

review: Disapprove

[Julien Breux (julien-breux)]

It's ok for me :)

[Sébastien Pauchet (sebastien-pauchet)]

review: Approve

[Sébastien Pauchet (sebastien-pauchet)]

In file automne/admin/rows-controler.php : untranslated string "Copie de " arround line 185

review: Disapprove

[Julien Breux (julien-breux)]

I'm sorry, but i thing that Automne is not i18n because this untranslated string exist too in automne/admin/templates-controler.php file on line 367.

I this this is irrelevant to the proposed feature ?

[Sébastien Pauchet (sebastien-pauchet)]

ok this is a mistake, it should be translated too in automne/admin/templates-controler.php. I will translate this in the two files later unless you want to do it?
I will test the rest of your proposal later today.

[Julien Breux (julien-breux)]

No no, i leave you translate later on a run.

Thx 4 your time :)

review: Needs Resubmitting

=== modified file 'CHANGELOG'
--- CHANGELOG	2010-09-06 16:07:24 +0000
+++ CHANGELOG	2010-09-23 09:23:46 +0000
@@ -5,6 +5,7 @@
 [FEATURE] : Add Google coordinates field for Polymod
 [FEATURE] : Add vhost subfolder support for Automne installation
 [FEATURE] : Add import/export of polymod modules structures
+[FEATURE] : Add duplicating rows
 
 V4.0.2 (25/05/2010)
 [BUG] : Corrected bugs : 269, 270, 486, 497 (see http://www.automne.ws/bug/)
@@ -100,4 +101,4 @@
 [FEATURE] : Add mysql fulltext search on users, groups, templates, rows, standard and polymod modules
 
 ---------------------------------------------------------
-View V3.X.X changelog for previous Automne versions
\ No newline at end of file
+View V3.X.X changelog for previous Automne versions

=== modified file 'automne/admin/rows-controler.php'
--- automne/admin/rows-controler.php	2010-08-25 16:09:23 +0000
+++ automne/admin/rows-controler.php	2010-09-23 09:23:46 +0000
@@ -9,10 +9,8 @@
 // | LICENSE-GPL, and is available through the world-wide-web at		  |
 // | http://www.gnu.org/copyleft/gpl.html.								  |
 // +----------------------------------------------------------------------+
-// | Author: Sébastien Pauchet <[e-mail]>	  |
+// | Author: Sébastien Pauchet <[e-mail]>	  |
 // +----------------------------------------------------------------------+
-//
-// $Id: rows-controler.php,v 1.6 2010/03/08 16:41:20 sebastien Exp $
 
 /**
   * PHP controler : Receive actions on templates
@@ -20,7 +18,8 @@
   *
   * @package Automne
   * @subpackage admin
-  * @author Sébastien Pauchet <[e-mail]>
+  * @author Sébastien Pauchet <[e-mail]>
+  * @author Julien Breux <[e-mail]>
   */
 
 require_once(dirname(__FILE__).'/../../cms_rc_admin.php');
@@ -33,10 +32,11 @@
 define("MESSAGE_ACTION_XML_UPDATED", 732);
 define("MESSAGE_ACTION_N_PAGES_REGEN", 733);
 define("MESSAGE_ACTION_NO_PAGES", 734);
+define("MESSAGE_ACTION_DUPICATION_DONE", 1485);
 define("MESSAGE_ERROR_WRITE_ROW", 1551);
 
 //Controler vars
-$action = sensitiveIO::request('action', array('properties', 'definition', 'regenerate'));
+$action = sensitiveIO::request('action', array('properties', 'definition', 'regenerate', 'copy'));
 $rowId = sensitiveIO::request('rowId', '');
 
 //Properties vars vars
@@ -185,6 +185,22 @@
 			$cms_message = $cms_language->getMessage(MESSAGE_ACTION_NO_PAGES);
 		}
 	break;
+	case 'copy':
+		if (is_a($row, "CMS_row") && !$row->hasError()) {
+			//Dupplicate selected row with given label
+			$label = 'Copie de '.$row->getLabel();
+			$row = CMS_rowsCatalog::getCloneFromID($rowId, $label);
+
+			$log = new CMS_log();
+			$log->logMiscAction(CMS_log::LOG_ACTION_TEMPLATE_EDIT, $cms_user, "Row : ".$label." (create row)");
+
+			$content = array('success' => array('rowId' => $row->getID()));
+			$cms_message = $cms_language->getMessage(MESSAGE_ACTION_DUPICATION_DONE, array($label));
+			$view->setContent($content);
+		} else {
+			$cms_message = $cms_language->getMessage(MESSAGE_ERROR_UNKNOWN_ROW);
+		}
+	break;
 }
 
 //set user message if any

=== modified file 'automne/admin/templates-row.php'
--- automne/admin/templates-row.php	2010-08-25 16:09:23 +0000
+++ automne/admin/templates-row.php	2010-09-23 09:23:46 +0000
@@ -9,10 +9,8 @@
 // | LICENSE-GPL, and is available through the world-wide-web at		  |
 // | http://www.gnu.org/copyleft/gpl.html.								  |
 // +----------------------------------------------------------------------+
-// | Author: Sébastien Pauchet <[e-mail]>	  |
+// | Author: Sébastien Pauchet <[e-mail]>	  |
 // +----------------------------------------------------------------------+
-//
-// $Id: templates-row.php,v 1.12 2010/03/08 16:41:21 sebastien Exp $
 
 /**
   * PHP page : Load page rows search window.
@@ -20,7 +18,8 @@
   *
   * @package Automne
   * @subpackage admin
-  * @author Sébastien Pauchet <[e-mail]>
+  * @author Sébastien Pauchet <[e-mail]>
+  * @author Julien Breux <[e-mail]>
   */
 
 require_once(dirname(__FILE__).'/../../cms_rc_admin.php');
@@ -49,6 +48,8 @@
 define("MESSAGE_PAGE_DESACTIVATE", 1518);
 define("MESSAGE_PAGE_VIEW_INACTIVE_ROWS", 1522);
 define("MESSAGE_PAGE_DELETE_CONFIRM", 1523);
+define("MESSAGE_PAGE_DUPLICATE", 1520);
+define("MESSAGE_ACTION_DUPLICATE_SELECTED", 1521);
 
 //load interface instance
 $view = CMS_view::getInstance();
@@ -380,7 +381,17 @@
 			},
 			scope:		resultsPanel,
 			disabled:	true
-		}, '->', {
+		},{
+			id:			'{$winId}copyItem',
+			xtype:		'button',
+			text:		'{$cms_language->getJSMessage(MESSAGE_PAGE_DUPLICATE)}',
+			handler:	function(button) {
+				//copy selected template and then refresh search results
+				Automne.server.call('rows-controler.php', rowWindow.search, {rowId:selectedObjects, action:'copy'})
+			},
+			scope:		resultsPanel,
+			disabled:	true
+		},'->', {
 			id:			'{$winId}createItem',
 			xtype:		'button',
 			text:		'{$cms_language->getJSMessage(MESSAGE_PAGE_NEW)}',
@@ -453,6 +464,10 @@
 		target: 		Ext.getCmp('{$winId}createItem').getEl(),
 		html: 			'{$cms_language->getJSMessage(MESSAGE_ACTION_CREATE_SELECTED)}'
 	});
+	qtips['copy'] = new Ext.ToolTip({
+		target: 		Ext.getCmp('{$winId}copyItem').getEl(),
+		html: 			'{$cms_language->getJSMessage(MESSAGE_ACTION_DUPLICATE_SELECTED)}'
+	});
 
 	resultsPanel.dv.on('selectionchange', function(dv, selections){
 		selectedObjects = [];
@@ -480,7 +495,9 @@
 			Ext.getCmp('{$winId}deleteItem').disable();
 			Ext.getCmp('{$winId}activateItem').disable();
 			Ext.getCmp('{$winId}desactivateItem').disable();
+			Ext.getCmp('{$winId}copyItem').disable();
 		} else { //enable / disable buttons allowed by selection
+			Ext.getCmp('{$winId}copyItem').setDisabled(selectLen != 1);
 			Ext.getCmp('{$winId}editItem').enable();
 			Ext.getCmp('{$winId}deleteItem').setDisabled(!hasDelete);
 			Ext.getCmp('{$winId}activateItem').setDisabled(!hasActivate);

=== modified file 'automne/classes/modules/standard/row.php'
--- automne/classes/modules/standard/row.php	2010-09-09 13:31:57 +0000
+++ automne/classes/modules/standard/row.php	2010-09-23 09:23:46 +0000
@@ -10,10 +10,8 @@
 // | http://www.gnu.org/copyleft/gpl.html.								  |
 // +----------------------------------------------------------------------+
 // | Author: Antoine Pouch <[e-mail]> &            |
-// | Author: Sébastien Pauchet <[e-mail]>      |
+// | Author: Sébastien Pauchet <[e-mail]>      |
 // +----------------------------------------------------------------------+
-//
-// $Id: row.php,v 1.12 2010/03/08 16:43:29 sebastien Exp $
 
 /**
   * Class CMS_row
@@ -23,7 +21,8 @@
   * @package Automne
   * @subpackage standard
   * @author Antoine Pouch <[e-mail]> &
-  * @author Sébastien Pauchet <[e-mail]>
+  * @author Sébastien Pauchet <[e-mail]>
+  * @author Julien Breux <[e-mail]>
   */
 
 class CMS_row extends CMS_grandFather
@@ -251,13 +250,18 @@
 	/**
 	  * Gets the row image.
 	  *
+	  * @param string $form location of image
+	  * @param boolean $fileOnly for return just filename
 	  * @return string the row image filename
 	  * @access public
 	  */
-	function getImage($from = CMS_file::WEBROOT) {
+	function getImage($from = CMS_file::WEBROOT, $fileOnly = false) {
 		if (!file_exists(PATH_TEMPLATES_ROWS_FS.'/images/'.$this->_image)) {
 			$this->_image = 'nopicto.gif';
 		}
+		if ($fileOnly) {
+			return $this->_image;
+		}
 		return ($from == CMS_file::FILE_SYSTEM) ? PATH_TEMPLATES_ROWS_FS.'/images/'.$this->_image : PATH_TEMPLATES_ROWS_WR.'/images/'.$this->_image;
 	}
 
@@ -552,6 +556,15 @@
 	}
 
 	/**
+	 * Set filename of row
+	 * 
+	 * @param string $filename Filename
+	 */
+	public function setDefinitionFile($filename) {
+		$this->_definitionFile = $filename;
+	}
+
+	/**
 	  * Gets the data, using the specified visualization mode.
 	  * The data is taken from the blocks and reintroduced into the definition file which may itself contain HTML instructions.
 	  *

=== modified file 'automne/classes/modules/standard/rowscatalog.php'
--- automne/classes/modules/standard/rowscatalog.php	2010-09-06 15:20:52 +0000
+++ automne/classes/modules/standard/rowscatalog.php	2010-09-23 09:23:46 +0000
@@ -1,4 +1,5 @@
 <?php
+
 // +----------------------------------------------------------------------+
 // | Automne (TM)														  |
 // +----------------------------------------------------------------------+
@@ -9,34 +10,30 @@
 // | LICENSE-GPL, and is available through the world-wide-web at		  |
 // | http://www.gnu.org/copyleft/gpl.html.								  |
 // +----------------------------------------------------------------------+
-
 // | Author: Antoine Pouch <[e-mail]>              |
 // +----------------------------------------------------------------------+
-//
-// $Id: rowscatalog.php,v 1.5 2010/03/08 16:43:29 sebastien Exp $
 
 /**
-  * Class CMS_rowsCatalog
-  *
-  * Represents a collection of rows
-  *
-  * @package Automne
-  * @subpackage standard
-  * @author Antoine Pouch <[e-mail]>
-  */
+ * Class CMS_rowsCatalog
+ *
+ * Represents a collection of rows
+ *
+ * @package Automne
+ * @subpackage standard
+ * @author Antoine Pouch <[e-mail]>
+ * @author Julien Breux <[e-mail]>
+ */
+class CMS_rowsCatalog extends CMS_grandFather {
 
-class CMS_rowsCatalog extends CMS_grandFather
-{
 	/**
-	  * Return a row by its ID (and tagID)
-	  *
-	  * @param integer $id The DB ID of the wanted row
-	  * @param integer $tagID The tag ID attribute of the wanted row
-	  * @return CMS_row
-	  * @access public
-	  */
-	function getByID($id, $tagID = false)
-	{
+	 * Return a row by its ID (and tagID)
+	 *
+	 * @param integer $id The DB ID of the wanted row
+	 * @param integer $tagID The tag ID attribute of the wanted row
+	 * @return CMS_row
+	 * @access public
+	 */
+	function getByID($id, $tagID = false) {
 		$row = new CMS_row($id, $tagID);
 		if (!$row->hasError()) {
 			return $row;
@@ -46,16 +43,16 @@
 	}
 
 	/**
-	  * Return all the rows available
-	  *
-	  * @param CMS_profile_user $cms_user : restrict to user rights on modules (default : false)
-	  * @param integer $tplId : restrict to rows usable in given template (default : false)
-	  * @param string $csId : restrict to rows usable in given clientspace (default : false)
-	  * @param integer $start : start position
-	  * @param integer $limit : limit position
-	  * @param integer $count : number of rows founded (passed by reference)
-	  * @access public
-	  */
+	 * Return all the rows available
+	 *
+	 * @param CMS_profile_user $cms_user : restrict to user rights on modules (default : false)
+	 * @param integer $tplId : restrict to rows usable in given template (default : false)
+	 * @param string $csId : restrict to rows usable in given clientspace (default : false)
+	 * @param integer $start : start position
+	 * @param integer $limit : limit position
+	 * @param integer $count : number of rows founded (passed by reference)
+	 * @access public
+	 */
 	function getAll($includeInactive = false, $keyword = '', $groups = array(), $rowIds = array(), $user = false, $tplId = false, $csId = false, $start = 0, $limit = 0, $returnObjects = true, &$score = array()) {
 		$select = 'id_row';
 		$where = '';
@@ -63,12 +60,12 @@
 		if ($keyword) {
 			//clean user keywords (never trust user input, user is evil)
 			$keyword = strtr($keyword, ",;", "  ");
-			$words=array();
-			$words=array_map("trim",array_unique(explode(" ", io::strtolower($keyword))));
+			$words = array();
+			$words = array_map("trim", array_unique(explode(" ", io::strtolower($keyword))));
 			$cleanedWords = array();
 			foreach ($words as $aWord) {
-				if ($aWord && $aWord!='' && io::strlen($aWord) >= 3) {
-					$aWord = str_replace(array('%','_'), array('\%','\_'), $aWord);
+				if ($aWord && $aWord != '' && io::strlen($aWord) >= 3) {
+					$aWord = str_replace(array('%', '_'), array('\%', '\_'), $aWord);
 					$cleanedWords[] = $aWord;
 				}
 			}
@@ -78,53 +75,53 @@
 			}
 			$keywordWhere = '';
 			foreach ($cleanedWords as $cleanedWord) {
-				$keywordWhere .= ($keywordWhere) ? ' and ' : '';
+				$keywordWhere .= ( $keywordWhere) ? ' and ' : '';
 				$keywordWhere .= " (
-					description_row like '%".sensitiveIO::sanitizeSQLString($cleanedWord)."%'
-					or label_row like '%".sensitiveIO::sanitizeSQLString($cleanedWord)."%'
+					description_row like '%" . sensitiveIO::sanitizeSQLString($cleanedWord) . "%'
+					or label_row like '%" . sensitiveIO::sanitizeSQLString($cleanedWord) . "%'
 				)";
 			}
-			$where .= ($where) ? ' and ' : '';
-			$where .= " ((".$keywordWhere.") or MATCH (label_row, description_row) AGAINST ('".sensitiveIO::sanitizeSQLString($keyword)."') )";
-			$select .= " , MATCH (label_row, description_row) AGAINST ('".sensitiveIO::sanitizeSQLString($keyword)."') as m ";
+			$where .= ( $where) ? ' and ' : '';
+			$where .= " ((" . $keywordWhere . ") or MATCH (label_row, description_row) AGAINST ('" . sensitiveIO::sanitizeSQLString($keyword) . "') )";
+			$select .= " , MATCH (label_row, description_row) AGAINST ('" . sensitiveIO::sanitizeSQLString($keyword) . "') as m ";
 		}
 		$sql = "
 			select
-				".$select."
+				" . $select . "
 			from
 				mod_standard_rows
 		";
 		//groups
 		if ($groups) {
 			foreach ($groups as $group) {
-				$where .= ($where) ? ' and ' : '';
+				$where .= ( $where) ? ' and ' : '';
 				$where .= " (
-					groupsStack_row='".sensitiveIO::sanitizeSQLString($group)."'
-					or groupsStack_row like '%;".sensitiveIO::sanitizeSQLString($group).";%'
-					or groupsStack_row like '".sensitiveIO::sanitizeSQLString($group).";%'
-					or groupsStack_row like '%;".sensitiveIO::sanitizeSQLString($group)."'
+					groupsStack_row='" . sensitiveIO::sanitizeSQLString($group) . "'
+					or groupsStack_row like '%;" . sensitiveIO::sanitizeSQLString($group) . ";%'
+					or groupsStack_row like '" . sensitiveIO::sanitizeSQLString($group) . ";%'
+					or groupsStack_row like '%;" . sensitiveIO::sanitizeSQLString($group) . "'
 				)";
 			}
 		}
 
 		//useable
 		if (!$includeInactive) {
-			$where .= ($where) ? ' and ' : '';
+			$where .= ( $where) ? ' and ' : '';
 			$where .= " useable_row=1 ";
 		}
 		//rowIds
 		if ($rowIds) {
-			$where .= ($where) ? ' and ' : '';
-			$where .= " id_row in (".implode(',',$rowIds).") ";
+			$where .= ( $where) ? ' and ' : '';
+			$where .= " id_row in (" . implode(',', $rowIds) . ") ";
 		}
 		if ($tplId) {
-			$where .= ($where) ? ' and ' : '';
+			$where .= ( $where) ? ' and ' : '';
 			$where .= " (
 				tplfilter_row=''
-				or tplfilter_row='".sensitiveIO::sanitizeSQLString($tplId)."'
-				or tplfilter_row like '%;".sensitiveIO::sanitizeSQLString($tplId).";%'
-				or tplfilter_row like '".sensitiveIO::sanitizeSQLString($tplId).";%'
-				or tplfilter_row like '%;".sensitiveIO::sanitizeSQLString($tplId)."'
+				or tplfilter_row='" . sensitiveIO::sanitizeSQLString($tplId) . "'
+				or tplfilter_row like '%;" . sensitiveIO::sanitizeSQLString($tplId) . ";%'
+				or tplfilter_row like '" . sensitiveIO::sanitizeSQLString($tplId) . ";%'
+				or tplfilter_row like '%;" . sensitiveIO::sanitizeSQLString($tplId) . "'
 			) ";
 		}
 		//user
@@ -132,20 +129,20 @@
 			$groupsDenied = $user->getRowGroupsDenied();
 			$groupsDenied = $groupsDenied->getElements();
 			if ($groupsDenied) {
-				$where .= ($where) ? ' and (' : '(';
+				$where .= ( $where) ? ' and (' : '(';
 				foreach ($groupsDenied as $group) {
 					$where .= " (
-						groupsStack_row != '".sensitiveIO::sanitizeSQLString($group[0])."'
-						and groupsStack_row not like '%;".sensitiveIO::sanitizeSQLString($group[0]).";%'
-						and groupsStack_row not like '".sensitiveIO::sanitizeSQLString($group[0]).";%'
-						and groupsStack_row not like '%;".sensitiveIO::sanitizeSQLString($group[0])."'
+						groupsStack_row != '" . sensitiveIO::sanitizeSQLString($group[0]) . "'
+						and groupsStack_row not like '%;" . sensitiveIO::sanitizeSQLString($group[0]) . ";%'
+						and groupsStack_row not like '" . sensitiveIO::sanitizeSQLString($group[0]) . ";%'
+						and groupsStack_row not like '%;" . sensitiveIO::sanitizeSQLString($group[0]) . "'
 					) and";
 				}
 				//remove last "or" and append )
-				$where = io::substr($where, 0, -3).')';
+				$where = io::substr($where, 0, -3) . ')';
 			}
 		}
-		$sql = $sql.($where ? ' where '.$where : '');
+		$sql = $sql . ($where ? ' where ' . $where : '');
 		//order
 		if (io::strpos($sql, 'MATCH') === false) {
 			$sql .= " order by label_row ";
@@ -154,7 +151,7 @@
 		}
 		//limit
 		if ($start || $limit) {
-			$sql .= " limit ".sensitiveIO::sanitizeSQLString($start).",".sensitiveIO::sanitizeSQLString($limit);
+			$sql .= " limit " . sensitiveIO::sanitizeSQLString($start) . "," . sensitiveIO::sanitizeSQLString($limit);
 		}
 		//pr($sql);
 		$q = new CMS_query($sql);
@@ -178,17 +175,17 @@
 	}
 
 	/**
-	  * Get All Groups
-	  * Static function
-	  *
-	  * @return array(string)
-	  * @access public
-	  */
+	 * Get All Groups
+	 * Static function
+	 *
+	 * @return array(string)
+	 * @access public
+	 */
 	function getAllGroups($returnStack = false, $reset = false) {
 		static $rowGroups;
 		if (!isset($rowGroups) || $reset) {
 			$rowGroups = array();
-			$sql ='
+			$sql = '
 				select distinct
 					groupsStack_row
 				from
@@ -200,7 +197,7 @@
 				$groupStack = new CMS_stack();
 				$groupStack->setTextDefinition($groupStackString);
 				foreach ($groupStack->getElements() as $group) {
-					if (!SensitiveIO::isInSet($group[0],$rowGroups) && $group[0]) {
+					if (!SensitiveIO::isInSet($group[0], $rowGroups) && $group[0]) {
 						$rowGroups[] = $group[0];
 					}
 				}
@@ -219,29 +216,97 @@
 	}
 
 	/**
-	  * Return pages IDs coresponding of a given row ID
-	  *
-	  * @param integer rowID : the row to get pagesIDs
-	  * @param boolean returnObjects : to return pages objects or pages IDs
-	  * @param boolean public : targets edited or public clientspaces
-	  * @return array : pages IDs or pages objects
-	  * @access public
-	  */
+	 * public static getCloneFromID
+	 *
+	 * Clones a Row, changes some attributes
+	 * and writes it to persistence (MySQL for now)
+	 *
+	 * @param anyRowID as the ID of Row to be cloned
+	 * @param String label receive a new label for this Row
+	 * @param boolean $setPrivate Should the template be set as a private one ?  ALSO determines if the new row should point to the same file
+	 * @return a valid new CMS_row
+	 */
+	function getCloneFromID($rowID = 0, $label = false, $setPrivate = false) {
+		$ret = false;
+		$model = new CMS_row($rowID);
+		if ($model->getID() > 0) {
+			//New blank one
+			$row = new CMS_row();
+
+			//First write a new object to get it's ID
+			$row->writeToPersistence();
+
+			//Setting label
+			$label = ($label) ? $label : $model->getLabel();
+			$row->setLabel($label);
+
+			//Copying template definition file (if not private template)
+			if ($setPrivate) {
+				$filename = $model->getDefinitionFileName();
+			} else {
+				$filename = "r" . $row->getID() . "_" . SensitiveIO::sanitizeAsciiString($row->getLabel()) . ".xml";
+			}
+			if ($setPrivate || CMS_file::copyTo(PATH_ROWS_FS . "/" . $model->getDefinitionFileName(), PATH_ROWS_FS . "/" . $filename)) {
+				$row->setDefinitionFile($filename);
+
+				//Copying groupsStack from database
+				foreach ($model->getGroups() as $grp) {
+					$row->addGroup($grp);
+				}
+
+				//Copying image
+				$row->setImage($model->getImage(CMS_file::WEBROOT, true));
+
+				//set private if asked to.
+				if ($setPrivate) {
+					$row->setPrivate(true);
+				}
+				//copy description
+				$row->setDescription($model->getDescription());
+
+				//add filtered templates
+				$row->setFilteredTemplates($model->getFilteredTemplates());
+
+				//Partial update for groups and image
+				$row->writeToPersistence();
+				$ret = $row;
+			}
+			unset($model);
+		}
+		if ($row) {
+			//Clean if any error when out
+			if (!$ret) {
+				$row->destroy();
+			}
+			unset($row);
+		}
+		return $ret;
+	}
+
+	/**
+	 * Return pages IDs coresponding of a given row ID
+	 *
+	 * @param integer rowID : the row to get pagesIDs
+	 * @param boolean returnObjects : to return pages objects or pages IDs
+	 * @param boolean public : targets edited or public clientspaces
+	 * @return array : pages IDs or pages objects
+	 * @access public
+	 */
 	function getPagesByRow($rowID, $returnObjects = false, $public = false) {
 		$return = array();
-		if(!SensitiveIO::isPositiveInteger($rowID)){
+		if (!SensitiveIO::isPositiveInteger($rowID)) {
 			CMS_grandFather::raiseError('rowID must be a positive integer');
 			return $return;
 		}
 		$clientSpacesTable = ($public) ? 'mod_standard_clientSpaces_public' : 'mod_standard_clientSpaces_edited';
-		$sql="
+		$sql = "
 			select
 				distinct id_pag
 			from
 				pages,
-				".$clientSpacesTable."
+				" . $clientSpacesTable . "
 			where
-				type_cs = '".$rowID."'
+				type_cs = '" . $rowID . "'
 				and template_cs = template_pag
 			order by
 				id_pag
@@ -249,8 +314,8 @@
 		$q = new CMS_query($sql);
 		if ($q->getNumRows()) {
 			while ($id = $q->getValue('id_pag')) {
-				if($returnObjects){
-					if($page = CMS_tree::getPageByID($id)){
+				if ($returnObjects) {
+					if ($page = CMS_tree::getPageByID($id)) {
 						$return[$id] = $page;
 					}
 				} else {
@@ -262,16 +327,16 @@
 	}
 
 	/**
-	  * Return rows ID used by a given page
-	  *
-	  * @param integer pageId : the row to get pagesIDs
-	  * @param boolean returnObjects : to return rows objects or rows IDs (default : false)
-	  * @return array : rows IDs or rows objects
-	  * @access public
-	  */
+	 * Return rows ID used by a given page
+	 *
+	 * @param integer pageId : the row to get pagesIDs
+	 * @param boolean returnObjects : to return rows objects or rows IDs (default : false)
+	 * @return array : rows IDs or rows objects
+	 * @access public
+	 */
 	function getRowsByPage($pageId, $returnObjects = false) {
 		$rows = array();
-		if(!SensitiveIO::isPositiveInteger($pageId)){
+		if (!SensitiveIO::isPositiveInteger($pageId)) {
 			CMS_grandFather::raiseError('pageId must be a positive integer');
 			return $rows;
 		}
@@ -281,14 +346,14 @@
 			'mod_standard_clientSpaces_edition'
 		);
 		foreach ($clientSpacesTables as $clientSpacesTable) {
-			$sql="
+			$sql = "
 				select
 					type_cs
 				from
 					pages,
-					".$clientSpacesTable."
+					" . $clientSpacesTable . "
 				where
-					id_pag = ".$pageId."
+					id_pag = " . $pageId . "
 					and template_cs = template_pag
 				order by
 					type_cs
@@ -297,8 +362,8 @@
 			if ($q->getNumRows()) {
 				while (($id = $q->getValue('type_cs')) !== false) {
 					if (!isset($rows[$id])) {
-						if($returnObjects){
-							if($row = CMS_rowsCatalog::getByID($id)){
+						if ($returnObjects) {
+							if ($row = CMS_rowsCatalog::getByID($id)) {
 								$rows[$id] = $row;
 							}
 						} else {
@@ -312,33 +377,35 @@
 	}
 
 	/**
-	  * Return all rows icons available on the server
-	  *
-	  * @return array : rows images path (from webroot)
-	  * @access public
-	  */
+	 * Return all rows icons available on the server
+	 *
+	 * @return array : rows images path (from webroot)
+	 * @access public
+	 */
 	function getAllIcons() {
 		//read img dir
 		$availableExtensions = array('gif', 'png', 'jpg');
-		try{
-			foreach ( new DirectoryIterator(PATH_TEMPLATES_ROWS_FS.'/images/') as $file) {
+		try {
+			foreach (new DirectoryIterator(PATH_TEMPLATES_ROWS_FS . '/images/') as $file) {
 				if ($file->isFile() && in_array(io::strtolower(pathinfo($file->getFilename(), PATHINFO_EXTENSION)), $availableExtensions)) {
-					$images[] = PATH_TEMPLATES_ROWS_WR.'/images/'.$file->getFilename();
+					$images[] = PATH_TEMPLATES_ROWS_WR . '/images/' . $file->getFilename();
 				}
 			}
-		} catch(Exception $e) {}
+		} catch (Exception $e) {
+
+		}
 
 		return $images;
 	}
-	
+
 	/**
-	  * Return all rows which uses given modules
-	  *
-	  * @param array modules : the modules codename to search rows for
-	  * @param boolean returnObjects : does the function return array of ids or array of objects (default)
-	  * @return array : rows
-	  * @access public
-	  */
+	 * Return all rows which uses given modules
+	 *
+	 * @param array modules : the modules codename to search rows for
+	 * @param boolean returnObjects : does the function return array of ids or array of objects (default)
+	 * @return array : rows
+	 * @access public
+	 */
 	function getByModules($modules= array(), $returnObjects = true) {
 		if (!is_array($modules) && is_string($modules) && $modules) {
 			$modules = array($modules);
@@ -347,8 +414,8 @@
 			CMS_grandFather::raiseError('No modules set');
 			return array();
 		}
-		
-		$sql ='
+
+		$sql = '
 			select 
 				id_row, modulesStack_row
 			from
@@ -384,39 +451,39 @@
 		}
 		return $rows;
 	}
-	
+
 	/**
-	  * Import module from given array datas
-	  *
-	  * @param array $data The module datas to import
-	  * @param array $params The import parameters.
-	  *		array(
-	  *				module	=> false|true : the module to create rows (required)
-	  *				create	=> false|true : create missing objects (default : true)
-	  *				update	=> false|true : update existing objects (default : true)
-	  *				files	=> false|true : use files from PATH_TMP_FS (default : true)
-	  *			)
-	  * @param CMS_language $cms_language The CMS_langage to use
-	  * @param array $idsRelation : Reference : The relations between import datas ids and real imported ids
-	  * @param string $infos : Reference : The import infos returned
-	  * @return boolean : true on success, false on failure
-	  * @access public
-	  */
+	 * Import module from given array datas
+	 *
+	 * @param array $data The module datas to import
+	 * @param array $params The import parameters.
+	 * 		array(
+	 * 				module	=> false|true : the module to create rows (required)
+	 * 				create	=> false|true : create missing objects (default : true)
+	 * 				update	=> false|true : update existing objects (default : true)
+	 * 				files	=> false|true : use files from PATH_TMP_FS (default : true)
+	 * 			)
+	 * @param CMS_language $cms_language The CMS_langage to use
+	 * @param array $idsRelation : Reference : The relations between import datas ids and real imported ids
+	 * @param string $infos : Reference : The import infos returned
+	 * @return boolean : true on success, false on failure
+	 * @access public
+	 */
 	function fromArray($data, $params, $cms_language, &$idsRelation, &$infos) {
 		if (!isset($params['module'])) {
-			$infos .= 'Error : missing module codename for rows importation ...'."\n";
+			$infos .= 'Error : missing module codename for rows importation ...' . "\n";
 			return false;
 		}
 		$module = CMS_modulesCatalog::getByCodename($params['module']);
 		if ($module->hasError()) {
-			$infos .= 'Error : invalid module for rows importation : '.$params['module']."\n";
+			$infos .= 'Error : invalid module for rows importation : ' . $params['module'] . "\n";
 			return false;
 		}
 		$return = true;
 		foreach ($data as $rowDatas) {
 			$importType = '';
 			if (isset($rowDatas['uuid'])
-				 && ($id = CMS_rowsCatalog::rowExists($params['module'], $rowDatas['uuid']))) {
+					&& ($id = CMS_rowsCatalog::rowExists($params['module'], $rowDatas['uuid']))) {
 				//row already exist : load it if we can update it
 				if (!isset($params['update']) || $params['update'] == true) {
 					$row = CMS_rowsCatalog::getByID($id);
@@ -433,25 +500,25 @@
 			if (isset($row)) {
 				if ($row->fromArray($rowDatas, $params, $cms_language, $idsRelation, $infos)) {
 					$return &= true;
-					$infos .= 'Row '.$row->getLabel().' successfully imported'.$importType."\n";
+					$infos .= 'Row ' . $row->getLabel() . ' successfully imported' . $importType . "\n";
 				} else {
 					$return = false;
-					$infos .= 'Error during import of row '.$rowDatas['id'].$importType."\n";
+					$infos .= 'Error during import of row ' . $rowDatas['id'] . $importType . "\n";
 				}
 			}
 		}
 		return $return;
 	}
-	
+
 	/**
-	  * Does a row exists with given parameters
-	  * this method is use by fromArray import method to know if an imported row already exist or not
-	  *
-	  * @param string $module The module codename to check
-	  * @param string $uuid The row uuid to check
-	  * @return mixed : integer id if exists, false otherwise
-	  * @access public
-	  */
+	 * Does a row exists with given parameters
+	 * this method is use by fromArray import method to know if an imported row already exist or not
+	 *
+	 * @param string $module The module codename to check
+	 * @param string $uuid The row uuid to check
+	 * @return mixed : integer id if exists, false otherwise
+	 * @access public
+	 */
 	function rowExists($module, $uuid) {
 		if (!$module) {
 			CMS_grandFather::raiseError("module must be set");
@@ -467,11 +534,11 @@
 			from 
 				mod_standard_rows 
 			where
-				uuid_row='".io::sanitizeSQLString($uuid)."'
-				and (modulesStack_row like '".io::sanitizeSQLString($module).";%'
-					or modulesStack_row = '".io::sanitizeSQLString($module)."'
-					or modulesStack_row like '%;".io::sanitizeSQLString($module)."'
-					or modulesStack_row like '%;".io::sanitizeSQLString($module).";%'
+				uuid_row='" . io::sanitizeSQLString($uuid) . "'
+				and (modulesStack_row like '" . io::sanitizeSQLString($module) . ";%'
+					or modulesStack_row = '" . io::sanitizeSQLString($module) . "'
+					or modulesStack_row like '%;" . io::sanitizeSQLString($module) . "'
+					or modulesStack_row like '%;" . io::sanitizeSQLString($module) . ";%'
 				)
 		");
 		if ($q->getNumRows()) {
@@ -479,14 +546,14 @@
 		}
 		return false;
 	}
-	
+
 	/**
-	  * Does given uuid already exists for rows
-	  *
-	  * @param string $uuid The uuid to check
-	  * @return boolean
-	  * @access public
-	  */
+	 * Does given uuid already exists for rows
+	 *
+	 * @param string $uuid The uuid to check
+	 * @return boolean
+	 * @access public
+	 */
 	function uuidExists($uuid) {
 		if (!$uuid) {
 			CMS_grandFather::raiseError("uuid must be set");
@@ -498,9 +565,11 @@
 			from 
 				mod_standard_rows 
 			where
-				uuid_row='".io::sanitizeSQLString($uuid)."'
+				uuid_row='" . io::sanitizeSQLString($uuid) . "'
 		");
 		return $q->getNumRows() ? true : false;
 	}
+
 }
+
 ?>
\ No newline at end of file