diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index ef2b70b685a..8344a6198b8 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -18,10 +18,10 @@ HtmlHeaderPage=HTML header (specific to this page only)
PageNameAliasHelp=Name or alias of the page. This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias.
EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
MediaFiles=Media library
-EditCss=Edit Style/CSS or HTML header
+EditCss=Edit website properties
EditMenu=Edit menu
EditMedias=Edit medias
-EditPageMeta=Edit Meta
+EditPageMeta=Edit page/container properties
EditInLine=Edit inline
AddWebsite=Add website
Webpage=Web page/container
@@ -30,6 +30,7 @@ HomePage=Home Page
PageContainer=Page/container
PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first add a page.
RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
PageContent=Page/Contenair
PageDeleted=Page/Contenair '%s' of website %s deleted
PageAdded=Page/Contenair '%s' added
@@ -38,8 +39,8 @@ ViewPageInNewTab=View page in new tab
SetAsHomePage=Set as Home page
RealURL=Real URL
ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on %s then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running php -S 0.0.0.0:8080 -t %s
+SetHereVirtualHost=Use with Apache/NGinx/... %s then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=Use with PHP embedded server On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running php -S 0.0.0.0:8080 -t %s
CheckVirtualHostPerms=Check also that virtual host has permission %s on files into %s
ReadPerm=Read
WritePerm=Write
@@ -50,7 +51,7 @@ NoPageYet=No pages yet
YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
SyntaxHelp=Help on specific syntax tips
YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource= You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.
You can also include content of another Page/Container with the following syntax: <?php includeContainer('alias_of_container_to_include'); ?>
You can make a redirect to another Page/Container with the following syntax: <?php redirectToContainer('alias_of_container_to_redirect_to'); ?>
To include a link to download a file stored into the documents directory, use the document.php wrapper: Example, for a file into documents/ecm (need to be logged), syntax is: <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"> For a file into documents/medias (open directory for public access), syntax is: <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"> For a file shared with a share link (open access using the sharing hash key of file), syntax is: <a href="/document.php?hashp=publicsharekeyoffile">
To include an image stored into the documents directory, use the viewimage.php wrapper: Example, for an image into documents/medias (open access), syntax is: <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
+YouCanEditHtmlSource= You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.
You can also include content of another Page/Container with the following syntax: <?php includeContainer('alias_of_container_to_include'); ?>
You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect): <?php redirectToContainer('alias_of_container_to_redirect_to'); ?>
To include a link to download a file stored into the documents directory, use the document.php wrapper: Example, for a file into documents/ecm (need to be logged), syntax is: <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"> For a file into documents/medias (open directory for public access), syntax is: <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"> For a file shared with a share link (open access using the sharing hash key of file), syntax is: <a href="/document.php?hashp=publicsharekeyoffile">
To include an image stored into the documents directory, use the viewimage.php wrapper: Example, for an image into documents/medias (open directory for public access), syntax is: <img src="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
ClonePage=Clone page/container
CloneSite=Clone site
SiteAdded=Web site added
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index ce8be81e2cd..812ad8a891e 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -58,6 +58,7 @@ $type_container=GETPOST('WEBSITE_TYPE_CONTAINER', 'alpha');
$section_dir = GETPOST('section_dir', 'alpha');
$file_manager = GETPOST('file_manager', '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'; }
@@ -714,6 +715,41 @@ if ($action == 'addcontainer')
}
}
+// Delete site
+if ($action == 'deletesite')
+{
+ $error = 0;
+
+ $db->begin();
+
+ $res = $object->fetch(0, $websitekey);
+ $website = $object;
+
+ if ($res > 0)
+ {
+ $res = $object->delete($user);
+ if ($res <= 0)
+ {
+ $error++;
+ setEventMessages($object->error, $object->errors, 'errors');
+ }
+ }
+
+ if (! $error)
+ {
+ $db->commit();
+ setEventMessages($langs->trans("SiteDeleted", $object->ref, $websitekey), null, 'mesgs');
+
+ header("Location: ".$_SERVER["PHP_SELF"]);
+ exit;
+ }
+ else
+ {
+ $db->rollback();
+ dol_print_error($db);
+ }
+}
+
// Delete page
if ($action == 'delete')
{
@@ -1590,6 +1626,8 @@ if (count($object->records) > 0)
print '';
}
+ print '';
+
print ' ';
print '';
@@ -1635,11 +1673,11 @@ if (count($object->records) > 0)
//print '';
$htmltext =$langs->trans("SetHereVirtualHost", $dataroot);
$htmltext.=' ';
- $htmltext.=' ';
- $htmltext.=$langs->trans("YouCanAlsoTestWithPHPS", $dataroot);
- $htmltext.=' ';
$htmltext.=' '.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
$htmltext.=' '.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT);
+ $htmltext.=' ';
+ $htmltext.=' ';
+ $htmltext.=$langs->trans("YouCanAlsoTestWithPHPS", $dataroot);
print $form->textwithpicto('', $htmltext, 1, 'help', '', 0, 2, 'helpvirtualhost');
print '';