Merge pull request #1 from dignajar/bluditv2

Bluditv2

bl-kernel/admin/controllers/pages.php

@@ -27,7 +27,7 @@ $pageNumber = $Url->pageNumber();
 $published = $dbPages->getList($pageNumber, $amountOfItems, $onlyPublished);
 
 // Check if out of range the pageNumber
-if (empty($published)) {
+if (empty($published) && $Url->pageNumber()>1) {
 	Redirect::page('pages');
 }
 

bl-kernel/admin/views/dashboard.php

@@ -146,7 +146,7 @@
 				echo '<li>'.$Language->g('There are no draft pages').'</li>';
 			}
 			else {
-				$keys = array_keys($scheduledPages);
+				$keys = array_keys($draftPages);
 				foreach($keys as $key) {
 					$page = buildPage($key);
 					echo '<li><a href="'.HTML_PATH_ADMIN_ROOT.'edit-page/'.$page->key().'">'.($page->title()?$page->title():'['.$Language->g('Empty title').'] ').'</a></li>';

bl-kernel/admin/views/edit-user.php

@@ -132,7 +132,7 @@ if($Login->role()==='admin') {
 		'value'=>$User->enabled()?$L->g('Enabled'):$L->g('Disabled'),
 		'class'=>'uk-width-1-2 uk-form-medium',
 		'disabled'=>true,
-		'tip'=>$User->enabled()?'':$L->g('To enable the user you must set a new password.')
+		'tip'=>$User->enabled()?'':$L->g('To enable the user you must set a new password')
 	));
 
 if( $User->enabled() ) {
@@ -149,8 +149,8 @@ if( ($Login->role()==='admin') && ($User->username()!='admin') ) {
 
 	echo '<div class="uk-form-row">
 		<div class="uk-form-controls">
-		<button type="submit" id="jsdelete-user-associate" class="delete-button" name="delete-user-associate"><i class="uk-icon-ban"></i> '.$L->g('Delete the user and associate its pages to admin user').'</button>
+		<button type="submit" id="jsdelete-user-associate" class="delete-button" name="delete-user-associate"><i class="uk-icon-ban"></i> '.$L->g('Delete the user and associate his pages to admin user').'</button>
-		<button type="submit" id="jsdelete-user-all" class="delete-button" name="delete-user-all"><i class="uk-icon-ban"></i> '.$L->g('Delete the user and all its posts').'</button>
+		<button type="submit" id="jsdelete-user-all" class="delete-button" name="delete-user-all"><i class="uk-icon-ban"></i> '.$L->g('Delete the user and all his pages').'</button>
 		</div>
 	</div>';
 

bl-kernel/admin/views/login.php

@@ -19,5 +19,3 @@
 </form>
 
 </div>
-
-<a class="login-email" href="<?php echo HTML_PATH_ADMIN_ROOT.'login-email' ?>"><i class="uk-icon-envelope-o"></i> <?php $L->p('Email access code') ?></a>

bl-kernel/admin/views/pages.php

@@ -40,7 +40,7 @@ function table($status, $icon='arrow-circle-o-down') {
 
 	if (!empty($list)) {
 		echo '<tr>
-		<td style="color: #aaa; font-size: 0.9em; text-transform: uppercase;"><i class="fa fa-'.$icon.'" aria-hidden="true"></i> '.$status.'</td>
+		<td style="color: #aaa; font-size: 0.9em; text-transform: uppercase;"><i class="fa fa-'.$icon.'" aria-hidden="true"></i> '.$Language->g($status).'</td>
 		<td></td>
 		<td></td>
 		</tr>';

bl-kernel/admin/views/settings-advanced.php

@@ -32,7 +32,7 @@ HTML::formOpen(array('class'=>'uk-form-horizontal'));
 
 	HTML::formSelect(array(
 		'name'=>'homepage',
-		'label'=>$L->g('Home page'),
+		'label'=>$L->g('Homepage'),
 		'options'=>$homepageOptions,
 		'selected'=>$Site->homepage(),
 		'class'=>'uk-width-1-3 uk-form-medium',
@@ -55,7 +55,7 @@ HTML::formOpen(array('class'=>'uk-form-horizontal'));
 	HTML::formSelect(array(
 		'name'=>'orderBy',
 		'label'=>$L->g('Order content By'),
-		'options'=>array('date'=>'Date','position'=>'Position'),
+		'options'=>array('date'=>$L->g('Date'),'position'=>$L->g('Position')),
 		'selected'=>$Site->orderBy(),
 		'class'=>'uk-width-1-3 uk-form-medium',
 		'tip'=>$L->g('Order the content by position to build a Website')

bl-kernel/admin/views/users.php

@@ -12,6 +12,7 @@ echo '
 	<th>'.$L->g('First name').'</th>
 	<th>'.$L->g('Last name').'</th>
 	<th>'.$L->g('Email').'</th>
+	<th class="uk-text-center">'.$L->g('Status').'</th>
 	<th class="uk-text-center">'.$L->g('Role').'</th>
 	<th class="uk-text-center">'.$L->g('Registered').'</th>
 	</tr>
@@ -19,16 +20,17 @@ echo '
 <tbody>
 ';
 
-$users = $dbUsers->getAll();
+// Get all users objects
-foreach($users as $username=>$field)
+$users = $dbUsers->getAllUsers();
-{
+foreach ($users as $username=>$User) {
 	echo '<tr>';
 	echo '<td><a href="'.HTML_PATH_ADMIN_ROOT.'edit-user/'.$username.'">'.$username.'</a></td>';
-	echo '<td>'.$field['firstName'].'</td>';
+	echo '<td>'.$User->firstName().'</td>';
-	echo '<td>'.$field['lastName'].'</td>';
+	echo '<td>'.$User->lastName().'</td>';
-	echo '<td>'.$field['email'].'</td>';
+	echo '<td>'.$User->email().'</td>';
-	echo '<td class="uk-text-center">'.$field['role'].'</td>';
+	echo '<td class="uk-text-center">'.($User->enabled()?'<b>'.$L->g('Enabled').'</b>':$L->g('Disabled')).'</td>';
-	echo '<td class="uk-text-center">'.Date::format($field['registered'], DB_DATE_FORMAT, DB_DATE_FORMAT).'</td>';
+	echo '<td class="uk-text-center">'.$User->role().'</td>';
+	echo '<td class="uk-text-center">'.Date::format($User->registered(), DB_DATE_FORMAT, DB_DATE_FORMAT).'</td>';
 	echo '</tr>';
 }
 

bl-kernel/boot/init.php

@@ -3,8 +3,8 @@
 // Bludit version
 define('BLUDIT_VERSION',	'2.0');
 define('BLUDIT_CODENAME',	'');
-define('BLUDIT_RELEASE_DATE',	'2017-09-21');
+define('BLUDIT_RELEASE_DATE',	'2017-09-23');
-define('BLUDIT_BUILD',		'20170921');
+define('BLUDIT_BUILD',		'20170923');
 
 // Debug mode
 // Change to FALSE, for prevent warning or errors on browser

bl-kernel/dbpages.class.php

@@ -10,7 +10,7 @@ class dbPages extends dbJSON
 		'description'=>		array('inFile'=>false,	'value'=>''),
 		'username'=>		array('inFile'=>false,	'value'=>''),
 		'tags'=>		array('inFile'=>false,	'value'=>array()),
-		'status'=>		array('inFile'=>false,	'value'=>'draft'), // published, draft, scheduled
+		'status'=>		array('inFile'=>false,	'value'=>'published'), // published, draft, scheduled
 		'date'=>		array('inFile'=>false,	'value'=>''),
 		'dateModified'=>	array('inFile'=>false,	'value'=>''),
 		'position'=>		array('inFile'=>false,	'value'=>0),
@@ -142,8 +142,8 @@ class dbPages extends dbJSON
 					}
 				}
 			} else {
-				// Default value for the field
+				// By default is the current value
-				$value = $options['value'];
+				$value = $this->db[$args['key']][$field];
 			}
 
 			$args[$field] = $value;
@@ -158,9 +158,6 @@ class dbPages extends dbJSON
 			$args['date'] = $this->db[$args['key']]['date'];
 		}
 
-		// Current UUID
-		$args['uuid'] = $this->db[$args['key']]['uuid'];
-
 		// Date
 		$currentDate = Date::current(DB_DATE_FORMAT);
 
@@ -192,9 +189,9 @@ class dbPages extends dbJSON
 			}
 		}
 
-		if( $climode===false ) {
+		if ($climode===false) {
 			// Move the directory from old key to new key.
-			if($newKey!==$args['key']) {
+			if ($newKey!==$args['key']) {
 				if( Filesystem::mv(PATH_PAGES.$args['key'], PATH_PAGES.$newKey) === false ) {
 					Log::set(__METHOD__.LOG_SEP.'Error occurred when trying to move the directory to '.PATH_PAGES.$newKey);
 					return false;
@@ -203,7 +200,7 @@ class dbPages extends dbJSON
 
 			// Make the index.txt and save the file.
 			$data = implode("\n", $dataForFile);
-			if( file_put_contents(PATH_PAGES.$newKey.DS.FILENAME, $data) === false ) {
+			if (file_put_contents(PATH_PAGES.$newKey.DS.FILENAME, $data)===false) {
 				Log::set(__METHOD__.LOG_SEP.'Error occurred when trying to put the content in the file '.FILENAME);
 				return false;
 			}
@@ -288,11 +285,12 @@ class dbPages extends dbJSON
 	public function getStaticDB()
 	{
 		$tmp = $this->db;
-		foreach($tmp as $key=>$fields) {
+		foreach ($tmp as $key=>$fields) {
-			if($fields['status']!='static') {
+			if ($fields['status']!='static') {
 				unset($tmp[$key]);
 			}
 		}
+		uasort($tmp, array($this, 'sortByPositionLowToHigh'));
 		return $tmp;
 	}
 

bl-kernel/dbusers.class.php

@@ -105,13 +105,11 @@ class dbUsers extends dbJSON
 			$User = new User();
 			$User->setField('username', $username);
 
-			foreach($this->db[$username] as $key=>$value) {
+			foreach ($this->db[$username] as $key=>$value) {
 				$User->setField($key, $value);
 			}
-
 			return $User;
 		}
-
 		return false;
 	}
 
@@ -152,8 +150,8 @@ class dbUsers extends dbJSON
 	// Return the username associated to an email, FALSE otherwise
 	public function getByEmail($email)
 	{
-		foreach($this->db as $username=>$values) {
+		foreach ($this->db as $username=>$values) {
-			if($values['email']==$email) {
+			if ($values['email']==$email) {
 				return $username;
 			}
 		}
@@ -163,8 +161,8 @@ class dbUsers extends dbJSON
 	// Returns the username with the authentication token assigned, FALSE otherwise
 	public function getByAuthToken($token)
 	{
-		foreach($this->db as $username=>$fields) {
+		foreach ($this->db as $username=>$fields) {
-			if($fields['tokenAuth']==$token) {
+			if ($fields['tokenAuth']==$token) {
 				return $username;
 			}
 		}
@@ -194,13 +192,17 @@ class dbUsers extends dbJSON
 		return false;
 	}
 
-// ---- OLD
-
-
 	public function getAll()
 	{
 		return $this->db;
 	}
 
-
+	public function getAllUsers()
+	{
+		$tmp = array();
+		foreach ($this->db as $username=>$fields) {
+			$tmp[$username] = $this->getUser($username);
+		}
+		return $tmp;
+	}
 }

bl-kernel/functions.php

@@ -349,10 +349,15 @@ function editPage($args) {
 	global $dbPages;
 	global $Syslog;
 
-	// The user is always the one loggued
+	// Check the key is not empty
-	$args['username'] = Session::get('username');
+	if (empty($args['key'])) {
-	if ( empty($args['username']) ) {
+		Log::set('Function editPage()'.LOG_SEP.'Empty key.');
-		Log::set('Function editPage()'.LOG_SEP.'Empty username.');
+		return false;
+	}
+
+	// Check if the page key exist
+	if (!$dbPages->exists($args['key'])) {
+		Log::set('Function editPage()'.LOG_SEP.'Page key does not exist, '.$args['key']);
 		return false;
 	}
 
@@ -362,6 +367,17 @@ function editPage($args) {
 		unset($args['externalCoverImage']);
 	}
 
+	// Title and content need to be here because from inside the dbPages is not visible
+	if (empty($args['title']) || empty($args['content'])) {
+		$page = buildPage($args['key']);
+		if (empty($args['title'])) {
+			$args['title'] = $page->title();
+		}
+		if (empty($args['content'])) {
+			$args['content'] = $page->contentRaw();
+		}
+	}
+
 	$key = $dbPages->edit($args);
 	if ($key) {
 		// Call the plugins after page modified

bl-languages/GR.json

@@ -213,5 +213,12 @@
 	"add-new-page": "Add new page",
 	"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
 	"about-your-site-or-yourself": "About your site or yourself",
-	"homepage": "Homepage"
+	"homepage": "Homepage",
+	"disabled": "Disabled",
+	"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
+	"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
+	"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
+	"user-disabled": "User disabled",
+	"user-password-changed": "User password changed",
+	"page-edited": "Page edited"
 }

bl-languages/ar_MA.json

@@ -212,5 +212,12 @@
 	"add-new-page": "Add new page",
 	"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
 	"about-your-site-or-yourself": "About your site or yourself",
-	"homepage": "Homepage"
+	"homepage": "Homepage",
+	"disabled": "Disabled",
+	"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
+	"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
+	"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
+	"user-disabled": "User disabled",
+	"user-password-changed": "User password changed",
+	"page-edited": "Page edited"
 }

bl-languages/bg_BG.json

@@ -212,5 +212,12 @@
 	"add-new-page": "Add new page",
 	"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
 	"about-your-site-or-yourself": "About your site or yourself",
-	"homepage": "Homepage"
+	"homepage": "Homepage",
+	"disabled": "Disabled",
+	"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
+	"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
+	"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
+	"user-disabled": "User disabled",
+	"user-password-changed": "User password changed",
+	"page-edited": "Page edited"
 }

bl-languages/de_CH.json

@@ -4,55 +4,53 @@
 		"native": "Deutsch (Schweiz)",
 		"english-name": "German",
 		"locale": "de, de_CH",
-		"last-update": "2017-09-10",
+		"last-update": "2017-09-23",
 		"author": "Clickwork",
 		"email": "egoetschel@clickwork.ch",
-		"website": "https:\/\/clickwork.ch"
+		"website": "https://clickwork.ch"
 	},
 
 	"dashboard": "Dashboard",
-	"manage-users": "Benutzerverwaltung",
+	"manage-users": "Benutzer verwalten",
-	"manage-categories": "Manage categories",
+	"manage-categories": "Kategorien verwalten",
 	"general-settings": "Allgemein",
 	"advanced-settings": "Erweitert",
 	"thanks-for-support-bludit": "Thanks for support Bludit",
-	"upgrade-to-bludit-pro": "Upgrade to Bludit PRO",
+	"upgrade-to-bludit-pro": "Upgrade auf Bludit PRO",
 	"language": "Sprache",
 	"plugin": "Plugin",
 	"plugins": "Plugins",
-	"developers": "Developers",
+	"developers": "Enwickler",
 	"themes": "Themes",
 	"about": "Über",
 	"url": "URL",
 	"fixed": "Fixed",
 	"welcome": "Willkommen",
 	"logout": "Abmelden",
-	"website": "Zur Website",
+	"website": "Website",
 	"publish": "Veröffentlichen",
 	"manage": "Verwalten",
-	"content": "Inhalt",
+
-	"category": "Category",
+	"category": "Kategorie",
 	"categories": "Kategorien",
 	"users": "Benutzer",
 	"settings": "Einstellungen",
 	"general": "Allgemein",
 	"advanced": "Erweitert",
-	"new-content": "New content",
+
-	"manage-content": "Manage content",
+	"new-category": "Neue Kategorie",
-	"add-new-content": "Add new content",
+	"you-do-not-have-sufficient-permissions": "You do not have sufficient permissions",
-	"new-category": "Neue Katgeorie",
+	"add-a-new-user": "Neuen Benutzer hinzufügen",
-	"you-do-not-have-sufficient-permissions": "Du bist nicht berechtigt, die Seite aufzurufen.",
-	"add-a-new-user": "Neuer Benutzer",
 	"url-associated-with-the-page": "URL associated with the page.",
 	"language-and-timezone": "Sprache und Zeitzone",
-	"change-your-language-and-region-settings": "Sprache ändern und Lokalisierung einstellen.",
+	"change-your-language-and-region-settings": "Change your language and region settings.",
-	"notifications": "Notifications",
+	"notifications": "Meldungen",
 	"plugin-activated": "Plugin activated",
 	"plugin-deactivated": "Plugin deactivated",
 	"new-theme-configured": "New theme configured",
 	"changes-on-settings": "Changes on settings",
 	"plugin-configured": "Plugin configured",
-	"welcome-to-bludit": "Willkommen bei Bludit",
+	"welcome-to-bludit": "Welcome to Bludit",
 	"statistics": "Statistiken",
 	"pages": "Seiten",
 	"drafts": "Entwürfe",
@@ -61,16 +59,16 @@
 	"save-as-draft": "Als Entwurf speichern",
 	"cancel": "Abbrechen",
 	"description": "Beschreibung",
-	"this-field-can-help-describe-the-content": "Kurze Inhaltsbeschreibung. Möglich sind bis zu 150 Zeichen.",
+	"this-field-can-help-describe-the-content": "This field can help describe the content in a few words. No more than 150 characters.",
 	"images": "Bilder",
-	"error": "Fehler",
+	"error": "Error",
-	"supported-image-file-types": "Unterstützte Datei-Formate",
+	"supported-image-file-types": "Supported image file types",
 	"cover-image": "Hauptbild",
-	"drag-and-drop-or-click-here": "Drag and Drop oder hier klicken",
+	"drag-and-drop-or-click-here": "Drag and drop or click here",
 	"there-are-no-images": "Keine Bilder vorhanden",
 	"upload-and-more-images": "Upload and more images",
-	"click-on-the-image-for-options": "Für die Bildoptionen auf das Bild klicken.",
+	"click-on-the-image-for-options": "Click on the image for options.",
-	"click-here-to-cancel": "Schliessen",
+	"click-here-to-cancel": "Click here to cancel.",
 	"insert-image": "Bild einfügen",
 	"set-as-cover-image": "Als Hauptbild verwenden",
 	"delete-image": "Bild löschen",
@@ -79,43 +77,43 @@
 	"status": "Status",
 	"published": "Veröffentlicht",
 	"draft": "Entwurf",
-	"empty-title": "Kein Titel",
+	"empty-title": "Empty title",
-	"date": "Datum und Zeit",
+	"date": "Datum",
 	"external-cover-image": "External cover image",
-	"parent": "Übergeordnete Seite",
+	"parent": "Parent",
 	"full-image-url": "Full image URL.",
-	"this-field-is-used-when-you-order-the-content-by-position": "This field is used when you order the content by position.",
+
 	"position": "Position",
-	"friendly-url": "Pretty URL",
+	"friendly-url": "Friendly URL",
-	"image-description": "Bildbeschreibung",
+	"image-description": "Image description",
-	"add-a-new-category": "Eine neue Kategorie hinzufügen",
+	"add-a-new-category": "Eine Kategorie hinzufügen",
 	"name": "Name",
 	"username": "Benutzername",
 	"first-name": "Vorname",
 	"last-name": "Nachname",
 	"to-schedule-the-page-select-the-date-and-time": "To schedule the page select the date and time.",
-	"email": "E-Mail",
+	"email": "E-Mail-Adresse",
 	"role": "Rolle",
 	"registered": "Hinzugefügt",
 	"site-information": "Angaben zur Website",
 	"site-title": "Titel der Webseite",
-	"use-this-field-to-name-your-site": "Name der Website, wie er auf jeder Seite angezeigt wird.",
+	"use-this-field-to-name-your-site": "Use this field to name your site, it will appear at the top of every page of your site.",
-	"site-slogan": "Untertitel",
+	"site-slogan": "Site slogan",
-	"use-this-field-to-add-a-catchy-phrase": "Untertitel oder Slogan der Website.",
+	"use-this-field-to-add-a-catchy-phrase": "Use this field to add a catchy phrase on your site.",
-	"site-description": "Informationen zur Website",
+	"site-description": "Site description",
-	"you-can-add-a-site-description-to-provide": "Kurze Beschreibung der Website für Suchmaschinen.",
+	"you-can-add-a-site-description-to-provide": "You can add a site description to provide a short bio or description of your site.",
 	"footer-text": "Footer-Text",
 	"you-can-add-a-small-text-on-the-bottom": "Text im Fussbereich jeder Seite. Beispielsweise: Copyright-Hinweis, Eigentümer der Website usw.",
 	"social-networks-links": "Links zu sozialen Netzwerken",
-	"site-url": "URL der Website",
+	"site-url": "Site URL",
-	"default-home-page": "Hauptseite",
+	"default-home-page": "Default home page",
-	"email-account-settings": "E-Mail-Adresse",
+	"email-account-settings": "Email account settings",
 	"sender-email": "Absender",
 	"emails-will-be-sent-from-this-address": "E-Mails werden mit dieser E-Mail-Adresse als Absender verschickt.",
-	"url-filters": "URL-Erweiterungen",
+	"url-filters": "URL-Filter",
-	"select-your-sites-language": "Sprache der Website.",
+	"select-your-sites-language": "Select your site's language.",
 	"timezone": "Zeitzone",
-	"select-a-timezone-for-a-correct": "Zeitzone für die richtige Anzeige des Datums und der Zeit auf der Website.",
+	"select-a-timezone-for-a-correct": "Select a timezone for a correct date\/time display on your site.",
 	"locale": "Lokalisierung",
 	"date-and-time-formats": "Datum und Zeit",
 	"date-format": "Datumsformat",
@@ -127,32 +125,32 @@
 	"edit-category": "Kategorie bearbeiten",
 	"delete": "Löschen",
 	"password": "Passwort",
-	"confirm-password": "Passwort wiederholen",
+	"confirm-password": "Confirm Password",
 	"editor": "Editor",
 	"administrator": "Administrator",
-	"edit-user": "Benutzer bearbeiten",
+	"edit-user": "Edit user",
-	"edit-content": "Edit content",
+
 	"profile": "Profil",
-	"change-password": "Neues Passwort",
+	"change-password": "Change password",
 	"enabled": "Aktiviert",
-	"disable-the-user": "Benutzer deaktivieren",
+	"disable-the-user": "Disable the user",
-	"profile-picture": "Profil-Bild",
+	"profile-picture": "Profile picture",
 	"edit-or-delete-your-categories": "Edit or delete your categories",
 	"create-a-new-page-for-your-site": "Create a new page for your site",
-	"create-a-new-category-to-organize-your-content": "Create a new category to organize your content",
+
-	"confirm-delete-this-action-cannot-be-undone": "Bestätige das Löschen, dieser Vorgang kann nicht rückgängig gemacht werden.",
+	"confirm-delete-this-action-cannot-be-undone": "Confirm delete, this action cannot be undone.",
-	"do-you-want-to-disable-the-user": "Willst Du den Benutzer deaktivieren?",
+	"do-you-want-to-disable-the-user": "Do you want to disable the user ?",
-	"new-password": "Neues Passwort",
+	"new-password": "New password",
 	"you-can-change-this-field-when-save-the-current-changes": "You can change this field when save the current changes.",
 	"items-per-page": "Items per page",
 	"invite-a-friend-to-collaborate-on-your-site": "Invite a friend to collaborate on your site",
 	"number-of-items-to-show-per-page": "Number of items to show per page.",
-	"website-or-blog": "Website or Blog",
+	"website-or-blog": "Website oder Blog",
 	"scheduled-pages": "Scheduled pages",
-	"there-are-no-scheduled-pages": "There are no scheduled pages",
+	"there-are-no-scheduled-pages": "Es sind keine geplanten Beiträge vorhanden.",
-	"there-are-no-draft-pages": "There are no draft pages",
+	"there-are-no-draft-pages": "Es sind keine Entwürfe vorhanden.",
 	"order-content-by": "Order content By",
-	"edit-or-delete-content-from-your-site": "Edit or delete content from your site",
+
 	"order-the-content-by-position-to-build-a-website": "Order the content by position to build a Website or order the content by date to build a Blog.",
 	"page-not-found-content": "Hey! look like the page doesn't exist.",
 	"page-not-found": "Page not found",
@@ -161,57 +159,64 @@
 	"returning-page-for-the-main-page": "Returning page for the main page, leave it blank if you want to show all the pages on the main page.",
 	"full-url-of-your-site": "Full URL of your site. Complete with the protocol HTTP or HTTPS (only if you have enabled SSL on your server).",
 	"with-the-locales-you-can-set-the-regional-user-interface": "With the locales, you can set the regional user interface, such as the dates in your language. The locales need to be installed on your system.",
-	"bludit-installer": "Bludit-Installer",
+	"bludit-installer": "Bludit Installer",
-	"choose-your-language": "Sprache wählen",
+	"choose-your-language": "Choose your language",
-	"next": "Weiter",
+	"next": "Next",
-	"complete-the-form-choose-a-password-for-the-username-admin": "Bitte ein Passwort für den Benutzer \"admin\" wählen<br>und eine E-Mail-Adresse eingeben.",
+	"complete-the-form-choose-a-password-for-the-username-admin": "Bitte ein Passwort für den Benutzer \"admin\"<br>und eine E-Mail-Adresse eingeben.",
-	"show-password": "Passwort zeigen",
+	"show-password": "Passwort im Klartext zeigen",
 	"install": "Installieren",
 	"login": "Anmelden",
-	"back-to-login-form": "Zurück zum Login",
+	"back-to-login-form": "Back to login form",
-	"get-login-access-code": "Zugangscode schicken",
+	"get-login-access-code": "Get login access code",
-	"email-access-code": "Zugangscode zuschicken",
+	"email-access-code": "Email access code",
-	"whats-next": "Und so geht es weiter:",
+	"whats-next": "What's Next",
-	"username-or-password-incorrect": "Der Benutzername oder das Passwort stimmt nicht.",
+	"username-or-password-incorrect": "Username or password incorrect",
-	"follow-bludit-on": "Folge Bludit bei",
+	"follow-bludit-on": "Follow Bludit on",
-	"visit-the-forum-for-support": "Visit the [forum](https:\/\/forum.bludit.org) for support",
+	"visit-the-forum-for-support": "Visit the [forum](https://forum.bludit.org) for support",
-	"manage-your-bludit-from-the-admin-panel": "Verwalte Bludit im [Administrationsbereich](.\/admin\/).",
+	"manage-your-bludit-from-the-admin-panel": "Manage your Bludit from the [admin area]({{ADMIN_AREA_LINK}})",
-	"chat-with-developers-and-users-on-gitter": "Chatte mit Entwicklern und Benutzern bei [Gitter](https:\/\/gitter.im\/dignajar\/bludit)",
+	"chat-with-developers-and-users-on-gitter":"Chat with developers and users on [Gitter](https://gitter.im/dignajar/bludit)",
-	"this-is-a-brief-description-of-yourself-our-your-site": "Dies ist eine kurze Beschreibung, wer du bist, oder deiner Website. Um diesen Text zu ändern, gehe im Admin-Panel zu den Einstellungen und bearbeite sie unter \"Plugins\" das Plugin \"Über\".",
+	"this-is-a-brief-description-of-yourself-our-your-site":"This is a brief description of yourself or your site, to change this text go to the admin panel, settings, plugins, and configure the plugin about.",
-	"read-the-documentation-for-more-information": "Lies die [Dokumentation](https:\/\/docs.bludit.com) und das [Bludit-Tutorial](https:\/\/bludit-tutorial.ch) für weitere Informationen.",
+	"read-the-documentation-for-more-information": "Read the [documentation](https://docs.bludit.com) for more information",
-	"new-page-created": "New page created",
+	"new-page-created": "Neue Seite erstellt",
 	"new-version-available": "New version available",
 	"new-category-created": "New category created",
-	"category-deleted": "Category deleted",
+	"category-deleted": "Kategorie gelöscht",
-	"category-edited": "Category edited",
+	"category-edited": "Kategorie bearbeitet",
 	"new-user-created": "New user created",
 	"user-edited": "User edited",
-	"user-deleted": "Der Benutzer wurde gelöscht.",
+	"user-deleted": "Benutzer gelöscht",
 	"recommended-for-recovery-password-and-notifications": "Recommended for recovery password and notifications.",
 	"authentication-token": "Authentication Token",
 	"token": "Token",
 	"current-status": "Current status",
-	"upload-image": "Bild hochladen",
+	"upload-image": "Upload image",
 	"this-token-is-similar-to-your-password-you-should-not-share-it": "This token is similar to your password, you should not share it.",
-	"the-changes-have-been-saved": "Die Änderungen wurden gespeichert.",
+	"the-changes-have-been-saved": "The changes have been saved",
 	"label": "Label",
 	"links": "Links",
 	"this-title-is-almost-always-used-in-the-sidebar-of-the-site": "This title is almost always used in the sidebar of the site.",
-	"password-must-be-at-least-6-characters-long": "Das Passwort muss mindestens 6 Zeichen lang sein",
+	"password-must-be-at-least-6-characters-long": "Password must be at least 6 characters long",
-	"ip-address-has-been-blocked": "Die IP-Adresse wurde blockiert.",
+	"ip-address-has-been-blocked": "IP address has been blocked",
-	"try-again-in-a-few-minutes": "Bitte versuche es in einigen Minuten noch einmal.",
+	"try-again-in-a-few-minutes": "Try again in a few minutes",
 	"page-published-from-scheduler": "Page published from scheduler",
 	"installer-page-about-content": "The about page is an important and powerful for potential clients and partners. For those who wonder who is behind the website, your About page is the first source of information.",
 	"blog": "Blog",
 	"complete-all-fields": "Complete all fields",
-	"static": "Static",
+	"static": "Statische Seiten",
-	"manage-pages": "Manage pages",
+	"manage-pages": "Seiten verwalten",
-	"new-page": "New page",
+	"new-page": "Neue Seite",
-	"edit-page": "Edit page",
+	"edit-page": "Seite bearbeiten",
 	"create-a-new-category-to-organize-your-pages": "Create a new category to organize your pages",
 	"edit-or-delete-pages-from-your-site": "Edit or delete pages from your site",
 	"add-new-page": "Add new page",
 	"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
 	"about-your-site-or-yourself": "About your site or yourself",
-	"homepage": "Homepage"
+	"homepage": "Hauptseite",
+	"disabled": "Disabled",
+	"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
+	"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
+	"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
+	"user-disabled": "User disabled",
+	"user-password-changed": "User password changed",
+	"page-edited": "Seite bearbeitet"
 }

bl-languages/de_DE.json

@@ -213,5 +213,12 @@
 	"add-new-page": "Add new page",
 	"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
 	"about-your-site-or-yourself": "About your site or yourself",
-	"homepage": "Homepage"
+	"homepage": "Homepage",
+	"disabled": "Disabled",
+	"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
+	"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
+	"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
+	"user-disabled": "User disabled",
+	"user-password-changed": "User password changed",
+	"page-edited": "Page edited"
 }

bl-languages/en.json

@@ -154,7 +154,7 @@
 	"order-content-by": "Order content By",
 
 	"order-the-content-by-position-to-build-a-website": "Order the content by position to build a Website or order the content by date to build a Blog.",
-	"page-not-found-content": "Hey! look like the page doesn't exist.",
+	"page-not-found-content": "Hey! looks like the page doesn't exist.",
 	"page-not-found": "Page not found",
 	"predefined-pages": "Predefined pages",
 	"returning-page-when-the-page-doesnt-exist": "Returning page when the page doesn't exist, leave it blank if you want to returns a default message.",
@@ -213,5 +213,12 @@
 	"add-new-page": "Add new page",
 	"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
 	"about-your-site-or-yourself": "About your site or yourself",
-	"homepage": "Homepage"
+	"homepage": "Homepage",
+	"disabled": "Disabled",
+	"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
+	"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
+	"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
+	"user-disabled": "User disabled",
+	"user-password-changed": "User password changed",
+	"page-edited": "Page edited"
 }

bl-languages/es.json

@@ -213,5 +213,12 @@
 	"add-new-page": "Add new page",
 	"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
 	"about-your-site-or-yourself": "About your site or yourself",
-	"homepage": "Homepage"
+	"homepage": "Homepage",
+	"disabled": "Disabled",
+	"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
+	"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
+	"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
+	"user-disabled": "User disabled",
+	"user-password-changed": "User password changed",
+	"page-edited": "Page edited"
 }

bl-languages/fa_IR.JSON

@@ -212,5 +212,12 @@
 	"add-new-page": "Add new page",
 	"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
 	"about-your-site-or-yourself": "About your site or yourself",
-	"homepage": "Homepage"
+	"homepage": "Homepage",
+	"disabled": "Disabled",
+	"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
+	"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
+	"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
+	"user-disabled": "User disabled",
+	"user-password-changed": "User password changed",
+	"page-edited": "Page edited"
 }

bl-languages/fi_FI.json

@@ -212,5 +212,12 @@
 	"add-new-page": "Add new page",
 	"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
 	"about-your-site-or-yourself": "About your site or yourself",
-	"homepage": "Homepage"
+	"homepage": "Homepage",
+	"disabled": "Disabled",
+	"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
+	"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
+	"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
+	"user-disabled": "User disabled",
+	"user-password-changed": "User password changed",
+	"page-edited": "Page edited"
 }

bl-languages/fr_FR.json

@@ -213,5 +213,12 @@
 	"add-new-page": "Add new page",
 	"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
 	"about-your-site-or-yourself": "About your site or yourself",
-	"homepage": "Homepage"
+	"homepage": "Homepage",
+	"disabled": "Disabled",
+	"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
+	"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
+	"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
+	"user-disabled": "User disabled",
+	"user-password-changed": "User password changed",
+	"page-edited": "Page edited"
 }

bl-languages/he_IL.json

@@ -213,5 +213,12 @@
 	"add-new-page": "Add new page",
 	"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
 	"about-your-site-or-yourself": "About your site or yourself",
-	"homepage": "Homepage"
+	"homepage": "Homepage",
+	"disabled": "Disabled",
+	"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
+	"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
+	"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
+	"user-disabled": "User disabled",
+	"user-password-changed": "User password changed",
+	"page-edited": "Page edited"
 }

bl-languages/hu_HU.json

@@ -212,5 +212,12 @@
 	"add-new-page": "Add new page",
 	"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
 	"about-your-site-or-yourself": "About your site or yourself",
-	"homepage": "Homepage"
+	"homepage": "Homepage",
+	"disabled": "Disabled",
+	"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
+	"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
+	"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
+	"user-disabled": "User disabled",
+	"user-password-changed": "User password changed",
+	"page-edited": "Page edited"
 }

bl-languages/it_IT.json

@@ -212,5 +212,12 @@
 	"add-new-page": "Add new page",
 	"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
 	"about-your-site-or-yourself": "About your site or yourself",
-	"homepage": "Homepage"
+	"homepage": "Homepage",
+	"disabled": "Disabled",
+	"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
+	"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
+	"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
+	"user-disabled": "User disabled",
+	"user-password-changed": "User password changed",
+	"page-edited": "Page edited"
 }

bl-languages/ja_JP.json

@@ -212,5 +212,12 @@
 	"add-new-page": "Add new page",
 	"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
 	"about-your-site-or-yourself": "About your site or yourself",
-	"homepage": "Homepage"
+	"homepage": "Homepage",
+	"disabled": "Disabled",
+	"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
+	"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
+	"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
+	"user-disabled": "User disabled",
+	"user-password-changed": "User password changed",
+	"page-edited": "Page edited"
 }

bl-languages/ms_MY.json

@@ -212,5 +212,12 @@
 	"add-new-page": "Add new page",
 	"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
 	"about-your-site-or-yourself": "About your site or yourself",
-	"homepage": "Homepage"
+	"homepage": "Homepage",
+	"disabled": "Disabled",
+	"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
+	"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
+	"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
+	"user-disabled": "User disabled",
+	"user-password-changed": "User password changed",
+	"page-edited": "Page edited"
 }

bl-languages/nl_NL.json

@@ -211,5 +211,12 @@
 	"add-new-page": "Add new page",
 	"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
 	"about-your-site-or-yourself": "About your site or yourself",
-	"homepage": "Homepage"
+	"homepage": "Homepage",
+	"disabled": "Disabled",
+	"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
+	"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
+	"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
+	"user-disabled": "User disabled",
+	"user-password-changed": "User password changed",
+	"page-edited": "Page edited"
 }

bl-languages/pl_PL.json

@@ -212,5 +212,12 @@
 	"add-new-page": "Add new page",
 	"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
 	"about-your-site-or-yourself": "About your site or yourself",
-	"homepage": "Homepage"
+	"homepage": "Homepage",
+	"disabled": "Disabled",
+	"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
+	"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
+	"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
+	"user-disabled": "User disabled",
+	"user-password-changed": "User password changed",
+	"page-edited": "Page edited"
 }

