Work on website module

dev/skeletons/skeleton_class.class.php

@@ -249,7 +249,7 @@ class Skeleton_Class extends CommonObject
 				$line->prop1 = $obj->field1;
 				$line->prop2 = $obj->field2;
 
-				$this->lines[] = $line;
+				$this->lines[$line->id] = $line;
 				//...
 			}
 			$this->db->free($resql);

htdocs/admin/websites.php

@@ -75,23 +75,23 @@ $tablib[1] = "Websites";
 
 // Requests to extract data
 $tabsql=array();
-$tabsql[1] = "SELECT f.rowid as rowid, f.entity, f.shortname, f.description, f.status FROM ".MAIN_DB_PREFIX."website as f";
+$tabsql[1] = "SELECT f.rowid as rowid, f.entity, f.ref, f.description, f.status FROM ".MAIN_DB_PREFIX."website as f";
 
 // Criteria to sort dictionaries
 $tabsqlsort=array();
-$tabsqlsort[1] ="shortname ASC";
+$tabsqlsort[1] ="ref ASC";
 
 // Nom des champs en resultat de select pour affichage du dictionnaire
 $tabfield=array();
-$tabfield[1] = "shortname,description";
+$tabfield[1] = "ref,description";
 
 // Nom des champs d'edition pour modification d'un enregistrement
 $tabfieldvalue=array();
-$tabfieldvalue[1] = "shortname,description";
+$tabfieldvalue[1] = "ref,description";
 
 // Nom des champs dans la table pour insertion d'un enregistrement
 $tabfieldinsert=array();
-$tabfieldinsert[1] = "shortname,description,entity";
+$tabfieldinsert[1] = "ref,description,entity";
 
 // Nom du rowid si le champ n'est pas de type autoincrement
 // Example: "" if id field is "rowid" and has autoincrement on

htdocs/install/mysql/migration/3.9.0-4.0.0.sql

@@ -106,7 +106,7 @@ CREATE TABLE llx_website
 (
 	rowid         integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
 	entity        integer DEFAULT 1,
-	shortname     varchar(24) NOT NULL,
+	ref		      varchar(24) NOT NULL,
 	description   varchar(255),
 	status		  integer,
     date_creation     datetime,
@@ -114,7 +114,7 @@ CREATE TABLE llx_website
 	tms           timestamp
 ) ENGINE=innodb;
  
