';
echo '| '.$username.' | ';
- echo ''.$field['firstName'].' | ';
- echo ''.$field['lastName'].' | ';
- echo ''.$field['email'].' | ';
- echo ''.$field['role'].' | ';
- echo ''.Date::format($field['registered'], DB_DATE_FORMAT, DB_DATE_FORMAT).' | ';
+ echo ''.$User->firstName().' | ';
+ echo ''.$User->lastName().' | ';
+ echo ''.$User->email().' | ';
+ echo ''.($User->enabled()?''.$L->g('Enabled').'':$L->g('Disabled')).' | ';
+ echo ''.$User->role().' | ';
+ echo ''.Date::format($User->registered(), DB_DATE_FORMAT, DB_DATE_FORMAT).' | ';
echo '
';
}
diff --git a/bl-kernel/boot/init.php b/bl-kernel/boot/init.php
index e7dbf82b..6f185bd9 100644
--- a/bl-kernel/boot/init.php
+++ b/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_BUILD', '20170921');
+define('BLUDIT_RELEASE_DATE', '2017-09-23');
+define('BLUDIT_BUILD', '20170923');
// Debug mode
// Change to FALSE, for prevent warning or errors on browser
diff --git a/bl-kernel/dbpages.class.php b/bl-kernel/dbpages.class.php
index 8df11345..b8413a87 100644
--- a/bl-kernel/dbpages.class.php
+++ b/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
- $value = $options['value'];
+ // By default is the current 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) {
- if($fields['status']!='static') {
+ foreach ($tmp as $key=>$fields) {
+ if ($fields['status']!='static') {
unset($tmp[$key]);
}
}
+ uasort($tmp, array($this, 'sortByPositionLowToHigh'));
return $tmp;
}
diff --git a/bl-kernel/dbusers.class.php b/bl-kernel/dbusers.class.php
index ede2db5c..2f22f441 100644
--- a/bl-kernel/dbusers.class.php
+++ b/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) {
- if($values['email']==$email) {
+ foreach ($this->db as $username=>$values) {
+ 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) {
- if($fields['tokenAuth']==$token) {
+ foreach ($this->db as $username=>$fields) {
+ 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;
+ }
}
\ No newline at end of file
diff --git a/bl-kernel/functions.php b/bl-kernel/functions.php
index b1b58ba0..29e9f8e3 100644
--- a/bl-kernel/functions.php
+++ b/bl-kernel/functions.php
@@ -349,10 +349,15 @@ function editPage($args) {
global $dbPages;
global $Syslog;
- // The user is always the one loggued
- $args['username'] = Session::get('username');
- if ( empty($args['username']) ) {
- Log::set('Function editPage()'.LOG_SEP.'Empty username.');
+ // Check the key is not empty
+ if (empty($args['key'])) {
+ Log::set('Function editPage()'.LOG_SEP.'Empty key.');
+ 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
diff --git a/bl-languages/GR.json b/bl-languages/GR.json
index d6cacfce..9f6f092f 100644
--- a/bl-languages/GR.json
+++ b/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"
}
\ No newline at end of file
diff --git a/bl-languages/ar_MA.json b/bl-languages/ar_MA.json
index 283ecb4d..5c0dfb82 100644
--- a/bl-languages/ar_MA.json
+++ b/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"
}
\ No newline at end of file
diff --git a/bl-languages/bg_BG.json b/bl-languages/bg_BG.json
index e013c5e0..f18f0f97 100644
--- a/bl-languages/bg_BG.json
+++ b/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"
}
\ No newline at end of file
diff --git a/bl-languages/de_CH.json b/bl-languages/de_CH.json
index dde0028f..74a8f88a 100644
--- a/bl-languages/de_CH.json
+++ b/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-categories": "Manage categories",
+ "manage-users": "Benutzer verwalten",
+ "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",
- "add-new-content": "Add new content",
- "new-category": "Neue Katgeorie",
- "you-do-not-have-sufficient-permissions": "Du bist nicht berechtigt, die Seite aufzurufen.",
- "add-a-new-user": "Neuer Benutzer",
+
+ "new-category": "Neue Kategorie",
+ "you-do-not-have-sufficient-permissions": "You do not have sufficient permissions",
+ "add-a-new-user": "Neuen Benutzer hinzufügen",
"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.",
- "notifications": "Notifications",
+ "change-your-language-and-region-settings": "Change your language and region settings.",
+ "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",
- "supported-image-file-types": "Unterstützte Datei-Formate",
+ "error": "Error",
+ "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-here-to-cancel": "Schliessen",
+ "click-on-the-image-for-options": "Click on the image for options.",
+ "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",
- "date": "Datum und Zeit",
+ "empty-title": "Empty title",
+ "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",
- "image-description": "Bildbeschreibung",
- "add-a-new-category": "Eine neue Kategorie hinzufügen",
+ "friendly-url": "Friendly URL",
+ "image-description": "Image description",
+ "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.",
- "site-slogan": "Untertitel",
- "use-this-field-to-add-a-catchy-phrase": "Untertitel oder Slogan der Website.",
- "site-description": "Informationen zur Website",
- "you-can-add-a-site-description-to-provide": "Kurze Beschreibung der Website für Suchmaschinen.",
+ "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": "Site slogan",
+ "use-this-field-to-add-a-catchy-phrase": "Use this field to add a catchy phrase on your site.",
+ "site-description": "Site description",
+ "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",
- "default-home-page": "Hauptseite",
- "email-account-settings": "E-Mail-Adresse",
+ "site-url": "Site URL",
+ "default-home-page": "Default home page",
+ "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",
- "select-your-sites-language": "Sprache der Website.",
+ "url-filters": "URL-Filter",
+ "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-content": "Edit content",
+ "edit-user": "Edit user",
+
"profile": "Profil",
- "change-password": "Neues Passwort",
+ "change-password": "Change password",
"enabled": "Aktiviert",
- "disable-the-user": "Benutzer deaktivieren",
- "profile-picture": "Profil-Bild",
+ "disable-the-user": "Disable the user",
+ "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.",
- "do-you-want-to-disable-the-user": "Willst Du den Benutzer deaktivieren?",
- "new-password": "Neues Passwort",
+
+ "confirm-delete-this-action-cannot-be-undone": "Confirm delete, this action cannot be undone.",
+ "do-you-want-to-disable-the-user": "Do you want to disable the user ?",
+ "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-draft-pages": "There are no draft pages",
+ "there-are-no-scheduled-pages": "Es sind keine geplanten Beiträge vorhanden.",
+ "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",
- "choose-your-language": "Sprache wählen",
- "next": "Weiter",
- "complete-the-form-choose-a-password-for-the-username-admin": "Bitte ein Passwort für den Benutzer \"admin\" wählen