bl-languages/pt_BR.json

@@ -211,5 +211,12 @@
 	"add-new-page": "Add new page",
 	"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
 	"about-your-site-or-yourself": "About your site or yourself",
-	"homepage": "Homepage"
+	"homepage": "Homepage",
+	"disabled": "Disabled",
+	"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
+	"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
+	"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
+	"user-disabled": "User disabled",
+	"user-password-changed": "User password changed",
+	"page-edited": "Page edited"
 }

bl-languages/pt_PT.json

@@ -211,5 +211,12 @@
 	"add-new-page": "Add new page",
 	"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
 	"about-your-site-or-yourself": "About your site or yourself",
-	"homepage": "Homepage"
+	"homepage": "Homepage",
+	"disabled": "Disabled",
+	"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
+	"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
+	"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
+	"user-disabled": "User disabled",
+	"user-password-changed": "User password changed",
+	"page-edited": "Page edited"
 }

bl-languages/ro_RO.json

@@ -212,5 +212,12 @@
 	"add-new-page": "Add new page",
 	"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
 	"about-your-site-or-yourself": "About your site or yourself",
-	"homepage": "Homepage"
+	"homepage": "Homepage",
+	"disabled": "Disabled",
+	"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
+	"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
+	"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
+	"user-disabled": "User disabled",
+	"user-password-changed": "User password changed",
+	"page-edited": "Page edited"
 }