-ALTER TABLE llx_website ADD UNIQUE INDEX uk_website_shortname (shortname, entity);
+ALTER TABLE llx_website ADD UNIQUE INDEX uk_website_ref (ref, entity);
 
 CREATE TABLE llx_website_page
 (

htdocs/install/mysql/tables/llx_website.key.sql

@@ -16,5 +16,5 @@
 --
 -- ===========================================================================
 
-ALTER TABLE llx_website ADD UNIQUE INDEX uk_website_shortname (shortname, entity);
+ALTER TABLE llx_website ADD UNIQUE INDEX uk_website_ref (ref, entity);
 

htdocs/install/mysql/tables/llx_website.sql

@@ -21,7 +21,7 @@ CREATE TABLE llx_website
 (
 	rowid         integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
 	entity        integer DEFAULT 1,
-	shortname     varchar(24) NOT NULL,
+	ref	          varchar(24) NOT NULL,
 	description   varchar(255),
 	status		  integer,
     date_creation     datetime,

htdocs/langs/en_US/errors.lang

@@ -85,7 +85,7 @@ ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field
 ErrorDatabaseParameterWrong=Database setup parameter '<b>%s</b>' has a value not compatible to use Dolibarr (must have value '<b>%s</b>').
 ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
 ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Error on mask
 ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
 ErrorBadMaskBadRazMonth=Error, bad reset value

htdocs/langs/en_US/website.lang

@@ -2,4 +2,12 @@
 Shortname=Code
 WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. 
+ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. 
+WEBSITE_PAGENAME=Page name/alias
+WEBSITE_URL=Page real URL
+EditMenu=Edit menu
+EditPageMeta=Edit Meta
+EditPageContent=Edit Content
+Website=Web site
+AddPage=Add page
+Page=Page

htdocs/theme/eldy/style.css.php

@@ -3104,6 +3104,27 @@ td.hidden {
 }
 
 
+/* ============================================================================== */
+/*  Module website                                                                */
+/* ============================================================================== */
+
+.websitebar {
+	border-bottom: 1px solid #888;
+	height: 30px; 
+}
+.websiteselection {
+	display: inline-block;
+	padding-left: 10px;
+	vertical-align: middle; 
+	margin-bottom: 5px;
+	line-height: 29px;
+}
+.websitetools {
+	float: right;
+	padding-top: 2px;
+}
+
+
 /* ============================================================================== */
 /*  Module agenda                                                                 */
 /* ============================================================================== */

htdocs/theme/md/style.css.php

@@ -2949,6 +2949,27 @@ td.hidden {
 }
 
 
+/* ============================================================================== */
+/*  Module website                                                                */
+/* ============================================================================== */
+
+.websitebar {
+	border-bottom: 1px solid #888;
+	height: 30px; 
+}
+.websiteselection {
+	display: inline-block;
+	padding-left: 10px;
+	vertical-align: middle; 
+	margin-bottom: 5px;
+	line-height: 29px;
+}
+.websitetools {
+	float: right;
+	padding-top: 2px;
+}
+
+
 /* ============================================================================== */
 /*  Module agenda                                                                 */
 /* ============================================================================== */

htdocs/websites/class/website.class.php

@@ -49,7 +49,7 @@ class Website extends CommonObject
 	public $table_element = 'website';
 
 	/**
-	 * @var WebsiteLine[] Lines
+	 * @var WebsitePage[]  Lines of all pages
 	 */
 	public $lines = array();
 
@@ -57,13 +57,15 @@ class Website extends CommonObject
 	 */
 	
 	public $entity;
-	public $shortname;
+	public $ref;
 	public $description;
 	public $status;
 	public $date_creation = '';
 	public $date_modification = '';
 	public $tms = '';
 
+	public $records;
+	
 	/**
 	 */
 	
@@ -98,8 +100,8 @@ class Website extends CommonObject
 		if (isset($this->entity)) {
 			 $this->entity = trim($this->entity);
 		}
-		if (isset($this->shortname)) {
+		if (isset($this->ref)) {
-			 $this->shortname = trim($this->shortname);
+			 $this->ref = trim($this->ref);
 		}
 		if (isset($this->description)) {
 			 $this->description = trim($this->description);
@@ -117,7 +119,7 @@ class Website extends CommonObject
 		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
 		
 		$sql.= 'entity,';
-		$sql.= 'shortname,';
+		$sql.= 'ref,';
 		$sql.= 'description,';
 		$sql.= 'status,';
 		$sql.= 'date_creation,';
@@ -127,7 +129,7 @@ class Website extends CommonObject
 		$sql .= ') VALUES (';
 		
 		$sql .= ' '.(! isset($this->entity)?'NULL':$this->entity).',';
-		$sql .= ' '.(! isset($this->shortname)?'NULL':"'".$this->db->escape($this->shortname)."'").',';
+		$sql .= ' '.(! isset($this->ref)?'NULL':"'".$this->db->escape($this->ref)."'").',';
 		$sql .= ' '.(! isset($this->description)?'NULL':"'".$this->db->escape($this->description)."'").',';
 		$sql .= ' '.(! isset($this->status)?'NULL':$this->status).',';
 		$sql .= ' '.(! isset($this->date_creation) || dol_strlen($this->date_creation)==0?'NULL':"'".$this->db->idate($this->date_creation)."'").',';
@@ -187,7 +189,7 @@ class Website extends CommonObject
 		$sql .= ' t.rowid,';
 		
 		$sql .= " t.entity,";
-		$sql .= " t.shortname,";
+		$sql .= " t.ref,";
 		$sql .= " t.description,";
 		$sql .= " t.status,";
 		$sql .= " t.date_creation,";
@@ -211,7 +213,7 @@ class Website extends CommonObject
 				$this->id = $obj->rowid;
 				
 				$this->entity = $obj->entity;
-				$this->shortname = $obj->shortname;
+				$this->ref = $obj->ref;
 				$this->description = $obj->description;
 				$this->status = $obj->status;
 				$this->date_creation = $this->db->jdate($obj->date_creation);
@@ -255,13 +257,12 @@ class Website extends CommonObject
 		$sql .= ' t.rowid,';
 		
 		$sql .= " t.entity,";
-		$sql .= " t.shortname,";
+		$sql .= " t.ref,";
 		$sql .= " t.description,";
 		$sql .= " t.status,";
 		$sql .= " t.date_creation,";
 		$sql .= " t.date_modification,";
 		$sql .= " t.tms";
-
 		
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
 
@@ -282,7 +283,7 @@ class Website extends CommonObject
 		if (!empty($limit)) {
 		 $sql .=  ' ' . $this->db->plimit($limit + 1, $offset);
 		}
-		$this->lines = array();
+		$this->records = array();
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -294,16 +295,14 @@ class Website extends CommonObject
 				$line->id = $obj->rowid;
 				
 				$line->entity = $obj->entity;
-				$line->shortname = $obj->shortname;
+				$line->ref = $obj->ref;
 				$line->description = $obj->description;
 				$line->status = $obj->status;
 				$line->date_creation = $this->db->jdate($obj->date_creation);
 				$line->date_modification = $this->db->jdate($obj->date_modification);
 				$line->tms = $this->db->jdate($obj->tms);
 
-				
+				$this->records[$line->id] = $line;
-
-				$this->lines[] = $line;
 			}
 			$this->db->free($resql);
 
@@ -335,8 +334,8 @@ class Website extends CommonObject
 		if (isset($this->entity)) {
 			 $this->entity = trim($this->entity);
 		}
-		if (isset($this->shortname)) {
+		if (isset($this->ref)) {
-			 $this->shortname = trim($this->shortname);
+			 $this->ref = trim($this->ref);
 		}
 		if (isset($this->description)) {
 			 $this->description = trim($this->description);
@@ -354,7 +353,7 @@ class Website extends CommonObject
 		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
 		
 		$sql .= ' entity = '.(isset($this->entity)?$this->entity:"null").',';
-		$sql .= ' shortname = '.(isset($this->shortname)?"'".$this->db->escape($this->shortname)."'":"null").',';
+		$sql .= ' ref = '.(isset($this->ref)?"'".$this->db->escape($this->ref)."'":"null").',';
 		$sql .= ' description = '.(isset($this->description)?"'".$this->db->escape($this->description)."'":"null").',';
 		$sql .= ' status = '.(isset($this->status)?$this->status:"null").',';
 		$sql .= ' date_creation = '.(! isset($this->date_creation) || dol_strlen($this->date_creation) != 0 ? "'".$this->db->idate($this->date_creation)."'" : 'null').',';
@@ -600,7 +599,7 @@ class Website extends CommonObject
 		$this->id = 0;
 		
 		$this->entity = '';
-		$this->shortname = '';
+		$this->ref = '';
 		$this->description = '';
 		$this->status = '';
 		$this->date_creation = '';
@@ -626,7 +625,7 @@ class WebsiteLine
 	 */
 	
 	public $entity;
-	public $shortname;
+	public $ref;
 	public $description;
 	public $status;
 	public $date_creation = '';

htdocs/websites/class/websitepage.class.php

@@ -0,0 +1,651 @@
+<?php
+/* Copyright (C) 2007-2012  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2014       Juanjo Menent       <jmenent@2byte.es>
+ * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
+ * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    websites/websitepage.class.php
+ * \ingroup websites
+ * \brief   This file is an example for a CRUD class file (Create/Read/Update/Delete)
+ *          Put some comments here
+ */
+
+// Put here all includes required by your class file
+require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
+//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+
+/**
+ * Class Websitepage
+ */
+class WebsitePage extends CommonObject
+{
+	/**
+	 * @var string Id to identify managed objects
+	 */
+	public $element = 'websitepage';
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'website_page';
+
+	/**
+	 */
+	
+	public $fk_website;
+	public $pageurl;
+	public $title;
+	public $description;
+	public $keywords;
+	public $content;
+	public $status;
+	public $date_creation = '';
+	public $date_modification = '';
+	public $tms = '';
+
+	/**
+	 */
+	
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDb $db Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		$this->db = $db;
+		return 1;
+	}
+
+	/**
+	 * Create object into database
+	 *
+	 * @param  User $user      User that creates
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 *
+	 * @return int <0 if KO, Id of created object if OK
+	 */
+	public function create(User $user, $notrigger = false)
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$error = 0;
+
+		// Clean parameters
+		
+		if (isset($this->fk_website)) {
+			 $this->fk_website = trim($this->fk_website);
+		}
+		if (isset($this->pageurl)) {
+			 $this->pageurl = trim($this->pageurl);
+		}
+		if (isset($this->title)) {
+			 $this->title = trim($this->title);
+		}
+		if (isset($this->description)) {
+			 $this->description = trim($this->description);
+		}
+		if (isset($this->keywords)) {
+			 $this->keywords = trim($this->keywords);
+		}
+		if (isset($this->content)) {
+			 $this->content = trim($this->content);
+		}
+		if (isset($this->status)) {
+			 $this->status = trim($this->status);
+		}
+
+		
+
+		// Check parameters
+		// Put here code to add control on parameters values
+
+		// Insert request
+		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
+		
+		$sql.= 'fk_website,';
+		$sql.= 'pageurl,';
+		$sql.= 'title,';
+		$sql.= 'description,';
+		$sql.= 'keywords,';
+		$sql.= 'content,';
+		$sql.= 'status,';
+		$sql.= 'date_creation,';
+		$sql.= 'date_modification';
+
+		
+		$sql .= ') VALUES (';
+		
+		$sql .= ' '.(! isset($this->fk_website)?'NULL':$this->fk_website).',';
+		$sql .= ' '.(! isset($this->pageurl)?'NULL':"'".$this->db->escape($this->pageurl)."'").',';
+		$sql .= ' '.(! isset($this->title)?'NULL':"'".$this->db->escape($this->title)."'").',';
+		$sql .= ' '.(! isset($this->description)?'NULL':"'".$this->db->escape($this->description)."'").',';
+		$sql .= ' '.(! isset($this->keywords)?'NULL':"'".$this->db->escape($this->keywords)."'").',';
+		$sql .= ' '.(! isset($this->content)?'NULL':"'".$this->db->escape($this->content)."'").',';
+		$sql .= ' '.(! isset($this->status)?'NULL':$this->status).',';
+		$sql .= ' '.(! isset($this->date_creation) || dol_strlen($this->date_creation)==0?'NULL':"'".$this->db->idate($this->date_creation)."'").',';
+		$sql .= ' '.(! isset($this->date_modification) || dol_strlen($this->date_modification)==0?'NULL':"'".$this->db->idate($this->date_modification)."'");
+
+		
+		$sql .= ')';
+
+		$this->db->begin();
+
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error ++;
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+		}
+
+		if (!$error) {
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
+
+			if (!$notrigger) {
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action to call a trigger.
+
+				//// Call triggers
+				//$result=$this->call_trigger('MYOBJECT_CREATE',$user);
+				//if ($result < 0) $error++;
+				//// End call triggers
+			}
+		}
+
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+
+			return - 1 * $error;
+		} else {
+			$this->db->commit();
+
+			return $this->id;
+		}
+	}
+
+	/**
+	 * Load object in memory from the database
+	 *
+	 * @param int    $id           Id object
+	 * @param string $website_id   Web site page
+	 * @param string $page         Page name
+	 *
+	 * @return int <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetch($id, $website_id = null, $page = null)
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$sql = 'SELECT';
+		$sql .= ' t.rowid,';
+		
+		$sql .= " t.fk_website,";
+		$sql .= " t.pageurl,";
+		$sql .= " t.title,";
+		$sql .= " t.description,";
+		$sql .= " t.keywords,";
+		$sql .= " t.content,";
+		$sql .= " t.status,";
+		$sql .= " t.date_creation,";
+		$sql .= " t.date_modification,";
+		$sql .= " t.tms";
+		
+		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
+		if (null !== $website_id) {
+		    $sql .= ' WHERE t.fk_website = ' . '\'' . $website_id . '\'';
+		    $sql .= ' AND t.pageurl = ' . '\'' . $page . '\'';
+		} else {
+			$sql .= ' WHERE t.rowid = ' . $id;
+		}
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$numrows = $this->db->num_rows($resql);
+			if ($numrows) {
+				$obj = $this->db->fetch_object($resql);
+
+				$this->id = $obj->rowid;
+				
+				$this->fk_website = $obj->fk_website;
+				$this->pageurl = $obj->pageurl;
+				$this->title = $obj->title;
+				$this->description = $obj->description;
+				$this->keywords = $obj->keywords;
+				$this->content = $obj->content;
+				$this->status = $obj->status;
+				$this->date_creation = $this->db->jdate($obj->date_creation);
+				$this->date_modification = $this->db->jdate($obj->date_modification);
+				$this->tms = $this->db->jdate($obj->tms);
+
+				
+			}
+			$this->db->free($resql);
+
+			if ($numrows) {
+				return 1;
+			} else {
+				return 0;
+			}
+		} else {
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+
+			return - 1;
+		}
+	}
+
+	/**
+	 * Load object in memory from the database
+	 *
+	 * @param string $sortorder Sort Order
+	 * @param string $sortfield Sort field
+	 * @param int    $limit     offset limit
+	 * @param int    $offset    offset limit
+	 * @param array  $filter    filter array
+	 * @param string $filtermode filter mode (AND or OR)
+	 *
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND')
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$sql = 'SELECT';
+		$sql .= ' t.rowid,';
+		
+		$sql .= " t.fk_website,";
+		$sql .= " t.pageurl,";
+		$sql .= " t.title,";
+		$sql .= " t.description,";
+		$sql .= " t.keywords,";
+		$sql .= " t.content,";
+		$sql .= " t.status,";
+		$sql .= " t.date_creation,";
+		$sql .= " t.date_modification,";
+		$sql .= " t.tms";
+
+		
+		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
+
+		// Manage filter
+		$sqlwhere = array();
+		if (count($filter) > 0) {
+			foreach ($filter as $key => $value) {
+				$sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
+			}
+		}
+		if (count($sqlwhere) > 0) {
+			$sql .= ' WHERE ' . implode(' '.$filtermode.' ', $sqlwhere);
+		}
+		
+		if (!empty($sortfield)) {
+			$sql .= $this->db->order($sortfield,$sortorder);
+		}
+		if (!empty($limit)) {
+		 $sql .=  ' ' . $this->db->plimit($limit + 1, $offset);
+		}
+		$this->lines = array();
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+
+			while ($obj = $this->db->fetch_object($resql)) {
+				$line = new WebsitepageLine();
+
+				$line->id = $obj->rowid;
+				
+				$line->fk_website = $obj->fk_website;
+				$line->pageurl = $obj->pageurl;
+				$line->title = $obj->title;
+				$line->description = $obj->description;
+				$line->keywords = $obj->keywords;
+				$line->content = $obj->content;
+				$line->status = $obj->status;
+				$line->date_creation = $this->db->jdate($obj->date_creation);
+				$line->date_modification = $this->db->jdate($obj->date_modification);
+				$line->tms = $this->db->jdate($obj->tms);
+
+				
+
+				$this->lines[$line->id] = $line;
+			}
+			$this->db->free($resql);
+
+			return $num;
+		} else {
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+
+			return - 1;
+		}
+	}
+
+	/**
+	 * Update object into database
+	 *
+	 * @param  User $user      User that modifies
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 *
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function update(User $user, $notrigger = false)
+	{
+		$error = 0;
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		// Clean parameters
+		
+		if (isset($this->fk_website)) {
+			 $this->fk_website = trim($this->fk_website);
+		}
+		if (isset($this->pageurl)) {
+			 $this->pageurl = trim($this->pageurl);
+		}
+		if (isset($this->title)) {
+			 $this->title = trim($this->title);
+		}
+		if (isset($this->description)) {
+			 $this->description = trim($this->description);
+		}
+		if (isset($this->keywords)) {
+			 $this->keywords = trim($this->keywords);
+		}
+		if (isset($this->content)) {
+			 $this->content = trim($this->content);
+		}
+		if (isset($this->status)) {
+			 $this->status = trim($this->status);
+		}
+
+		
+
+		// Check parameters
+		// Put here code to add a control on parameters values
+
+		// Update request
+		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
+		
+		$sql .= ' fk_website = '.(isset($this->fk_website)?$this->fk_website:"null").',';
+		$sql .= ' pageurl = '.(isset($this->pageurl)?"'".$this->db->escape($this->pageurl)."'":"null").',';
+		$sql .= ' title = '.(isset($this->title)?"'".$this->db->escape($this->title)."'":"null").',';
+		$sql .= ' description = '.(isset($this->description)?"'".$this->db->escape($this->description)."'":"null").',';
+		$sql .= ' keywords = '.(isset($this->keywords)?"'".$this->db->escape($this->keywords)."'":"null").',';
+		$sql .= ' content = '.(isset($this->content)?"'".$this->db->escape($this->content)."'":"null").',';
+		$sql .= ' status = '.(isset($this->status)?$this->status:"null").',';
+		$sql .= ' date_creation = '.(! isset($this->date_creation) || dol_strlen($this->date_creation) != 0 ? "'".$this->db->idate($this->date_creation)."'" : 'null').',';
+		$sql .= ' date_modification = '.(! isset($this->date_modification) || dol_strlen($this->date_modification) != 0 ? "'".$this->db->idate($this->date_modification)."'" : 'null').',';
+		$sql .= ' tms = '.(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : "'".$this->db->idate(dol_now())."'");
+
+        
+		$sql .= ' WHERE rowid=' . $this->id;
+
+		$this->db->begin();
+
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error ++;
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+		}
+
+		if (!$error && !$notrigger) {
+			// Uncomment this and change MYOBJECT to your own tag if you
+			// want this action calls a trigger.
+
+			//// Call triggers
+			//$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
+			//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+			//// End call triggers
+		}
+
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+
+			return - 1 * $error;
+		} else {
+			$this->db->commit();
+
+			return 1;
+		}
+	}
+
+	/**
+	 * Delete object in database
+	 *
+	 * @param User $user      User that deletes
+	 * @param bool $notrigger false=launch triggers after, true=disable triggers
+	 *
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function delete(User $user, $notrigger = false)
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$error = 0;
+
+		$this->db->begin();
+
+		if (!$error) {
+			if (!$notrigger) {
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action calls a trigger.
+
+				//// Call triggers
+				//$result=$this->call_trigger('MYOBJECT_DELETE',$user);
+				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+				//// End call triggers
+			}
+		}
+
+		if (!$error) {
+			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
+			$sql .= ' WHERE rowid=' . $this->id;
+
+			$resql = $this->db->query($sql);
+			if (!$resql) {
+				$error ++;
+				$this->errors[] = 'Error ' . $this->db->lasterror();
+				dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+			}
+		}
+
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+
+			return - 1 * $error;
+		} else {
+			$this->db->commit();
+
+			return 1;
+		}
+	}
+
+	/**
+	 * Load an object from its id and create a new one in database
+	 *
+	 * @param int $fromid Id of object to clone
+	 *
+	 * @return int New id of clone
+	 */
+	public function createFromClone($fromid)
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		global $user;
+		$error = 0;
+		$object = new Websitepage($this->db);
+
+		$this->db->begin();
+
+		// Load source object
+		$object->fetch($fromid);
+		// Reset object
+		$object->id = 0;
+
+		// Clear fields
+		// ...
+
+		// Create clone
+		$result = $object->create($user);
+
+		// Other options
+		if ($result < 0) {
+			$error ++;
+			$this->errors = $object->errors;
+			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+		}
+
+		// End
+		if (!$error) {
+			$this->db->commit();
+
+			return $object->id;
+		} else {
+			$this->db->rollback();
+
+			return - 1;
+		}
+	}
+
+	/**
+	 *  Return a link to the user card (with optionaly the picto)
+	 * 	Use this->id,this->lastname, this->firstname
+	 *
+	 *	@param	int		$withpicto			Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
+	 *	@param	string	$option				On what the link point to
+     *  @param	integer	$notooltip			1=Disable tooltip
+     *  @param	int		$maxlen				Max length of visible user name
+     *  @param  string  $morecss            Add more css on link
+	 *	@return	string						String with URL
+	 */
+	function getNomUrl($withpicto=0, $option='', $notooltip=0, $maxlen=24, $morecss='')
+	{
+		global $langs, $conf, $db;
+        global $dolibarr_main_authentication, $dolibarr_main_demo;
+        global $menumanager;
+
+
+        $result = '';
+        $companylink = '';
+
+        $label = '<u>' . $langs->trans("MyModule") . '</u>';
+        $label.= '<div width="100%">';
+        $label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+
+        $link = '<a href="'.DOL_URL_ROOT.'/websites/card.php?id='.$this->id.'"';
+        $link.= ($notooltip?'':' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip'.($morecss?' '.$morecss:'').'"');
+        $link.= '>';
+		$linkend='</a>';
+
+        if ($withpicto)
+        {
+            $result.=($link.img_object(($notooltip?'':$label), 'label', ($notooltip?'':'class="classfortooltip"')).$linkend);
+            if ($withpicto != 2) $result.=' ';
+		}
+		$result.= $link . $this->ref . $linkend;
+		return $result;
+	}
+	
+	/**
+	 *  Retourne le libelle du status d'un user (actif, inactif)
+	 *
+	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 *  @return	string 			       Label of status
+	 */
+	function getLibStatut($mode=0)
+	{
+		return $this->LibStatut($this->status,$mode);
+	}
+
+	/**
+	 *  Renvoi le libelle d'un status donne
+	 *
+	 *  @param	int		$status        	Id status
+	 *  @param  int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 *  @return string 			       	Label of status
+	 */
+	function LibStatut($status,$mode=0)
+	{
+		global $langs;
+
+		if ($mode == 0)
+		{
+			$prefix='';
+			if ($status == 1) return $langs->trans('Enabled');
+			if ($status == 0) return $langs->trans('Disabled');
+		}
+		if ($mode == 1)
+		{
+			if ($status == 1) return $langs->trans('Enabled');
+			if ($status == 0) return $langs->trans('Disabled');
+		}
+		if ($mode == 2)
+		{
+			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+		}
+		if ($mode == 3)
+		{
+			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
+			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
+		}
+		if ($mode == 4)
+		{
+			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+		}
+		if ($mode == 5)
+		{
+			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
+			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+		}
+	}
+	
+	
+	/**
+	 * Initialise object with example values
+	 * Id must be 0 if object instance is a specimen
+	 *
+	 * @return void
+	 */
+	public function initAsSpecimen()
+	{
+		$this->id = 0;
+		
+		$this->fk_website = '';
+		$this->pageurl = '';
+		$this->title = '';
+		$this->description = '';
+		$this->keywords = '';
+		$this->content = '';
+		$this->status = '';
+		$this->date_creation = '';
+		$this->date_modification = '';
+		$this->tms = '';
+
+		
+	}
+
+}

