diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index d0ffc3ccc03..fe2e6aab4cf 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -244,7 +244,9 @@ class Website extends CommonObject
if (is_array($tmplangarray)) {
dol_mkdir($conf->website->dir_output.'/'.$this->ref);
foreach ($tmplangarray as $val) {
- if (trim($val) == $this->lang) continue;
+ if (trim($val) == $this->lang) {
+ continue;
+ }
dol_mkdir($conf->website->dir_output.'/'.$this->ref.'/'.trim($val));
}
}
@@ -540,7 +542,9 @@ class Website extends CommonObject
if (is_array($tmplangarray)) {
dol_mkdir($conf->website->dir_output.'/'.$this->ref);
foreach ($tmplangarray as $val) {
- if (trim($val) == $this->lang) continue;
+ if (trim($val) == $this->lang) {
+ continue;
+ }
dol_mkdir($conf->website->dir_output.'/'.$this->ref.'/'.trim($val));
}
}
@@ -603,8 +607,7 @@ class Website extends CommonObject
}
}
- if (!$error && !empty($this->ref))
- {
+ if (!$error && !empty($this->ref)) {
$pathofwebsite = DOL_DATA_ROOT.'/website/'.$this->ref;
dol_delete_dir_recursive($pathofwebsite);
@@ -645,8 +648,7 @@ class Website extends CommonObject
$object = new self($this->db);
// Check no site with ref exists
- if ($object->fetch(0, $newref) > 0)
- {
+ if ($object->fetch(0, $newref) > 0) {
$this->error = 'ErrorNewRefIsAlreadyUsed';
return -1;
}
@@ -678,7 +680,9 @@ class Website extends CommonObject
$object->fk_user_creat = $user->id;
$object->position = ((int) $object->position) + 1;
$object->status = self::STATUS_DRAFT;
- if (empty($object->lang)) $object->lang = substr($langs->defaultlang, 0, 2); // Should not happen. Protection for corrupted site with no languages
+ if (empty($object->lang)) {
+ $object->lang = substr($langs->defaultlang, 0, 2); // Should not happen. Protection for corrupted site with no languages
+ }
// Create clone
$object->context['createfromclone'] = 'createfromclone';
@@ -690,15 +694,13 @@ class Website extends CommonObject
dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
}
- if (!$error)
- {
+ if (!$error) {
dolCopyDir($pathofwebsiteold, $pathofwebsitenew, $conf->global->MAIN_UMASK, 0, null, 2);
// Check symlink to medias and restore it if ko
$pathtomedias = DOL_DATA_ROOT.'/medias'; // Target
$pathtomediasinwebsite = $pathofwebsitenew.'/medias'; // Source / Link name
- if (!is_link(dol_osencode($pathtomediasinwebsite)))
- {
+ if (!is_link(dol_osencode($pathtomediasinwebsite))) {
dol_syslog("Create symlink for ".$pathtomedias." into name ".$pathtomediasinwebsite);
dol_mkdir(dirname($pathtomediasinwebsite)); // To be sure dir for website exists
$result = symlink($pathtomedias, $pathtomediasinwebsite);
@@ -718,8 +720,7 @@ class Website extends CommonObject
// Duplicate pages
$objectpages = new WebsitePage($this->db);
$listofpages = $objectpages->fetchAll($fromid);
- foreach ($listofpages as $pageid => $objectpageold)
- {
+ foreach ($listofpages as $pageid => $objectpageold) {
// Delete old file
$filetplold = $pathofwebsitenew.'/page'.$pageid.'.tpl.php';
dol_delete_file($filetplold);
@@ -728,43 +729,41 @@ class Website extends CommonObject
$objectpagenew = $objectpageold->createFromClone($user, $pageid, $objectpageold->pageurl, '', 0, $object->id, 1);
//print $pageid.' = '.$objectpageold->pageurl.' -> '.$objectpagenew->id.' = '.$objectpagenew->pageurl.'
';
- if (is_object($objectpagenew) && $objectpagenew->pageurl)
- {
+ if (is_object($objectpagenew) && $objectpagenew->pageurl) {
$filealias = $pathofwebsitenew.'/'.$objectpagenew->pageurl.'.php';
$filetplnew = $pathofwebsitenew.'/page'.$objectpagenew->id.'.tpl.php';
// Save page alias
$result = dolSavePageAlias($filealias, $object, $objectpagenew);
- if (!$result) setEventMessages('Failed to write file '.$filealias, null, 'errors');
+ if (!$result) {
+ setEventMessages('Failed to write file '.$filealias, null, 'errors');
+ }
$result = dolSavePageContent($filetplnew, $object, $objectpagenew);
- if (!$result) setEventMessages('Failed to write file '.$filetplnew, null, 'errors');
+ if (!$result) {
+ setEventMessages('Failed to write file '.$filetplnew, null, 'errors');
+ }
- if ($pageid == $oldidforhome)
- {
+ if ($pageid == $oldidforhome) {
$newidforhome = $objectpagenew->id;
}
- }
- else {
+ } else {
setEventMessages($objectpageold->error, $objectpageold->errors, 'errors');
$error++;
}
}
}
- if (!$error)
- {
+ if (!$error) {
// Restore id of home page
$object->fk_default_home = $newidforhome;
$res = $object->update($user);
- if (!($res > 0))
- {
+ if (!($res > 0)) {
$error++;
setEventMessages($object->error, $object->errors, 'errors');
}
- if (!$error)
- {
+ if (!$error) {
$filetpl = $pathofwebsitenew.'/page'.$newidforhome.'.tpl.php';
$filewrapper = $pathofwebsitenew.'/wrapper.php';
@@ -821,10 +820,11 @@ class Website extends CommonObject
$linkstart = $linkend = '';
- if ($withpicto)
- {
+ if ($withpicto) {
$result .= ($linkstart.img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? '' : 'class="classfortooltip"')).$linkend);
- if ($withpicto != 2) $result .= ' ';
+ if ($withpicto != 2) {
+ $result .= ' ';
+ }
}
$result .= $linkstart.$this->ref.$linkend;
return $result;
@@ -854,8 +854,7 @@ class Website extends CommonObject
// phpcs:enable
global $langs;
- if (empty($this->labelStatus) || empty($this->labelStatusShort))
- {
+ if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
global $langs;
//$langs->load("mymodule");
$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Disabled');
@@ -865,7 +864,9 @@ class Website extends CommonObject
}
$statusType = 'status5';
- if ($status == self::STATUS_VALIDATED) $statusType = 'status4';
+ if ($status == self::STATUS_VALIDATED) {
+ $statusType = 'status4';
+ }
return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
}
@@ -909,16 +910,14 @@ class Website extends CommonObject
$website = $this;
- if (empty($website->id) || empty($website->ref))
- {
+ if (empty($website->id) || empty($website->ref)) {
setEventMessages("Website id or ref is not defined", null, 'errors');
return '';
}
dol_syslog("Create temp dir ".$conf->website->dir_temp);
dol_mkdir($conf->website->dir_temp);
- if (!is_writable($conf->website->dir_temp))
- {
+ if (!is_writable($conf->website->dir_temp)) {
setEventMessages("Temporary dir ".$conf->website->dir_temp." is not writable", null, 'errors');
return '';
}
@@ -928,8 +927,7 @@ class Website extends CommonObject
dol_syslog("Clear temp dir ".$destdir);
$count = 0; $countreallydeleted = 0;
$counttodelete = dol_delete_dir_recursive($destdir, $count, 1, 0, $countreallydeleted);
- if ($counttodelete != $countreallydeleted)
- {
+ if ($counttodelete != $countreallydeleted) {
setEventMessages("Failed to clean temp directory ".$destdir, null, 'errors');
return '';
}
@@ -987,8 +985,7 @@ class Website extends CommonObject
// Build sql file
$filesql = $conf->website->dir_temp.'/'.$website->ref.'/website_pages.sql';
$fp = fopen($filesql, "w");
- if (empty($fp))
- {
+ if (empty($fp)) {
setEventMessages("Failed to create file ".$filesql, null, 'errors');
return '';
}
@@ -998,20 +995,16 @@ class Website extends CommonObject
// Assign ->newid and ->newfk_page
$i = 1;
- foreach ($listofpages as $pageid => $objectpageold)
- {
+ foreach ($listofpages as $pageid => $objectpageold) {
$objectpageold->newid = $i;
$i++;
}
$i = 1;
- foreach ($listofpages as $pageid => $objectpageold)
- {
+ foreach ($listofpages as $pageid => $objectpageold) {
// Search newid
$newfk_page = 0;
- foreach ($listofpages as $pageid2 => $objectpageold2)
- {
- if ($pageid2 == $objectpageold->fk_page)
- {
+ foreach ($listofpages as $pageid2 => $objectpageold2) {
+ if ($pageid2 == $objectpageold->fk_page) {
$newfk_page = $objectpageold2->newid;
break;
}
@@ -1019,8 +1012,7 @@ class Website extends CommonObject
$objectpageold->newfk_page = $newfk_page;
$i++;
}
- foreach ($listofpages as $pageid => $objectpageold)
- {
+ foreach ($listofpages as $pageid => $objectpageold) {
$allaliases = $objectpageold->pageurl;
$allaliases .= ($objectpageold->aliasalt ? ','.$objectpageold->aliasalt : '');
@@ -1081,8 +1073,7 @@ class Website extends CommonObject
// Add line to update home page id during import
//var_dump($this->fk_default_home.' - '.$objectpageold->id.' - '.$objectpageold->newid);exit;
- if ($this->fk_default_home > 0 && ($objectpageold->id == $this->fk_default_home) && ($objectpageold->newid > 0)) // This is the record with home page
- {
+ if ($this->fk_default_home > 0 && ($objectpageold->id == $this->fk_default_home) && ($objectpageold->newid > 0)) { // This is the record with home page
// Warning: We must keep llx_ here. It is a generic SQL.
$line = "UPDATE llx_website SET fk_default_home = ".($objectpageold->newid > 0 ? $this->db->escape($objectpageold->newid)."__+MAX_llx_website_page__" : "null")." WHERE rowid = __WEBSITE_ID__;";
$line .= "\n";
@@ -1091,8 +1082,9 @@ class Website extends CommonObject
}
fclose($fp);
- if (!empty($conf->global->MAIN_UMASK))
+ if (!empty($conf->global->MAIN_UMASK)) {
@chmod($filesql, octdec($conf->global->MAIN_UMASK));
+ }
// Build zip file
$filedir = $conf->website->dir_temp.'/'.$website->ref.'/.';
@@ -1102,11 +1094,9 @@ class Website extends CommonObject
dol_delete_file($fileglob, 0);
$result = dol_compress_file($filedir, $filename, 'zip');
- if ($result > 0)
- {
+ if ($result > 0) {
return $filename;
- }
- else {
+ } else {
global $errormsg;
$this->error = $errormsg;
return '';
@@ -1127,8 +1117,7 @@ class Website extends CommonObject
$error = 0;
$object = $this;
- if (empty($object->ref))
- {
+ if (empty($object->ref)) {
$this->error = 'Function importWebSite called on object not loaded (object->ref is empty)';
return -1;
}
@@ -1137,16 +1126,14 @@ class Website extends CommonObject
dol_mkdir($conf->website->dir_temp.'/'.$object->ref);
$filename = basename($pathtofile);
- if (!preg_match('/^website_(.*)-(.*)$/', $filename, $reg))
- {
+ if (!preg_match('/^website_(.*)-(.*)$/', $filename, $reg)) {
$this->errors[] = 'Bad format for filename '.$filename.'. Must be website_XXX-VERSION.';
return -1;
}
$result = dol_uncompress($pathtofile, $conf->website->dir_temp.'/'.$object->ref);
- if (!empty($result['error']))
- {
+ if (!empty($result['error'])) {
$this->errors[] = 'Failed to unzip file '.$pathtofile.'.';
return -1;
}
@@ -1172,8 +1159,7 @@ class Website extends CommonObject
// Now generate the master.inc.php page
$filemaster = $conf->website->dir_output.'/'.$object->ref.'/master.inc.php';
$result = dolSaveMasterFile($filemaster);
- if (!$result)
- {
+ if (!$result) {
$this->errors[] = 'Failed to write file '.$filemaster;
$error++;
}
@@ -1190,16 +1176,14 @@ class Website extends CommonObject
// Search the $maxrowid because we need it later
$sqlgetrowid = 'SELECT MAX(rowid) as max from '.MAIN_DB_PREFIX.'website_page';
$resql = $this->db->query($sqlgetrowid);
- if ($resql)
- {
+ if ($resql) {
$obj = $this->db->fetch_object($resql);
$maxrowid = $obj->max;
}
// Load sql record
$runsql = run_sql($sqlfile, 1, '', 0, '', 'none', 0, 1); // The maxrowid of table is searched into this function two
- if ($runsql <= 0)
- {
+ if ($runsql <= 0) {
$this->errors[] = 'Failed to load sql file '.$sqlfile;
$error++;
}
@@ -1208,16 +1192,13 @@ class Website extends CommonObject
// Make replacement of IDs
$fp = fopen($sqlfile, "r");
- if ($fp)
- {
- while (!feof($fp))
- {
+ if ($fp) {
+ while (!feof($fp)) {
$reg = array();
// Warning fgets with second parameter that is null or 0 hang.
$buf = fgets($fp, 65000);
- if (preg_match('/^-- Page ID (\d+)\s[^\s]+\s(\d+).*Aliases\s(.*)\s--;/i', $buf, $reg))
- {
+ if (preg_match('/^-- Page ID (\d+)\s[^\s]+\s(\d+).*Aliases\s(.*)\s--;/i', $buf, $reg)) {
$oldid = $reg[1];
$newid = ($reg[2] + $maxrowid);
$aliasesarray = explode(',', $reg[3]);
@@ -1237,12 +1218,9 @@ class Website extends CommonObject
}
// Regenerate alternative aliases pages
- if (is_array($aliasesarray))
- {
- foreach ($aliasesarray as $aliasshortcuttocreate)
- {
- if (trim($aliasshortcuttocreate))
- {
+ if (is_array($aliasesarray)) {
+ foreach ($aliasesarray as $aliasshortcuttocreate) {
+ if (trim($aliasshortcuttocreate)) {
$filealias = $conf->website->dir_output.'/'.$object->ref.'/'.trim($aliasshortcuttocreate).'.php';
$result = dolSavePageAlias($filealias, $object, $objectpagestatic);
if (!$result) {
@@ -1274,12 +1252,10 @@ class Website extends CommonObject
$pathofwebsite = $conf->website->dir_output.'/'.$object->ref;
dolSaveIndexPage($pathofwebsite, $pathofwebsite.'/index.php', $pathofwebsite.'/page'.$object->fk_default_home.'.tpl.php', $pathofwebsite.'/wrapper.php');
- if ($error)
- {
+ if ($error) {
$this->db->rollback();
return -1;
- }
- else {
+ } else {
$this->db->commit();
return $object->id;
}
@@ -1298,8 +1274,7 @@ class Website extends CommonObject
$error = 0;
$object = $this;
- if (empty($object->ref))
- {
+ if (empty($object->ref)) {
$this->error = 'Function rebuildWebSiteFiles called on object not loaded (object->ref is empty)';
return -1;
}
@@ -1386,7 +1361,9 @@ class Website extends CommonObject
{
global $websitepagefile, $website;
- if (!is_object($weblangs)) return 'ERROR componentSelectLang called with parameter $weblangs not defined';
+ if (!is_object($weblangs)) {
+ return 'ERROR componentSelectLang called with parameter $weblangs not defined';
+ }
$arrayofspecialmainlanguages = array(
'en'=>'en_US',
@@ -1419,51 +1396,55 @@ class Website extends CommonObject
$tmppage = new WebsitePage($this->db);
$pageid = 0;
- if (!empty($websitepagefile))
- {
+ if (!empty($websitepagefile)) {
$websitepagefileshort = basename($websitepagefile);
- if ($websitepagefileshort == 'index.php') $pageid = $website->fk_default_home;
- else $pageid = str_replace(array('.tpl.php', 'page'), array('', ''), $websitepagefileshort);
- if ($pageid > 0)
- {
+ if ($websitepagefileshort == 'index.php') {
+ $pageid = $website->fk_default_home;
+ } else {
+ $pageid = str_replace(array('.tpl.php', 'page'), array('', ''), $websitepagefileshort);
+ }
+ if ($pageid > 0) {
$tmppage->fetch($pageid);
}
}
// Fill $languagecodes array with existing translation, nothing if none
- if (!is_array($languagecodes) && $pageid > 0)
- {
+ if (!is_array($languagecodes) && $pageid > 0) {
$languagecodes = array();
$sql = "SELECT wp.rowid, wp.lang, wp.pageurl, wp.fk_page";
$sql .= " FROM ".MAIN_DB_PREFIX."website_page as wp";
$sql .= " WHERE wp.fk_website = ".$website->id;
$sql .= " AND (wp.fk_page = ".$pageid." OR wp.rowid = ".$pageid;
- if ($tmppage->fk_page > 0) $sql .= " OR wp.fk_page = ".$tmppage->fk_page." OR wp.rowid = ".$tmppage->fk_page;
+ if ($tmppage->fk_page > 0) {
+ $sql .= " OR wp.fk_page = ".$tmppage->fk_page." OR wp.rowid = ".$tmppage->fk_page;
+ }
$sql .= ")";
$resql = $this->db->query($sql);
- if ($resql)
- {
- while ($obj = $this->db->fetch_object($resql))
- {
+ if ($resql) {
+ while ($obj = $this->db->fetch_object($resql)) {
$newlang = $obj->lang;
- if ($obj->rowid == $pageid) $newlang = $obj->lang;
- if (!in_array($newlang, $languagecodes)) $languagecodes[] = $newlang;
+ if ($obj->rowid == $pageid) {
+ $newlang = $obj->lang;
+ }
+ if (!in_array($newlang, $languagecodes)) {
+ $languagecodes[] = $newlang;
+ }
}
}
}
// Now $languagecodes is always an array. Example array('en', 'fr', 'es');
$languagecodeselected = substr($weblangs->defaultlang, 0, 2); // Because we must init with a value, but real value is the lang of main parent container
- if (!empty($websitepagefile))
- {
+ if (!empty($websitepagefile)) {
$pageid = str_replace(array('.tpl.php', 'page'), array('', ''), basename($websitepagefile));
- if ($pageid > 0)
- {
+ if ($pageid > 0) {
$pagelang = substr($tmppage->lang, 0, 2);
$languagecodeselected = substr($pagelang, 0, 2);
- if (!in_array($pagelang, $languagecodes)) $languagecodes[] = $pagelang; // We add language code of page into combo list
+ if (!in_array($pagelang, $languagecodes)) {
+ $languagecodes[] = $pagelang; // We add language code of page into combo list
+ }
}
}
@@ -1474,7 +1455,9 @@ class Website extends CommonObject
$url = preg_replace('/(\?|&)l=([a-zA-Z_]*)/', '', $url); // We remove param l from url
//$url = preg_replace('/(\?|&)lang=([a-zA-Z_]*)/', '', $url); // We remove param lang from url
$url .= (preg_match('/\?/', $url) ? '&' : '?').'l=';
- if (!preg_match('/^\//', $url)) $url = '/'.$url;
+ if (!preg_match('/^\//', $url)) {
+ $url = '/'.$url;
+ }
$HEIGHTOPTION = 40;
$MAXHEIGHT = 4 * $HEIGHTOPTION;
@@ -1504,8 +1487,7 @@ class Website extends CommonObject
$out .= '';
$out .= '';
- if ($languagecodeselected)
- {
+ if ($languagecodeselected) {
// Convert $languagecodeselected into a long language code
if (strlen($languagecodeselected) == 2) {
$languagecodeselected = (empty($arrayofspecialmainlanguages[$languagecodeselected]) ? $languagecodeselected.'_'.strtoupper($languagecodeselected) : $arrayofspecialmainlanguages[$languagecodeselected]);
@@ -1513,28 +1495,34 @@ class Website extends CommonObject
$countrycode = strtolower(substr($languagecodeselected, -2));
$label = $weblangs->trans("Language_".$languagecodeselected);
- if ($countrycode == 'us') $label = preg_replace('/\s*\(.*\)/', '', $label);
+ if ($countrycode == 'us') {
+ $label = preg_replace('/\s*\(.*\)/', '', $label);
+ }
$out .= '
'.$label.'';
$out .= '';
$out .= '- '.$label.'';
- if (empty($i) && empty($languagecodeselected)) $out .= '';
+ if (empty($i) && empty($languagecodeselected)) {
+ $out .= '';
+ }
$out .= '
';
$i++;
}
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index bacc4664791..c6c4d81d04e 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -106,9 +106,9 @@ class WebsitePage extends CommonObject
*/
public $author_alias;
- /**
- * @var string path of external object
- */
+ /**
+ * @var string path of external object
+ */
public $object_type;
/**
@@ -229,7 +229,9 @@ class WebsitePage extends CommonObject
{
$this->description = dol_trunc($this->description, 255, 'right', 'utf-8', 1);
$this->keywords = dol_trunc($this->keywords, 255, 'right', 'utf-8', 1);
- if ($this->aliasalt) $this->aliasalt = ','.preg_replace('/,+$/', '', preg_replace('/^,+/', '', $this->aliasalt)).','; // content in database must be ',xxx,...,yyy,'
+ if ($this->aliasalt) {
+ $this->aliasalt = ','.preg_replace('/,+$/', '', preg_replace('/^,+/', '', $this->aliasalt)).','; // content in database must be ',xxx,...,yyy,'
+ }
// Remove spaces and be sure we have main language only
$this->lang = preg_replace('/[_-].*$/', '', trim($this->lang)); // en_US or en-US -> en
@@ -281,12 +283,12 @@ class WebsitePage extends CommonObject
$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
//$sql .= ' WHERE entity IN ('.getEntity('website').')'; // entity is on website level
$sql .= ' WHERE 1 = 1';
- if ($id > 0)
- {
+ if ($id > 0) {
$sql .= ' AND t.rowid = '.$id;
- }
- else {
- if ($id < 0) $sql .= ' AND t.rowid <> '.abs($id);
+ } else {
+ if ($id < 0) {
+ $sql .= ' AND t.rowid <> '.abs($id);
+ }
if (null !== $website_id) {
$sql .= " AND t.fk_website = '".$this->db->escape($website_id)."'";
if ($page) {
@@ -295,12 +297,18 @@ class WebsitePage extends CommonObject
$tmppage = explode('/', $page);
if (!empty($tmppage[1])) {
$pagetouse = $tmppage[1];
- if (strlen($tmppage[0])) $langtouse = $tmppage[0];
+ if (strlen($tmppage[0])) {
+ $langtouse = $tmppage[0];
+ }
}
$sql .= " AND t.pageurl = '".$this->db->escape($pagetouse)."'";
- if ($langtouse) $sql .= " AND t.lang = '".$this->db->escape($langtouse)."'";
+ if ($langtouse) {
+ $sql .= " AND t.lang = '".$this->db->escape($langtouse)."'";
+ }
+ }
+ if ($aliasalt) {
+ $sql .= " AND (t.aliasalt LIKE '%,".$this->db->escape($aliasalt).",%' OR t.aliasalt LIKE '%, ".$this->db->escape($aliasalt).",%')";
}
- if ($aliasalt) $sql .= " AND (t.aliasalt LIKE '%,".$this->db->escape($aliasalt).",%' OR t.aliasalt LIKE '%, ".$this->db->escape($aliasalt).",%')";
}
}
$sql .= $this->db->plimit(1);
@@ -419,7 +427,9 @@ class WebsitePage extends CommonObject
$listoflang[] = "'".$this->db->escape(substr(str_replace("'", '', $tmpvalue), 0, 2))."'";
}
$stringtouse = $key." IN (".join(',', $listoflang).")";
- if ($foundnull) $stringtouse = '('.$stringtouse.' OR '.$key.' IS NULL)';
+ if ($foundnull) {
+ $stringtouse = '('.$stringtouse.' OR '.$key.' IS NULL)';
+ }
$sqlwhere[] = $stringtouse;
} else {
$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
@@ -441,8 +451,7 @@ class WebsitePage extends CommonObject
if ($resql) {
$num = $this->db->num_rows($resql);
- while ($obj = $this->db->fetch_object($resql))
- {
+ while ($obj = $this->db->fetch_object($resql)) {
$record = new self($this->db);
$record->id = $obj->rowid;
@@ -520,7 +529,9 @@ class WebsitePage extends CommonObject
$listoflang[] = "'".$this->db->escape(substr(str_replace("'", '', $tmpvalue), 0, 2))."'";
}
$stringtouse = $key." IN (".join(',', $listoflang).")";
- if ($foundnull) $stringtouse = '('.$stringtouse.' OR '.$key.' IS NULL)';
+ if ($foundnull) {
+ $stringtouse = '('.$stringtouse.' OR '.$key.' IS NULL)';
+ }
$sqlwhere[] = $stringtouse;
} else {
$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
@@ -561,7 +572,9 @@ class WebsitePage extends CommonObject
{
$this->description = dol_trunc($this->description, 255, 'right', 'utf-8', 1);
$this->keywords = dol_trunc($this->keywords, 255, 'right', 'utf-8', 1);
- if ($this->aliasalt) $this->aliasalt = ','.preg_replace('/,+$/', '', preg_replace('/^,+/', '', $this->aliasalt)).','; // content in database must be ',xxx,...,yyy,'
+ if ($this->aliasalt) {
+ $this->aliasalt = ','.preg_replace('/,+$/', '', preg_replace('/^,+/', '', $this->aliasalt)).','; // content in database must be ',xxx,...,yyy,'
+ }
// Remove spaces and be sure we have main language only
$this->lang = preg_replace('/[_-].*$/', '', trim($this->lang)); // en_US or en-US -> en
@@ -595,8 +608,7 @@ class WebsitePage extends CommonObject
// Delete all child tables
if (!$error) {
- foreach ($this->childtablesoncascade as $table)
- {
+ foreach ($this->childtablesoncascade as $table) {
$sql = "DELETE FROM ".MAIN_DB_PREFIX.$table;
$sql .= " WHERE fk_website_page = ".(int) $this->id;
@@ -611,19 +623,16 @@ class WebsitePage extends CommonObject
if (!$error) {
$result = $this->deleteCommon($user, $trigger);
- if ($result <= 0)
- {
+ if ($result <= 0) {
$error++;
}
}
- if (!$error)
- {
+ if (!$error) {
$websiteobj = new Website($this->db);
$result = $websiteobj->fetch($this->fk_website);
- if ($result > 0)
- {
+ if ($result > 0) {
global $dolibarr_main_data_root;
$pathofwebsite = $dolibarr_main_data_root.'/website/'.$websiteobj->ref;
@@ -696,10 +705,17 @@ class WebsitePage extends CommonObject
$object->date_creation = $now;
$object->title = ($newtitle == '1' ? $object->title : ($newtitle ? $newtitle : $object->title));
$object->description = $object->title;
- if (!empty($newlang)) $object->lang = $newlang;
- if ($istranslation) $object->fk_page = $fromid;
- else $object->fk_page = 0;
- if (!empty($newwebsite)) $object->fk_website = $newwebsite;
+ if (!empty($newlang)) {
+ $object->lang = $newlang;
+ }
+ if ($istranslation) {
+ $object->fk_page = $fromid;
+ } else {
+ $object->fk_page = 0;
+ }
+ if (!empty($newwebsite)) {
+ $object->fk_website = $newwebsite;
+ }
$object->import_key = '';
// Create clone
@@ -755,17 +771,16 @@ class WebsitePage extends CommonObject
$url = DOL_URL_ROOT.'/website/index.php?websiteid='.$this->fk_website.'&pageid='.$this->id;
$linkclose = '';
- if (empty($notooltip))
- {
- if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
- {
+ if (empty($notooltip)) {
+ if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
$label = $langs->trans("ShowMyObject");
$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
}
$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+ } else {
+ $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
}
- else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
$linkstart = '';
@@ -774,8 +789,12 @@ class WebsitePage extends CommonObject
//$linkstart = $linkend = '';
$result .= $linkstart;
- if ($withpicto) $result .= img_picto(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
- if ($withpicto != 2) $result .= $this->ref;
+ if ($withpicto) {
+ $result .= img_picto(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+ }
+ if ($withpicto != 2) {
+ $result .= $this->ref;
+ }
$result .= $linkend;
return $result;
@@ -805,8 +824,7 @@ class WebsitePage extends CommonObject
// phpcs:enable
global $langs;
- if (empty($this->labelStatus) || empty($this->labelStatusShort))
- {
+ if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
global $langs;
//$langs->load("mymodule");
$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Disabled');
@@ -816,7 +834,9 @@ class WebsitePage extends CommonObject
}
$statusType = 'status5';
- if ($status == self::STATUS_VALIDATED) $statusType = 'status4';
+ if ($status == self::STATUS_VALIDATED) {
+ $statusType = 'status4';
+ }
return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
}
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 46dfd49ed0a..425af726c24 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -44,7 +44,9 @@ require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
$langs->loadLangs(array("admin", "other", "website", "errors"));
-if (!$user->rights->website->read) accessforbidden();
+if (!$user->rights->website->read) {
+ accessforbidden();
+}
$conf->dol_hide_leftmenu = 1; // Force hide of left menu.
@@ -70,38 +72,78 @@ $section_dir = GETPOST('section_dir', 'alpha');
$file_manager = GETPOST('file_manager', 'alpha');
$replacesite = GETPOST('replacesite', 'alpha');
-if (GETPOST('deletesite', 'alpha')) { $action = 'deletesite'; }
-if (GETPOST('delete', 'alpha')) { $action = 'delete'; }
-if (GETPOST('preview', 'alpha')) $action = 'preview';
-if (GETPOST('createsite', 'alpha')) { $action = 'createsite'; }
-if (GETPOST('createcontainer', 'alpha')) { $action = 'createcontainer'; }
-if (GETPOST('editcss', 'alpha')) { $action = 'editcss'; }
-if (GETPOST('editmenu', 'alpha')) { $action = 'editmenu'; }
-if (GETPOST('setashome', 'alpha')) { $action = 'setashome'; }
-if (GETPOST('editmeta', 'alpha')) { $action = 'editmeta'; }
-if (GETPOST('editsource', 'alpha')) { $action = 'editsource'; }
-if (GETPOST('editcontent', 'alpha')) { $action = 'editcontent'; }
-if (GETPOST('exportsite', 'alpha')) { $action = 'exportsite'; }
-if (GETPOST('importsite', 'alpha')) { $action = 'importsite'; }
-if (GETPOST('createfromclone', 'alpha')) { $action = 'createfromclone'; }
-if (GETPOST('createpagefromclone', 'alpha')) { $action = 'createpagefromclone'; }
-if (empty($action) && $file_manager) $action = 'file_manager';
-if (empty($action) && $replacesite) $action = 'replacesite';
-if (GETPOST('refreshsite') || GETPOST('refreshsite_x') || GETPOST('refreshsite.x')) $pageid = 0;
+if (GETPOST('deletesite', 'alpha')) {
+ $action = 'deletesite';
+}
+if (GETPOST('delete', 'alpha')) {
+ $action = 'delete';
+}
+if (GETPOST('preview', 'alpha')) {
+ $action = 'preview';
+}
+if (GETPOST('createsite', 'alpha')) {
+ $action = 'createsite';
+}
+if (GETPOST('createcontainer', 'alpha')) {
+ $action = 'createcontainer';
+}
+if (GETPOST('editcss', 'alpha')) {
+ $action = 'editcss';
+}
+if (GETPOST('editmenu', 'alpha')) {
+ $action = 'editmenu';
+}
+if (GETPOST('setashome', 'alpha')) {
+ $action = 'setashome';
+}
+if (GETPOST('editmeta', 'alpha')) {
+ $action = 'editmeta';
+}
+if (GETPOST('editsource', 'alpha')) {
+ $action = 'editsource';
+}
+if (GETPOST('editcontent', 'alpha')) {
+ $action = 'editcontent';
+}
+if (GETPOST('exportsite', 'alpha')) {
+ $action = 'exportsite';
+}
+if (GETPOST('importsite', 'alpha')) {
+ $action = 'importsite';
+}
+if (GETPOST('createfromclone', 'alpha')) {
+ $action = 'createfromclone';
+}
+if (GETPOST('createpagefromclone', 'alpha')) {
+ $action = 'createpagefromclone';
+}
+if (empty($action) && $file_manager) {
+ $action = 'file_manager';
+}
+if (empty($action) && $replacesite) {
+ $action = 'replacesite';
+}
+if (GETPOST('refreshsite') || GETPOST('refreshsite_x') || GETPOST('refreshsite.x')) {
+ $pageid = 0;
+}
// Load variable for pagination
$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
$sortfield = GETPOST("sortfield", 'alpha');
$sortorder = GETPOST("sortorder", 'alpha');
$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+ $page = 0;
+} // If $page is not defined, or '' or -1
$offset = $limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
//if (! $sortfield) $sortfield='name';
//if (! $sortorder) $sortorder='ASC';
-if (empty($action)) $action = 'preview';
+if (empty($action)) {
+ $action = 'preview';
+}
$object = new Website($db);
$objectpage = new WebsitePage($db);
@@ -109,16 +151,13 @@ $objectpage = new WebsitePage($db);
$object->fetchAll('ASC', 'position'); // Init $object->records with list of websites
// If website not defined, we take first found
-if (!($websiteid > 0) && empty($websitekey) && $action != 'createsite')
-{
- foreach ($object->records as $key => $valwebsite)
- {
+if (!($websiteid > 0) && empty($websitekey) && $action != 'createsite') {
+ foreach ($object->records as $key => $valwebsite) {
$websitekey = $valwebsite->ref;
break;
}
}
-if ($websiteid > 0 || $websitekey)
-{
+if ($websiteid > 0 || $websitekey) {
$res = $object->fetch($websiteid, $websitekey);
$websitekey = $object->ref;
}
@@ -126,38 +165,33 @@ if ($websiteid > 0 || $websitekey)
$website = $object;
// Check pageid received as parameter
-if ($pageid < 0) $pageid = 0;
-if (($pageid > 0 || $pageref) && $action != 'addcontainer')
-{
+if ($pageid < 0) {
+ $pageid = 0;
+}
+if (($pageid > 0 || $pageref) && $action != 'addcontainer') {
$res = $objectpage->fetch($pageid, ($object->id > 0 ? $object->id : null), $pageref);
- if ($res == 0)
- {
+ if ($res == 0) {
$res = $objectpage->fetch($pageid, ($object->id > 0 ? $object->id : null), null, $pageref);
}
// Check if pageid is inside the new website, if not we reset param pageid
- if ($res >= 0 && $object->id > 0)
- {
- if ($objectpage->fk_website != $object->id) // We have a bad page that does not belong to web site
- {
- if ($object->fk_default_home > 0)
- {
+ if ($res >= 0 && $object->id > 0) {
+ if ($objectpage->fk_website != $object->id) { // We have a bad page that does not belong to web site
+ if ($object->fk_default_home > 0) {
$res = $objectpage->fetch($object->fk_default_home, $object->id, ''); // We search first page of web site
- if ($res > 0) $pageid = $object->fk_default_home;
- }
- else {
- $res = $objectpage->fetch(0, $object->id, ''); // We search first page of web site
- if ($res == 0) // Page was not found, we reset it
- {
- $objectpage = new WebsitePage($db);
+ if ($res > 0) {
+ $pageid = $object->fk_default_home;
}
- else // We found a page, we set pageid to it.
+ } else {
+ $res = $objectpage->fetch(0, $object->id, ''); // We search first page of web site
+ if ($res == 0) { // Page was not found, we reset it
+ $objectpage = new WebsitePage($db);
+ } else // We found a page, we set pageid to it.
{
$pageid = $objectpage->id;
}
}
- }
- else // We have a valid page. We force pageid for the case we got the page with a fetch on ref.
+ } else // We have a valid page. We force pageid for the case we got the page with a fetch on ref.
{
$pageid = $objectpage->id;
}
@@ -165,20 +199,23 @@ if (($pageid > 0 || $pageref) && $action != 'addcontainer')
}
// Define pageid if pageid and pageref not received as parameter or was wrong
-if (empty($pageid) && empty($pageref) && $object->id > 0 && $action != 'createcontainer')
-{
+if (empty($pageid) && empty($pageref) && $object->id > 0 && $action != 'createcontainer') {
$pageid = $object->fk_default_home;
- if (empty($pageid))
- {
+ if (empty($pageid)) {
$array = $objectpage->fetchAll($object->id, 'ASC,ASC', 'type_container,pageurl');
- if (!is_array($array) && $array < 0) dol_print_error('', $objectpage->error, $objectpage->errors);
+ if (!is_array($array) && $array < 0) {
+ dol_print_error('', $objectpage->error, $objectpage->errors);
+ }
$atleastonepage = (is_array($array) && count($array) > 0);
$firstpageid = 0; $homepageid = 0;
- foreach ($array as $key => $valpage)
- {
- if (empty($firstpageid)) $firstpageid = $valpage->id;
- if ($object->fk_default_home && $key == $object->fk_default_home) $homepageid = $valpage->id;
+ foreach ($array as $key => $valpage) {
+ if (empty($firstpageid)) {
+ $firstpageid = $valpage->id;
+ }
+ if ($object->fk_default_home && $key == $object->fk_default_home) {
+ $homepageid = $valpage->id;
+ }
}
$pageid = ($homepageid ? $homepageid : $firstpageid); // We choose home page and if not defined yet, we take first page
}
@@ -267,9 +304,15 @@ $manifestjsoncontentdefault .= '{
$listofpages = array();
$algo = '';
-if (GETPOST('optionmeta')) $algo .= 'meta';
-if (GETPOST('optioncontent')) $algo .= 'content';
-if (GETPOST('optionsitefiles')) $algo .= 'sitefiles';
+if (GETPOST('optionmeta')) {
+ $algo .= 'meta';
+}
+if (GETPOST('optioncontent')) {
+ $algo .= 'content';
+}
+if (GETPOST('optionsitefiles')) {
+ $algo .= 'sitefiles';
+}
if (empty($sortfield)) {
if ($action == 'file_manager') {
@@ -301,43 +344,49 @@ $permissiontodelete = $user->rights->website->delete;
*/
// Protections
-if (GETPOST('refreshsite') || GETPOST('refreshsite_x') || GETPOST('refreshsite.x') || GETPOST('refreshpage') || GETPOST('refreshpage_x') || GETPOST('refreshpage.x'))
-{
+if (GETPOST('refreshsite') || GETPOST('refreshsite_x') || GETPOST('refreshsite.x') || GETPOST('refreshpage') || GETPOST('refreshpage_x') || GETPOST('refreshpage.x')) {
$action = 'preview'; // To avoid to make an action on another page or another site when we click on button to select another site or page.
}
-if (GETPOST('refreshsite', 'alpha') || GETPOST('refreshsite.x', 'alpha') || GETPOST('refreshsite_x', 'alpha')) // If we change the site, we reset the pageid and cancel addsite action.
-{
- if ($action == 'addsite') $action = 'preview';
- if ($action == 'updatesource') $action = 'preview';
+if (GETPOST('refreshsite', 'alpha') || GETPOST('refreshsite.x', 'alpha') || GETPOST('refreshsite_x', 'alpha')) { // If we change the site, we reset the pageid and cancel addsite action.
+ if ($action == 'addsite') {
+ $action = 'preview';
+ }
+ if ($action == 'updatesource') {
+ $action = 'preview';
+ }
$pageid = $object->fk_default_home;
- if (empty($pageid))
- {
+ if (empty($pageid)) {
$array = $objectpage->fetchAll($object->id, 'ASC,ASC', 'type_container,pageurl');
- if (!is_array($array) && $array < 0) dol_print_error('', $objectpage->error, $objectpage->errors);
+ if (!is_array($array) && $array < 0) {
+ dol_print_error('', $objectpage->error, $objectpage->errors);
+ }
$atleastonepage = (is_array($array) && count($array) > 0);
$firstpageid = 0; $homepageid = 0;
- foreach ($array as $key => $valpage)
- {
- if (empty($firstpageid)) $firstpageid = $valpage->id;
- if ($object->fk_default_home && $key == $object->fk_default_home) $homepageid = $valpage->id;
+ foreach ($array as $key => $valpage) {
+ if (empty($firstpageid)) {
+ $firstpageid = $valpage->id;
+ }
+ if ($object->fk_default_home && $key == $object->fk_default_home) {
+ $homepageid = $valpage->id;
+ }
}
$pageid = ($homepageid ? $homepageid : $firstpageid); // We choose home page and if not defined yet, we take first page
}
}
-if (GETPOST('refreshpage', 'alpha') && !in_array($action, array('updatecss'))) $action = 'preview';
+if (GETPOST('refreshpage', 'alpha') && !in_array($action, array('updatecss'))) {
+ $action = 'preview';
+}
if ($cancel && $action == 'renamefile') {
$cancel = '';
}
// Cancel
-if ($cancel)
-{
+if ($cancel) {
$action = 'preview';
- if ($backtopage)
- {
+ if ($backtopage) {
header("Location: ".$backtopage);
exit;
}
@@ -345,8 +394,12 @@ if ($cancel)
$savbacktopage = $backtopage;
$backtopage = $_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid.(GETPOST('section_dir', 'alpha') ? '§ion_dir='.urlencode(GETPOST('section_dir', 'alpha')) : ''); // used after a confirm_deletefile into actions_linkedfiles.inc.php
-if ($sortfield) $backtopage .= '&sortfield='.$sortfield;
-if ($sortorder) $backtopage .= '&sortorder='.$sortorder;
+if ($sortfield) {
+ $backtopage .= '&sortfield='.$sortfield;
+}
+if ($sortorder) {
+ $backtopage .= '&sortorder='.$sortorder;
+}
include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
$backtopage = $savbacktopage;
@@ -354,43 +407,37 @@ if ($action == 'renamefile') { // Must be after include DOL_DOCUMENT_ROOT.'/core
$action = 'file_manager';
}
-if ($action == 'seteditinline')
-{
+if ($action == 'seteditinline') {
dolibarr_set_const($db, 'WEBSITE_EDITINLINE', 1);
setEventMessages($langs->trans("FeatureNotYetAvailable"), null, 'warnings');
//dolibarr_set_const($db, 'WEBSITE_SUBCONTAINERSINLINE', 0); // Force disable of 'Include dynamic content'
header("Location: ".$_SERVER["PHP_SELF"].'?website='.GETPOST('website', 'alphanohtml').'&pageid='.GETPOST('pageid', 'int'));
exit;
}
-if ($action == 'unseteditinline')
-{
+if ($action == 'unseteditinline') {
dolibarr_del_const($db, 'WEBSITE_EDITINLINE');
header("Location: ".$_SERVER["PHP_SELF"].'?website='.GETPOST('website', 'alphanohtml').'&pageid='.GETPOST('pageid', 'int'));
exit;
}
-if ($action == 'setshowsubcontainers')
-{
+if ($action == 'setshowsubcontainers') {
dolibarr_set_const($db, 'WEBSITE_SUBCONTAINERSINLINE', 1);
//dolibarr_set_const($db, 'WEBSITE_EDITINLINE', 0); // Force disable of edit inline
header("Location: ".$_SERVER["PHP_SELF"].'?website='.GETPOST('website', 'alphanohtml').'&pageid='.GETPOST('pageid', 'int'));
exit;
}
-if ($action == 'unsetshowsubcontainers')
-{
+if ($action == 'unsetshowsubcontainers') {
dolibarr_del_const($db, 'WEBSITE_SUBCONTAINERSINLINE');
header("Location: ".$_SERVER["PHP_SELF"].'?website='.GETPOST('website', 'alphanohtml').'&pageid='.GETPOST('pageid', 'int'));
exit;
}
-if ($massaction == 'replace' && GETPOST('confirmmassaction', 'alpha') && !$searchkey)
-{
+if ($massaction == 'replace' && GETPOST('confirmmassaction', 'alpha') && !$searchkey) {
$action = 'replacesite';
$massaction = '';
}
// Set category
-if ($massaction == 'setcategory' && GETPOST('confirmmassaction', 'alpha') && $usercanedit)
-{
+if ($massaction == 'setcategory' && GETPOST('confirmmassaction', 'alpha') && $usercanedit) {
$error = 0;
$nbupdate = 0;
@@ -429,17 +476,14 @@ if ($massaction == 'setcategory' && GETPOST('confirmmassaction', 'alpha') && $us
}
// Replacement of string into pages
-if ($massaction == 'replace' && GETPOST('confirmmassaction', 'alpha'))
-{
+if ($massaction == 'replace' && GETPOST('confirmmassaction', 'alpha')) {
$replacestring = GETPOST('replacestring', 'none');
if (empty($user->rights->website->writephp)) {
setEventMessages("NotAllowedToAddDynamicContent", null, 'errors');
- }
- elseif (!$replacestring) {
+ } elseif (!$replacestring) {
setEventMessages("ErrorReplaceStringEmpty", null, 'errors');
- }
- else {
+ } else {
$nbreplacement = 0;
foreach ($toselect as $keyselected) {
@@ -461,15 +505,13 @@ if ($massaction == 'replace' && GETPOST('confirmmassaction', 'alpha'))
// Save page alias
$result = dolSavePageAlias($filealias, $object, $objectpage);
- if (!$result)
- {
+ if (!$result) {
setEventMessages('Failed to write file '.basename($filealias), null, 'errors');
}
// Save page of content
$result = dolSavePageContent($filetpl, $object, $objectpage);
- if ($result)
- {
+ if ($result) {
$nbreplacement++;
//var_dump($objectpage->content);exit;
$objectpage->update($user);
@@ -524,31 +566,26 @@ if ($action == 'adddir' && $permtouploadfile)
*/
// Add site
-if ($action == 'addsite')
-{
+if ($action == 'addsite') {
$db->begin();
- if (GETPOST('virtualhost', 'alpha') && !preg_match('/^http/', GETPOST('virtualhost', 'alpha')))
- {
+ if (GETPOST('virtualhost', 'alpha') && !preg_match('/^http/', GETPOST('virtualhost', 'alpha'))) {
$error++;
setEventMessages($langs->trans('ErrorURLMustStartWithHttp', $langs->transnoentitiesnoconv("VirtualHost")), null, 'errors');
}
- if (!$error && !GETPOST('WEBSITE_REF', 'alpha'))
- {
+ if (!$error && !GETPOST('WEBSITE_REF', 'alpha')) {
$error++;
$langs->load("errors");
setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities("Ref")), null, 'errors');
}
- if (!$error && !preg_match('/^[a-z0-9_\-\.]+$/i', GETPOST('WEBSITE_REF', 'alpha')))
- {
+ if (!$error && !preg_match('/^[a-z0-9_\-\.]+$/i', GETPOST('WEBSITE_REF', 'alpha'))) {
$error++;
$langs->load("errors");
setEventMessages($langs->transnoentities("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities("Ref")), null, 'errors');
}
- if (!$error)
- {
+ if (!$error) {
$arrayotherlang = explode(',', GETPOST('WEBSITE_OTHERLANG', 'alphanohtml'));
foreach ($arrayotherlang as $key => $val) {
$arrayotherlang[$key] = substr(trim($val), 0, 2); // Kept short language code only
@@ -562,75 +599,64 @@ if ($action == 'addsite')
$tmpobject->virtualhost = GETPOST('virtualhost', 'alpha');
$result = $tmpobject->create($user);
- if ($result <= 0)
- {
+ if ($result <= 0) {
$error++;
setEventMessages($tmpobject->error, $tmpobject->errors, 'errors');
}
}
- if (!$error)
- {
+ if (!$error) {
$db->commit();
setEventMessages($langs->trans("SiteAdded", $object->ref), null, 'mesgs');
$action = '';
header("Location: ".$_SERVER["PHP_SELF"].'?website='.$tmpobject->ref);
exit;
- }
- else {
+ } else {
$db->rollback();
$action = 'createsite';
}
- if (!$error)
- {
+ if (!$error) {
$action = 'preview';
$id = $object->id;
}
}
// Add page/container
-if ($action == 'addcontainer')
-{
+if ($action == 'addcontainer') {
dol_mkdir($pathofwebsite);
$db->begin();
$objectpage->fk_website = $object->id;
- if (GETPOSTISSET('fetchexternalurl')) // Fetch from external url
- {
+ if (GETPOSTISSET('fetchexternalurl')) { // Fetch from external url
$urltograb = GETPOST('externalurl', 'alpha');
$grabimages = GETPOST('grabimages', 'alpha');
$grabimagesinto = GETPOST('grabimagesinto', 'alpha');
include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
- if (empty($urltograb))
- {
+ if (empty($urltograb)) {
$error++;
$langs->load("errors");
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("URL")), null, 'errors');
$action = 'createcontainer';
- }
- elseif (!preg_match('/^http/', $urltograb))
- {
+ } elseif (!preg_match('/^http/', $urltograb)) {
$error++;
$langs->load("errors");
setEventMessages('Error URL must start with http:// or https://', null, 'errors');
$action = 'createcontainer';
}
- if (!$error)
- {
+ if (!$error) {
// Clean url to grab, so url can be
// http://www.example.com/ or http://www.example.com/dir1/ or http://www.example.com/dir1/aaa
$urltograbwithoutdomainandparam = preg_replace('/^https?:\/\/[^\/]+\/?/i', '', $urltograb);
//$urltograbwithoutdomainandparam = preg_replace('/^file:\/\/[^\/]+\/?/i', '', $urltograb);
$urltograbwithoutdomainandparam = preg_replace('/\?.*$/', '', $urltograbwithoutdomainandparam);
- if (empty($urltograbwithoutdomainandparam) && !preg_match('/\/$/', $urltograb))
- {
+ if (empty($urltograbwithoutdomainandparam) && !preg_match('/\/$/', $urltograb)) {
$urltograb .= '/';
}
$pageurl = dol_sanitizeFileName(preg_replace('/[\/\.]/', '-', preg_replace('/\/+$/', '', $urltograbwithoutdomainandparam)));
@@ -642,34 +668,27 @@ if ($action == 'addcontainer')
}
// Check pageurl is not already used
- if ($pageurl)
- {
+ if ($pageurl) {
$tmpwebsitepage = new WebsitePage($db);
$result = $tmpwebsitepage->fetch(0, $object->id, $pageurl);
- if ($result > 0)
- {
+ if ($result > 0) {
setEventMessages($langs->trans("AliasPageAlreadyExists", $pageurl), null, 'errors');
$error++;
$action = 'createcontainer';
}
}
- if (!$error)
- {
+ if (!$error) {
$tmp = getURLContent($urltograb);
- if ($tmp['curl_error_no'])
- {
+ if ($tmp['curl_error_no']) {
$error++;
setEventMessages('Error getting '.$urltograb.': '.$tmp['curl_error_msg'], null, 'errors');
$action = 'createcontainer';
- }
- elseif ($tmp['http_code'] != '200')
- {
+ } elseif ($tmp['http_code'] != '200') {
$error++;
setEventMessages('Error getting '.$urltograb.': '.$tmp['http_code'], null, 'errors');
$action = 'createcontainer';
- }
- else {
+ } else {
// Remove comments
$tmp['content'] = removeHtmlComment($tmp['content']);
@@ -679,36 +698,34 @@ if ($action == 'addcontainer')
$head = $regs[1];
$objectpage->type_container = 'page';
- $objectpage->pageurl = $pageurl;
- if (empty($objectpage->pageurl))
- {
- $tmpdomain = getDomainFromURL($urltograb);
- $objectpage->pageurl = $tmpdomain.'-home';
- }
+ $objectpage->pageurl = $pageurl;
+ if (empty($objectpage->pageurl)) {
+ $tmpdomain = getDomainFromURL($urltograb);
+ $objectpage->pageurl = $tmpdomain.'-home';
+ }
- $objectpage->aliasalt = '';
+ $objectpage->aliasalt = '';
- if (preg_match('/^(\d+)\-/', basename($urltograb), $regs)) $objectpage->aliasalt = $regs[1];
+ if (preg_match('/^(\d+)\-/', basename($urltograb), $regs)) {
+ $objectpage->aliasalt = $regs[1];
+ }
- $regtmp = array();
- if (preg_match('/(.*)<\/title>/ims', $head, $regtmp))
- {
+ $regtmp = array();
+ if (preg_match('/<title>(.*)<\/title>/ims', $head, $regtmp)) {
$objectpage->title = $regtmp[1];
}
- if (preg_match('/<meta name="title"[^"]+content="([^"]+)"/ims', $head, $regtmp))
- {
- if (empty($objectpage->title)) $objectpage->title = $regtmp[1]; // If title not found into <title>, we get it from <meta title>
+ if (preg_match('/<meta name="title"[^"]+content="([^"]+)"/ims', $head, $regtmp)) {
+ if (empty($objectpage->title)) {
+ $objectpage->title = $regtmp[1]; // If title not found into <title>, we get it from <meta title>
+ }
}
- if (preg_match('/<meta name="description"[^"]+content="([^"]+)"/ims', $head, $regtmp))
- {
+ if (preg_match('/<meta name="description"[^"]+content="([^"]+)"/ims', $head, $regtmp)) {
$objectpage->description = $regtmp[1];
}
- if (preg_match('/<meta name="keywords"[^"]+content="([^"]+)"/ims', $head, $regtmp))
- {
+ if (preg_match('/<meta name="keywords"[^"]+content="([^"]+)"/ims', $head, $regtmp)) {
$objectpage->keywords = $regtmp[1];
}
- if (preg_match('/<html\s+lang="([^"]+)"/ims', $tmp['content'], $regtmp))
- {
+ if (preg_match('/<html\s+lang="([^"]+)"/ims', $tmp['content'], $regtmp)) {
$tmplang = explode('-', $regtmp[1]);
$objectpage->lang = $tmplang[0].($tmplang[1] ? '_'.strtoupper($tmplang[1]) : '');
}
@@ -749,22 +766,18 @@ if ($action == 'addcontainer')
// We grab files found into <script> tags
preg_match_all('/<script([^\.>]+)src=["\']([^"\'>]+)["\']([^>]*)><\/script>/i', $objectpage->htmlheader, $regs);
$errorforsubresource = 0;
- foreach ($regs[0] as $key => $val)
- {
+ foreach ($regs[0] as $key => $val) {
dol_syslog("We will grab the script resource found into script tag ".$regs[2][$key]);
$linkwithoutdomain = $regs[2][$key];
- if (preg_match('/^\//', $regs[2][$key]))
- {
+ if (preg_match('/^\//', $regs[2][$key])) {
$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key]; // We use dirroot
- }
- else {
+ } else {
$urltograbbis = $urltograbdirwithoutslash.'/'.$regs[2][$key]; // We use dir of grabbed file
}
//$filetosave = $conf->medias->multidir_output[$conf->entity].'/css/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $regs[2][$key])?'':'/').$regs[2][$key];
- if (preg_match('/^http/', $regs[2][$key]))
- {
+ if (preg_match('/^http/', $regs[2][$key])) {
$urltograbbis = $regs[2][$key];
$linkwithoutdomain = preg_replace('/^https?:\/\/[^\/]+\//i', '', $regs[2][$key]);
//$filetosave = $conf->medias->multidir_output[$conf->entity].'/css/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
@@ -776,17 +789,19 @@ if ($action == 'addcontainer')
// Test if this is an external URL of grabbed web site. If yes, we do not load resource
$domaintograb = getDomainFromURL($urltograbdirwithoutslash);
$domaintograbbis = getDomainFromURL($urltograbbis);
- if ($domaintograb != $domaintograbbis) continue;
+ if ($domaintograb != $domaintograbbis) {
+ continue;
+ }
/*
- $tmpgeturl = getURLContent($urltograbbis);
- if ($tmpgeturl['curl_error_no'])
- {
- $error++;
- setEventMessages('Error getting script url '.$urltograbbis.': '.$tmpgeturl['curl_error_msg'], null, 'errors');
- $errorforsubresource++;
- $action='createcontainer';
- }
+ $tmpgeturl = getURLContent($urltograbbis);
+ if ($tmpgeturl['curl_error_no'])
+ {
+ $error++;
+ setEventMessages('Error getting script url '.$urltograbbis.': '.$tmpgeturl['curl_error_msg'], null, 'errors');
+ $errorforsubresource++;
+ $action='createcontainer';
+ }
elseif ($tmpgeturl['http_code'] != '200')
{
$error++;
@@ -795,15 +810,15 @@ if ($action == 'addcontainer')
$action='createcontainer';
}
else
- {
- dol_mkdir(dirname($filetosave));
+ {
+ dol_mkdir(dirname($filetosave));
- $fp = fopen($filetosave, "w");
- fputs($fp, $tmpgeturl['content']);
- fclose($fp);
- if (! empty($conf->global->MAIN_UMASK))
- @chmod($file, octdec($conf->global->MAIN_UMASK));
- }
+ $fp = fopen($filetosave, "w");
+ fputs($fp, $tmpgeturl['content']);
+ fclose($fp);
+ if (! empty($conf->global->MAIN_UMASK))
+ @chmod($file, octdec($conf->global->MAIN_UMASK));
+ }
*/
//$filename = 'image/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
@@ -817,22 +832,18 @@ if ($action == 'addcontainer')
preg_match_all('/<link([^\.>]+)href=["\']([^"\'>]+\.css[^"\'>]*)["\']([^>]*)>/i', $objectpage->htmlheader, $regs);
$errorforsubresource = 0;
- foreach ($regs[0] as $key => $val)
- {
+ foreach ($regs[0] as $key => $val) {
dol_syslog("We will grab the css resources found into link tag ".$regs[2][$key]);
$linkwithoutdomain = $regs[2][$key];
- if (preg_match('/^\//', $regs[2][$key]))
- {
+ if (preg_match('/^\//', $regs[2][$key])) {
$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key]; // We use dirroot
- }
- else {
+ } else {
$urltograbbis = $urltograbdirwithoutslash.'/'.$regs[2][$key]; // We use dir of grabbed file
}
//$filetosave = $conf->medias->multidir_output[$conf->entity].'/css/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $regs[2][$key])?'':'/').$regs[2][$key];
- if (preg_match('/^http/', $regs[2][$key]))
- {
+ if (preg_match('/^http/', $regs[2][$key])) {
$urltograbbis = $regs[2][$key];
$linkwithoutdomain = preg_replace('/^https?:\/\/[^\/]+\//i', '', $regs[2][$key]);
//$filetosave = $conf->medias->multidir_output[$conf->entity].'/css/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
@@ -844,24 +855,22 @@ if ($action == 'addcontainer')
// Test if this is an external URL of grabbed web site. If yes, we do not load resource
$domaintograb = getDomainFromURL($urltograbdirwithoutslash);
$domaintograbbis = getDomainFromURL($urltograbbis);
- if ($domaintograb != $domaintograbbis) continue;
+ if ($domaintograb != $domaintograbbis) {
+ continue;
+ }
$tmpgeturl = getURLContent($urltograbbis);
- if ($tmpgeturl['curl_error_no'])
- {
+ if ($tmpgeturl['curl_error_no']) {
$errorforsubresource++;
setEventMessages('Error getting link tag url '.$urltograbbis.': '.$tmpgeturl['curl_error_msg'], null, 'errors');
dol_syslog('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg']);
$action = 'createcontainer';
- }
- elseif ($tmpgeturl['http_code'] != '200')
- {
+ } elseif ($tmpgeturl['http_code'] != '200') {
$errorforsubresource++;
setEventMessages('Error getting link tag url '.$urltograbbis.': '.$tmpgeturl['http_code'], null, 'errors');
dol_syslog('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg']);
$action = 'createcontainer';
- }
- else {
+ } else {
// Clean some comment
//$tmpgeturl['content'] = dol_string_is_good_iso($tmpgeturl['content'], 1);
//$tmpgeturl['content'] = utf8_encode(utf8_decode($tmpgeturl['content']));
@@ -959,7 +968,9 @@ if ($action == 'addcontainer')
$objectpage->fk_page = $pageidfortranslation;
$sample = GETPOST('sample', 'alpha');
- if (empty($sample)) $sample = 'empty';
+ if (empty($sample)) {
+ $sample = 'empty';
+ }
$pathtosample = DOL_DOCUMENT_ROOT.'/website/samples/page-sample-'.dol_sanitizeFileName($sample).'.html';
@@ -967,38 +978,31 @@ if ($action == 'addcontainer')
$objectpage->content = make_substitutions(@file_get_contents($pathtosample), $substitutionarray);
}
- if (!$error)
- {
- if (empty($objectpage->pageurl))
- {
+ if (!$error) {
+ if (empty($objectpage->pageurl)) {
$langs->load("errors");
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("WEBSITE_PAGENAME")), null, 'errors');
$error++;
$action = 'createcontainer';
- }
- elseif (!preg_match('/^[a-z0-9\-\_]+$/i', $objectpage->pageurl))
- {
+ } elseif (!preg_match('/^[a-z0-9\-\_]+$/i', $objectpage->pageurl)) {
$langs->load("errors");
setEventMessages($langs->transnoentities("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities('WEBSITE_PAGENAME')), null, 'errors');
$error++;
$action = 'createcontainer';
}
- if (empty($objectpage->title))
- {
+ if (empty($objectpage->title)) {
$langs->load("errors");
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("WEBSITE_TITLE")), null, 'errors');
$error++;
$action = 'createcontainer';
}
- if ($objectpage->fk_page > 0 && empty($objectpage->lang))
- {
+ if ($objectpage->fk_page > 0 && empty($objectpage->lang)) {
$langs->load("errors");
setEventMessages($langs->trans("ErrorLanguageRequiredIfPageIsTranslationOfAnother"), null, 'errors');
$error++;
$action = 'createcontainer';
}
- if ($objectpage->fk_page > 0 && !empty($objectpage->lang))
- {
+ if ($objectpage->fk_page > 0 && !empty($objectpage->lang)) {
if ($objectpage->lang == $website->lang) {
$langs->load("errors");
setEventMessages($langs->trans("ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother"), null, 'errors');
@@ -1008,8 +1012,7 @@ if ($action == 'addcontainer')
}
}
- if (!$error)
- {
+ if (!$error) {
$pageid = $objectpage->create($user);
if ($pageid <= 0) {
$error++;
@@ -1022,8 +1025,7 @@ if ($action == 'addcontainer')
// Website categories association
$categoriesarray = GETPOST('categories', 'array');
$result = $objectpage->setCategories($categoriesarray);
- if ($result < 0)
- {
+ if ($result < 0) {
$error++;
setEventMessages($object->error, $object->errors, 'errors');
}
@@ -1034,8 +1036,7 @@ if ($action == 'addcontainer')
if (empty($object->fk_default_home)) {
$object->fk_default_home = $pageid;
$res = $object->update($user);
- if ($res <= 0)
- {
+ if ($res <= 0) {
$error++;
setEventMessages($object->error, $object->errors, 'errors');
} else {
@@ -1044,50 +1045,44 @@ if ($action == 'addcontainer')
// Generate the index.php page (to be the home page) and wrapper.php file
$result = dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper);
- if ($result <= 0) setEventMessages('Failed to write file '.$fileindex, null, 'errors');
+ if ($result <= 0) {
+ setEventMessages('Failed to write file '.$fileindex, null, 'errors');
+ }
}
}
}
- if (!$error)
- {
- if (!empty($objectpage->content))
- {
+ if (!$error) {
+ if (!empty($objectpage->content)) {
$filealias = $pathofwebsite.'/'.$objectpage->pageurl.'.php';
$filetpl = $pathofwebsite.'/page'.$objectpage->id.'.tpl.php';
// Save page alias
$result = dolSavePageAlias($filealias, $object, $objectpage);
- if (!$result)
- {
+ if (!$result) {
setEventMessages('Failed to write file '.basename($filealias), null, 'errors');
}
// Save page of content
$result = dolSavePageContent($filetpl, $object, $objectpage);
- if ($result)
- {
+ if ($result) {
setEventMessages($langs->trans("Saved"), null, 'mesgs');
- }
- else {
+ } else {
setEventMessages('Failed to write file '.$filetpl, null, 'errors');
$action = 'createcontainer';
}
}
}
- if (!$error)
- {
+ if (!$error) {
$db->commit();
setEventMessages($langs->trans("PageAdded", $objectpage->pageurl), null, 'mesgs');
$action = '';
- }
- else {
+ } else {
$db->rollback();
}
- if (!$error)
- {
+ if (!$error) {
$pageid = $objectpage->id;
// To generate the CSS, robot and htmlheader file.
@@ -1095,64 +1090,54 @@ if ($action == 'addcontainer')
// Check symlink to medias and restore it if ko
$pathtomedias = DOL_DATA_ROOT.'/medias';
$pathtomediasinwebsite = $pathofwebsite.'/medias';
- if (!is_link(dol_osencode($pathtomediasinwebsite)))
- {
+ if (!is_link(dol_osencode($pathtomediasinwebsite))) {
dol_syslog("Create symlink for ".$pathtomedias." into name ".$pathtomediasinwebsite);
dol_mkdir(dirname($pathtomediasinwebsite)); // To be sure dir for website exists
$result = symlink($pathtomedias, $pathtomediasinwebsite);
}
// Now generate the master.inc.php page if it does not exists yet
- if (!dol_is_file($filemaster))
- {
+ if (!dol_is_file($filemaster)) {
$result = dolSaveMasterFile($filemaster);
- if (!$result)
- {
+ if (!$result) {
$error++;
setEventMessages('Failed to write file '.$filemaster, null, 'errors');
}
}
- if (!dol_is_file($filehtmlheader))
- {
+ if (!dol_is_file($filehtmlheader)) {
$htmlheadercontent = "<html>\n";
$htmlheadercontent .= $htmlheadercontentdefault;
$htmlheadercontent .= "</html>";
$result = dolSaveHtmlHeader($filehtmlheader, $htmlheadercontent);
}
- if (!dol_is_file($filecss))
- {
+ if (!dol_is_file($filecss)) {
$csscontent = "/* CSS content (all pages) */\nbody.bodywebsite { margin: 0; font-family: 'Open Sans', sans-serif; }\n.bodywebsite h1 { margin-top: 0; margin-bottom: 0; padding: 10px;}";
$result = dolSaveCssFile($filecss, $csscontent);
}
- if (!dol_is_file($filejs))
- {
+ if (!dol_is_file($filejs)) {
$jscontent = "/* JS content (all pages) */\n";
$result = dolSaveJsFile($filejs, $jscontent);
}
- if (!dol_is_file($filerobot))
- {
+ if (!dol_is_file($filerobot)) {
$robotcontent = "# Robot file. Generated with Dolibarr\nUser-agent: *\nAllow: /public/\nDisallow: /administrator/";
$result = dolSaveRobotFile($filerobot, $robotcontent);
}
- if (!dol_is_file($filehtaccess))
- {
+ if (!dol_is_file($filehtaccess)) {
$htaccesscontent = "# Order allow,deny\n# Deny from all";
$result = dolSaveHtaccessFile($filehtaccess, $htaccesscontent);
}
- if (!dol_is_file($filemanifestjson))
- {
+ if (!dol_is_file($filemanifestjson)) {
$manifestjsoncontent = "";
$result = dolSaveManifestJson($filemanifestjson, $manifestjsoncontent);
}
- if (!dol_is_file($filereadme))
- {
+ if (!dol_is_file($filereadme)) {
$readmecontent = "Website generated by Dolibarr ERP CRM";
$result = dolSaveReadme($filereadme, $readmecontent);
}
@@ -1162,8 +1147,7 @@ if ($action == 'addcontainer')
}
// Delete site
-if ($action == 'confirm_deletesite' && $confirm == 'yes')
-{
+if ($action == 'confirm_deletesite' && $confirm == 'yes') {
$error = 0;
$db->begin();
@@ -1171,40 +1155,33 @@ if ($action == 'confirm_deletesite' && $confirm == 'yes')
$res = $object->fetch(GETPOST('id', 'int'));
$website = $object;
- if ($res > 0)
- {
+ if ($res > 0) {
$res = $object->delete($user);
- if ($res <= 0)
- {
+ if ($res <= 0) {
$error++;
setEventMessages($object->error, $object->errors, 'errors');
}
}
- if (!$error)
- {
- if (GETPOST('delete_also_js', 'alpha') == 'on')
- {
+ if (!$error) {
+ if (GETPOST('delete_also_js', 'alpha') == 'on') {
$pathofwebsitejs = DOL_DATA_ROOT.'/medias/js/'.$object->ref;
dol_delete_dir_recursive($pathofwebsitejs);
}
- if (GETPOST('delete_also_medias', 'alpha') == 'on')
- {
+ if (GETPOST('delete_also_medias', 'alpha') == 'on') {
$pathofwebsitemedias = DOL_DATA_ROOT.'/medias/image/'.$object->ref;
dol_delete_dir_recursive($pathofwebsitemedias);
}
}
- if (!$error)
- {
+ if (!$error) {
$db->commit();
setEventMessages($langs->trans("SiteDeleted", $object->ref), null, 'mesgs');
header("Location: ".$_SERVER["PHP_SELF"].'?id='.$object->id);
exit;
- }
- else {
+ } else {
$db->rollback();
dol_print_error($db);
}
@@ -1221,25 +1198,21 @@ if (GETPOSTISSET('pageid') && $action == 'delete' && $permissiontodelete) {
$res = $objectpage->fetch($pageid, $object->id);
- if ($res > 0)
- {
+ if ($res > 0) {
$res = $objectpage->delete($user);
- if ($res <= 0)
- {
+ if ($res <= 0) {
$error++;
setEventMessages($objectpage->error, $objectpage->errors, 'errors');
}
}
- if (!$error)
- {
+ if (!$error) {
$db->commit();
setEventMessages($langs->trans("PageDeleted", $objectpage->pageurl, $websitekey), null, 'mesgs');
header("Location: ".$_SERVER["PHP_SELF"].'?website='.$websitekey);
exit;
- }
- else {
+ } else {
$db->rollback();
dol_print_error($db);
}
@@ -1250,25 +1223,23 @@ if (!GETPOSTISSET('pageid')) {
// Add part of code from actions_massactions.inc.php
// Delete record from mass action (massaction = 'delete' for direct delete, action/confirm='delete'/'yes' with a confirmation step before)
- if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == 'yes')) && $permissiontodelete)
- {
+ if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == 'yes')) && $permissiontodelete) {
$db->begin();
$objecttmp = new $objectclass($db);
$nbok = 0;
- foreach ($toselect as $toselectid)
- {
+ foreach ($toselect as $toselectid) {
$result = $objecttmp->fetch($toselectid);
- if ($result > 0)
- {
+ if ($result > 0) {
$result = $objecttmp->delete($user);
- if ($result <= 0)
- {
+ if ($result <= 0) {
setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
$error++;
break;
- } else $nbok++;
+ } else {
+ $nbok++;
+ }
} else {
setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
$error++;
@@ -1276,10 +1247,12 @@ if (!GETPOSTISSET('pageid')) {
}
}
- if (!$error)
- {
- if ($nbok > 1) setEventMessages($langs->trans("RecordsDeleted", $nbok), null, 'mesgs');
- else setEventMessages($langs->trans("RecordDeleted", $nbok), null, 'mesgs');
+ if (!$error) {
+ if ($nbok > 1) {
+ setEventMessages($langs->trans("RecordsDeleted", $nbok), null, 'mesgs');
+ } else {
+ setEventMessages($langs->trans("RecordDeleted", $nbok), null, 'mesgs');
+ }
$db->commit();
} else {
$db->rollback();
@@ -1302,29 +1275,23 @@ if (!GETPOSTISSET('pageid')) {
}
// Update css Update site properties
-if ($action == 'updatecss')
-{
+if ($action == 'updatecss') {
// If we tried to reload another site/page, we stay on editcss mode.
- if (GETPOST('refreshsite') || GETPOST('refreshsite_x') || GETPOST('refreshsite.x') || GETPOST('refreshpage') || GETPOST('refreshpage_x') || GETPOST('refreshpage.x'))
- {
+ if (GETPOST('refreshsite') || GETPOST('refreshsite_x') || GETPOST('refreshsite.x') || GETPOST('refreshpage') || GETPOST('refreshpage_x') || GETPOST('refreshpage.x')) {
$action = 'editcss';
- }
- else {
+ } else {
$res = $object->fetch(0, $websitekey);
$website = $object;
- if (GETPOSTISSET('virtualhost'))
- {
+ if (GETPOSTISSET('virtualhost')) {
$tmpvirtualhost = preg_replace('/\/$/', '', GETPOST('virtualhost', 'alpha'));
- if ($tmpvirtualhost && !preg_match('/^http/', $tmpvirtualhost))
- {
+ if ($tmpvirtualhost && !preg_match('/^http/', $tmpvirtualhost)) {
$error++;
setEventMessages($langs->trans('ErrorURLMustStartWithHttp', $langs->transnoentitiesnoconv("VirtualHost")), null, 'errors');
$action = 'editcss';
}
- if (!$error)
- {
+ if (!$error) {
$arrayotherlang = explode(',', GETPOST('WEBSITE_OTHERLANG', 'alphanohtml'));
foreach ($arrayotherlang as $key => $val) {
$arrayotherlang[$key] = substr(trim($val), 0, 2); // Kept short language code only
@@ -1336,8 +1303,7 @@ if ($action == 'updatecss')
$object->use_manifest = GETPOST('use_manifest', 'alpha');
$result = $object->update($user);
- if ($result < 0)
- {
+ if ($result < 0) {
$error++;
setEventMessages($object->error, $object->errors, 'errors');
$action = 'editcss';
@@ -1345,8 +1311,7 @@ if ($action == 'updatecss')
}
}
- if (!$error)
- {
+ if (!$error) {
// Save master.inc.php file
dol_syslog("Save master file ".$filemaster);
@@ -1354,8 +1319,7 @@ if ($action == 'updatecss')
// Now generate the master.inc.php page
$result = dolSaveMasterFile($filemaster);
- if (!$result)
- {
+ if (!$result) {
$error++;
setEventMessages('Failed to write file '.$filemaster, null, 'errors');
}
@@ -1365,26 +1329,25 @@ if ($action == 'updatecss')
$htmlheadercontent = '';
/* We disable php code since htmlheader is never executed as an include but only read by fgets_content.
- $htmlheadercontent.= "<?php // BEGIN PHP\n";
- $htmlheadercontent.= '$websitekey=basename(__DIR__);'."\n";
- $htmlheadercontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load env if not already loaded"."\n";
- $htmlheadercontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
- $htmlheadercontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
- $htmlheadercontent.= "ob_start();\n";
- // $htmlheadercontent.= "header('Content-type: text/html');\n"; // Not required. htmlheader.html is never call as a standalone page
- $htmlheadercontent.= "// END PHP ?>\n";*/
+ $htmlheadercontent.= "<?php // BEGIN PHP\n";
+ $htmlheadercontent.= '$websitekey=basename(__DIR__);'."\n";
+ $htmlheadercontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load env if not already loaded"."\n";
+ $htmlheadercontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+ $htmlheadercontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+ $htmlheadercontent.= "ob_start();\n";
+ // $htmlheadercontent.= "header('Content-type: text/html');\n"; // Not required. htmlheader.html is never call as a standalone page
+ $htmlheadercontent.= "// END PHP ?>\n";*/
$htmlheadercontent .= preg_replace(array('/<html>\n*/ims', '/<\/html>\n*/ims'), array('', ''), GETPOST('WEBSITE_HTML_HEADER', 'none'));
/*$htmlheadercontent.= "\n".'<?php // BEGIN PHP'."\n";
- $htmlheadercontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp);'."\n";
- $htmlheadercontent.= "// END PHP ?>"."\n";*/
+ $htmlheadercontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp);'."\n";
+ $htmlheadercontent.= "// END PHP ?>"."\n";*/
$htmlheadercontent = trim($htmlheadercontent)."\n";
$result = dolSaveHtmlHeader($filehtmlheader, $htmlheadercontent);
- if (!$result)
- {
+ if (!$result) {
$error++;
setEventMessages('Failed to write file '.$filehtmlheader, null, 'errors');
}
@@ -1414,8 +1377,7 @@ if ($action == 'updatecss')
dol_syslog("Save css content into ".$filecss);
$result = dolSaveCssFile($filecss, $csscontent);
- if (!$result)
- {
+ if (!$result) {
$error++;
setEventMessages('Failed to write file '.$filecss, null, 'errors');
}
@@ -1441,8 +1403,7 @@ if ($action == 'updatecss')
$jscontent .= "// END PHP ?>\n";
$result = dolSaveJsFile($filejs, $jscontent);
- if (!$result)
- {
+ if (!$result) {
$error++;
setEventMessages('Failed to write file '.$filejs, null, 'errors');
}
@@ -1452,24 +1413,23 @@ if ($action == 'updatecss')
$robotcontent = '';
/*$robotcontent.= "<?php // BEGIN PHP\n";
- $robotcontent.= '$websitekey=basename(__DIR__);'."\n";
- $robotcontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load env if not already loaded"."\n";
- $robotcontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
- $robotcontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
- $robotcontent.= "ob_start();\n";
- $robotcontent.= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
- $robotcontent.= "header('Content-type: text/css');\n";
- $robotcontent.= "// END PHP ?>\n";*/
+ $robotcontent.= '$websitekey=basename(__DIR__);'."\n";
+ $robotcontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load env if not already loaded"."\n";
+ $robotcontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+ $robotcontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+ $robotcontent.= "ob_start();\n";
+ $robotcontent.= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
+ $robotcontent.= "header('Content-type: text/css');\n";
+ $robotcontent.= "// END PHP ?>\n";*/
$robotcontent .= trim(GETPOST('WEBSITE_ROBOT', 'restricthtml'))."\n";
/*$robotcontent.= "\n".'<?php // BEGIN PHP'."\n";
- $robotcontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "robot");'."\n";
- $robotcontent.= "// END PHP ?>"."\n";*/
+ $robotcontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "robot");'."\n";
+ $robotcontent.= "// END PHP ?>"."\n";*/
$result = dolSaveRobotFile($filerobot, $robotcontent);
- if (!$result)
- {
+ if (!$result) {
$error++;
setEventMessages('Failed to write file '.$filerobot, null, 'errors');
}
@@ -1480,87 +1440,80 @@ if ($action == 'updatecss')
$htaccesscontent .= trim(GETPOST('WEBSITE_HTACCESS', 'restricthtml'))."\n";
$result = dolSaveHtaccessFile($filehtaccess, $htaccesscontent);
- if (!$result)
- {
+ if (!$result) {
$error++;
setEventMessages('Failed to write file '.$filehtaccess, null, 'errors');
}
- // manifest.json file
- $manifestjsoncontent = '';
+ // manifest.json file
+ $manifestjsoncontent = '';
- $manifestjsoncontent .= "<?php // BEGIN PHP\n";
- $manifestjsoncontent .= '$websitekey=basename(__DIR__);'."\n";
- $manifestjsoncontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded\n"; // For the css, we need to set path of master using the dirname of css file.
- $manifestjsoncontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
- $manifestjsoncontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
- $manifestjsoncontent .= "ob_start();\n";
- $manifestjsoncontent .= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
- $manifestjsoncontent .= "header('Content-type: application/manifest+json');\n";
- $manifestjsoncontent .= "// END PHP ?>\n";
+ $manifestjsoncontent .= "<?php // BEGIN PHP\n";
+ $manifestjsoncontent .= '$websitekey=basename(__DIR__);'."\n";
+ $manifestjsoncontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded\n"; // For the css, we need to set path of master using the dirname of css file.
+ $manifestjsoncontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+ $manifestjsoncontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+ $manifestjsoncontent .= "ob_start();\n";
+ $manifestjsoncontent .= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
+ $manifestjsoncontent .= "header('Content-type: application/manifest+json');\n";
+ $manifestjsoncontent .= "// END PHP ?>\n";
- $manifestjsoncontent .= trim(GETPOST('WEBSITE_MANIFEST_JSON', 'none'))."\n";
+ $manifestjsoncontent .= trim(GETPOST('WEBSITE_MANIFEST_JSON', 'none'))."\n";
- $manifestjsoncontent .= '<?php // BEGIN PHP'."\n";
- $manifestjsoncontent .= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "manifest");'."\n";
- $manifestjsoncontent .= "// END PHP ?>\n";
+ $manifestjsoncontent .= '<?php // BEGIN PHP'."\n";
+ $manifestjsoncontent .= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "manifest");'."\n";
+ $manifestjsoncontent .= "// END PHP ?>\n";
- $result = dolSaveManifestJson($filemanifestjson, $manifestjsoncontent);
- if (!$result)
- {
- $error++;
- setEventMessages('Failed to write file '.$filemanifestjson, null, 'errors');
- }
+ $result = dolSaveManifestJson($filemanifestjson, $manifestjsoncontent);
+ if (!$result) {
+ $error++;
+ setEventMessages('Failed to write file '.$filemanifestjson, null, 'errors');
+ }
- // README.md file
- $readmecontent = '';
+ // README.md file
+ $readmecontent = '';
- /*$readmecontent.= "<?php // BEGIN PHP\n";
- $readmecontent.= '$websitekey=basename(__DIR__);'."\n";
- $readmecontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded"."\n"; // For the css, we need to set path of master using the dirname of css file.
- $readmecontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
- $readmecontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
- $readmecontent.= "ob_start();\n";
- $readmecontent.= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
- $readmecontent.= "header('Content-type: application/manifest+json');\n";
- $readmecontent.= "// END PHP ?>\n";*/
+ /*$readmecontent.= "<?php // BEGIN PHP\n";
+ $readmecontent.= '$websitekey=basename(__DIR__);'."\n";
+ $readmecontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded"."\n"; // For the css, we need to set path of master using the dirname of css file.
+ $readmecontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+ $readmecontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+ $readmecontent.= "ob_start();\n";
+ $readmecontent.= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
+ $readmecontent.= "header('Content-type: application/manifest+json');\n";
+ $readmecontent.= "// END PHP ?>\n";*/
- $readmecontent .= trim(GETPOST('WEBSITE_README', 'restricthtml'))."\n";
+ $readmecontent .= trim(GETPOST('WEBSITE_README', 'restricthtml'))."\n";
- /*$readmecontent.= '<?php // BEGIN PHP'."\n";
- $readmecontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "manifest");'."\n";
- $readmecontent.= "// END PHP ?>"."\n";*/
+ /*$readmecontent.= '<?php // BEGIN PHP'."\n";
+ $readmecontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "manifest");'."\n";
+ $readmecontent.= "// END PHP ?>"."\n";*/
- $result = dolSaveReadme($filereadme, $readmecontent);
- if (!$result)
- {
- $error++;
- setEventMessages('Failed to write file '.$filereadme, null, 'errors');
- }
+ $result = dolSaveReadme($filereadme, $readmecontent);
+ if (!$result) {
+ $error++;
+ setEventMessages('Failed to write file '.$filereadme, null, 'errors');
+ }
- // Save wrapper.php
+ // Save wrapper.php
$result = dolSaveIndexPage($pathofwebsite, '', '', $filewrapper);
// Message if no error
- if (!$error)
- {
+ if (!$error) {
setEventMessages($langs->trans("Saved"), null, 'mesgs');
}
- if (!GETPOSTISSET('updateandstay')) // If we click on "Save And Stay", we don not make the redirect
- {
+ if (!GETPOSTISSET('updateandstay')) { // If we click on "Save And Stay", we don not make the redirect
$action = 'preview';
- if ($backtopage)
- {
+ if ($backtopage) {
header("Location: ".$backtopage);
exit;
}
- }
- else {
+ } else {
$action = 'editcss';
}
}
@@ -1568,22 +1521,19 @@ if ($action == 'updatecss')
}
// Update page
-if ($action == 'setashome')
-{
+if ($action == 'setashome') {
$db->begin();
$object->fetch(0, $websitekey);
$website = $object;
$object->fk_default_home = $pageid;
$res = $object->update($user);
- if (! ($res > 0))
- {
+ if (! ($res > 0)) {
$error++;
setEventMessages($object->error, $object->errors, 'errors');
}
- if (!$error)
- {
+ if (!$error) {
$db->commit();
$filetpl = $pathofwebsite.'/page'.$pageid.'.tpl.php';
@@ -1591,19 +1541,20 @@ if ($action == 'setashome')
// Generate the index.php page to be the home page
$result = dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper);
- if ($result) setEventMessages($langs->trans("Saved"), null, 'mesgs');
- else setEventMessages('Failed to write file '.$fileindex, null, 'errors');
+ if ($result) {
+ setEventMessages($langs->trans("Saved"), null, 'mesgs');
+ } else {
+ setEventMessages('Failed to write file '.$fileindex, null, 'errors');
+ }
$action = 'preview';
- }
- else {
+ } else {
$db->rollback();
}
}
// Update page properties (meta)
-if ($action == 'updatemeta')
-{
+if ($action == 'updatemeta') {
$db->begin();
$result = $object->fetch(0, $websitekey);
@@ -1612,8 +1563,7 @@ if ($action == 'updatemeta')
$objectpage->fk_website = $object->id;
// Check parameters
- if (!preg_match('/^[a-z0-9\-\_]+$/i', GETPOST('WEBSITE_PAGENAME', 'alpha')))
- {
+ if (!preg_match('/^[a-z0-9\-\_]+$/i', GETPOST('WEBSITE_PAGENAME', 'alpha'))) {
$error++;
$langs->load("errors");
setEventMessages($langs->transnoentities("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities('WEBSITE_PAGENAME')), null, 'errors');
@@ -1621,38 +1571,32 @@ if ($action == 'updatemeta')
}
$res = $objectpage->fetch($pageid, $object->id);
- if ($res <= 0)
- {
+ if ($res <= 0) {
$error++;
setEventMessages('Page not found '.$objectpage->error, $objectpage->errors, 'errors');
}
// Check alias not exists
- if (!$error && GETPOST('WEBSITE_PAGENAME', 'alpha'))
- {
+ if (!$error && GETPOST('WEBSITE_PAGENAME', 'alpha')) {
$websitepagetemp = new WebsitePage($db);
$result = $websitepagetemp->fetch(-1 * $objectpage->id, $object->id, GETPOST('WEBSITE_PAGENAME', 'alpha'));
- if ($result < 0)
- {
+ if ($result < 0) {
$error++;
$langs->load("errors");
setEventMessages($websitepagetemp->error, $websitepagetemp->errors, 'errors');
$action = 'editmeta';
}
- if ($result > 0)
- {
+ if ($result > 0) {
$error++;
$langs->load("errors");
setEventMessages($langs->trans("ErrorAPageWithThisNameOrAliasAlreadyExists", $websitepagetemp->pageurl), null, 'errors');
$action = 'editmeta';
}
}
- if (!$error && GETPOST('WEBSITE_ALIASALT', 'alpha'))
- {
+ if (!$error && GETPOST('WEBSITE_ALIASALT', 'alpha')) {
$arrayofaliastotest = explode(',', GETPOST('WEBSITE_ALIASALT', 'alpha'));
$websitepagetemp = new WebsitePage($db);
- foreach ($arrayofaliastotest as $aliastotest)
- {
+ foreach ($arrayofaliastotest as $aliastotest) {
// Disallow alias name pageX (already used to save the page with id)
if (preg_match('/^page\d+/i', $aliastotest)) {
$error++;
@@ -1662,16 +1606,14 @@ if ($action == 'updatemeta')
break;
} else {
$result = $websitepagetemp->fetch(-1 * $objectpage->id, $object->id, $aliastotest);
- if ($result < 0)
- {
+ if ($result < 0) {
$error++;
$langs->load("errors");
setEventMessages($websitepagetemp->error, $websitepagetemp->errors, 'errors');
$action = 'editmeta';
break;
}
- if ($result > 0)
- {
+ if ($result > 0) {
$error++;
$langs->load("errors");
setEventMessages($langs->trans("ErrorAPageWithThisNameOrAliasAlreadyExists", $websitepagetemp->pageurl), null, 'errors');
@@ -1682,8 +1624,7 @@ if ($action == 'updatemeta')
}
}
- if (!$error)
- {
+ if (!$error) {
$objectpage->old_object = clone $objectpage;
$objectpage->title = str_replace(array('<', '>'), '', GETPOST('WEBSITE_TITLE', 'alphanohtml'));
@@ -1703,20 +1644,19 @@ if ($action == 'updatemeta')
$objectpage->fk_object = GETPOST('WEBSITE_OBJECTID', 'aZ09');
$newdatecreation = dol_mktime(GETPOST('datecreationhour', 'int'), GETPOST('datecreationmin', 'int'), GETPOST('datecreationsec', 'int'), GETPOST('datecreationmonth', 'int'), GETPOST('datecreationday', 'int'), GETPOST('datecreationyear', 'int'));
- if ($newdatecreation) $objectpage->date_creation = $newdatecreation;
+ if ($newdatecreation) {
+ $objectpage->date_creation = $newdatecreation;
+ }
$res = $objectpage->update($user);
- if (!($res > 0))
- {
+ if (!($res > 0)) {
$langs->load("errors");
- if ($db->lasterrno == 'DB_ERROR_RECORD_ALREADY_EXISTS')
- {
+ if ($db->lasterrno == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
$error++;
$langs->load("errors");
setEventMessages($langs->trans("ErrorAPageWithThisNameOrAliasAlreadyExists"), null, 'errors');
$action = 'editmeta';
- }
- else {
+ } else {
$error++;
$langs->load("errors");
setEventMessages($objectpage->error, $objectpage->errors, 'errors');
@@ -1729,23 +1669,19 @@ if ($action == 'updatemeta')
// Website categories association
$categoriesarray = GETPOST('categories', 'array');
$result = $objectpage->setCategories($categoriesarray);
- if ($result < 0)
- {
+ if ($result < 0) {
$error++;
setEventMessages($object->error, $object->errors, 'errors');
}
}
- if (!$error)
- {
+ if (!$error) {
$db->commit();
- }
- else {
+ } else {
$db->rollback();
}
- if (!$error)
- {
+ if (!$error) {
$filemaster = $pathofwebsite.'/master.inc.php';
$fileoldalias = $pathofwebsite.'/'.$objectpage->old_object->pageurl.'.php';
$filealias = $pathofwebsite.'/'.$objectpage->pageurl.'.php';
@@ -1754,11 +1690,12 @@ if ($action == 'updatemeta')
// Now generate the master.inc.php page
$result = dolSaveMasterFile($filemaster);
- if (!$result) setEventMessages('Failed to write file '.$filemaster, null, 'errors');
+ if (!$result) {
+ setEventMessages('Failed to write file '.$filemaster, null, 'errors');
+ }
// Now delete the alias.php page
- if (!empty($fileoldalias))
- {
+ if (!empty($fileoldalias)) {
dol_syslog("We delete old alias page name=".$fileoldalias." to build a new alias page=".$filealias);
dol_delete_file($fileoldalias);
@@ -1774,13 +1711,10 @@ if ($action == 'updatemeta')
}
}
// Now delete the alternative alias.php pages
- if (!empty($objectpage->old_object->aliasalt))
- {
+ if (!empty($objectpage->old_object->aliasalt)) {
$tmpaltaliases = explode(',', $objectpage->old_object->aliasalt);
- if (is_array($tmpaltaliases))
- {
- foreach ($tmpaltaliases as $tmpaliasalt)
- {
+ if (is_array($tmpaltaliases)) {
+ foreach ($tmpaltaliases as $tmpaliasalt) {
dol_syslog("We delete old alt alias pages name=".trim($tmpaliasalt));
dol_delete_file($pathofwebsite.'/'.trim($tmpaliasalt).'.php');
@@ -1800,20 +1734,20 @@ if ($action == 'updatemeta')
// Save page main alias
$result = dolSavePageAlias($filealias, $object, $objectpage);
- if (!$result) setEventMessages('Failed to write file '.$filealias, null, 'errors');
+ if (!$result) {
+ setEventMessages('Failed to write file '.$filealias, null, 'errors');
+ }
// Save alt aliases
- if (!empty($objectpage->aliasalt))
- {
+ if (!empty($objectpage->aliasalt)) {
$tmpaltaliases = explode(',', $objectpage->aliasalt);
- if (is_array($tmpaltaliases))
- {
- foreach ($tmpaltaliases as $tmpaliasalt)
- {
- if (trim($tmpaliasalt))
- {
+ if (is_array($tmpaltaliases)) {
+ foreach ($tmpaltaliases as $tmpaliasalt) {
+ if (trim($tmpaliasalt)) {
$filealias = $pathofwebsite.'/'.trim($tmpaliasalt).'.php';
$result = dolSavePageAlias($filealias, $object, $objectpage);
- if (!$result) setEventMessages('Failed to write file '.basename($filealias), null, 'errors');
+ if (!$result) {
+ setEventMessages('Failed to write file '.basename($filealias), null, 'errors');
+ }
}
}
}
@@ -1822,24 +1756,20 @@ if ($action == 'updatemeta')
// Save page of content
$result = dolSavePageContent($filetpl, $object, $objectpage);
- if ($result)
- {
+ if ($result) {
setEventMessages($langs->trans("Saved"), null, 'mesgs');
- if (!GETPOSTISSET('updateandstay')) // If we click on "Save And Stay", we do not make the redirect
- {
+ if (!GETPOSTISSET('updateandstay')) { // If we click on "Save And Stay", we do not make the redirect
//header("Location: ".$_SERVER["PHP_SELF"].'?website='.$websitekey.'&pageid='.$pageid);
//exit;
$action = 'preview';
- }
- else {
+ } else {
$action = 'editmeta';
}
- }
- else {
+ } else {
setEventMessages('Failed to write file '.$filetpl, null, 'errors');
//header("Location: ".$_SERVER["PHP_SELF"].'?website='.$websitekey.'&pageid='.$pageid);
- //exit;
+ //exit;
$action = 'preview';
}
}
@@ -1847,27 +1777,23 @@ if ($action == 'updatemeta')
// Update page
if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'confirm_createfromclone' || $action == 'confirm_createpagefromclone')
- || ($action == 'preview' && (GETPOST('refreshsite') || GETPOST('refreshpage') || GETPOST('preview'))))
-{
+ || ($action == 'preview' && (GETPOST('refreshsite') || GETPOST('refreshpage') || GETPOST('preview')))) {
$object->fetch(0, $websitekey);
$website = $object;
- if ($action == 'confirm_createfromclone')
- {
+ if ($action == 'confirm_createfromclone') {
$db->begin();
$objectnew = new Website($db);
$result = $objectnew->createFromClone($user, GETPOST('id', 'int'), GETPOST('siteref', 'aZ09'), (GETPOST('newlang', 'aZ09') ?GETPOST('newlang', 'aZ09') : ''));
- if ($result < 0)
- {
+ if ($result < 0) {
$error++;
setEventMessages($objectnew->error, $objectnew->errors, 'errors');
$action = 'preview';
$db->rollback();
- }
- else {
+ } else {
$object = $objectnew;
$id = $object->id;
$pageid = $object->fk_default_home;
@@ -1877,12 +1803,10 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
}
}
- if ($action == 'confirm_createpagefromclone')
- {
+ if ($action == 'confirm_createpagefromclone') {
$istranslation = (GETPOST('is_a_translation', 'aZ09') == 'on' ? 1 : 0);
// Protection if it is a translation page
- if ($istranslation)
- {
+ if ($istranslation) {
if (GETPOST('newlang', 'aZ09') == $objectpage->lang || !GETPOST('newlang', 'aZ09')) {
$error++;
setEventMessages($langs->trans("LanguageMustNotBeSameThanClonedPage"), null, 'errors');
@@ -1895,27 +1819,23 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
}
}
- if (!$error)
- {
+ if (!$error) {
$db->begin();
$newwebsiteid = GETPOST('newwebsite', 'int');
$pathofwebsitenew = $pathofwebsite;
$tmpwebsite = new Website($db);
- if ($newwebsiteid > 0 && $newwebsiteid != $object->id)
- {
+ if ($newwebsiteid > 0 && $newwebsiteid != $object->id) {
$tmpwebsite->fetch($newwebsiteid);
$pathofwebsitenew = $dolibarr_main_data_root.'/website/'.$tmpwebsite->ref;
- }
- else {
+ } else {
$tmpwebsite = $object;
}
$objectpage = new WebsitePage($db);
$resultpage = $objectpage->createFromClone($user, $pageid, GETPOST('newpageurl', 'aZ09'), (GETPOST('newlang', 'aZ09') ? GETPOST('newlang', 'aZ09') : ''), $istranslation, $newwebsiteid, GETPOST('newtitle', 'alphanohtml'));
- if ($resultpage < 0)
- {
+ if ($resultpage < 0) {
$error++;
setEventMessages($objectpage->error, $objectpage->errors, 'errors');
$action = 'createpagefromclone';
@@ -1933,8 +1853,7 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
dolSavePageContent($filetpl, $tmpwebsite, $resultpage);
// Switch on the new page if web site of new page/container is same
- if (empty($newwebsiteid) || $newwebsiteid == $object->id)
- {
+ if (empty($newwebsiteid) || $newwebsiteid == $object->id) {
$pageid = $resultpage->id;
}
@@ -1945,47 +1864,39 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
$res = 0;
- if (!$error)
- {
+ if (!$error) {
// Check symlink to medias and restore it if ko
$pathtomedias = DOL_DATA_ROOT.'/medias';
$pathtomediasinwebsite = $pathofwebsite.'/medias';
- if (!is_link(dol_osencode($pathtomediasinwebsite)))
- {
+ if (!is_link(dol_osencode($pathtomediasinwebsite))) {
dol_syslog("Create symlink for ".$pathtomedias." into name ".$pathtomediasinwebsite);
dol_mkdir(dirname($pathtomediasinwebsite)); // To be sure dir for website exists
$result = symlink($pathtomedias, $pathtomediasinwebsite);
}
/*if (GETPOST('savevirtualhost') && $object->virtualhost != GETPOST('previewsite'))
- {
- $object->virtualhost = GETPOST('previewsite', 'alpha');
- $object->update($user);
- }*/
+ {
+ $object->virtualhost = GETPOST('previewsite', 'alpha');
+ $object->update($user);
+ }*/
$objectpage->fk_website = $object->id;
- if ($pageid > 0)
- {
+ if ($pageid > 0) {
$res = $objectpage->fetch($pageid);
- }
- else {
+ } else {
$res = 0;
- if ($object->fk_default_home > 0)
- {
+ if ($object->fk_default_home > 0) {
$res = $objectpage->fetch($object->fk_default_home);
}
- if (!($res > 0))
- {
+ if (!($res > 0)) {
$res = $objectpage->fetch(0, $object->id);
}
}
}
- if (!$error && $res > 0)
- {
- if ($action == 'updatesource' || $action == 'updatecontent')
- {
+ if (!$error && $res > 0) {
+ if ($action == 'updatesource' || $action == 'updatecontent') {
$db->begin();
$phpfullcodestringold = dolKeepOnlyPhpCode($objectpage->content);
@@ -1996,29 +1907,32 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
$phpfullcodestring = dolKeepOnlyPhpCode($objectpage->content);
//print dol_escape_htmltag($phpfullcodestring);exit;
$forbiddenphpcommands = array("exec", "passthru", "system", "shell_exec", "proc_open");
- if (empty($conf->global->WEBSITE_PHP_ALLOW_WRITE)) // If option is not on, we disallow functions to write files
- {
+ if (empty($conf->global->WEBSITE_PHP_ALLOW_WRITE)) { // If option is not on, we disallow functions to write files
$forbiddenphpcommands = array_merge($forbiddenphpcommands, array("fopen", "file_put_contents", "fputs", "fputscsv", "fwrite", "fpassthru", "unlink", "mkdir", "rmdir", "symlink", "touch", "umask"));
}
- foreach ($forbiddenphpcommands as $forbiddenphpcommand)
- {
- if (preg_match('/'.$forbiddenphpcommand.'\s*\(/ms', $phpfullcodestring))
- {
+ foreach ($forbiddenphpcommands as $forbiddenphpcommand) {
+ if (preg_match('/'.$forbiddenphpcommand.'\s*\(/ms', $phpfullcodestring)) {
$error++;
setEventMessages($langs->trans("DynamicPHPCodeContainsAForbiddenInstruction", $forbiddenphpcommand), null, 'errors');
- if ($action == 'updatesource') $action = 'editsource';
- if ($action == 'updatecontent') $action = 'editcontent';
+ if ($action == 'updatesource') {
+ $action = 'editsource';
+ }
+ if ($action == 'updatecontent') {
+ $action = 'editcontent';
+ }
}
}
- if (empty($user->rights->website->writephp))
- {
- if ($phpfullcodestringold != $phpfullcodestring)
- {
+ if (empty($user->rights->website->writephp)) {
+ if ($phpfullcodestringold != $phpfullcodestring) {
$error++;
setEventMessages($langs->trans("NotAllowedToAddDynamicContent"), null, 'errors');
- if ($action == 'updatesource') $action = 'editsource';
- if ($action == 'updatecontent') $action = 'editcontent';
+ if ($action == 'updatesource') {
+ $action = 'editsource';
+ }
+ if ($action == 'updatecontent') {
+ $action = 'editcontent';
+ }
}
}
@@ -2028,16 +1942,18 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
$res = $objectpage->update($user);
- if ($res < 0)
- {
+ if ($res < 0) {
$error++;
setEventMessages($objectpage->error, $objectpage->errors, 'errors');
- if ($action == 'updatesource') $action = 'editsource';
- if ($action == 'updatecontent') $action = 'editcontent';
+ if ($action == 'updatesource') {
+ $action = 'editsource';
+ }
+ if ($action == 'updatecontent') {
+ $action = 'editcontent';
+ }
}
- if (!$error)
- {
+ if (!$error) {
$db->commit();
$filemaster = $pathofwebsite.'/master.inc.php';
@@ -2049,7 +1965,9 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
// Now generate the master.inc.php page
$result = dolSaveMasterFile($filemaster);
- if (!$result) setEventMessages('Failed to write the master file file '.$filemaster, null, 'errors');
+ if (!$result) {
+ setEventMessages('Failed to write the master file file '.$filemaster, null, 'errors');
+ }
// Now delete the old alias.php page if we removed one
/*if (!empty($fileoldalias))
@@ -2071,16 +1989,16 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
// Save page alias
$result = dolSavePageAlias($filealias, $object, $objectpage);
- if (!$result) setEventMessages('Failed to write the alias file '.basename($filealias), null, 'errors');
+ if (!$result) {
+ setEventMessages('Failed to write the alias file '.basename($filealias), null, 'errors');
+ }
// Save page content
$result = dolSavePageContent($filetpl, $object, $objectpage);
- if ($result)
- {
+ if ($result) {
setEventMessages($langs->trans("Saved"), null, 'mesgs');
- if (!GETPOSTISSET('updateandstay')) // If we click on "Save And Stay", we do not make the redirect
- {
+ if (!GETPOSTISSET('updateandstay')) { // If we click on "Save And Stay", we do not make the redirect
if ($backtopage) {
header("Location: ".$backtopage);
exit;
@@ -2089,13 +2007,17 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
exit;
}
} else {
- if ($action == 'updatesource') $action = 'editsource';
- if ($action == 'updatecontent') $action = 'editcontent';
+ if ($action == 'updatesource') {
+ $action = 'editsource';
+ }
+ if ($action == 'updatecontent') {
+ $action = 'editcontent';
+ }
}
} else {
setEventMessages('Failed to write file '.$filetpl, null, 'errors');
header("Location: ".$_SERVER["PHP_SELF"].'?website='.$websitekey.'&pageid='.$pageid);
- exit;
+ exit;
}
} else {
$db->rollback();
@@ -2105,10 +2027,8 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
exit;
}
} else {
- if (!$error)
- {
- if (empty($websitekey) || $websitekey == '-1')
- {
+ if (!$error) {
+ if (empty($websitekey) || $websitekey == '-1') {
setEventMessages($langs->trans("NoWebSiteCreateOneFirst"), null, 'warnings');
} else {
setEventMessages($langs->trans("NoPageYet"), null, 'warnings');
@@ -2119,12 +2039,10 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
}
// Export site
-if ($action == 'exportsite')
-{
+if ($action == 'exportsite') {
$fileofzip = $object->exportWebSite();
- if ($fileofzip)
- {
+ if ($fileofzip) {
$file_name = basename($fileofzip);
header("Content-Type: application/zip");
@@ -2133,19 +2051,16 @@ if ($action == 'exportsite')
readfile($fileofzip);
exit;
- }
- else {
+ } else {
setEventMessages($object->error, $object->errors, 'errors');
$action = 'preview';
}
}
// Regenerate site
-if ($action == 'regeneratesite')
-{
+if ($action == 'regeneratesite') {
$result = $object->rebuildWebSiteFiles();
- if ($result > 0)
- {
+ if ($result > 0) {
setEventMessages($langs->trans("PagesRegenerated", $result), null, 'mesgs');
$action = 'preview';
} else {
@@ -2155,83 +2070,68 @@ if ($action == 'regeneratesite')
}
// Import site
-if ($action == 'importsiteconfirm')
-{
- if (empty($_FILES) && !GETPOSTISSET('templateuserfile'))
- {
+if ($action == 'importsiteconfirm') {
+ if (empty($_FILES) && !GETPOSTISSET('templateuserfile')) {
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("File")), null, 'errors');
$action = 'importsite';
- }
- else {
- if (!empty($_FILES) || GETPOSTISSET('templateuserfile'))
- {
+ } else {
+ if (!empty($_FILES) || GETPOSTISSET('templateuserfile')) {
// Check symlink to medias and restore it if ko
$pathtomedias = DOL_DATA_ROOT.'/medias';
$pathtomediasinwebsite = $pathofwebsite.'/medias';
- if (!is_link(dol_osencode($pathtomediasinwebsite)))
- {
+ if (!is_link(dol_osencode($pathtomediasinwebsite))) {
dol_syslog("Create symlink for ".$pathtomedias." into name ".$pathtomediasinwebsite);
dol_mkdir(dirname($pathtomediasinwebsite)); // To be sure dir for website exists
$result = symlink($pathtomedias, $pathtomediasinwebsite);
- if (!$result)
- {
+ if (!$result) {
setEventMessages($langs->trans("ErrorFieldToCreateSymLinkToMedias", $pathtomediasinwebsite, $pathtomedias), null, 'errors');
$action = 'importsite';
}
}
$fileofzip = '';
- if (GETPOSTISSET('templateuserfile'))
- {
+ if (GETPOSTISSET('templateuserfile')) {
$fileofzip = DOL_DATA_ROOT.'/doctemplates/websites/'.GETPOST('templateuserfile', 'alpha');
- }
- elseif (!empty($_FILES))
- {
- if (is_array($_FILES['userfile']['tmp_name'])) $userfiles = $_FILES['userfile']['tmp_name'];
- else $userfiles = array($_FILES['userfile']['tmp_name']);
+ } elseif (!empty($_FILES)) {
+ if (is_array($_FILES['userfile']['tmp_name'])) {
+ $userfiles = $_FILES['userfile']['tmp_name'];
+ } else {
+ $userfiles = array($_FILES['userfile']['tmp_name']);
+ }
- foreach ($userfiles as $key => $userfile)
- {
- if (empty($_FILES['userfile']['tmp_name'][$key]))
- {
+ foreach ($userfiles as $key => $userfile) {
+ if (empty($_FILES['userfile']['tmp_name'][$key])) {
$error++;
if ($_FILES['userfile']['error'][$key] == 1 || $_FILES['userfile']['error'][$key] == 2) {
setEventMessages($langs->trans('ErrorFileSizeTooLarge'), null, 'errors');
$action = 'importsite';
- }
- else {
+ } else {
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("File")), null, 'errors');
$action = 'importsite';
}
}
}
- if (!$error)
- {
+ if (!$error) {
$upload_dir = $conf->website->dir_temp;
$result = dol_add_file_process($upload_dir, 1, -1, 'userfile', '');
}
// Get name of file (take last one if several name provided)
$fileofzip = $upload_dir.'/unknown';
- foreach ($_FILES as $key => $ifile)
- {
- foreach ($ifile['name'] as $key2 => $ifile2)
- {
+ foreach ($_FILES as $key => $ifile) {
+ foreach ($ifile['name'] as $key2 => $ifile2) {
$fileofzip = $upload_dir.'/'.$ifile2;
}
}
}
- if (!$error)
- {
+ if (!$error) {
$result = $object->importWebSite($fileofzip);
- if ($result < 0)
- {
+ if ($result < 0) {
setEventMessages($object->error, $object->errors, 'errors');
$action = 'importsite';
- }
- else {
+ } else {
// Force mode dynamic on
dolibarr_set_const($db, 'WEBSITE_SUBCONTAINERSINLINE', 1, 'chaine', 0, '', $conf->entity);
@@ -2271,7 +2171,9 @@ $moreheadjs = '';
$arrayofjs[] = 'includes/jquery/plugins/blockUI/jquery.blockUI.js';
$arrayofjs[] = 'core/js/blockUI.js'; // Used by ecm/tpl/enabledfiletreeajax.tpl.php
-if (empty($conf->global->MAIN_ECM_DISABLE_JS)) $arrayofjs[] = "includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js";
+if (empty($conf->global->MAIN_ECM_DISABLE_JS)) {
+ $arrayofjs[] = "includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js";
+}
$moreheadjs .= '<script type="text/javascript">'."\n";
$moreheadjs .= 'var indicatorBlockUI = \''.DOL_URL_ROOT."/theme/".$conf->theme."/img/working.gif".'\';'."\n";
@@ -2284,56 +2186,43 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" enctype="multipart/
print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-if ($action == 'createsite')
-{
+if ($action == 'createsite') {
print '<input type="hidden" name="action" value="addsite">';
}
-if ($action == 'createcontainer')
-{
+if ($action == 'createcontainer') {
print '<input type="hidden" name="action" value="addcontainer">';
}
-if ($action == 'editcss')
-{
+if ($action == 'editcss') {
print '<input type="hidden" name="action" value="updatecss">';
}
-if ($action == 'editmenu')
-{
+if ($action == 'editmenu') {
print '<input type="hidden" name="action" value="updatemenu">';
}
-if ($action == 'setashome')
-{
+if ($action == 'setashome') {
print '<input type="hidden" name="action" value="updateashome">';
}
-if ($action == 'editmeta')
-{
+if ($action == 'editmeta') {
print '<input type="hidden" name="action" value="updatemeta">';
}
-if ($action == 'editsource')
-{
+if ($action == 'editsource') {
print '<input type="hidden" name="action" value="updatesource">';
}
-if ($action == 'editcontent')
-{
+if ($action == 'editcontent') {
print '<input type="hidden" name="action" value="updatecontent">';
}
-if ($action == 'edit')
-{
+if ($action == 'edit') {
print '<input type="hidden" name="action" value="update">';
}
-if ($action == 'importsite')
-{
+if ($action == 'importsite') {
print '<input type="hidden" name="action" value="importsiteconfirm">';
}
-if ($action == 'file_manager')
-{
+if ($action == 'file_manager') {
print '<input type="hidden" name="action" value="file_manager">';
}
-if ($action == 'replacesite')
-{
+if ($action == 'replacesite') {
print '<input type="hidden" name="action" value="replacesiteconfirm">';
}
-if ($action == 'replacesiteconfirm')
-{
+if ($action == 'replacesiteconfirm') {
print '<input type="hidden" name="action" value="replacesiteconfirm">';
}
@@ -2341,28 +2230,33 @@ print '<div>';
// Add a margin under toolbar ?
$style = '';
-if ($action != 'preview' && $action != 'editcontent' && $action != 'editsource' && !GETPOST('createpagefromclone', 'alphanohtml')) $style = ' margin-bottom: 5px;';
+if ($action != 'preview' && $action != 'editcontent' && $action != 'editsource' && !GETPOST('createpagefromclone', 'alphanohtml')) {
+ $style = ' margin-bottom: 5px;';
+}
-if (!GETPOST('hide_websitemenu'))
-{
+if (!GETPOST('hide_websitemenu')) {
$disabled = '';
- if (empty($user->rights->website->write)) $disabled = ' disabled="disabled"';
+ if (empty($user->rights->website->write)) {
+ $disabled = ' disabled="disabled"';
+ }
- if ($websitekey)
- {
+ if ($websitekey) {
$virtualurl = '';
$dataroot = DOL_DATA_ROOT.'/website/'.$websitekey;
- if (!empty($object->virtualhost)) $virtualurl = $object->virtualhost;
+ if (!empty($object->virtualhost)) {
+ $virtualurl = $object->virtualhost;
+ }
}
$array = array();
- if ($object->id > 0)
- {
+ if ($object->id > 0) {
$array = $objectpage->fetchAll($object->id, 'ASC,ASC', 'type_container,pageurl');
$object->lines = $array;
}
- if (!is_array($array) && $array < 0) dol_print_error('', $objectpage->error, $objectpage->errors);
+ if (!is_array($array) && $array < 0) {
+ dol_print_error('', $objectpage->error, $objectpage->errors);
+ }
$atleastonepage = (is_array($array) && count($array) > 0);
@@ -2390,21 +2284,26 @@ if (!GETPOST('hide_websitemenu'))
print '<span class="websiteselection">';
$out = '';
$out .= '<select name="website" class="minwidth100 width200 maxwidth150onsmartphone" id="website">';
- if (empty($object->records)) $out .= '<option value="-1"> </option>';
+ if (empty($object->records)) {
+ $out .= '<option value="-1"> </option>';
+ }
if (!empty($conf->use_javascript_ajax)) {
$valueoption = '<span class="classlink">'.img_picto('', 'add', 'class="paddingrightonly"').$langs->trans("AddWebsite").'</span>';
$out .= '<option value="-2" data-html="'.dol_escape_htmltag($valueoption).'">'.$valueoption.'</option>';
}
// Loop on each sites
$i = 0;
- foreach ($object->records as $key => $valwebsite)
- {
+ foreach ($object->records as $key => $valwebsite) {
if (empty($websitekey)) {
- if ($action != 'createsite') $websitekey = $valwebsite->ref;
+ if ($action != 'createsite') {
+ $websitekey = $valwebsite->ref;
+ }
}
$out .= '<option value="'.$valwebsite->ref.'"';
- if ($websitekey == $valwebsite->ref) $out .= ' selected'; // To preselect a value
+ if ($websitekey == $valwebsite->ref) {
+ $out .= ' selected'; // To preselect a value
+ }
//$outoption = $valwebsite->getLibStatut(3).' '.$valwebsite->ref.' ';
$outoption = (($valwebsite->status == $valwebsite::STATUS_DRAFT) ? '<span class="opacitymedium">' : '').$valwebsite->ref.(($valwebsite->status == $valwebsite::STATUS_DRAFT) ? '</span>' : '');
$out .= ' data-html="'.dol_escape_htmltag($outoption).'"';
@@ -2436,8 +2335,7 @@ if (!GETPOST('hide_websitemenu'))
print '<input type="image" class="valignmiddle" src="'.img_picto('', 'refresh', '', 0, 1).'" name="refreshsite" value="'.$langs->trans("Load").'">';
}
- if ($websitekey && $websitekey != '-1' && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite'))
- {
+ if ($websitekey && $websitekey != '-1' && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite')) {
print ' ';
print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditCss")).'" name="editcss">';
@@ -2449,11 +2347,9 @@ if (!GETPOST('hide_websitemenu'))
$exportlabel = $langs->trans("Export");
}
- if ($atleastonepage)
- {
+ if ($atleastonepage) {
print '<input type="submit" class="button bordertransp" disabled="disabled" value="'.dol_escape_htmltag($importlabel).'" name="importsite">';
- }
- else {
+ } else {
print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($importlabel).'" name="importsite">';
}
@@ -2474,8 +2370,7 @@ if (!GETPOST('hide_websitemenu'))
print '</span>';
- if ($websitekey && $websitekey != '-1' && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite'))
- {
+ if ($websitekey && $websitekey != '-1' && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite')) {
print '<span class="websiteselection">';
//print '<a href="'.$_SERVER["PHP_SELF"].'?action=file_manager&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("MediaFiles")).'"><span class="fa fa-image"><span></a>';
print dolButtonToOpenUrlInDialogPopup('file_manager', $langs->transnoentitiesnoconv("MediaFiles"), '<span class="fa fa-image"><span>', '/website/index.php?action=file_manager&website='.$website->ref, $disabled);
@@ -2494,8 +2389,7 @@ if (!GETPOST('hide_websitemenu'))
print '<span class="websitetools websiteselection">';
- if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite')
- {
+ if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite') {
$urlext = $virtualurl;
$urlint = $urlwithroot.'/public/website/index.php?website='.$websitekey;
@@ -2504,22 +2398,16 @@ if (!GETPOST('hide_websitemenu'))
$linktotestonwebserver .= '<span class="hideonsmartphone paddingrightonly">'.$langs->trans("TestDeployOnWeb", $virtualurl).'</span>'.img_picto('', 'globe');
$linktotestonwebserver .= '</a>';
$htmltext = '';
- if (empty($object->fk_default_home))
- {
+ if (empty($object->fk_default_home)) {
$htmltext .= '<br><span class="error">'.$langs->trans("YouMustDefineTheHomePage").'</span><br><br>';
- }
- elseif (empty($virtualurl))
- {
+ } elseif (empty($virtualurl)) {
//$htmltext .= '<br><span class="error">'.$langs->trans("VirtualHostUrlNotDefined").'</span><br><br>';
- }
- else {
+ } else {
$htmltext .= '<br><center>'.$langs->trans("GoTo").' <a href="'.$virtualurl.'" target="_website">'.$virtualurl.'</a></center><br>';
}
- if (!empty($conf->global->WEBSITE_REPLACE_INFO_ABOUT_USAGE_WITH_WEBSERVER))
- {
+ if (!empty($conf->global->WEBSITE_REPLACE_INFO_ABOUT_USAGE_WITH_WEBSERVER)) {
$htmltext .= '<br>'.$langs->trans($conf->global->WEBSITE_REPLACE_INFO_ABOUT_USAGE_WITH_WEBSERVER);
- }
- else {
+ } else {
$htmltext .= $langs->trans("SetHereVirtualHost", $dataroot);
$htmltext .= '<br>';
$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
@@ -2556,12 +2444,19 @@ if (!GETPOST('hide_websitemenu'))
print '</span>';
}
- if (in_array($action, array('editcss', 'editmenu', 'file_manager', 'replacesite', 'replacesiteconfirm')))
- {
- if ($action == 'editcss') print '<input type="submit" id="savefilean stay" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("SaveAndStay")).'" name="updateandstay">';
- if (preg_match('/^create/', $action) && $action != 'file_manager' && $action != 'replacesite' && $action != 'replacesiteconfirm') print '<input type="submit" id="savefile" class="button buttonforacesave button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
- if (preg_match('/^edit/', $action) && $action != 'file_manager' && $action != 'replacesite' && $action != 'replacesiteconfirm') print '<input type="submit" id="savefile" class="button buttonforacesave button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
- if ($action != 'preview') print '<input type="submit" class="button button-cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="cancel">';
+ if (in_array($action, array('editcss', 'editmenu', 'file_manager', 'replacesite', 'replacesiteconfirm'))) {
+ if ($action == 'editcss') {
+ print '<input type="submit" id="savefilean stay" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("SaveAndStay")).'" name="updateandstay">';
+ }
+ if (preg_match('/^create/', $action) && $action != 'file_manager' && $action != 'replacesite' && $action != 'replacesiteconfirm') {
+ print '<input type="submit" id="savefile" class="button buttonforacesave button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
+ }
+ if (preg_match('/^edit/', $action) && $action != 'file_manager' && $action != 'replacesite' && $action != 'replacesiteconfirm') {
+ print '<input type="submit" id="savefile" class="button buttonforacesave button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
+ }
+ if ($action != 'preview') {
+ print '<input type="submit" class="button button-cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="cancel">';
+ }
}
print '</span>';
@@ -2570,8 +2465,7 @@ if (!GETPOST('hide_websitemenu'))
// Toolbar for pages
//
- if ($websitekey && $websitekey != '-1' && !in_array($action, array('editcss', 'editmenu', 'importsite', 'file_manager', 'replacesite', 'replacesiteconfirm')) && !$file_manager)
- {
+ if ($websitekey && $websitekey != '-1' && !in_array($action, array('editcss', 'editmenu', 'importsite', 'file_manager', 'replacesite', 'replacesiteconfirm')) && !$file_manager) {
print '</div>'; // Close current websitebar to open a new one
print '<!-- Bar for websitepage -->';
@@ -2587,8 +2481,7 @@ if (!GETPOST('hide_websitemenu'))
//print '<span class="websiteselection">';
- if ($action != 'addcontainer')
- {
+ if ($action != 'addcontainer') {
$out = '';
$s = $formwebsite->selectContainer($website, 'pageid', $pageid, 0, $action, 'maxwidth200onsmartphone');
@@ -2617,8 +2510,7 @@ if (!GETPOST('hide_websitemenu'))
}
print $out;
- }
- else {
+ } else {
print $langs->trans("New");
}
@@ -2629,47 +2521,50 @@ if (!GETPOST('hide_websitemenu'))
// Print nav arrows
$pagepreviousid = 0;
$pagenextid = 0;
- if ($pageid)
- {
+ if ($pageid) {
$sql = 'SELECT MAX(rowid) as pagepreviousid FROM '.MAIN_DB_PREFIX.'website_page WHERE rowid < '.$pageid.' AND fk_website = '.$object->id;
$resql = $db->query($sql);
- if ($resql)
- {
+ if ($resql) {
$obj = $db->fetch_object($resql);
- if ($obj)
- {
+ if ($obj) {
$pagepreviousid = $obj->pagepreviousid;
}
+ } else {
+ dol_print_error($db);
}
- else dol_print_error($db);
$sql = 'SELECT MIN(rowid) as pagenextid FROM '.MAIN_DB_PREFIX.'website_page WHERE rowid > '.$pageid.' AND fk_website = '.$object->id;
$resql = $db->query($sql);
- if ($resql)
- {
+ if ($resql) {
$obj = $db->fetch_object($resql);
- if ($obj)
- {
+ if ($obj) {
$pagenextid = $obj->pagenextid;
}
+ } else {
+ dol_print_error($db);
}
- else dol_print_error($db);
}
- if ($pagepreviousid) print '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?website='.urlencode($object->ref).'&pageid='.$pagepreviousid.'&action='.$action.'">'.img_previous($langs->trans("PreviousContainer")).'</a>';
- else print '<span class="valignmiddle opacitymedium">'.img_previous($langs->trans("Previous")).'</span>';
- if ($pagenextid) print '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?website='.urlencode($object->ref).'&pageid='.$pagenextid.'&action='.$action.'">'.img_next($langs->trans("NextContainer")).'</a>';
- else print '<span class="valignmiddle opacitymedium">'.img_next($langs->trans("Next")).'</span>';
+ if ($pagepreviousid) {
+ print '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?website='.urlencode($object->ref).'&pageid='.$pagepreviousid.'&action='.$action.'">'.img_previous($langs->trans("PreviousContainer")).'</a>';
+ } else {
+ print '<span class="valignmiddle opacitymedium">'.img_previous($langs->trans("Previous")).'</span>';
+ }
+ if ($pagenextid) {
+ print '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?website='.urlencode($object->ref).'&pageid='.$pagenextid.'&action='.$action.'">'.img_next($langs->trans("NextContainer")).'</a>';
+ } else {
+ print '<span class="valignmiddle opacitymedium">'.img_next($langs->trans("Next")).'</span>';
+ }
$websitepage = new WebSitePage($db);
- if ($pageid > 0 && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone'))
- {
+ if ($pageid > 0 && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone')) {
$websitepage->fetch($pageid);
}
- if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite')
- {
+ if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite') {
$disabled = '';
- if (empty($user->rights->website->write)) $disabled = ' disabled="disabled"';
+ if (empty($user->rights->website->write)) {
+ $disabled = ' disabled="disabled"';
+ }
// Confirmation delete site
if ($action == 'deletesite') {
@@ -2698,8 +2593,7 @@ if (!GETPOST('hide_websitemenu'))
print $formconfirm;
}
- if ($pageid > 0 && $atleastonepage) // pageid can be set without pages, if homepage of site is set and all pages were removed
- {
+ if ($pageid > 0 && $atleastonepage) { // pageid can be set without pages, if homepage of site is set and all pages were removed
// Confirmation to clone
if ($action == 'createpagefromclone') {
// Create an array for form
@@ -2730,7 +2624,7 @@ if (!GETPOST('hide_websitemenu'))
$value= $formadmin->select_language($preselectedlanguage, 'newlang', 0, null, $textifempty, 0, 0, 'minwidth200', 1, 0, 0, $onlylang, 1);
$formquestion[] = array('type' => 'other', 'name' => 'newlang', 'label' => $form->textwithpicto($langs->trans("Language"), $langs->trans("DefineListOfAltLanguagesInWebsiteProperties")), 'value' => $value);
- $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid, $langs->trans('ClonePage'), '', 'confirm_createpagefromclone', $formquestion, 0, 1, 300, 550);
+ $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid, $langs->trans('ClonePage'), '', 'confirm_createpagefromclone', $formquestion, 0, 1, 300, 550);
print $formconfirm;
}
@@ -2746,11 +2640,9 @@ if (!GETPOST('hide_websitemenu'))
print '<div class="inline-block marginrightonly">'; // Button include dynamic contant
print $langs->trans("ShowSubcontainers");
- if (empty($conf->global->WEBSITE_SUBCONTAINERSINLINE))
- {
+ if (empty($conf->global->WEBSITE_SUBCONTAINERSINLINE)) {
print '<a class="nobordertransp nohoverborder marginleftonlyshort valignmiddle"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=setshowsubcontainers&token='.newToken().'">'.img_picto($langs->trans("ShowSubContainersOnOff", $langs->transnoentitiesnoconv("Off")), 'switch_off', '', false, 0, 0, '', 'nomarginleft').'</a>';
- }
- else {
+ } else {
print '<a class="nobordertransp nohoverborder marginleftonlyshort valignmiddle"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=unsetshowsubcontainers&token='.newToken().'">'.img_picto($langs->trans("ShowSubContainersOnOff", $langs->transnoentitiesnoconv("On")), 'switch_on', '', false, 0, 0, '', 'nomarginleft').'</a>';
}
print '</div>';
@@ -2807,18 +2699,14 @@ if (!GETPOST('hide_websitemenu'))
//$disableeditinline = $websitepage->grabbed_from;
$disableeditinline = 0;
- if ($disableeditinline)
- {
+ if ($disableeditinline) {
//print '<input type="submit" class="button bordertransp" disabled="disabled" title="'.dol_escape_htmltag($langs->trans("OnlyEditionOfSourceForGrabbedContent")).'" value="'.dol_escape_htmltag($langs->trans("EditWithEditor")).'" name="editcontent">';
print '<a class="nobordertransp opacitymedium nohoverborder marginleftonlyshort"'.$disabled.' href="#" disabled="disabled" title="'.dol_escape_htmltag($langs->trans("OnlyEditionOfSourceForGrabbedContent")).'">'.img_picto($langs->trans("OnlyEditionOfSourceForGrabbedContent"), 'switch_off', '', false, 0, 0, '', 'nomarginleft').'</a>';
- }
- else {
+ } else {
//print '<input type="submit" class="button nobordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditWithEditor")).'" name="editcontent">';
- if (empty($conf->global->WEBSITE_EDITINLINE))
- {
+ if (empty($conf->global->WEBSITE_EDITINLINE)) {
print '<a class="nobordertransp nohoverborder marginleftonlyshort valignmiddle"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=seteditinline&token='.newToken().'">'.img_picto($langs->trans("EditInLineOnOff", $langs->transnoentitiesnoconv("Off")), 'switch_off', '', false, 0, 0, '', 'nomarginleft').'</a>';
- }
- else {
+ } else {
print '<a class="nobordertransp nohoverborder marginleftonlyshort valignmiddle"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=unseteditinline&token='.newToken().'">'.img_picto($langs->trans("EditInLineOnOff", $langs->transnoentitiesnoconv("On")), 'switch_on', '', false, 0, 0, '', 'nomarginleft').'</a>';
}
}
@@ -2828,14 +2716,12 @@ if (!GETPOST('hide_websitemenu'))
print '</div>';
// Set page as homepage
- if ($object->fk_default_home > 0 && $pageid == $object->fk_default_home)
- {
+ if ($object->fk_default_home > 0 && $pageid == $object->fk_default_home) {
//$disabled=' disabled="disabled"';
//print '<span class="button bordertransp disabled"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'"><span class="fa fa-home"></span></span>';
//print '<input type="submit" class="button bordertransp" disabled="disabled" value="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'" name="setashome">';
print '<a href="#" class="button bordertransp disabled" disabled="disabled" title="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'"><span class="fa fa-home valignmiddle btnTitle-icon"><span></a>';
- }
- else {
+ } else {
//$disabled='';
//print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'" name="setashome">';
print '<a href="'.$_SERVER["PHP_SEFL"].'?action=setashome&token='.newToken().'&website='.$website->ref.'&pageid='.$pageid.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'"><span class="fa fa-home valignmiddle btnTitle-icon"><span></a>';
@@ -2849,8 +2735,7 @@ if (!GETPOST('hide_websitemenu'))
print '<span class="websitetools">';
- if (($pageid > 0 && $atleastonepage) && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite'))
- {
+ if (($pageid > 0 && $atleastonepage) && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite')) {
$realpage = $urlwithroot.'/public/website/index.php?website='.$websitekey.'&pageref='.$websitepage->pageurl;
$pagealias = $websitepage->pageurl;
@@ -2886,30 +2771,34 @@ if (!GETPOST('hide_websitemenu'))
// TODO Add js to save alias like we save virtual host name and use dynamic virtual host for url of id=previewpageext
}
- if (!in_array($action, array('editcss', 'editmenu', 'file_manager', 'replacesite', 'replacesiteconfirm', 'createsite', 'createcontainer', 'createfromclone', 'createpagefromclone', 'deletesite')))
- {
- if ($action == 'editsource' || $action == 'editmeta') print '<input type="submit" id="savefilean stay" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("SaveAndStay")).'" name="updateandstay">';
- if (preg_match('/^create/', $action)) print '<input type="submit" id="savefile" class="button buttonforacesave button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
- if (preg_match('/^edit/', $action)) print '<input type="submit" id="savefile" class="button buttonforacesave button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
- if ($action != 'preview') print '<input type="submit" class="button button-cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="cancel">';
+ if (!in_array($action, array('editcss', 'editmenu', 'file_manager', 'replacesite', 'replacesiteconfirm', 'createsite', 'createcontainer', 'createfromclone', 'createpagefromclone', 'deletesite'))) {
+ if ($action == 'editsource' || $action == 'editmeta') {
+ print '<input type="submit" id="savefilean stay" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("SaveAndStay")).'" name="updateandstay">';
+ }
+ if (preg_match('/^create/', $action)) {
+ print '<input type="submit" id="savefile" class="button buttonforacesave button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
+ }
+ if (preg_match('/^edit/', $action)) {
+ print '<input type="submit" id="savefile" class="button buttonforacesave button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
+ }
+ if ($action != 'preview') {
+ print '<input type="submit" class="button button-cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="cancel">';
+ }
}
print '</span>'; // end websitetools
print '<span class="websitehelp">';
- if (GETPOST('editsource', 'alpha') || GETPOST('editcontent', 'alpha'))
- {
+ if (GETPOST('editsource', 'alpha') || GETPOST('editcontent', 'alpha')) {
$url = 'https://wiki.dolibarr.org/index.php/Module_Website';
$htmltext = $langs->transnoentitiesnoconv("YouCanEditHtmlSource", $url);
$htmltext .= $langs->transnoentitiesnoconv("YouCanEditHtmlSource2", $url);
$htmltext .= $langs->transnoentitiesnoconv("YouCanEditHtmlSourceMore", $url);
$htmltext .= '<br>';
- if ($conf->browser->layout == 'phone')
- {
+ if ($conf->browser->layout == 'phone') {
print $form->textwithpicto('', $htmltext, 1, 'help', 'inline-block', 1, 2, 'tooltipsubstitution');
- }
- else {
+ } else {
//img_help(($tooltiptrigger != '' ? 2 : 1), $alt)
print $form->textwithpicto($langs->trans("SyntaxHelp").' '.img_help(2, $langs->trans("SyntaxHelp")), $htmltext, 1, 'none', 'inline-block', 1, 2, 'tooltipsubstitution');
}
@@ -2917,11 +2806,9 @@ if (!GETPOST('hide_websitemenu'))
print '</span>'; // end websitehelp
- if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone')
- {
+ if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone') {
// Adding jquery code to change on the fly url of preview ext
- if (!empty($conf->use_javascript_ajax))
- {
+ if (!empty($conf->use_javascript_ajax)) {
print '<script type="text/javascript" language="javascript">
jQuery(document).ready(function() {
jQuery("#websiteinputurl").keyup(function() {
@@ -2979,115 +2866,96 @@ $head = array();
* Edit Site HTML header and CSS
*/
-if ($action == 'editcss')
-{
+if ($action == 'editcss') {
print '<div class="fiche">';
print '<br>';
- if (!GETPOSTISSET('WEBSITE_CSS_INLINE'))
- {
+ if (!GETPOSTISSET('WEBSITE_CSS_INLINE')) {
$csscontent = @file_get_contents($filecss);
// Clean the php css file to remove php code and get only css part
$csscontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $csscontent);
- }
- else {
+ } else {
$csscontent = GETPOST('WEBSITE_CSS_INLINE', 'none');
}
if (!trim($csscontent)) {
$csscontent = '/* CSS content (all pages) */'."\nbody.bodywebsite { margin: 0; font-family: 'Open Sans', sans-serif; }\n.bodywebsite h1 { margin-top: 0; margin-bottom: 0; padding: 10px;}";
}
- if (!GETPOSTISSET('WEBSITE_JS_INLINE'))
- {
+ if (!GETPOSTISSET('WEBSITE_JS_INLINE')) {
$jscontent = @file_get_contents($filejs);
// Clean the php js file to remove php code and get only js part
$jscontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $jscontent);
- }
- else {
+ } else {
$jscontent = GETPOST('WEBSITE_JS_INLINE', 'none');
}
- if (!trim($jscontent)) $jscontent = '/* JS content (all pages) */'."\n";
+ if (!trim($jscontent)) {
+ $jscontent = '/* JS content (all pages) */'."\n";
+ }
- if (!GETPOSTISSET('WEBSITE_HTML_HEADER'))
- {
+ if (!GETPOSTISSET('WEBSITE_HTML_HEADER')) {
$htmlheadercontent = @file_get_contents($filehtmlheader);
// Clean the php htmlheader file to remove php code and get only html part
$htmlheadercontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $htmlheadercontent);
- }
- else {
+ } else {
$htmlheadercontent = GETPOST('WEBSITE_HTML_HEADER', 'none');
}
- if (!trim($htmlheadercontent))
- {
+ if (!trim($htmlheadercontent)) {
$htmlheadercontent = "<html>\n";
$htmlheadercontent .= $htmlheadercontentdefault;
$htmlheadercontent .= "</html>";
- }
- else {
+ } else {
$htmlheadercontent = preg_replace('/^\s*<html>/ims', '', $htmlheadercontent);
$htmlheadercontent = preg_replace('/<\/html>\s*$/ims', '', $htmlheadercontent);
$htmlheadercontent = '<html>'."\n".trim($htmlheadercontent)."\n".'</html>';
}
- if (!GETPOSTISSET('WEBSITE_ROBOT'))
- {
+ if (!GETPOSTISSET('WEBSITE_ROBOT')) {
$robotcontent = @file_get_contents($filerobot);
// Clean the php htmlheader file to remove php code and get only html part
$robotcontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $robotcontent);
- }
- else {
+ } else {
$robotcontent = GETPOST('WEBSITE_ROBOT', 'nothtml');
}
- if (!trim($robotcontent))
- {
+ if (!trim($robotcontent)) {
$robotcontent .= "# Robot file. Generated with ".DOL_APPLICATION_TITLE."\n";
$robotcontent .= "User-agent: *\n";
$robotcontent .= "Allow: /public/\n";
$robotcontent .= "Disallow: /administrator/\n";
}
- if (!GETPOSTISSET('WEBSITE_HTACCESS'))
- {
+ if (!GETPOSTISSET('WEBSITE_HTACCESS')) {
$htaccesscontent = @file_get_contents($filehtaccess);
// Clean the php htaccesscontent file to remove php code and get only html part
$htaccesscontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $htaccesscontent);
- }
- else {
+ } else {
$htaccesscontent = GETPOST('WEBSITE_HTACCESS', 'nohtml');
}
- if (!trim($htaccesscontent))
- {
+ if (!trim($htaccesscontent)) {
$htaccesscontent .= "# Order allow,deny\n";
$htaccesscontent .= "# Deny from all\n";
}
- if (!GETPOSTISSET('WEBSITE_MANIFEST_JSON'))
- {
+ if (!GETPOSTISSET('WEBSITE_MANIFEST_JSON')) {
$manifestjsoncontent = @file_get_contents($filemanifestjson);
// Clean the manifestjson file to remove php code and get only html part
$manifestjsoncontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $manifestjsoncontent);
- }
- else {
+ } else {
$manifestjsoncontent = GETPOST('WEBSITE_MANIFEST_JSON', 'restricthtml');
}
- if (!trim($manifestjsoncontent))
- {
+ if (!trim($manifestjsoncontent)) {
//$manifestjsoncontent.="";
}
- if (!GETPOSTISSET('WEBSITE_README'))
- {
+ if (!GETPOSTISSET('WEBSITE_README')) {
$readmecontent = @file_get_contents($filereadme);
// Clean the readme file to remove php code and get only html part
$readmecontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $readmecontent);
- }
- else {
+ } else {
$readmecontent = GETPOST('WEBSITE_README', 'none');
}
- if (!trim($readmecontent))
- {
+ if (!trim($readmecontent)) {
//$readmecontent.="";
}
@@ -3245,8 +3113,7 @@ if ($action == 'editcss')
}
-if ($action == 'createsite')
-{
+if ($action == 'createsite') {
print '<div class="fiche">';
print '<br>';
@@ -3256,12 +3123,14 @@ if ($action == 'createsite')
$head[$h][0] = dol_buildpath('/website/index.php',1).'?id='.$object->id;
$head[$h][1] = $langs->trans("AddSite");
- $head[$h][2] = 'card';
+ $head[$h][2] = 'card';
$h++;
- print dol_get_fiche_head($head, 'card', $langs->trans("AddSite"), -1, 'globe');
- */
- if ($action == 'createcontainer') print load_fiche_titre($langs->trans("AddSite"));
+ print dol_get_fiche_head($head, 'card', $langs->trans("AddSite"), -1, 'globe');
+ */
+ if ($action == 'createcontainer') {
+ print load_fiche_titre($langs->trans("AddSite"));
+ }
print '<!-- Add site -->'."\n";
//print '<div class="fichecenter">';
@@ -3269,10 +3138,18 @@ if ($action == 'createsite')
print '<table class="border centpercent">';
$siteref = $sitedesc = $sitelang = $siteotherlang = '';
- if (GETPOST('WEBSITE_REF')) $siteref = GETPOST('WEBSITE_REF', 'alpha');
- if (GETPOST('WEBSITE_DESCRIPTION')) $sitedesc = GETPOST('WEBSITE_DESCRIPTION', 'alpha');
- if (GETPOST('WEBSITE_LANG')) $sitelang = GETPOST('WEBSITE_LANG', 'aZ09');
- if (GETPOST('WEBSITE_OTHERLANG')) $siteotherlang = GETPOST('WEBSITE_OTHERLANG', 'aZ09comma');
+ if (GETPOST('WEBSITE_REF')) {
+ $siteref = GETPOST('WEBSITE_REF', 'alpha');
+ }
+ if (GETPOST('WEBSITE_DESCRIPTION')) {
+ $sitedesc = GETPOST('WEBSITE_DESCRIPTION', 'alpha');
+ }
+ if (GETPOST('WEBSITE_LANG')) {
+ $sitelang = GETPOST('WEBSITE_LANG', 'aZ09');
+ }
+ if (GETPOST('WEBSITE_OTHERLANG')) {
+ $siteotherlang = GETPOST('WEBSITE_OTHERLANG', 'aZ09comma');
+ }
print '<tr><td class="titlefieldcreate fieldrequired">';
print $form->textwithpicto($langs->trans('WebSite'), $langs->trans("Example").': www.mywebsite.com, myportal, ...');
@@ -3317,8 +3194,7 @@ if ($action == 'createsite')
print '</table>';
- if ($action == 'createsite')
- {
+ if ($action == 'createsite') {
print '<div class="center">';
print '<input class="button" type="submit" name="addcontainer" value="'.$langs->trans("Create").'">';
@@ -3337,8 +3213,7 @@ if ($action == 'createsite')
print '<br>';
}
-if ($action == 'importsite')
-{
+if ($action == 'importsite') {
print '<div class="fiche">';
print '<br>';
@@ -3368,8 +3243,7 @@ if ($action == 'importsite')
print '<br>';
}
-if ($action == 'editmeta' || $action == 'createcontainer') // Edit properties of a web site OR properties of a web page
-{
+if ($action == 'editmeta' || $action == 'createcontainer') { // Edit properties of a web site OR properties of a web page
print '<div class="fiche">';
print '<br>';
@@ -3379,31 +3253,38 @@ if ($action == 'editmeta' || $action == 'createcontainer') // Edit properties of
$head[$h][0] = dol_buildpath('/website/index.php',1).'?id='.$object->id;
$head[$h][1] = $langs->trans("AddPage");
- $head[$h][2] = 'card';
+ $head[$h][2] = 'card';
$h++;
- print dol_get_fiche_head($head, 'card', $langs->trans("AddPage"), -1, 'globe');
- */
- if ($action == 'createcontainer') print load_fiche_titre($langs->trans("AddPage"));
+ print dol_get_fiche_head($head, 'card', $langs->trans("AddPage"), -1, 'globe');
+ */
+ if ($action == 'createcontainer') {
+ print load_fiche_titre($langs->trans("AddPage"));
+ }
print '<!-- Edit or create page/container -->'."\n";
//print '<div class="fichecenter">';
$hiddenfromfetchingafterload = ' hideobject';
$hiddenmanuallyafterload = ' hideobject';
- if (GETPOST('radiocreatefrom') == 'checkboxcreatefromfetching') $hiddenfromfetchingafterload = '';
- if (GETPOST('radiocreatefrom') == 'checkboxcreatemanually') $hiddenmanuallyafterload = '';
+ if (GETPOST('radiocreatefrom') == 'checkboxcreatefromfetching') {
+ $hiddenfromfetchingafterload = '';
+ }
+ if (GETPOST('radiocreatefrom') == 'checkboxcreatemanually') {
+ $hiddenmanuallyafterload = '';
+ }
if ($action == 'editmeta' || empty($conf->use_javascript_ajax)) { // No autohide/show in such case
$hiddenfromfetchingafterload = '';
$hiddenmanuallyafterload = '';
}
- if ($action == 'createcontainer')
- {
+ if ($action == 'createcontainer') {
print '<br>';
- if (!empty($conf->use_javascript_ajax)) print '<input type="radio" name="radiocreatefrom" id="checkboxcreatefromfetching" value="checkboxcreatefromfetching"'.(GETPOST('radiocreatefrom') == 'checkboxcreatefromfetching' ? ' checked' : '').'> ';
+ if (!empty($conf->use_javascript_ajax)) {
+ print '<input type="radio" name="radiocreatefrom" id="checkboxcreatefromfetching" value="checkboxcreatefromfetching"'.(GETPOST('radiocreatefrom') == 'checkboxcreatefromfetching' ? ' checked' : '').'> ';
+ }
print '<label for="checkboxcreatefromfetching"><span class="opacitymediumxx">'.$langs->trans("CreateByFetchingExternalPage").'</span></label><br>';
print '<hr class="tablecheckboxcreatefromfetching'.$hiddenfromfetchingafterload.'">';
print '<table class="tableforfield centpercent tablecheckboxcreatefromfetching'.$hiddenfromfetchingafterload.'">';
@@ -3424,15 +3305,16 @@ if ($action == 'editmeta' || $action == 'createcontainer') // Edit properties of
print '<br>';
- if (!empty($conf->use_javascript_ajax)) print '<input type="radio" name="radiocreatefrom" id="checkboxcreatemanually" value="checkboxcreatemanually"'.(GETPOST('radiocreatefrom') == 'checkboxcreatemanually' ? ' checked' : '').'> ';
+ if (!empty($conf->use_javascript_ajax)) {
+ print '<input type="radio" name="radiocreatefrom" id="checkboxcreatemanually" value="checkboxcreatemanually"'.(GETPOST('radiocreatefrom') == 'checkboxcreatemanually' ? ' checked' : '').'> ';
+ }
print '<label for="checkboxcreatemanually"><span class="opacitymediumxx">'.$langs->trans("OrEnterPageInfoManually").'</span></label><br>';
print '<hr class="tablecheckboxcreatemanually'.$hiddenmanuallyafterload.'">';
}
print '<table class="border tableforfield nobackground centpercent tablecheckboxcreatemanually'.$hiddenmanuallyafterload.'">';
- if ($action != 'createcontainer')
- {
+ if ($action != 'createcontainer') {
print '<tr><td class="titlefield fieldrequired">';
print $langs->trans('IDOfPage').' - '.$langs->trans('InternalURLOfPage');
print '</td><td>';
@@ -3462,9 +3344,8 @@ if ($action == 'editmeta' || $action == 'createcontainer') // Edit properties of
$pageauthorid = $objectpage->fk_user_creat;
$pageusermodifid = $objectpage->fk_user_modif;
$pageauthoralias = $objectpage->author_alias;
- $pagestatus = $objectpage->status;
- }
- else {
+ $pagestatus = $objectpage->status;
+ } else {
$type_container = 'page';
$pagedatecreation = dol_now();
$pageauthorid = $user->id;
@@ -3472,18 +3353,35 @@ if ($action == 'editmeta' || $action == 'createcontainer') // Edit properties of
$pageauthoralias = '';
$pagestatus = 1;
}
- if (GETPOST('WEBSITE_TITLE', 'alpha')) $pagetitle = str_replace(array('<', '>'), '', GETPOST('WEBSITE_TITLE', 'alphanohtml'));
- if (GETPOST('WEBSITE_PAGENAME', 'alpha')) $pageurl = GETPOST('WEBSITE_PAGENAME', 'alpha');
- if (GETPOST('WEBSITE_ALIASALT', 'alpha')) $pagealiasalt = str_replace(array('<', '>'), '', GETPOST('WEBSITE_ALIASALT', 'alphanohtml'));
- if (GETPOST('WEBSITE_DESCRIPTION', 'alpha')) $pagedescription = str_replace(array('<', '>'), '', GETPOST('WEBSITE_DESCRIPTION', 'alphanohtml'));
- if (GETPOST('WEBSITE_IMAGE', 'alpha')) $pageimage = GETPOST('WEBSITE_IMAGE', 'alpha');
- if (GETPOST('WEBSITE_KEYWORDS', 'alpha')) $pagekeywords = str_replace(array('<', '>'), '', GETPOST('WEBSITE_KEYWORDS', 'alphanohtml'));
- if (GETPOST('WEBSITE_LANG', 'aZ09')) $pagelang = GETPOST('WEBSITE_LANG', 'aZ09');
- if (GETPOST('WEBSITE_ALLOWED_IN_FRAMES', 'aZ09')) $pageallowedinframes = GETPOST('WEBSITE_ALLOWED_IN_FRAMES', 'aZ09');
- if (GETPOST('htmlheader', 'none')) $pagehtmlheader = GETPOST('htmlheader', 'none');
+ if (GETPOST('WEBSITE_TITLE', 'alpha')) {
+ $pagetitle = str_replace(array('<', '>'), '', GETPOST('WEBSITE_TITLE', 'alphanohtml'));
+ }
+ if (GETPOST('WEBSITE_PAGENAME', 'alpha')) {
+ $pageurl = GETPOST('WEBSITE_PAGENAME', 'alpha');
+ }
+ if (GETPOST('WEBSITE_ALIASALT', 'alpha')) {
+ $pagealiasalt = str_replace(array('<', '>'), '', GETPOST('WEBSITE_ALIASALT', 'alphanohtml'));
+ }
+ if (GETPOST('WEBSITE_DESCRIPTION', 'alpha')) {
+ $pagedescription = str_replace(array('<', '>'), '', GETPOST('WEBSITE_DESCRIPTION', 'alphanohtml'));
+ }
+ if (GETPOST('WEBSITE_IMAGE', 'alpha')) {
+ $pageimage = GETPOST('WEBSITE_IMAGE', 'alpha');
+ }
+ if (GETPOST('WEBSITE_KEYWORDS', 'alpha')) {
+ $pagekeywords = str_replace(array('<', '>'), '', GETPOST('WEBSITE_KEYWORDS', 'alphanohtml'));
+ }
+ if (GETPOST('WEBSITE_LANG', 'aZ09')) {
+ $pagelang = GETPOST('WEBSITE_LANG', 'aZ09');
+ }
+ if (GETPOST('WEBSITE_ALLOWED_IN_FRAMES', 'aZ09')) {
+ $pageallowedinframes = GETPOST('WEBSITE_ALLOWED_IN_FRAMES', 'aZ09');
+ }
+ if (GETPOST('htmlheader', 'none')) {
+ $pagehtmlheader = GETPOST('htmlheader', 'none');
+ }
- if ($action != 'createcontainer')
- {
+ if ($action != 'createcontainer') {
print '<!-- Status of page -->'."\n";
print '<tr><td class="fieldrequired">';
print $langs->trans('Status');
@@ -3501,8 +3399,7 @@ if ($action == 'editmeta' || $action == 'createcontainer') // Edit properties of
$formwebsite->selectTypeOfContainer('WEBSITE_TYPE_CONTAINER', (GETPOST('WEBSITE_TYPE_CONTAINER', 'alpha') ? GETPOST('WEBSITE_TYPE_CONTAINER', 'alpha') : $type_container), 0, '', 1);
print '</td></tr>';
- if ($action == 'createcontainer')
- {
+ if ($action == 'createcontainer') {
print '<tr><td class="titlefield fieldrequired">';
print $langs->trans('WEBSITE_PAGE_EXAMPLE');
print '</td><td>';
@@ -3556,8 +3453,11 @@ if ($action == 'editmeta' || $action == 'createcontainer') // Edit properties of
print $langs->trans('Language');
print '</td><td>';
$onlykeys = array();
- if ($object->lang) $onlykeys[$object->lang] = $object->lang;
- else $onlykeys[$langs->defaultlang] = $langs->defaultlang;
+ if ($object->lang) {
+ $onlykeys[$object->lang] = $object->lang;
+ } else {
+ $onlykeys[$langs->defaultlang] = $langs->defaultlang;
+ }
if ($object->otherlang) {
$tmparray = explode(',', $object->otherlang);
foreach ($tmparray as $key) {
@@ -3582,47 +3482,45 @@ if ($action == 'editmeta' || $action == 'createcontainer') // Edit properties of
print '<!-- Translation of --><tr><td>';
print $langs->trans('TranslationLinks');
print '</td><td>';
- if ($action != 'createcontainer')
- {
+ if ($action != 'createcontainer') {
// Has translation pages
$sql = 'SELECT rowid, lang from '.MAIN_DB_PREFIX.'website_page where fk_page = '.$objectpage->id;
$resql = $db->query($sql);
- if ($resql)
- {
+ if ($resql) {
$num_rows = $db->num_rows($resql);
- if ($num_rows > 0)
- {
+ if ($num_rows > 0) {
print '<span class="opacitymedium">'.$langs->trans('ThisPageHasTranslationPages').':</span>';
$i = 0;
$tmppage = new WebsitePage($db);
$tmpstring = '';
- while ($obj = $db->fetch_object($resql))
- {
+ while ($obj = $db->fetch_object($resql)) {
$result = $tmppage->fetch($obj->rowid);
if ($result > 0) {
- if ($i > 0) $tmpstring .= '<br>';
+ if ($i > 0) {
+ $tmpstring .= '<br>';
+ }
$tmpstring .= $tmppage->getNomUrl(1).' ('.$tmppage->lang.')';
$translatedby++;
$i++;
}
}
- if ($i > 1) print '<br>';
- else print ' ';
+ if ($i > 1) {
+ print '<br>';
+ } else {
+ print ' ';
+ }
print $tmpstring;
}
+ } else {
+ dol_print_error($db);
}
- else dol_print_error($db);
}
- if (empty($translatedby) && ($action == 'editmeta' || $action == 'createcontainer' || $objectpage->fk_page > 0))
- {
+ if (empty($translatedby) && ($action == 'editmeta' || $action == 'createcontainer' || $objectpage->fk_page > 0)) {
$sourcepage = new WebsitePage($db);
$result = $sourcepage->fetch($objectpage->fk_page);
- if ($result == 0)
- {
+ if ($result == 0) {
// not found, we can reset value to clean database
- }
- elseif ($result > 0)
- {
+ } elseif ($result > 0) {
$translationof = $objectpage->fk_page;
print '<span class="opacitymedium">'.$langs->trans('ThisPageIsTranslationOf').'</span> ';
print $formwebsite->selectContainer($website, 'pageidfortranslation', ($translationof ? $translationof : -1), 1, $action, 'minwidth300', array($objectpage->id));
@@ -3643,8 +3541,7 @@ if ($action == 'editmeta' || $action == 'createcontainer') // Edit properties of
print '</td></tr>';
// Categories
- if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
- {
+ if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
$langs->load('categories');
if (!GETPOSTISSET('categories')) {
@@ -3686,8 +3583,7 @@ if ($action == 'editmeta' || $action == 'createcontainer') // Edit properties of
print '<tr><td>';
print $langs->trans('Author');
print '</td><td>';
- if ($pageauthorid > 0)
- {
+ if ($pageauthorid > 0) {
$fuser->fetch($pageauthorid);
print $fuser->getNomUrl(1);
} else {
@@ -3708,13 +3604,11 @@ if ($action == 'editmeta' || $action == 'createcontainer') // Edit properties of
//print dol_print_date($pagedatecreation, 'dayhour');
print '</td></tr>';
- if ($action != 'createcontainer')
- {
+ if ($action != 'createcontainer') {
print '<tr><td>';
print $langs->trans('UserModif');
print '</td><td>';
- if ($pageusermodifid > 0)
- {
+ if ($pageusermodifid > 0) {
$fuser->fetch($pageusermodifid);
print $fuser->getNomUrl(1);
}
@@ -3738,8 +3632,7 @@ if ($action == 'editmeta' || $action == 'createcontainer') // Edit properties of
print '</td></tr>';
print '</table>';
- if ($action == 'createcontainer')
- {
+ if ($action == 'createcontainer') {
print '<div class="center tablecheckboxcreatemanually'.$hiddenmanuallyafterload.'">';
print '<input class="button" type="submit" name="addcontainer" value="'.$langs->trans("Create").'">';
@@ -3748,8 +3641,7 @@ if ($action == 'editmeta' || $action == 'createcontainer') // Edit properties of
print '</div>';
}
- if ($action == 'createcontainer')
- {
+ if ($action == 'createcontainer') {
print '<script type="text/javascript" language="javascript">
jQuery(document).ready(function() {
var disableautofillofalias = 0;
@@ -3794,27 +3686,26 @@ if ($action == 'editmeta' || $action == 'createcontainer') // Edit properties of
print '<br>';
}
-if ($action == 'editfile' || $action == 'file_manager')
-{
+if ($action == 'editfile' || $action == 'file_manager') {
print '<!-- Edit Media -->'."\n";
print '<div class="fiche"><br>';
//print '<div class="center">'.$langs->trans("FeatureNotYetAvailable").'</center>';
$module = 'medias';
- if (empty($url)) $url = DOL_URL_ROOT.'/website/index.php'; // Must be an url without param
+ if (empty($url)) {
+ $url = DOL_URL_ROOT.'/website/index.php'; // Must be an url without param
+ }
include DOL_DOCUMENT_ROOT.'/core/tpl/filemanager.tpl.php';
print '</div>';
}
-if ($action == 'editmenu')
-{
+if ($action == 'editmenu') {
print '<!-- Edit Menu -->'."\n";
print '<div class="center">'.$langs->trans("FeatureNotYetAvailable").'</center>';
}
-if ($action == 'editsource')
-{
+if ($action == 'editsource') {
// Editing with source editor
$contentforedit = '';
@@ -3824,10 +3715,13 @@ if ($action == 'editsource')
$contentforedit .= $objectpage->content;
//var_dump($_SESSION["dol_screenheight"]);
$maxheightwin = 480;
- if (isset($_SESSION["dol_screenheight"]))
- {
- if ($_SESSION["dol_screenheight"] > 680) $maxheightwin = $_SESSION["dol_screenheight"] - 400;
- if ($_SESSION["dol_screenheight"] > 800) $maxheightwin = $_SESSION["dol_screenheight"] - 490;
+ if (isset($_SESSION["dol_screenheight"])) {
+ if ($_SESSION["dol_screenheight"] > 680) {
+ $maxheightwin = $_SESSION["dol_screenheight"] - 400;
+ }
+ if ($_SESSION["dol_screenheight"] > 800) {
+ $maxheightwin = $_SESSION["dol_screenheight"] - 490;
+ }
}
//var_dump($_SESSION["dol_screenheight"]);
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
@@ -3841,8 +3735,8 @@ if ($action == 'editsource')
$contentforedit = '';
//$contentforedit.='<style scoped>'."\n"; // "scoped" means "apply to parent element only". Not yet supported by browsers
- //$contentforedit.=$csscontent;
- //$contentforedit.='</style>'."\n";
+ //$contentforedit.=$csscontent;
+ //$contentforedit.='</style>'."\n";
$contentforedit .= $objectpage->content;
$contentforedit = preg_replace('/(<img.*src=")(?!http)/', '\1'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $contentforedit, -1, $nbrep);
@@ -3856,8 +3750,7 @@ print "</div>\n";
print "</form>\n";
-if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction == 'replace')
-{
+if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction == 'replace') {
print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="action" value="replacesiteconfirm">';
@@ -3919,8 +3812,7 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
print '</div>';
// Categories
- if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
- {
+ if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
print '<div class="tagtr">';
print '<div class="tagtd paddingrightonly marginrightonly opacitymedium" style="padding-right: 10px !important">';
print $langs->trans("Category");
@@ -3939,16 +3831,14 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
print '</div></div>';
- if ($action == 'replacesiteconfirm')
- {
+ if ($action == 'replacesiteconfirm') {
print '<!-- List of search result -->'."\n";
print '<div class="rowsearchresult clearboth">';
print '<br>';
print '<br>';
- if ($listofpages['code'] == 'OK')
- {
+ if ($listofpages['code'] == 'OK') {
$arrayofselected = is_array($toselect) ? $toselect : array();
$param = '';
$nbtotalofrecords = count($listofpages['list']);
@@ -3957,10 +3847,18 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
// List of mass actions available
$arrayofmassactions = array();
- if ($user->rights->website->writephp && $searchkey) $arrayofmassactions['replace'] = $langs->trans("Replace");
- if ($user->rights->website->write) $arrayofmassactions['setcategory'] = $langs->trans("ClassifyInCategory");
- if ($permissiontodelete) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
- if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+ if ($user->rights->website->writephp && $searchkey) {
+ $arrayofmassactions['replace'] = $langs->trans("Replace");
+ }
+ if ($user->rights->website->write) {
+ $arrayofmassactions['setcategory'] = $langs->trans("ClassifyInCategory");
+ }
+ if ($permissiontodelete) {
+ $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+ }
+ if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+ $arrayofmassactions = array();
+ }
$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
$massactionbutton .= '<div class="massactionother massactionreplace hidden">';
@@ -3988,12 +3886,24 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
$param = 'action=replacesiteconfirm&website='.urlencode($website->ref);
$param .= '&searchstring='.urlencode($searchkey);
- if (GETPOST('optioncontent')) $param .= '&optioncontent=content';
- if (GETPOST('optionmeta')) $param .= '&optionmeta=meta';
- if (GETPOST('optionsitefiles')) $param .= '&optionsitefiles=optionsitefiles';
- if (GETPOST('optioncontainertype')) $param .= '&optioncontainertype='.GETPOST('optioncontainertype', 'aZ09');
- if (GETPOST('optionlanguage')) $param .= '&optionlanguage='.GETPOST('optionlanguage', 'aZ09');
- if (GETPOST('optioncategory')) $param .= '&optioncategory='.GETPOST('optioncategory', 'aZ09');
+ if (GETPOST('optioncontent')) {
+ $param .= '&optioncontent=content';
+ }
+ if (GETPOST('optionmeta')) {
+ $param .= '&optionmeta=meta';
+ }
+ if (GETPOST('optionsitefiles')) {
+ $param .= '&optionsitefiles=optionsitefiles';
+ }
+ if (GETPOST('optioncontainertype')) {
+ $param .= '&optioncontainertype='.GETPOST('optioncontainertype', 'aZ09');
+ }
+ if (GETPOST('optionlanguage')) {
+ $param .= '&optionlanguage='.GETPOST('optionlanguage', 'aZ09');
+ }
+ if (GETPOST('optioncategory')) {
+ $param .= '&optioncategory='.GETPOST('optioncategory', 'aZ09');
+ }
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder centpercent">';
@@ -4012,10 +3922,8 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
$totalnbwords = 0;
- foreach ($listofpages['list'] as $answerrecord)
- {
- if (get_class($answerrecord) == 'WebsitePage')
- {
+ foreach ($listofpages['list'] as $answerrecord) {
+ if (get_class($answerrecord) == 'WebsitePage') {
print '<tr>';
// Type of container
@@ -4035,8 +3943,7 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
// Categories - Tags
print '<td>';
- if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
- {
+ if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
// Get current categories
$existing = $c->containing($answerrecord->id, Categorie::TYPE_WEBSITE_PAGE, 'object');
if (is_array($existing)) {
@@ -4103,10 +4010,11 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
print '<td class="nowrap center">';
print '<!-- Status of page -->'."\n";
- if ($massactionbutton || $massaction)
- {
+ if ($massactionbutton || $massaction) {
$selected = 0;
- if (in_array($answerrecord->id, $arrayofselected)) $selected = 1;
+ if (in_array($answerrecord->id, $arrayofselected)) {
+ $selected = 1;
+ }
print '<input id="'.$answerrecord->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$answerrecord->id.'"'.($selected ? ' checked="checked"' : '').'>';
}
print '</td>';
@@ -4213,8 +4121,7 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
print '</table>';
print '</div>';
print '<br>';
- }
- else {
+ } else {
print '<div class="warning">'.$listofpages['message'].'</div>';
}
@@ -4224,10 +4131,8 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
print '</form>';
}
-if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone')
-{
- if ($pageid > 0 && $atleastonepage)
- {
+if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone') {
+ if ($pageid > 0 && $atleastonepage) {
// $filejs
// $filecss
// $filephp
@@ -4291,10 +4196,11 @@ if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpa
$tmp = preg_split('(<style[^>]*>|</style>)', $objectpage->htmlheader);
$tmpstyleinheader = '';
$i = 0;
- foreach ($tmp as $valtmp)
- {
+ foreach ($tmp as $valtmp) {
$i++;
- if ($i % 2 == 0) $tmpstyleinheader .= $valtmp."\n";
+ if ($i % 2 == 0) {
+ $tmpstyleinheader .= $valtmp."\n";
+ }
}
$tmpout .= $tmpstyleinheader."\n";
// Clean style that may affect global style of Dolibarr
@@ -4312,8 +4218,7 @@ if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpa
$newcontent = $objectpage->content;
// If mode WEBSITE_SUBCONTAINERSINLINE is on
- if (!empty($conf->global->WEBSITE_SUBCONTAINERSINLINE))
- {
+ if (!empty($conf->global->WEBSITE_SUBCONTAINERSINLINE)) {
// TODO Check file $filephp exists, if not create it.
//var_dump($filetpl);
@@ -4324,8 +4229,7 @@ if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpa
if (empty($res)) {
print "ERROR: Failed to include file '".$filephp."'. Try to edit and save page.";
}
- } catch (Exception $e)
- {
+ } catch (Exception $e) {
print $e->getMessage();
}
$newcontent = ob_get_contents();
@@ -4333,12 +4237,10 @@ if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpa
}
// Change the contenteditable to "true" or "false" when mode Edit Inline is on or off
- if (empty($conf->global->WEBSITE_EDITINLINE))
- {
+ if (empty($conf->global->WEBSITE_EDITINLINE)) {
// Remove the contenteditable="true"
$newcontent = preg_replace('/(div|section)(\s[^\>]*)contenteditable="true"/', '\1\2', $newcontent);
- }
- else {
+ } else {
// Keep the contenteditable="true" when mode Edit Inline is on
}
$out .= dolWebsiteReplacementOfLinks($object, $newcontent, 0, 'html', $objectpage->id)."\n";
@@ -4359,33 +4261,30 @@ if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpa
print $out;
/*file_put_contents($filetpl, $out);
- if (! empty($conf->global->MAIN_UMASK))
- @chmod($filetpl, octdec($conf->global->MAIN_UMASK));
+ if (! empty($conf->global->MAIN_UMASK))
+ @chmod($filetpl, octdec($conf->global->MAIN_UMASK));
- // Output file on browser
- dol_syslog("index.php include $filetpl $filename content-type=$type");
- $original_file_osencoded=dol_osencode($filetpl); // New file name encoded in OS encoding charset
+ // Output file on browser
+ dol_syslog("index.php include $filetpl $filename content-type=$type");
+ $original_file_osencoded=dol_osencode($filetpl); // New file name encoded in OS encoding charset
- // This test if file exists should be useless. We keep it to find bug more easily
- if (! file_exists($original_file_osencoded))
- {
- dol_print_error(0,$langs->trans("ErrorFileDoesNotExists",$original_file));
- exit;
- }
+ // This test if file exists should be useless. We keep it to find bug more easily
+ if (! file_exists($original_file_osencoded))
+ {
+ dol_print_error(0,$langs->trans("ErrorFileDoesNotExists",$original_file));
+ exit;
+ }
- //include_once $original_file_osencoded;
- */
+ //include_once $original_file_osencoded;
+ */
/*print '<iframe class="websiteiframenoborder centpercent" src="'.DOL_URL_ROOT.'/public/website/index.php?website='.$websitekey.'&pageid='.$pageid.'"/>';
- print '</iframe>';*/
- }
- else {
- if (empty($websitekey) || $websitekey == '-1')
- {
+ print '</iframe>';*/
+ } else {
+ if (empty($websitekey) || $websitekey == '-1') {
print '<br><br><div class="center previewnotyetavailable"><span class="">'.$langs->trans("NoWebSiteCreateOneFirst").'</span></div><br><br><br>';
print '<div class="center"><div class="logo_setup"></div></div>';
- }
- else {
+ } else {
print '<br><br><div class="center previewnotyetavailable"><span class="">'.$langs->trans("PreviewOfSiteNotYetAvailable", $object->ref).'</span></div><br><br><br>';
print '<div class="center"><div class="logo_setup"></div></div>';
}
diff --git a/htdocs/website/samples/wrapper.php b/htdocs/website/samples/wrapper.php
index 24b804058ea..b847f607bf3 100644
--- a/htdocs/website/samples/wrapper.php
+++ b/htdocs/website/samples/wrapper.php
@@ -1,8 +1,12 @@
<?php
// BEGIN PHP File wrapper.php - DO NOT MODIFY - It is just a copy of file website/samples/wrapper.php
$websitekey = basename(__DIR__);
-if (strpos($_SERVER["PHP_SELF"], 'website/samples/wrapper.php')) die("Sample file for website module. Can be called directly.");
-if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load master if not already loaded
+if (strpos($_SERVER["PHP_SELF"], 'website/samples/wrapper.php')) {
+ die("Sample file for website module. Can be called directly.");
+}
+if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) {
+ require_once './master.inc.php';
+} // Load master if not already loaded
include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
$encoding = '';
@@ -17,42 +21,36 @@ $limit = GETPOST('limit', 'int');
// Parameters for RSS
$rss = GETPOST('rss', 'aZ09');
-if ($rss) $original_file = 'blog.rss';
+if ($rss) {
+ $original_file = 'blog.rss';
+}
// If we have a hash public (hashp), we guess the original_file.
-if (!empty($hashp))
-{
+if (!empty($hashp)) {
include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
$ecmfile = new EcmFiles($db);
$result = $ecmfile->fetch(0, '', '', '', $hashp);
- if ($result > 0)
- {
+ if ($result > 0) {
$tmp = explode('/', $ecmfile->filepath, 2); // $ecmfile->filepath is relative to document directory
// filepath can be 'users/X' or 'X/propale/PR11111'
- if (is_numeric($tmp[0])) // If first tmp is numeric, it is subdir of company for multicompany, we take next part.
- {
+ if (is_numeric($tmp[0])) { // If first tmp is numeric, it is subdir of company for multicompany, we take next part.
$tmp = explode('/', $tmp[1], 2);
}
$moduleparttocheck = $tmp[0]; // moduleparttocheck is first part of path
- if ($modulepart) // Not required, so often not defined, for link using public hashp parameter.
- {
- if ($moduleparttocheck == $modulepart)
- {
+ if ($modulepart) { // Not required, so often not defined, for link using public hashp parameter.
+ if ($moduleparttocheck == $modulepart) {
// We remove first level of directory
$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir
//var_dump($original_file); exit;
- }
- else {
+ } else {
print 'Bad link. File is from another module part.';
}
- }
- else {
+ } else {
$modulepart = $moduleparttocheck;
$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir
}
- }
- else {
+ } else {
print "ErrorFileNotFoundWithSharedLink";
exit;
}
@@ -60,21 +58,29 @@ if (!empty($hashp))
// Define attachment (attachment=true to force choice popup 'open'/'save as')
$attachment = true;
-if (preg_match('/\.(html|htm)$/i', $original_file)) $attachment = false;
-if (isset($_GET["attachment"])) $attachment = (GETPOST("attachment", 'alphanohtml') ? true : false);
-if (!empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS_WEBSITE)) $attachment = false;
+if (preg_match('/\.(html|htm)$/i', $original_file)) {
+ $attachment = false;
+}
+if (isset($_GET["attachment"])) {
+ $attachment = (GETPOST("attachment", 'alphanohtml') ? true : false);
+}
+if (!empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS_WEBSITE)) {
+ $attachment = false;
+}
// Define mime type
$type = 'application/octet-stream';
-if (GETPOSTISSET('type')) $type = GETPOST('type', 'alpha');
-else $type = dol_mimetype($original_file);
+if (GETPOSTISSET('type')) {
+ $type = GETPOST('type', 'alpha');
+} else {
+ $type = dol_mimetype($original_file);
+}
// Security: Delete string ../ into $original_file
$original_file = str_replace("../", "/", $original_file);
// Cache or not
-if (GETPOST("cache", 'aZ09') || image_format_supported($original_file) >= 0)
-{
+if (GETPOST("cache", 'aZ09') || image_format_supported($original_file) >= 0) {
// Important: Following code is to avoid page request by browser and PHP CPU at
// each Dolibarr page access.
header('Cache-Control: max-age=3600, public, must-revalidate');
@@ -99,7 +105,9 @@ if ($rss) {
$website->fetch('', $websitekey);
$filters = array('type_container'=>'blogpost');
- if ($l) $filters['lang'] = $l;
+ if ($l) {
+ $filters['lang'] = $l;
+ }
$MAXNEWS = ($limit ? $limit : 20);
$arrayofblogs = $websitepage->fetchAll($website->id, 'DESC', 'date_creation', $MAXNEWS, 0, $filters);
@@ -118,8 +126,7 @@ if ($rss) {
dol_syslog("build_exportfile Build export file format=".$format.", type=".$type.", cachedelay=".$cachedelay.", filename=".$filename.", filters size=".count($filters), LOG_DEBUG);
// Clean parameters
- if (!$filename)
- {
+ if (!$filename) {
$extension = 'rss';
$filename = $format.'.'.$extension;
}
@@ -132,19 +139,16 @@ if ($rss) {
$buildfile = true;
- if ($cachedelay)
- {
+ if ($cachedelay) {
$nowgmt = dol_now();
include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
- if (dol_filemtime($outputfile) > ($nowgmt - $cachedelay))
- {
+ if (dol_filemtime($outputfile) > ($nowgmt - $cachedelay)) {
dol_syslog("build_exportfile file ".$outputfile." is not older than now - cachedelay (".$nowgmt." - ".$cachedelay."). Build is canceled");
$buildfile = false;
}
}
- if ($buildfile)
- {
+ if ($buildfile) {
$langs->load("other");
$title = $desc = $langs->transnoentities('LatestBlogPosts');
@@ -155,18 +159,17 @@ if ($rss) {
// Write file
$result = build_rssfile($format, $title, $desc, $eventarray, $outputfiletmp, '', $website->virtualhost.'/wrapper.php?rss=1'.($l ? '&l='.$l : ''), $l);
- if ($result >= 0)
- {
- if (dol_move($outputfiletmp, $outputfile, 0, 1)) $result = 1;
- else {
+ if ($result >= 0) {
+ if (dol_move($outputfiletmp, $outputfile, 0, 1)) {
+ $result = 1;
+ } else {
$error = 'Failed to rename '.$outputfiletmp.' into '.$outputfile;
dol_syslog("build_exportfile ".$error, LOG_ERR);
dol_delete_file($outputfiletmp, 0, 1);
print $error;
exit(-1);
}
- }
- else {
+ } else {
dol_syslog("build_exportfile build_xxxfile function fails to for format=".$format." outputfiletmp=".$outputfile, LOG_ERR);
dol_delete_file($outputfiletmp, 0, 1);
$langs->load("errors");
@@ -175,56 +178,63 @@ if ($rss) {
}
}
- if ($result >= 0)
- {
+ if ($result >= 0) {
$attachment = false;
- if (isset($_GET["attachment"])) $attachment = $_GET["attachment"];
+ if (isset($_GET["attachment"])) {
+ $attachment = $_GET["attachment"];
+ }
//$attachment = false;
$contenttype = 'application/rss+xml';
- if (isset($_GET["contenttype"])) $contenttype = $_GET["contenttype"];
+ if (isset($_GET["contenttype"])) {
+ $contenttype = $_GET["contenttype"];
+ }
//$contenttype='text/plain';
$outputencoding = 'UTF-8';
- if ($contenttype) header('Content-Type: '.$contenttype.($outputencoding ? '; charset='.$outputencoding : ''));
- if ($attachment) header('Content-Disposition: attachment; filename="'.$filename.'"');
+ if ($contenttype) {
+ header('Content-Type: '.$contenttype.($outputencoding ? '; charset='.$outputencoding : ''));
+ }
+ if ($attachment) {
+ header('Content-Disposition: attachment; filename="'.$filename.'"');
+ }
// Ajout directives pour resoudre bug IE
//header('Cache-Control: Public, must-revalidate');
//header('Pragma: public');
- if ($cachedelay) header('Cache-Control: max-age='.$cachedelay.', private, must-revalidate');
- else header('Cache-Control: private, must-revalidate');
+ if ($cachedelay) {
+ header('Cache-Control: max-age='.$cachedelay.', private, must-revalidate');
+ } else {
+ header('Cache-Control: private, must-revalidate');
+ }
// Clean parameters
$outputfile = $dir_temp.'/'.$filename;
$result = readfile($outputfile);
- if (!$result) print 'File '.$outputfile.' was empty.';
+ if (!$result) {
+ print 'File '.$outputfile.' was empty.';
+ }
// header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
exit;
}
-}
-// Get logos
-elseif ($modulepart == "mycompany" && preg_match('/^\/?logos\//', $original_file))
-{
+} elseif ($modulepart == "mycompany" && preg_match('/^\/?logos\//', $original_file)) {
+ // Get logos
readfile(dol_osencode($conf->mycompany->dir_output."/".$original_file));
-}
-else {
+} else {
// Find the subdirectory name as the reference
include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
$check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, $refname);
$accessallowed = $check_access['accessallowed'];
$sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
$fullpath_original_file = $check_access['original_file']; // $fullpath_original_file is now a full path name
- if ($hashp)
- {
+ if ($hashp) {
$accessallowed = 1; // When using hashp, link is public so we force $accessallowed
$sqlprotectagainstexternals = '';
}
// Security:
// Limit access if permissions are wrong
- if (!$accessallowed)
- {
+ if (!$accessallowed) {
print 'Access forbidden';
exit;
}
@@ -238,8 +248,7 @@ else {
$fullpath_original_file_osencoded = dol_osencode($fullpath_original_file); // New file name encoded in OS encoding charset
// This test if file exists should be useless. We keep it to find bug more easily
- if (!file_exists($fullpath_original_file_osencoded))
- {
+ if (!file_exists($fullpath_original_file_osencoded)) {
print "ErrorFileDoesNotExists: ".$original_file;
exit;
}
@@ -248,13 +257,20 @@ else {
//top_httphead($type);
header('Content-Type: '.$type);
header('Content-Description: File Transfer');
- if ($encoding) header('Content-Encoding: '.$encoding);
+ if ($encoding) {
+ header('Content-Encoding: '.$encoding);
+ }
// Add MIME Content-Disposition from RFC 2183 (inline=automatically displayed, attachment=need user action to open)
- if ($attachment) header('Content-Disposition: attachment; filename="'.$filename.'"');
- else header('Content-Disposition: inline; filename="'.$filename.'"');
+ if ($attachment) {
+ header('Content-Disposition: attachment; filename="'.$filename.'"');
+ } else {
+ header('Content-Disposition: inline; filename="'.$filename.'"');
+ }
header('Content-Length: '.dol_filesize($fullpath_original_file));
readfile($fullpath_original_file_osencoded);
}
-if (is_object($db)) $db->close();
+if (is_object($db)) {
+ $db->close();
+}
// END PHP
diff --git a/htdocs/website/websiteaccount_card.php b/htdocs/website/websiteaccount_card.php
index 17f50e709b7..e63c3cb8fef 100644
--- a/htdocs/website/websiteaccount_card.php
+++ b/htdocs/website/websiteaccount_card.php
@@ -53,12 +53,15 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
// Initialize array of search criterias
$search_all = GETPOST("search_all", 'alpha');
$search = array();
-foreach ($object->fields as $key => $val)
-{
- if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
+foreach ($object->fields as $key => $val) {
+ if (GETPOST('search_'.$key, 'alpha')) {
+ $search[$key] = GETPOST('search_'.$key, 'alpha');
+ }
}
-if (empty($action) && empty($id) && empty($ref)) $action = 'view';
+if (empty($action) && empty($id) && empty($ref)) {
+ $action = 'view';
+}
// Security check - Protection if external user
//if ($user->socid > 0) accessforbidden();
@@ -80,10 +83,11 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
$parameters = array();
$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+ setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
-if (empty($reshook))
-{
+if (empty($reshook)) {
$error = 0;
$permissiontoadd = $user->rights->website->write;
@@ -130,8 +134,7 @@ jQuery(document).ready(function() {
// Part to create
-if ($action == 'create')
-{
+if ($action == 'create') {
print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("WebsiteAccount")));
print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
@@ -163,8 +166,7 @@ if ($action == 'create')
}
// Part to edit record
-if (($id || $ref) && $action == 'edit')
-{
+if (($id || $ref) && $action == 'edit') {
print load_fiche_titre($langs->trans("WebsiteAccount"));
print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
@@ -194,9 +196,10 @@ if (($id || $ref) && $action == 'edit')
}
// Part to show record
-if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
-{
- if ($object->fk_soc > 0 && empty($socid)) $socid = $object->fk_soc;
+if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
+ if ($object->fk_soc > 0 && empty($socid)) {
+ $socid = $object->fk_soc;
+ }
$res = $object->fetch_optionals();
@@ -213,8 +216,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
// Call Hook formConfirm
$parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
- if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
- elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
+ if (empty($reshook)) {
+ $formconfirm .= $hookmanager->resPrint;
+ } elseif ($reshook > 0) {
+ $formconfirm = $hookmanager->resPrint;
+ }
// Print form confirm
print $formconfirm;
@@ -223,8 +229,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
// Object card
// ------------------------------------------------------------
$linkback = '';
- if ($socid) $linkback = '<a href="'.DOL_URL_ROOT.'/societe/website.php?socid='.$socid.'&restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToListForThirdParty").'</a>';
- if ($fk_website) $linkback = '<a href="'.DOL_URL_ROOT.'/website/website_card.php?fk_website='.$fk_website.'&restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+ if ($socid) {
+ $linkback = '<a href="'.DOL_URL_ROOT.'/societe/website.php?socid='.$socid.'&restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToListForThirdParty").'</a>';
+ }
+ if ($fk_website) {
+ $linkback = '<a href="'.DOL_URL_ROOT.'/website/website_card.php?fk_website='.$fk_website.'&restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+ }
$morehtmlref = '<div class="refidno">';
/*
@@ -236,41 +246,43 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
// Project
if (! empty($conf->projet->enabled))
{
- $langs->load("projects");
- $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
- if ($user->rights->website->creer)
- {
- if ($action != 'classify')
- {
- $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
- if ($action == 'classify') {
- //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
- $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
- $morehtmlref.='<input type="hidden" name="action" value="classin">';
- $morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
- $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
- $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
- $morehtmlref.='</form>';
- } else {
- $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
- }
- }
- } else {
- if (! empty($object->fk_project)) {
- $proj = new Project($db);
- $proj->fetch($object->fk_project);
- $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
- $morehtmlref.=$proj->ref;
- $morehtmlref.='</a>';
- } else {
- $morehtmlref.='';
- }
- }
+ $langs->load("projects");
+ $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+ if ($user->rights->website->creer)
+ {
+ if ($action != 'classify')
+ {
+ $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+ if ($action == 'classify') {
+ //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+ $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+ $morehtmlref.='<input type="hidden" name="action" value="classin">';
+ $morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
+ $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+ $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+ $morehtmlref.='</form>';
+ } else {
+ $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+ }
+ }
+ } else {
+ if (! empty($object->fk_project)) {
+ $proj = new Project($db);
+ $proj->fetch($object->fk_project);
+ $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+ $morehtmlref.=$proj->ref;
+ $morehtmlref.='</a>';
+ } else {
+ $morehtmlref.='';
+ }
+ }
}
*/
$morehtmlref .= '</div>';
- if ($socid > 0) $object->next_prev_filter = 'te.fk_soc = '.$socid;
+ if ($socid > 0) {
+ $object->next_prev_filter = 'te.fk_soc = '.$socid;
+ }
dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $morehtmlref);
@@ -301,36 +313,35 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print '<div class="tabsAction">'."\n";
$parameters = array();
$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
- if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+ if ($reshook < 0) {
+ setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+ }
- if (empty($reshook))
- {
+ if (empty($reshook)) {
// Send
if (empty($user->socid)) {
print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>'."\n";
}
- if ($user->rights->website->write)
- {
+ if ($user->rights->website->write) {
print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
}
/*
- if ($user->rights->sellyoursaas->create)
- {
- if ($object->status == 1)
- {
- print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=disable">'.$langs->trans("Disable").'</a></div>'."\n";
- }
- else
- {
- print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=enable">'.$langs->trans("Enable").'</a></div>'."\n";
- }
- }
- */
-
- if ($user->rights->website->delete)
+ if ($user->rights->sellyoursaas->create)
{
+ if ($object->status == 1)
+ {
+ print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=disable">'.$langs->trans("Disable").'</a></div>'."\n";
+ }
+ else
+ {
+ print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=enable">'.$langs->trans("Enable").'</a></div>'."\n";
+ }
+ }
+ */
+
+ if ($user->rights->website->delete) {
print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans('Delete').'</a></div>'."\n";
}
}
@@ -343,21 +354,20 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
$action = 'presend';
}
- if ($action != 'presend')
- {
+ if ($action != 'presend') {
print '<div class="fichecenter"><div class="fichehalfleft">';
print '<a name="builddoc"></a>'; // ancre
print '</div><div class="fichehalfright"><div class="ficheaddleft">';
/*
- $MAXEVENT = 10;
+ $MAXEVENT = 10;
- // List of actions on element
- include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
- $formactions = new FormActions($db);
- $somethingshown = $formactions->showactions($object, 'websiteaccount', $socid, 1, '', $MAXEVENT);
- */
+ // List of actions on element
+ include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+ $formactions = new FormActions($db);
+ $somethingshown = $formactions->showactions($object, 'websiteaccount', $socid, 1, '', $MAXEVENT);
+ */
print '</div></div></div>';
}