bl-languages/ru_RU.json

@@ -210,5 +210,12 @@
 	"add-new-page": "Add new page",
 	"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
 	"about-your-site-or-yourself": "About your site or yourself",
-	"homepage": "Homepage"
+	"homepage": "Homepage",
+	"disabled": "Disabled",
+	"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
+	"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
+	"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
+	"user-disabled": "User disabled",
+	"user-password-changed": "User password changed",
+	"page-edited": "Page edited"
 }

bl-languages/tr_TR.json

@@ -210,5 +210,12 @@
 	"add-new-page": "Add new page",
 	"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
 	"about-your-site-or-yourself": "About your site or yourself",
-	"homepage": "Homepage"
+	"homepage": "Homepage",
+	"disabled": "Disabled",
+	"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
+	"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
+	"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
+	"user-disabled": "User disabled",
+	"user-password-changed": "User password changed",
+	"page-edited": "Page edited"
 }

bl-languages/uk_UA.json

@@ -210,5 +210,12 @@
 	"add-new-page": "Add new page",
 	"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
 	"about-your-site-or-yourself": "About your site or yourself",
-	"homepage": "Homepage"
+	"homepage": "Homepage",
+	"disabled": "Disabled",
+	"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
+	"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
+	"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
+	"user-disabled": "User disabled",
+	"user-password-changed": "User password changed",
+	"page-edited": "Page edited"
 }