htdocs/websites/index.php

@@ -64,6 +64,7 @@ function llxHeader($head='', $title='', $help_url='', $target='', $disablejs=0,
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/websites/class/website.class.php';
+require_once DOL_DOCUMENT_ROOT.'/websites/class/websitepage.class.php';
 
 $langs->load("admin");
 $langs->load("other");
@@ -71,13 +72,23 @@ $langs->load("website");
 
 if (! $user->admin) accessforbidden();
 
-$action = GETPOST('action','alpha');
-
 $conf->dol_hide_leftmenu = 1;
 
+$error=0;
+$website=GETPOST('website', 'alpha');
+$page=GETPOST('page', 'alpha');
+$action = GETPOST('action','alpha');
+
+if (GETPOST('preview')) $action='preview';
+if (GETPOST('editmeta')) { $action='editmeta'; }
+if (GETPOST('editmenu')) { $action='editmenu'; }
+if (GETPOST('editcontent')) { $action='editcontent'; }
+
+if (empty($action)) $action='preview';
+
 
-$website='website1';
 $object=new Website($db);
+$objectpage=new WebsitePage($db);
 
 
 /*
@@ -87,19 +98,43 @@ $object=new Website($db);
 // Action mise a jour ou ajout d'une constante
 if ($action == 'update')
 {
-
+    $db->begin();
     
+    $object->fetch(0, $website);
     
-	if (! $res > 0) $error++;
+    $objectpage->fk_website = $object->id;
-
+    $objectpage->pageurl = GETPOST('WEBSITE_PAGENAME');
-	if (! $error)
+    
-	{
+    $res = $objectpage->fetch(0, $object->fk_website, $objectpage->pageurl);
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+    
-	}
+    if ($res > 0)
-	else
+    {
-	{
+        $objectpage->title = GETPOST('WEBSITE_TITLE');
-		setEventMessages($langs->trans("Error"), null, 'errors');
+        $objectpage->description = GETPOST('WEBSITE_DESCRIPTION');
-	}
+        $objectpage->keyword = GETPOST('WEBSITE_KEYWORD');
+        
+        $res = $objectpage->update($user);
+        if (! $res > 0)
+        {
+            $error++;
+            setEventMessages($objectpage->error, $objectpage->errors, 'errors');
+        }
+        
+    	if (! $error)
+    	{
+    		$db->commit();
+    	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+    	    $action='';
+    	}
+    	else
+    	{
+    		$db->rollback();
+    	}
+    }
+    else
+    {
+        dol_print_error($db);
+    }
 }
 
 
@@ -109,26 +144,108 @@ if ($action == 'update')
  * View
  */
 
-$_SESSION['website_mode'] = 'edit';
-
-
 $form = new Form($db);
 
 $help_url='';
 
 llxHeader('', $langs->trans("WebsiteSetup"), $help_url);
 
-$style=' style="padding-top: 4px; padding-left: 10px; border-bottom: 1px solid #888; height: 20px; vertical-align: middle; margin-bottom: 5px;"';
+    print "\n".'<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="action" value="update">';
+    print '<input type="hidden" name="website" value="'.dol_escape_htmltag($website).'">';
+    print '<input type="hidden" name="page" value="'.dol_escape_htmltag($page).'">';
 
-print '<div class="websiteselection centpercent"'.$style.'>';
 
-// Loop on each sites
+$style='';
+if ($action != 'preview') $style=' margin-bottom: 5px;';
+
+print '<div class="centpercent websitebar">';
 
 $tmp = $object->fetchAll();
-foreach($object->lines as $websitearray)
+if (count($object->records) > 0)
 {
-    var_dump($websitearray);
+    print '<div class="websiteselection">';
+    print $langs->trans("Website").': ';
+    print '</div>';
+    
+    print '<div class="websiteselection">';
+    // Loop on each sites
+    $i=0;
+    foreach($object->records as $key => $websitearray)
+    {
+        if (empty($website)) $website=$websitearray->ref;
+        
+        if ($i) print ' - ';
+        print '<a href="'.$_SERVER["PHP_SELF"].'?website='.urlencode($websitearray->ref).'">';
+        if ($websitearray->ref == $website) print '<strong>';
+        print $websitearray->ref;
+        if ($websitearray->ref == $website) print '</strong>';
+        print '</a>';
+        
+        $i++;    
+    }
+    
+    print '</div>';
+    
+    print '<div class="websitetools">';
+    
+    if ($action == 'preview') 
+    {
+        $disabled='';
+        if (empty($user->rights->websites->create)) $disabled=' disabled="disabled"';
+
+        print '<input type="submit" class="button"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditMenu")).'" name="editmenu">';
+    }
+    //else print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="preview">';
+    if (preg_match('/^edit/',$action)) print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
+
+    print '</div>';
+    
+    if ($website)
+    {
+        print '</div>';
+        print '<div class="centpercent websitebar"'.($style?' style="'.$style.'"':'').'">';
+        print '<div class="websiteselection">';
+        print $langs->trans("Page").': ';
+        print '</div>';
+        print '<div class="websiteselection">';
+        $array=$objectpage->fetchAll();
+        print $form->selectarray('page', $array);
+        print '</div>';
+        print '<div class="websiteselection">';
+        print '<a class="buttonAddPage"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?action=addpage&website='.urlencode($website).'">'.dol_escape_htmltag($langs->trans("AddPage")).'</a>';
+        print '</div>';
+        
+        print '<div class="websitetools">';
+        
+        if ($action == 'preview')
+        {
+            $disabled='';
+            if (empty($user->rights->websites->create)) $disabled=' disabled="disabled"';
+        
+            if ($page)
+            {
+                print '<input type="submit" class="button"'.$disabled.'  value="'.dol_escape_htmltag($langs->trans("EditPageMeta")).'" name="editmeta">';
+                print '<input type="submit" class="button"'.$disabled.'  value="'.dol_escape_htmltag($langs->trans("EditPageContent")).'" name="editcontent">';
+            }
+        }
+        else print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="preview">';
+        if (preg_match('/^addpage/',$action)) print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
+        
+        print '</div>';
+        
+    }    
 }
+else
+{
+    print '<div class="websiteselection">';
+    $langs->load("errors");
+    print $langs->trans("ErrorModuleSetupNotComplete");
+    print '<div>';
+    $action='';
+}
+
 
 print '</div>';
 
@@ -139,12 +256,8 @@ $head = array();
  * Edit mode
  */
 
-if ($_SESSION['website_mode'] == 'edit')
+if ($action == 'editmeta' || $action == 'addpage')
 {
-    print "\n".'<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-    print '<input type="hidden" name="action" value="update">';
-    
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
     print '<td>'.$langs->trans("Description").'</td>';
@@ -152,11 +265,20 @@ if ($_SESSION['website_mode'] == 'edit')
     print "</tr>\n";
     
     print '<tr><td>';
-    print $langs->trans('WEBSITE_PAGEURL');
+    print $langs->trans('WEBSITE_PAGENAME');
     print '</td><td>';
-    print '/public/websites/'.$website.'/index.php?page=home';
+    print '<input type="text" class="flat" size="96" name="WEBSITE_PAGENAME" value="'.dol_escape_htmltag($page).'">';
     print '</td></tr>';
     
+    if ($action != 'addpage')
+    {
+        print '<tr><td>';
+        print $langs->trans('WEBSITE_URL');
+        print '</td><td>';
+        print '/public/websites/'.$website.'/index.php?page='.urlencode($page);
+        print '</td></tr>';
+    }
+    
     print '<tr><td>';
     print $langs->trans('WEBSITE_TITLE');
     print '</td><td>';
@@ -178,9 +300,16 @@ if ($_SESSION['website_mode'] == 'edit')
     print '</table>';
     
     print '<br>';
-    
+}
-    
+
-    /*
+if ($action == 'editmenu')
+{
+    print '<div class="center">'.$langs->trans("FeatureNotYetAvailable").'</center>';
+}
+
+if ($action == 'editcontent')
+{
+/*
      * Editing global variables not related to a specific theme
      */
     
@@ -197,14 +326,19 @@ if ($_SESSION['website_mode'] == 'edit')
     require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor=new DolEditor('WEBSITE_FOOTER',$obj->value,'',160,'dolibarr_notes','',false,false,$conf->fckeditor->enabled,5,60);
     $doleditor->Create();
-    
-    print '<div align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
-    
-    print '</form>';
 }
 
