Merge branch 'release/0.6.2'

Creatiwity · Jun 4, 2018 · 07865b7 · 07865b7
2 parents 783d3b4 + 4da60d6
commit 07865b7
Show file tree

Hide file tree

Showing 525 changed files with 37,221 additions and 1,621 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,6 @@ upload/[^.]*/
 
 # macOS
 .DS_Store
+
+# HTML Purifier
+helpers/htmlpurifier/HTMLPurifier/DefinitionCache/Serializer/*/
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,22 +1,9 @@
-## License
+MIT License
 
-The MIT License (MIT)
+Copyright (c) 2018 Creatiwity
 
-Copyright (c) 2013 - Julien Blatecky and Johan Dufau
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ This CMS uses its own templating system, named [WTemplate](https://github.com/Cr
 * An **Apache server** with PHP 5.3+ or PHP7, *mod_rewrite* enabled and .htaccess files allowed;
 * A **SQL server**, like *MySQL* or *MariaDB*, with a database available;
 * A **FTP client**, like [FileZilla](https://filezilla-project.org/), to upload the files;
-* Download the latest version of **wityCMS**: [zip](https://github.com/Creatiwity/wityCMS/releases/download/0.6.1/wityCMS-0.6.1.zip).
+* Download the latest version of **wityCMS**: [zip](https://github.com/Creatiwity/wityCMS/releases/download/0.6.2/wityCMS-0.6.2.zip).
 
 ### Let's go
 

diff --git a/apps/contact/admin/main.php b/apps/contact/admin/main.php
@@ -11,7 +11,7 @@
  * @package Apps\Contact\Admin
  * @author Johan Dufau <johan.dufau@creatiwity.net>
  * @author Julien Blatecky <julien.blatecky@creatiwity.net>
- * @version 0.6.1-23-11-2016
+ * @version 0.6.2-04-06-2018
  */
 class ContactAdminController extends WController {
 

diff --git a/apps/contact/admin/model.php b/apps/contact/admin/model.php
@@ -14,7 +14,7 @@
  * @package Apps\Contact\Admin
  * @author Johan Dufau <johan.dufau@creatiwity.net>
  * @author Julien Blatecky <julien.blatecky@creatiwity.net>
- * @version 0.6.1-23-11-2016
+ * @version 0.6.2-04-06-2018
  */
 class ContactAdminModel extends ContactModel {
 

diff --git a/apps/contact/admin/view.php b/apps/contact/admin/view.php
@@ -11,7 +11,7 @@
  * @package Apps\Contact\Admin
  * @author Johan Dufau <johan.dufau@creatiwity.net>
  * @author Julien Blatecky <julien.blatecky@creatiwity.net>
- * @version 0.6.1-23-11-2016
+ * @version 0.6.2-04-06-2018
  */
 class ContactAdminView extends WView {
 

diff --git a/apps/contact/front/main.php b/apps/contact/front/main.php
@@ -11,7 +11,7 @@
  * @package Apps\Contact\Front
  * @author Johan Dufau <johan.dufau@creatiwity.net>
  * @author Julien Blatecky <julien.blatecky@creatiwity.net>
- * @version 0.6.1-23-11-2016
+ * @version 0.6.2-04-06-2018
  */
 class ContactController extends WController {
 

diff --git a/apps/contact/front/model.php b/apps/contact/front/model.php
@@ -11,7 +11,7 @@
  * @package Apps\Contact\Front
  * @author Johan Dufau <johan.dufau@creatiwity.net>
  * @author Julien Blatecky <julien.blatecky@creatiwity.net>
- * @version 0.6.1-23-11-2016
+ * @version 0.6.2-04-06-2018
  */
 class ContactModel {
 

diff --git a/apps/contact/front/view.php b/apps/contact/front/view.php
@@ -11,7 +11,7 @@
  * @package Apps\Contact\Front
  * @author Johan Dufau <johan.dufau@creatiwity.net>
  * @author Julien Blatecky <julien.blatecky@creatiwity.net>
- * @version 0.6.1-23-11-2016
+ * @version 0.6.2-04-06-2018
  */
 class ContactView extends WView {
 

diff --git a/apps/contact/js/main.js b/apps/contact/js/main.js
@@ -2,7 +2,7 @@
  * Contacts management script allowing ajax usage.
  *
  * @author Julien Blatecky <julien.blatecky@creatiwity.net>
- * @version 0.6.1-23-11-2016
+ * @version 0.6.2-04-06-2018
  */
 require(['jquery'], function($) {
 	$(document).ready(function() {

diff --git a/apps/contact/manifest.php b/apps/contact/manifest.php
@@ -4,7 +4,7 @@
 	<!-- Application name -->
 	<name>Contact</name>
 
-	<version>0.6.1</version>
+	<version>0.6.2</version>
 
 	<!-- Last update date -->
 	<date>02-10-2013</date>

diff --git a/apps/lang/front/main.php b/apps/lang/front/main.php
@@ -11,7 +11,7 @@
  * @package Apps\Lang\Front
  * @author Johan Dufau <johan.dufau@creatiwity.net>
  * @author Julien Blatecky <julien.blatecky@creatiwity.net>
- * @version 0.6.1-23-11-2016
+ * @version 0.6.2-04-06-2018
  */
 class LangController extends WController {
 	protected function select($params) {

diff --git a/apps/lang/manifest.php b/apps/lang/manifest.php
@@ -4,7 +4,7 @@
 	<!-- Application name -->
 	<name>Lang</name>
 
-	<version>0.6.1</version>
+	<version>0.6.2</version>
 
 	<!-- Last update date -->
 	<date>14-06-2015</date>

diff --git a/apps/mail/front/main.php b/apps/mail/front/main.php
@@ -11,7 +11,7 @@
  * @package Apps\Mail\Front
  * @author Johan Dufau <johan.dufau@creatiwity.net>
  * @author Julien Blatecky <julien.blatecky@creatiwity.net>
- * @version 0.6.1-23-11-2016
+ * @version 0.6.2-04-06-2018
  */
 class MailController extends WController {
 

diff --git a/apps/mail/front/model.php b/apps/mail/front/model.php
@@ -11,7 +11,7 @@
  * @package Apps\Mail\Front
  * @author Johan Dufau <johan.dufau@creatiwity.net>
  * @author Julien Blatecky <julien.blatecky@creatiwity.net>
- * @version 0.6.1-23-11-2016
+ * @version 0.6.2-04-06-2018
  */
 class MailModel {
 	/**

diff --git a/apps/mail/manifest.php b/apps/mail/manifest.php
@@ -4,7 +4,7 @@
 	<!-- Application name -->
 	<name>Mail</name>
 
-	<version>0.6.1</version>
+	<version>0.6.2</version>
 
 	<!-- Last update date -->
 	<date>25-11-2013</date>

diff --git a/apps/news/admin/main.php b/apps/news/admin/main.php
@@ -11,7 +11,7 @@
  * @package Apps\News\Admin
  * @author Johan Dufau <johan.dufau@creatiwity.net>
  * @author Julien Blatecky <julien.blatecky@creatiwity.net>
- * @version 0.6.1-23-11-2016
+ * @version 0.6.2-04-06-2018
  */
 class NewsAdminController extends WController {
 	private $upload_dir;

diff --git a/apps/news/admin/model.php b/apps/news/admin/model.php
@@ -16,7 +16,7 @@
  * @package Apps\News\Admin
  * @author Johan Dufau <johan.dufau@creatiwity.net>
  * @author Julien Blatecky <julien.blatecky@creatiwity.net>
- * @version 0.6.1-23-11-2016
+ * @version 0.6.2-04-06-2018
  */
 class NewsAdminModel extends NewsModel {
 	public function __construct() {

diff --git a/apps/news/admin/view.php b/apps/news/admin/view.php
@@ -11,7 +11,7 @@
  * @package Apps\News\Admin
  * @author Johan Dufau <johan.dufau@creatiwity.net>
  * @author Julien Blatecky <julien.blatecky@creatiwity.net>
- * @version 0.6.1-23-11-2016
+ * @version 0.6.2-04-06-2018
  */
 class NewsAdminView extends WView {
 	public function __construct() {

diff --git a/apps/news/front/main.php b/apps/news/front/main.php
@@ -11,7 +11,7 @@
  * @package Apps\News\Front
  * @author Johan Dufau <johan.dufau@creatiwity.net>
  * @author Julien Blatecky <julien.blatecky@creatiwity.net>
- * @version 0.6.1-23-11-2016
+ * @version 0.6.2-04-06-2018
  */
 class NewsController extends WController {
 	protected function listing($params) {

diff --git a/apps/news/front/model.php b/apps/news/front/model.php
@@ -11,7 +11,7 @@
  * @package Apps\News\Front
  * @author Johan Dufau <johan.dufau@creatiwity.net>
  * @author Julien Blatecky <julien.blatecky@creatiwity.net>
- * @version 0.6.1-23-11-2016
+ * @version 0.6.2-04-06-2018
  */
 class NewsModel {
 	/**

diff --git a/apps/news/front/view.php b/apps/news/front/view.php
@@ -11,7 +11,7 @@
  * @package Apps\News\Front
  * @author Johan Dufau <johan.dufau@creatiwity.net>
  * @author Julien Blatecky <julien.blatecky@creatiwity.net>
- * @version 0.6.1-23-11-2016
+ * @version 0.6.2-04-06-2018
  */
 class NewsView extends WView {
 	public function listing($data) {

diff --git a/apps/news/manifest.php b/apps/news/manifest.php
@@ -4,7 +4,7 @@
 	<!-- Application name -->
 	<name>News</name>
 
-	<version>0.6.1</version>
+	<version>0.6.2</version>
 
 	<!-- Last update date -->
 	<date>02-05-2015</date>

diff --git a/apps/newsletter/admin/main.php b/apps/newsletter/admin/main.php
@@ -10,7 +10,7 @@
  *
  * @package Apps\Newsletter\Admin
  * @author Thibault Vlacich <thibault@vlacich.fr>
- * @version 0.6.1-23-11-2016
+ * @version 0.6.2-04-06-2018
  */
 class NewsletterAdminController extends WController {
 	/**

diff --git a/apps/newsletter/admin/model.php b/apps/newsletter/admin/model.php
@@ -10,7 +10,7 @@
  *
  * @package Apps\Newsletter\Admin
  * @author Thibault Vlacich <thibault@vlacich.fr>
- * @version 0.6.1-23-11-2016
+ * @version 0.6.2-04-06-2018
  */
 class NewsletterAdminModel {
 	/**

diff --git a/apps/newsletter/admin/view.php b/apps/newsletter/admin/view.php
@@ -11,7 +11,7 @@
  * @package Apps\Newsletter\Admin
  * @author Johan Dufau <johan.dufau@creatiwity.net>
  * @author Julien Blatecky <julien.blatecky@creatiwity.net>
- * @version 0.6.1-23-11-2016
+ * @version 0.6.2-04-06-2018
  */
 class NewsletterAdminView extends WView {
 	public function listing($model) {

diff --git a/apps/newsletter/front/main.php b/apps/newsletter/front/main.php
@@ -10,7 +10,7 @@
  *
  * @package Apps\Newsletter\Front
  * @author Thibault Vlacich <thibault@vlacich.fr>
- * @version 0.6.1-23-11-2016
+ * @version 0.6.2-04-06-2018
  */
 class NewsletterController extends WController {
 	public function add(array $params) {

diff --git a/apps/newsletter/front/model.php b/apps/newsletter/front/model.php
@@ -10,7 +10,7 @@
  *
  * @package Apps\Newsletter\Front
  * @author Thibault Vlacich <thibault@vlacich.fr>
- * @version 0.6.1-23-11-2016
+ * @version 0.6.2-04-06-2018
  */
 class NewsletterModel {
 	/**

diff --git a/apps/newsletter/front/view.php b/apps/newsletter/front/view.php
@@ -10,7 +10,7 @@
  *
  * @package Apps\Newsletter\Front
  * @author Thibault Vlacich <thibault@vlacich.fr>
- * @version 0.6.1-23-11-2016
+ * @version 0.6.2-04-06-2018
  */
 class NewsletterView extends WView {
 	public function add($model) {

diff --git a/apps/newsletter/manifest.php b/apps/newsletter/manifest.php
@@ -4,7 +4,7 @@
 	<!-- Application name -->
 	<name>Newsletter</name>
 
-	<version>0.6.1</version>
+	<version>0.6.2</version>
 
 	<!-- Last update date -->
 	<date>01-03-2015</date>

diff --git a/apps/page/admin/main.php b/apps/page/admin/main.php
@@ -11,7 +11,7 @@
  * @package Apps\Page\Admin
  * @author Johan Dufau <johan.dufau@creatiwity.net>
  * @author Julien Blatecky <julien.blatecky@creatiwity.net>
- * @version 0.6.1-23-11-2016
+ * @version 0.6.2-04-06-2018
  */
 class PageAdminController extends WController {
 	private $upload_dir;

diff --git a/apps/page/admin/model.php b/apps/page/admin/model.php
@@ -16,7 +16,7 @@
  * @package Apps\Page\Admin
  * @author Johan Dufau <johan.dufau@creatiwity.net>
  * @author Julien Blatecky <julien.blatecky@creatiwity.net>
- * @version 0.6.1-23-11-2016
+ * @version 0.6.2-04-06-2018
  */
 class PageAdminModel extends PageModel {
 	public function __construct() {

diff --git a/apps/page/admin/view.php b/apps/page/admin/view.php
@@ -11,7 +11,7 @@
  * @package Apps\Page\Admin
  * @author Johan Dufau <johan.dufau@creatiwity.net>
  * @author Julien Blatecky <julien.blatecky@creatiwity.net>
- * @version 0.6.1-23-11-2016
+ * @version 0.6.2-04-06-2018
  */
 class PageAdminView extends WView {
 	public function pages($model) {

diff --git a/apps/page/front/main.php b/apps/page/front/main.php
@@ -11,7 +11,7 @@
  * @package Apps\Page\Front
  * @author Johan Dufau <johan.dufau@creatiwity.net>
  * @author Julien Blatecky <julien.blatecky@creatiwity.net>
- * @version 0.6.1-23-11-2016
+ * @version 0.6.2-04-06-2018
  */
 class PageController extends WController {
 	protected function display(array $params) {

diff --git a/apps/page/front/model.php b/apps/page/front/model.php
@@ -11,7 +11,7 @@
  * @package Apps\Page\Front
  * @author Johan Dufau <johan.dufau@creatiwity.net>
  * @author Julien Blatecky <julien.blatecky@creatiwity.net>
- * @version 0.6.1-23-11-2016
+ * @version 0.6.2-04-06-2018
  */
 class PageModel {
 	/**

diff --git a/apps/page/front/view.php b/apps/page/front/view.php
@@ -11,7 +11,7 @@
  * @package Apps\Page\Front
  * @author Johan Dufau <johan.dufau@creatiwity.net>
  * @author Julien Blatecky <julien.blatecky@creatiwity.net>
- * @version 0.6.1-23-11-2016
+ * @version 0.6.2-04-06-2018
  */
 class PageView extends WView {
 	public function display(array $model) {

diff --git a/apps/page/manifest.php b/apps/page/manifest.php
@@ -4,7 +4,7 @@
 	<!-- Application name -->
 	<name>Page</name>
 
-	<version>0.6.1</version>
+	<version>0.6.2</version>
 
 	<!-- Last update date -->
 	<date>23-03-2015</date>

diff --git a/apps/search/front/main.php b/apps/search/front/main.php
@@ -11,7 +11,7 @@
  * @package Apps\Search\Front
  * @author Johan Dufau <johan.dufau@creatiwity.net>
  * @author Julien Blatecky <julien.blatecky@creatiwity.net>
- * @version 0.6.1-23-11-2016
+ * @version 0.6.2-04-06-2018
  */
 class SearchController extends WController {
 	protected function form(array $params) {

diff --git a/apps/search/front/templates/form.html b/apps/search/front/templates/form.html
@@ -1,9 +1,9 @@
 <div class="wity-app wity-app-search wity-action-form">
-	<h1>{lang Research} {if !empty({$query})}<strong>"{$query}"</strong>{/if}</h1>
+	<h1>{lang Research} {if !empty({$query})}<strong>"{!$query!}"</strong>{/if}</h1>
 
 	<form class="search-form" action="/search" method="get">
 		<p class="input-group research">
-			<input class="form-control" type="text" name="query" placeholder="{lang Search}" value="{if !empty({$query})}{$query}{/if}" />
+			<input class="form-control" type="text" name="query" placeholder="{lang Search}" value="{if !empty({$query})}{!$query!}{/if}" />
 			<span class="input-group-btn">
 				<button class="btn btn-default" type="submit"><span class="glyphicon glyphicon-search"></span></button>
 			</span>

diff --git a/apps/search/front/view.php b/apps/search/front/view.php
@@ -11,7 +11,7 @@
  * @package Apps\Search\Front
  * @author Johan Dufau <johan.dufau@creatiwity.net>
  * @author Julien Blatecky <julien.blatecky@creatiwity.net>
- * @version 0.6.1-23-11-2016
+ * @version 0.6.2-04-06-2018
  */
 class SearchView extends WView {
 	public function form($data) {

diff --git a/apps/search/manifest.php b/apps/search/manifest.php
@@ -4,7 +4,7 @@
 	<!-- Application name -->
 	<name>Search</name>
 
-	<version>0.6.1</version>
+	<version>0.6.2</version>
 
 	<!-- Last update date -->
 	<date>23-03-2015</date>

diff --git a/apps/settings/admin/main.php b/apps/settings/admin/main.php
@@ -11,7 +11,7 @@
  * @package Apps\Settings\Admin
  * @author Johan Dufau <johan.dufau@creatiwity.net>
  * @author Julien Blatecky <julien.blatecky@creatiwity.net>
- * @version 0.6.1-23-11-2016
+ * @version 0.6.2-04-06-2018
  */
 class SettingsAdminController extends WController {
 	private $upload_dir;