bl-languages/vi_VN.json

@@ -210,5 +210,12 @@
 	"add-new-page": "Add new page",
 	"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
 	"about-your-site-or-yourself": "About your site or yourself",
-	"homepage": "Homepage"
+	"homepage": "Homepage",
+	"disabled": "Disabled",
+	"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
+	"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
+	"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
+	"user-disabled": "User disabled",
+	"user-password-changed": "User password changed",
+	"page-edited": "Page edited"
 }

bl-languages/zh_CN.json

@@ -210,5 +210,12 @@
 	"add-new-page": "Add new page",
 	"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
 	"about-your-site-or-yourself": "About your site or yourself",
-	"homepage": "Homepage"
+	"homepage": "Homepage",
+	"disabled": "Disabled",
+	"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
+	"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
+	"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
+	"user-disabled": "User disabled",
+	"user-password-changed": "User password changed",
+	"page-edited": "Page edited"
 }

bl-languages/zh_TW.json

@@ -210,5 +210,12 @@
 	"add-new-page": "Add new page",
 	"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
 	"about-your-site-or-yourself": "About your site or yourself",
-	"homepage": "Homepage"
+	"homepage": "Homepage",
+	"disabled": "Disabled",
+	"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
+	"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
+	"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
+	"user-disabled": "User disabled",
+	"user-password-changed": "User password changed",
+	"page-edited": "Page edited"
 }