+print '</form>';
 
 
+
+if ($action == 'preview')
+{
+    print '<div class="center">Preview TO DO</center>';
+}
+
+    
+
 llxFooter();
 
 $db->close();

htdocs/websites/indexold.php

@@ -1,65 +0,0 @@
-<?php
-/* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- *     \file       htdocs/externalsite/frames.php
- *     \ingroup    externalsite
- *     \brief      Page that build two frames: One for menu, the other for the target page to show
- *     \author	   Laurent Destailleur
- */
-
-require '../main.inc.php';
-
-$langs->load("website");
-
-
-$mainmenu=GETPOST('mainmenu', 'alpha');
-$leftmenu=GETPOST('leftmenu', 'alpha');
-$idmenu=GETPOST('idmenu', 'int');
-$theme=GETPOST('theme', 'alpha');
-$codelang=GETPOST('lang', 'alpha');
-
-print "
-<html>
-<head>
-<title>Dolibarr frame for web site menu</title>
-</head>
-
-<frameset ".(empty($conf->global->MAIN_MENU_INVERT)?"rows":"cols")."=\"".($heightforframes+50).",*\" border=0 framespacing=0 frameborder=0>
-    <frame name=\"barre\" src=\"frametop.php?mainmenu=".$mainmenu."&leftmenu=".$leftmenu."&idmenu=".$idmenu.($theme?'&theme='.$theme:'').($codelang?'&lang='.$codelang:'')."&nobackground=1\" noresize scrolling=\"NO\" noborder>
-    <frame name=\"main\" src=\"framebottom.php\">
-    <noframes>
-    <body>
-
-    </body>
-    </noframes>
-</frameset>
-
-<noframes>
-<body>
-	<br><div class=\"center\">
-	Sorry, your browser is too old or not correctly configured to view this area.<br>
-	Your browser must support frames.<br>
-	</div>
-</body>
-</noframes>
-
-</html>
-";
-
-