bl-plugins/api/plugin.php

@@ -91,13 +91,20 @@ class pluginAPI extends Plugin {
 		// ------------------------------------------------------------
 		$writePermissions = false;
 		if ( !empty($inputs['authentication']) ) {
-			// Get the user with the authentication token
+
+			// Get the user with the authentication token, FALSE if doesn't exit
 			$username = $dbUsers->getByAuthToken($inputs['authentication']);
 			if ($username!==false) {
-				// Enable write permissions
+
-				$writePermissions = true;
+				// Get the object user to check the role
+				$user = $dbUsers->getUser($username);
+				if (($user->role()=='admin') && ($user->enabled())) {
+
 					// Loggin the user to create the session
 					$Login->setLogin($username, 'admin');
+					// Enable write permissions
+					$writePermissions = true;
+				}
 			}
 		}
 
@@ -270,7 +277,7 @@ class pluginAPI extends Plugin {
 	{
 		// This function is defined on functions.php
 		$key = createPage($args);
-var_dump($key);exit;
+
 		if ($key===false) {
 			return array(
 				'status'=>'1',

bl-plugins/ping/languages/en.json

@@ -1,7 +0,0 @@
-{
-	"plugin-data":
-	{
-		"name": "Ping",
-		"description": "Ping Bludit's feed to share your site with other users."
-	}
-}

bl-plugins/ping/metadata.json

@@ -1,10 +0,0 @@
-{
-	"author": "Bludit",
-	"email": "",
-	"website": "https://plugins.bludit.com",
-	"version": "2.0",
-	"releaseDate": "2017-05-26",
-	"license": "MIT",
-	"compatible": "2.0",
-	"notes": ""
-}

bl-plugins/ping/plugin.php

@@ -1,32 +0,0 @@
-<?php
-
-class pluginPing extends Plugin {
-
-	private function ping()
-	{
-		$url = 'https://ping.bludit.com?url='.DOMAIN_BASE;
-
-		if( function_exists('curl_version') ) {
-			$ch = curl_init();
-			curl_setopt($ch, CURLOPT_URL, $url);
-			// TRUE to include the header in the output
-			curl_setopt($ch, CURLOPT_HEADER, false);
-			curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
-			$out = curl_exec($ch);
-			if($out===false) {
-				Log::set('Plugin Ping: Curl error: '.curl_error($ch));
-			}
-			curl_close($ch);
-		}
-		else {
-			$options = array(
-				"ssl"=>array(
-					"verify_peer"=>false,
-					"verify_peer_name"=>false
-				)
-			);
-			$stream = stream_context_create($options);
-			$out = file_get_contents($url, false, $stream);
-		}
-	}
-}

install.php

@@ -367,6 +367,7 @@ function install($adminPassword, $email, $timezone)
 	// File users.php
 	$salt = uniqid();
 	$passwordHash = sha1($adminPassword.$salt);
+	$tokenAuth = md5( uniqid().time().DOMAIN );
 
 	$data = array(
 		'admin'=>array(
@@ -379,7 +380,7 @@ function install($adminPassword, $email, $timezone)
 			'registered'=>$currentDate,
 			'tokenEmail'=>'',
 			'tokenEmailTTL'=>'2009-03-15 14:00',
-			'tokenAuth'=>'',
+			'tokenAuth'=>$tokenAuth,
 			'tokenAuthTTL'=>'2009-03-15 14:00',
 			'twitter'=>'',
 			'facebook'=>'',

logo-o.svg

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg viewBox="0 0 500 500" xmlns="http://www.w3.org/2000/svg">
-  <defs>
-    <pattern id="pattern-0" x="0" y="0" width="20" height="20" patternUnits="userSpaceOnUse" viewBox="0 0 100 100">
-      <path d="M 0 0 L 50 0 L 50 100 L 0 100 Z" style="fill: black;"/>
-    </pattern>
-  </defs>
-  <ellipse cx="250.5" cy="250.5" rx="237.5" ry="237.5" style="stroke-linecap: round; stroke-linejoin: round; fill: none; stroke: rgb(0, 0, 0); stroke-width: 20;"/>
-  <path style="fill: rgb(255, 255, 255); stroke: rgb(0, 0, 0); stroke-miterlimit: 4; stroke-dasharray: none; stroke-width: 24.1239;" d="M 158.667 87.152 C 155.235 82.316 146.152 132.249 131.337 182.96 C 127.264 196.901 133.055 210.965 135.156 223.162 C 138.686 229.357 142.193 238.4 145.167 249.671 C 146.169 253.468 147.043 257.335 147.823 261.205 C 139.586 282.077 134.937 305.727 134.937 330.795 C 134.937 353.886 138.899 375.765 145.957 395.387 C 159.253 405.431 172.154 420.048 182.749 438.214 C 187.707 446.714 191.802 455.416 195.066 464.062 C 212.031 476.426 231.594 483.493 252.428 483.493 C 272.104 483.493 290.642 477.197 306.936 466.085 C 310.311 456.775 314.263 447.138 319.998 438.214 C 331.35 420.553 345.348 403.584 359.644 393.305 C 369.548 377.538 370.84 353.988 369.918 330.795 C 368.961 306.729 365.617 283.936 357.976 263.676 C 358.637 258.755 359.459 253.832 360.479 248.992 C 363.045 236.8 366.346 227.131 369.809 220.79 C 371.176 208.863 375.797 195.087 371.411 181.755 C 353.911 128.554 356.134 173.61 351.039 177.873 C 344.597 183.265 310.534 130.382 311.876 182.96 C 312.022 188.695 312.332 194.298 312.775 199.745 C 295.137 185.992 273.789 202.974 251.725 202.974 C 229.107 202.974 208.689 186.398 190.762 200.795 C 190.997 194.637 191.039 188.273 190.872 181.755 C 189.53 129.176 180.008 117.222 158.667 87.152 Z" id="path2987"/>
-  <path id="path3763" d="M 250.244 395.418 C 241.817 395.418 222.517 411.928 222.517 423.223 C 222.517 426.316 223.471 429.244 225.17 431.872 C 228.37 433.217 231.475 435.175 234.026 437.609 C 235.219 438.747 236.204 439.912 236.989 441.07 C 241.073 442.726 245.782 443.672 250.797 443.672 C 255.534 443.672 259.996 442.829 263.917 441.34 C 264.731 440.094 265.775 438.836 267.061 437.609 C 269.794 435.001 273.163 432.941 276.604 431.594 C 278.192 429.04 279.078 426.206 279.078 423.223 C 279.078 411.928 259.223 395.418 250.244 395.418 Z" style="fill: rgb(0, 0, 0); stroke: rgb(0, 0, 0); stroke-miterlimit: 4; stroke-dasharray: none; stroke-width: 24.1239;"/>
-  <path style="fill: rgb(0, 0, 0); stroke: rgb(0, 0, 0); stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-width: 24.1239;" d="M 224.964 337.983 C 254.772 288.759 202.269 222.255 176.078 277.623 C 164.35 302.417 191.915 360.54 224.964 337.983 Z" id="path3779"/>
-  <path style="fill: rgb(0, 0, 0); stroke: rgb(0, 0, 0); stroke-miterlimit: 4; stroke-width: 18;" d="M 303.95 305.028 C 303.95 309.924 299.469 313.895 293.941 313.895 C 288.414 313.895 283.932 309.924 283.932 305.028 C 283.932 300.13 288.414 296.16 293.941 296.16 C 299.469 296.16 303.95 300.13 303.95 305.028 Z" id="path3785"/>
-  <path style="stroke: rgb(0, 0, 0); stroke-miterlimit: 4; fill: rgb(255, 255, 255); stroke-width: 24.1239;" d="M 233.859 302.456 C 233.859 315.6 222.937 326.257 209.463 326.257 C 195.992 326.257 185.069 315.6 185.069 302.456 C 185.069 289.305 195.992 278.65 209.463 278.65 C 222.937 278.65 233.859 289.305 233.859 302.456 Z" id="path-1"/>
-</svg>

logo.svg

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg viewBox="0 0 500 500" xmlns="http://www.w3.org/2000/svg">
-  <defs>
-    <pattern id="pattern-0" x="0" y="0" width="20" height="20" patternUnits="userSpaceOnUse" viewBox="0 0 100 100">
-      <path d="M 0 0 L 50 0 L 50 100 L 0 100 Z" style="fill: black;"/>
-    </pattern>
-  </defs>
-  <path style="fill: rgb(255, 255, 255); stroke: rgb(0, 0, 0); stroke-miterlimit: 4; stroke-dasharray: none; stroke-width: 24.1239;" d="M 140.612 16.07 C 136.565 10.367 125.853 69.255 108.381 129.061 C 103.577 145.502 110.407 162.089 112.885 176.473 C 117.048 183.779 121.184 194.444 124.691 207.736 C 125.873 212.214 126.903 216.775 127.823 221.339 C 118.109 245.954 112.626 273.846 112.626 303.409 C 112.626 330.642 117.299 356.445 125.623 379.586 C 141.303 391.431 156.518 408.669 169.013 430.093 C 174.86 440.118 179.69 450.381 183.539 460.577 C 203.547 475.159 226.618 483.493 251.189 483.493 C 274.393 483.493 296.256 476.068 315.472 462.963 C 319.453 451.983 324.113 440.618 330.877 430.093 C 344.265 409.265 360.773 389.253 377.633 377.13 C 389.314 358.536 390.837 330.762 389.75 303.409 C 388.621 275.027 384.678 248.146 375.666 224.253 C 376.446 218.449 377.415 212.643 378.618 206.935 C 381.644 192.557 385.537 181.154 389.621 173.676 C 391.233 159.61 396.683 143.363 391.511 127.64 C 370.872 64.898 373.494 118.034 367.485 123.062 C 359.888 129.421 319.716 67.053 321.298 129.061 C 321.471 135.825 321.836 142.432 322.359 148.856 C 301.557 132.637 276.381 152.664 250.36 152.664 C 223.685 152.664 199.605 133.116 178.463 150.095 C 178.74 142.832 178.79 135.327 178.593 127.64 C 177.01 65.631 165.781 51.533 140.612 16.07 Z" id="path2987"/>
-  <path id="path3763" d="M 248.613 379.622 C 238.675 379.622 215.913 399.093 215.913 412.414 C 215.913 416.062 217.038 419.515 219.042 422.614 C 222.816 424.2 226.478 426.509 229.486 429.38 C 230.893 430.722 232.055 432.096 232.981 433.462 C 237.797 435.415 243.351 436.53 249.265 436.53 C 254.852 436.53 260.114 435.536 264.738 433.78 C 265.698 432.311 266.929 430.827 268.446 429.38 C 271.669 426.304 275.642 423.875 279.701 422.286 C 281.573 419.274 282.618 415.932 282.618 412.414 C 282.618 399.093 259.202 379.622 248.613 379.622 Z" style="fill: rgb(0, 0, 0); stroke: rgb(0, 0, 0); stroke-miterlimit: 4; stroke-dasharray: none; stroke-width: 24.1239;"/>
-  <path style="fill: rgb(0, 0, 0); stroke: rgb(0, 0, 0); stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-width: 24.1239;" d="M 218.799 311.887 C 253.953 253.834 192.034 175.403 161.146 240.701 C 147.314 269.942 179.823 338.489 218.799 311.887 Z" id="path3779"/>
-  <path style="fill: rgb(0, 0, 0); stroke: rgb(0, 0, 0); stroke-miterlimit: 4; stroke-width: 18;" d="M 311.951 273.021 C 311.951 278.795 306.666 283.478 300.147 283.478 C 293.629 283.478 288.343 278.795 288.343 273.021 C 288.343 267.245 293.629 262.563 300.147 262.563 C 306.666 262.563 311.951 267.245 311.951 273.021 Z" id="path3785"/>
-  <path style="stroke: rgb(0, 0, 0); stroke-miterlimit: 4; fill: rgb(255, 255, 255); stroke-width: 24.1239;" d="M 229.289 269.988 C 229.289 285.489 216.409 298.058 200.518 298.058 C 184.631 298.058 171.749 285.489 171.749 269.988 C 171.749 254.478 184.631 241.912 200.518 241.912 C 216.409 241.912 229.289 254.478 229.289 269.988 Z" id="path-1"/>
-</svg>