diff --git a/admin/controllers/add-user.php b/admin/controllers/add-user.php index 723f0564..ce004cf3 100644 --- a/admin/controllers/add-user.php +++ b/admin/controllers/add-user.php @@ -18,30 +18,44 @@ function addUser($args) global $dbUsers; global $Language; - // Check if the username already exist in db. - if( Text::isEmpty($args['username']) ) + // Check empty username + if( Text::isEmpty($args['new_username']) ) { - Alert::set($Language->g('username-field-is-empty')); + Alert::set($Language->g('username-field-is-empty'), ALERT_STATUS_FAIL); return false; } - if( $dbUsers->userExists($args['username']) ) + // Check already exist username + if( $dbUsers->userExists($args['new_username']) ) { - Alert::set($Language->g('username-already-exists')); + Alert::set($Language->g('username-already-exists'), ALERT_STATUS_FAIL); return false; } - // Validate password. - if( ($args['password'] != $args['confirm-password'] ) || Text::isEmpty($args['password']) ) + // Password length + if( strlen($args['new_password']) < 6 ) { - Alert::set($Language->g('The password and confirmation password do not match')); + Alert::set($Language->g('Password must be at least 6 characters long'), ALERT_STATUS_FAIL); return false; } - // Add the user. - if( $dbUsers->add($args) ) + // Check new password and confirm password are equal + if( $args['new_password'] != $args['confirm_password'] ) { - Alert::set($Language->g('user-has-been-added-successfully')); + Alert::set($Language->g('The password and confirmation password do not match'), ALERT_STATUS_FAIL); + return false; + } + + // Filter form fields + $tmp = array(); + $tmp['username'] = $args['new_username']; + $tmp['password'] = $args['new_password']; + $tmp['role'] = $args['role']; + + // Add the user to the database + if( $dbUsers->add($tmp) ) + { + Alert::set($Language->g('user-has-been-added-successfully'), ALERT_STATUS_OK); return true; } else diff --git a/admin/controllers/edit-user.php b/admin/controllers/edit-user.php index 39a6bd7c..6b85671d 100644 --- a/admin/controllers/edit-user.php +++ b/admin/controllers/edit-user.php @@ -17,26 +17,6 @@ function editUser($args) } } -function setPassword($username, $new_password, $confirm_password) -{ - global $dbUsers; - global $Language; - - if( ($new_password===$confirm_password) && !Text::isEmpty($new_password) ) - { - if( $dbUsers->setPassword($username, $new_password) ) { - Alert::set($Language->g('The changes have been saved')); - } - else { - Log::set(__METHOD__.LOG_SEP.'Error occurred when trying to change the user password.'); - } - } - else { - Alert::set($Language->g('The password and confirmation password do not match')); - return false; - } -} - function deleteUser($args, $deleteContent=false) { global $dbUsers; @@ -92,10 +72,6 @@ if( $_SERVER['REQUEST_METHOD'] == 'POST' ) elseif(isset($_POST['delete-user-associate'])) { deleteUser($_POST, false); } - elseif( !empty($_POST['new-password']) && !empty($_POST['confirm-password']) ) { - setPassword($_POST['username'], $_POST['new-password'], $_POST['confirm-password']); - editUser($_POST); - } else { editUser($_POST); } diff --git a/admin/controllers/user-password.php b/admin/controllers/user-password.php new file mode 100644 index 00000000..6b4c977a --- /dev/null +++ b/admin/controllers/user-password.php @@ -0,0 +1,73 @@ +g('Password must be at least 6 characters long'), ALERT_STATUS_FAIL); + return false; + } + + if($new_password===$confirm_password) + { + if( $dbUsers->setPassword($username, $new_password) ) { + Alert::set($Language->g('The changes have been saved'), ALERT_STATUS_OK); + return true; + } + else { + Log::set(__METHOD__.LOG_SEP.'Error occurred when trying to change the user password.'); + return false; + } + } + else { + Alert::set($Language->g('The password and confirmation password do not match'), ALERT_STATUS_FAIL); + return false; + } +} + +// ============================================================================ +// Main before POST +// ============================================================================ + +// ============================================================================ +// POST Method +// ============================================================================ + +if( $_SERVER['REQUEST_METHOD'] == 'POST' ) +{ + // Prevent editors to administrate other users. + if($Login->role()!=='admin') + { + $_POST['username'] = $Login->username(); + unset($_POST['role']); + } + + if( setPassword($_POST['username'], $_POST['new_password'], $_POST['confirm_password']) ) { + Redirect::page('admin', 'users'); + } +} + +// ============================================================================ +// Main after POST +// ============================================================================ + +if($Login->role()!=='admin') { + $layout['parameters'] = $Login->username(); +} + +$_user = $dbUsers->getDb($layout['parameters']); + +// If the user doesn't exist, redirect to the users list. +if($_user===false) { + Redirect::page('admin', 'users'); +} + +$_user['username'] = $layout['parameters']; diff --git a/admin/themes/default/css/default.css b/admin/themes/default/css/default.css index 8f2aebfd..4c58ae51 100644 --- a/admin/themes/default/css/default.css +++ b/admin/themes/default/css/default.css @@ -99,9 +99,15 @@ button.delete-button:hover { text-decoration: underline; } +#jscontent { + height: 400px; +} + + +/* ----------- ALERT ----------- */ + #alert { display: none; - background: rgba(48, 102, 187, 0.91); color: #ffffff; padding: 24px; position: fixed; @@ -110,8 +116,12 @@ button.delete-button:hover { z-index: 100; } -#jscontent { - height: 400px; +.alert-ok { + background: rgba(48, 102, 187, 0.91); +} + +.alert-fail { + background: rgba(187, 48, 48, 0.91); } /* ----------- LOGIN FORM ----------- */ @@ -226,9 +236,16 @@ div.plugin-links > span.separator { color: #AAAAAA; } +#jsformplugin textarea { + min-width: 400px; + width: 60%; + min-height: 100px; +} + #jsformplugin input[type=text] { min-width: 400px; width: 60%; + height: 37px; } #jsformplugin input[type="checkbox"] { @@ -239,6 +256,6 @@ div.plugin-links > span.separator { #jsformplugin label.forCheckbox { margin-left: 3px; - margin-bottom: 10px; + margin-bottom: 0px !important; display: inline-block; } diff --git a/admin/themes/default/index.php b/admin/themes/default/index.php index f834fb0a..dae2d4d1 100644 --- a/admin/themes/default/index.php +++ b/admin/themes/default/index.php @@ -48,7 +48,7 @@ $(document).ready(function() { }); -
+
diff --git a/admin/themes/default/init.php b/admin/themes/default/init.php index 07ce459e..1f3db143 100644 --- a/admin/themes/default/init.php +++ b/admin/themes/default/init.php @@ -30,6 +30,7 @@ class HTML { $type = isset($args['type']) ? $args['type'] : 'text'; $class = empty($args['class']) ? '' : 'class="'.$args['class'].'"'; $placeholder = empty($args['placeholder']) ? '' : 'placeholder="'.$args['placeholder'].'"'; + $disabled = empty($args['disabled']) ? '' : 'disabled'; $html = '
'; @@ -39,7 +40,7 @@ class HTML { $html .= '
'; - $html .= ''; + $html .= ''; if(!empty($args['tip'])) { $html .= '

'.$args['tip'].'

'; @@ -158,6 +159,9 @@ class HTML { $("#jsaddImage").on("click", function() { var filename = $("#jsimageList option:selected").text(); + if(!filename.trim()) { + return false; + } var textareaValue = $("#jscontent").val(); $("#jscontent").val(textareaValue + "\"\"" + "\n"); }); @@ -186,6 +190,10 @@ class HTML { bar.css("width", "100%").text("100%"); setTimeout(function() { progressbar.addClass("uk-hidden"); }, 250); $("#jsimageList").prepend(""); + }, + + notallowed: function(file, settings) { + alert("'.$L->g('Supported image file types').' "+settings.allow); } }; diff --git a/admin/views/add-user.php b/admin/views/add-user.php index ff3b871d..2b7230e0 100644 --- a/admin/views/add-user.php +++ b/admin/views/add-user.php @@ -2,7 +2,7 @@ HTML::title(array('title'=>$L->g('Add a new user'), 'icon'=>'user-plus')); -HTML::formOpen(array('class'=>'uk-form-horizontal')); +HTML::formOpen(array('id'=>'add-user-form', 'class'=>'uk-form-horizontal')); // Security token HTML::formInputHidden(array( @@ -11,15 +11,15 @@ HTML::formOpen(array('class'=>'uk-form-horizontal')); )); HTML::formInputText(array( - 'name'=>'username', + 'name'=>'new_username', 'label'=>$L->g('Username'), - 'value'=>(isset($_POST['username'])?$_POST['username']:''), + 'value'=>(isset($_POST['new_username'])?$_POST['new_username']:''), 'class'=>'uk-width-1-2 uk-form-medium', 'tip'=>'' )); HTML::formInputPassword(array( - 'name'=>'password', + 'name'=>'new_password', 'label'=>$L->g('Password'), 'value'=>'', 'class'=>'uk-width-1-2 uk-form-medium', @@ -27,7 +27,7 @@ HTML::formOpen(array('class'=>'uk-form-horizontal')); )); HTML::formInputPassword(array( - 'name'=>'confirm-password', + 'name'=>'confirm_password', 'label'=>$L->g('Confirm Password'), 'value'=>'', 'class'=>'uk-width-1-2 uk-form-medium', diff --git a/admin/views/edit-user.php b/admin/views/edit-user.php index 6416e9b5..bb336c46 100644 --- a/admin/views/edit-user.php +++ b/admin/views/edit-user.php @@ -1,8 +1,8 @@ $L->g('Edit user').' :: '.$_user['username'], 'icon'=>'user')); +HTML::title(array('title'=>$L->g('Edit user'), 'icon'=>'user')); -HTML::formOpen(array('class'=>'uk-form-horizontal')); +HTML::formOpen(array('id'=>'edit-user-profile-form','class'=>'uk-form-horizontal')); // Security token HTML::formInputHidden(array( @@ -18,6 +18,15 @@ HTML::formOpen(array('class'=>'uk-form-horizontal')); HTML::legend(array('value'=>$L->g('Profile'))); + HTML::formInputText(array( + 'name'=>'usernameDisable', + 'label'=>$L->g('Username'), + 'value'=>$_user['username'], + 'class'=>'uk-width-1-2 uk-form-medium', + 'disabled'=>true, + 'tip'=>'' + )); + HTML::formInputText(array( 'name'=>'firstName', 'label'=>$L->g('First name'), @@ -34,6 +43,13 @@ HTML::formOpen(array('class'=>'uk-form-horizontal')); 'tip'=>'' )); + echo '
+ +
+ '.$L->g('Change password').' +
+
'; + if($Login->role()==='admin') { HTML::formSelect(array( @@ -54,24 +70,6 @@ if($Login->role()==='admin') { 'tip'=>$L->g('email-will-not-be-publicly-displayed') )); - HTML::legend(array('value'=>$L->g('Change password'))); - - HTML::formInputPassword(array( - 'name'=>'new-password', - 'label'=>$L->g('New password'), - 'value'=>'', - 'class'=>'uk-width-1-2 uk-form-medium', - 'tip'=>'' - )); - - HTML::formInputPassword(array( - 'name'=>'confirm-password', - 'label'=>$L->g('Confirm Password'), - 'value'=>'', - 'class'=>'uk-width-1-2 uk-form-medium', - 'tip'=>'' - )); - echo '
diff --git a/admin/views/new-post.php b/admin/views/new-post.php index fd4f1494..3d89fb99 100644 --- a/admin/views/new-post.php +++ b/admin/views/new-post.php @@ -44,7 +44,7 @@ echo '
'; // Tabs, general and advanced mode echo ''; diff --git a/admin/views/user-password.php b/admin/views/user-password.php new file mode 100644 index 00000000..d51fa456 --- /dev/null +++ b/admin/views/user-password.php @@ -0,0 +1,55 @@ +$L->g('Change password'), 'icon'=>'key')); + +HTML::formOpen(array('id'=>'edit-user-profile-form','class'=>'uk-form-horizontal')); + + // Security token + HTML::formInputHidden(array( + 'name'=>'tokenCSRF', + 'value'=>$Security->getToken() + )); + + // Hidden field username + HTML::formInputHidden(array( + 'name'=>'username', + 'value'=>$_user['username'] + )); + + HTML::legend(array('value'=>$L->g('New password'))); + + HTML::formInputText(array( + 'name'=>'usernameDisable', + 'label'=>$L->g('Username'), + 'value'=>$_user['username'], + 'class'=>'uk-width-1-2 uk-form-medium', + 'disabled'=>true, + 'tip'=>'' + )); + + HTML::formInputPassword(array( + 'name'=>'new_password', + 'label'=>$L->g('New password'), + 'value'=>'', + 'class'=>'uk-width-1-2 uk-form-medium', + 'tip'=>'' + )); + + HTML::formInputPassword(array( + 'name'=>'confirm_password', + 'label'=>$L->g('Confirm password'), + 'value'=>'', + 'class'=>'uk-width-1-2 uk-form-medium', + 'tip'=>'' + )); + + echo '
+
+ + '.$L->g('Cancel').' +
+
'; + +HTML::formClose(); + +?> \ No newline at end of file diff --git a/install.php b/install.php index 7da52d20..f2bc046d 100644 --- a/install.php +++ b/install.php @@ -7,6 +7,11 @@ * Bludit is opensource software licensed under the MIT license. */ +// Check PHP version +if(version_compare(phpversion(), '5.3', '<')) { + exit('Current PHP version '.phpversion().', you need > 5.3. (ERR_202)'); +} + // Security constant define('BLUDIT', true); @@ -139,19 +144,6 @@ function checkSystem() $phpModules = get_loaded_extensions(); } - // If the php version is less than 5.3, then don't check others requirements. - if(!version_compare(phpversion(), '5.3', '>=')) - { - $errorText = 'Current PHP version '.phpversion().', you need > 5.3. (ERR_202)'; - error_log($errorText, 0); - - $tmp['title'] = 'PHP version'; - $tmp['errorText'] = $errorText; - array_push($stdOut, $tmp); - - return $stdOut; - } - if(!file_exists(PATH_ROOT.'.htaccess')) { $errorText = 'Missing file, upload the file .htaccess (ERR_201)'; @@ -202,9 +194,8 @@ function install($adminPassword, $email, $timezoneOffset) $stdOut = array(); - $timezone = timezone_name_from_abbr('', $timezoneOffset, 1); + $timezone = timezone_name_from_abbr('', $timezoneOffset, 0); if($timezone === false) { $timezone = timezone_name_from_abbr('', $timezoneOffset, 0); } // Workaround bug #44780 - date_default_timezone_set($timezone); $currentDate = Date::current(DB_DATE_FORMAT); diff --git a/kernel/boot/init.php b/kernel/boot/init.php index 56d8b319..e9471d91 100644 --- a/kernel/boot/init.php +++ b/kernel/boot/init.php @@ -48,6 +48,12 @@ if(!defined('JSON_PRETTY_PRINT')) { define('JSON_PRETTY_PRINT', 128); } +// Alert status ok +define('ALERT_STATUS_OK', 0); + +// Alert status fail +define('ALERT_STATUS_FAIL', 1); + // Salt length define('SALT_LENGTH', 8); diff --git a/kernel/dblanguage.class.php b/kernel/dblanguage.class.php index 58a999cc..6cb9bd11 100644 --- a/kernel/dblanguage.class.php +++ b/kernel/dblanguage.class.php @@ -93,6 +93,7 @@ class dbLanguage extends dbJSON foreach($files as $file) { + $t = new dbJSON($file, false); $native = $t->db['language-data']['native']; $locale = basename($file, '.json'); diff --git a/kernel/dbpages.class.php b/kernel/dbpages.class.php index 410553ad..9cf55dd1 100644 --- a/kernel/dbpages.class.php +++ b/kernel/dbpages.class.php @@ -11,7 +11,7 @@ class dbPages extends dbJSON 'username'=> array('inFile'=>false, 'value'=>''), 'tags'=> array('inFile'=>false, 'value'=>array()), 'status'=> array('inFile'=>false, 'value'=>'draft'), - 'date'=> array('inFile'=>false, 'value'=>0), + 'date'=> array('inFile'=>false, 'value'=>''), 'position'=> array('inFile'=>false, 'value'=>0) ); @@ -34,9 +34,7 @@ class dbPages extends dbJSON } // Current date. - if(empty($args['date'])) { - $args['date'] = Date::current(DB_DATE_FORMAT); - } + $args['date'] = Date::current(DB_DATE_FORMAT); // Verify arguments with the database fields. foreach($this->dbFields as $field=>$options) diff --git a/kernel/helpers/alert.class.php b/kernel/helpers/alert.class.php index 6b7bd9b6..b0d11bf2 100644 --- a/kernel/helpers/alert.class.php +++ b/kernel/helpers/alert.class.php @@ -2,21 +2,25 @@ class Alert { - // new - public static function set($value, $key='alert') + // Status, 0 = OK, 1 = Fail + public static function set($value, $status=ALERT_STATUS_OK, $key='alert') { Session::set('defined', true); - + Session::set('alertStatus', $status); Session::set($key, $value); } public static function get($key='alert') { Session::set('defined', false); - return Session::get($key); } + public static function status() + { + return Session::get('alertStatus'); + } + public static function p($key='alert') { echo self::get($key); diff --git a/languages/bg_BG.json b/languages/bg_BG.json index bd21daf4..9aabe2af 100644 --- a/languages/bg_BG.json +++ b/languages/bg_BG.json @@ -3,7 +3,11 @@ { "native": "Български (България)", "english-name": "Bulgarian", +<<<<<<< HEAD "last-update": "2015-11-06", +======= + "last-update": "2015-11-09", +>>>>>>> upstream/master "author": "Христо Дипчиков", "email": "", "website": "www.hristodipchikov.tk" @@ -52,7 +56,11 @@ "prev-page": "Предишна страница", "next-page": "Следваща страница", "configure-plugin": "Конфигуриране", +<<<<<<< HEAD "confirm-delete-this-action-cannot-be-undone": "Ако потвърдете изтриванер, действието не може да бъде отменено.", +======= + "confirm-delete-this-action-cannot-be-undone": "Ако потвърдете, действието не може да бъде отменено.", +>>>>>>> upstream/master "site-title": "Заглавие на сайта", "site-slogan": "Ключови думи / Етикети", "site-description": "Описание на сайта", @@ -70,7 +78,11 @@ "timezone": "Часова зона", "locale": "Местоположение", "new-post": "Нова публикация", +<<<<<<< HEAD "html-and-markdown-code-supported": "Поддръжан код HTML и Markdown ", +======= + "html-and-markdown-code-supported": "Поддръжан код HTML и Markdown ", +>>>>>>> upstream/master "new-page": "Нова страница", "manage-posts": "Управление на публикациите", "published-date": "Дата на побликуване", @@ -105,8 +117,13 @@ "you-do-not-have-sufficient-permissions": "Вие нямате права за достъп до тази страница, моля свържете се с администратора.", "settings-advanced-writting-settings": "Настройки->Разширени настройки->Записване на настройки", "new-posts-and-pages-synchronized": "Новите публикации и страници са синхронизирани.", +<<<<<<< HEAD "you-can-choose-the-users-privilege": "Можете да зададете правомощия на потребителя. Редактора може само да напише страници и мнения.", "email-will-not-be-publicly-displayed": "Имейл адрес няма да бъде показван.Ще се използва за възстановяване парола и уведомления.", +======= + "you-can-choose-the-users-privilege": "Можете да зададете правомощия на потребителя. Редактора, може само да напише страници и мнения.", + "email-will-not-be-publicly-displayed": "Този имейл адрес няма да бъде показван. Ще се използва за възстановяване парола и уведомления.", +>>>>>>> upstream/master "use-this-field-to-name-your-site": "Използвайте това поле за име на вашия сайт, той ще се появи в горната част на всяка страница на вашия сайт.", "use-this-field-to-add-a-catchy-phrase": "Използвайте това поле, за да добавите ключови думи и изрази за вашия сайт.", "you-can-add-a-site-description-to-provide": "Можете да добавите кратко описание или биография на сайта.", @@ -116,9 +133,15 @@ "add-or-edit-description-tags-or": "Добавяне или редактиране на описание, eтикети или модифициране URL.", "select-your-sites-language": "Изберете системен език.", "select-a-timezone-for-a-correct": "Изберете часова зона за правилтото показване на дата / час.", +<<<<<<< HEAD "you-can-use-this-field-to-define-a-set-of": "Можете да използвате това поле, за набор на параметри, свързани с език, страната и специални преференции.", "you-can-modify-the-url-which-identifies":"Можете да промените адреса, на дадената страница или публикация, ключови думи. Но не повече от 150 символа.", "this-field-can-help-describe-the-content": " В това поле може да опишете съдържанието с няколко думи. Но не повече от 150 символа.", +======= + "you-can-use-this-field-to-define-a-set-of": "Можете да използвате това поле за избар на параметри свързани с езика, страната и специални преференции.", + "you-can-modify-the-url-which-identifies":"Можете да промените URL адреса , който идентифицира страницата или публикацията използвайки ключови думи, но с обща дължина не повече от 150 символа.", + "this-field-can-help-describe-the-content": " В това поле може да опишете съдържанието с няколко думи, но с обща дължина не повече от 150 символа.", +>>>>>>> upstream/master "write-the-tags-separeted-by-comma": "Добавянето на етикети става чрез добавянето на запетая. Например: TAG1, tag2, tag3", "delete-the-user-and-all-its-posts":"Изтриване на потребителя и всички негови публикации.", "delete-the-user-and-associate-its-posts-to-admin-user": "Изтриване на потребителя, без изтриване на неговите публикации.", @@ -129,8 +152,13 @@ "there-are-no-drafts": "Не са открити чернови.", "create-a-new-article-for-your-blog":"Създайте на нова публикация във вашия блог.", "create-a-new-page-for-your-website":"Създайте на нова страница във вашия уеб сайт.", +<<<<<<< HEAD "invite-a-friend-to-collaborate-on-your-website":"Добави приятел, който да помага за развитието вашият сайт.", "change-your-language-and-region-settings":"Избор на параметри, свързани с език, страната и местоположение.", +======= + "invite-a-friend-to-collaborate-on-your-website":"Добави потребител, който да ви помага за развитието вашият сайт.", + "change-your-language-and-region-settings":"Избор на параметри свързани с език, страна и местоположение.", +>>>>>>> upstream/master "language-and-timezone":"Език и часова зона", "author": "Автор", "start-here": "Начало", @@ -139,14 +167,24 @@ "congratulations-you-have-successfully-installed-your-bludit": "Поздравления вие успешно инсталирахте вашият **Bludit**", "whats-next": "Какво следва?", "manage-your-bludit-from-the-admin-panel": "Управлявайте вашият Bludit от [Администраторският панел](./admin/)", +<<<<<<< HEAD "follow-bludit-on": "Follow Bludit on", "visit-the-support-forum": "Visit the [forum](http://forum.bludit.com) for support", +======= + "follow-bludit-on": "Последвайте Bludit в", + "visit-the-support-forum": "Посети [форум](http://forum.bludit.com) за подръжка", +>>>>>>> upstream/master "read-the-documentation-for-more-information": "Прочети [документацията](http://docs.bludit.com) за повече информация", "share-with-your-friends-and-enjoy": "Споделете с приятелите си", "the-page-has-not-been-found": "Страницата не е намерена.", "error": "Грешна", +<<<<<<< HEAD "bludit-installer": "Bludit Installer", "welcome-to-the-bludit-installer": "Welcome to the Bludit installer", +======= + "bludit-installer": "Bludit Инстлатор", + "welcome-to-the-bludit-installer": "Добре дошли в Bludit инсталатор", +>>>>>>> upstream/master "complete-the-form-choose-a-password-for-the-username-admin": "Попълнете формуляра, или парола за потребителското име « admin »", "password-visible-field": "Парола във видимото поле!", "install": "Инсталиране", @@ -155,7 +193,11 @@ "the-password-field-is-empty": "Полето за парола е празно", "your-email-address-is-invalid":"Вашият имейл адрес е невалиден.", "proceed-anyway": "Продължете така или иначе!", +<<<<<<< HEAD "drafts":"Чернови", +======= + "drafts":"Чернови:", +>>>>>>> upstream/master "ip-address-has-been-blocked": "IP адрес е блокиран.", "try-again-in-a-few-minutes": "Опитайте отново след няколко минути.", "date": "Дата", @@ -171,6 +213,7 @@ "enable-the-command-line-mode-if-you-add-edit": "Смени с режим на командния ред, ако добавяте, променяте или изтривате постове и страници от файловата система", "configure": "Конфигориране", "uninstall": "Премахване", +<<<<<<< HEAD "change-password": "Промяна на парола", "to-schedule-the-post-just-select-the-date-and-time": "За да планирате поста, просто изберете датата и часа.", "write-the-tags-separated-by-commas": "Напиши етикети, разделени със запетая.", @@ -178,6 +221,15 @@ "published": "Пубиликуван", "scheduled-posts": "Планирани постове", "statistics": "Статистика", +======= + "change-password": "Промяна на парола:", + "to-schedule-the-post-just-select-the-date-and-time": "За да планирате поста, просто изберете дата и час.", + "write-the-tags-separated-by-commas": "Напишете етикети, разделени със запетая.", + "status": "Статус", + "published": "Пубиликуван", + "scheduled-posts": "Планирани постове:", + "statistics": "Статистика:", +>>>>>>> upstream/master "name": "Име", "email-account-settings":"Настройки на имейл акаунт", "sender-email": "Имейл на изпращача", @@ -185,6 +237,7 @@ "bludit-login-access-code": "BLUDIT - Код за достъп", "check-your-inbox-for-your-login-access-code":"Проверете вашата пощенска кутия за вашия код за достъп", "there-was-a-problem-sending-the-email":"Възникна проблем при изпращането на имейла", +<<<<<<< HEAD "back-to-login-form": "Връщане вкъм входящата форма", "send-me-a-login-access-code": "Изпрати ми кода за достъп", "get-login-access-code": "Вземете кода за достъп", @@ -193,6 +246,16 @@ "show-password": "Покажи паролата", "edit-or-remove-your=pages": "Промяна или премахване на страници.", "edit-or-remove-your-blogs-posts": "Промяна или премахване на статии от блога ви.", +======= + "back-to-login-form": "Връщане към входяща форма", + "send-me-a-login-access-code": "Изпрати код за достъп", + "get-login-access-code": "Вземете код за достъп", + "email-notification-login-access-code": "

Това е уведомление от вашия сайт {{WEBSITE_NAME}}

Вашият код за достъп , последвайте следващата връзката:

{{LINK}}

", + "there-are-no-scheduled-posts": "Не са открити планирани публикации.", + "show-password": "Покажи паролата", + "edit-or-remove-your=pages": "Промяна или премахване на страници.", + "edit-or-remove-your-blogs-posts": "Промяна или премахване на публикации.", +>>>>>>> upstream/master "general-settings": "Основни настройки", "advanced-settings": "Разширени настройки", "manage-users": "Управление на потребители", diff --git a/languages/de_DE.json b/languages/de_DE.json index 254d05b5..df4ef2a8 100644 --- a/languages/de_DE.json +++ b/languages/de_DE.json @@ -3,7 +3,7 @@ { "native": "Deutsch (Deutschland)", "english-name": "German", - "last-update": "2015-11-05", + "last-update": "2015-11-10", "author": "Edi Goetschel", "email": "egoetschel@clickwork.ch", "website": "http://www.clickwork.ch" @@ -41,8 +41,8 @@ "profile": "Profil", "email": "E-Mail", "settings": "Einstellungen", - "general": "Allgemeine Einstellungen", - "advanced": "Erweiterte Einstellungen", + "general": "Allgemein", + "advanced": "Erweitert", "regional": "Lokalisierung", "about": "Systeminformation", "login": "Anmelden", @@ -163,14 +163,14 @@ "scheduled": "Veröffentlichung geplant.", "publish": "Veröffentlichen", "please-check-your-theme-configuration": "Bitte die Einstellungen des Themes prüfen.", - "plugin-label": "Plugin-Bezeichnung", + "plugin-label": "Titel auf der Website", "enabled": "Aktiviert", "disabled": "Deaktiviert", "cli-mode": "CLI-Modus", "command-line-mode": "Kommandozeilen-Modus", "enable-the-command-line-mode-if-you-add-edit": "Verwende den Kommandozeilen-Modus, wenn du Beiträge und Seiten im Dateisystem hinzufügen, ändern oder löschen möchtest.", "configure": "Konfiguration", - "uninstall": "Deaktivieren, + "uninstall": "Deaktivieren", "change-password": "Neues Passwort", "to-schedule-the-post-just-select-the-date-and-time": "Um einen Beitrag zu einem bestimmten Zeitpunkt zu veröffentlichen, Datum und Zeit wählen.", "write-the-tags-separated-by-commas": "Schlagwörter durch Kommas getrennt.", diff --git a/languages/en_US.json b/languages/en_US.json index 405f1f45..e308c6f4 100644 --- a/languages/en_US.json +++ b/languages/en_US.json @@ -203,5 +203,6 @@ "images": "Images", "upload-image": "Upload image", "drag-and-drop-or-click-here": "Drag and drop or click here", - "insert-image": "Insert image" + "insert-image": "Insert image", + "supported-image-file-types": "Supported image file types" } \ No newline at end of file diff --git a/languages/fr_FR.json b/languages/fr_FR.json index b749454a..5eb05848 100644 --- a/languages/fr_FR.json +++ b/languages/fr_FR.json @@ -3,7 +3,7 @@ { "native": "Français (France)", "english-name": "French", - "last-update": "2015-10-29", + "last-update": "2015-11-08", "author": "Frédéric K.", "email": "stradfred@gmail.com", "website": "" @@ -196,5 +196,12 @@ "general-settings": "Paramètres généraux", "advanced-settings": "Paramètres avancés", "manage-users": "Gestion des utilisateurs", - "view-and-edit-your-profile": "Modifier votre profil" + "view-and-edit-your-profile": "Modifier votre profil", + + "password-must-be-at-least-6-characters-long": "Le mot de passe doit contenir au moins 6 caractères", + "images": "Images", + "upload-image": "Envoyer une image", + "drag-and-drop-or-click-here": "Glissez et déposez ou cliquez ici", + "insert-image": "Insérer l’image sélectionnée" + } \ No newline at end of file diff --git a/languages/zh_TW.json b/languages/zh_TW.json index 7a2460c1..86df91d4 100644 --- a/languages/zh_TW.json +++ b/languages/zh_TW.json @@ -3,7 +3,7 @@ { "native": "Traditional Chinese (Taiwan)", "english-name": "Traditional Chinese", - "last-update": "2015-11-05", + "last-update": "2015-11-10", "author": "Ethan Chen", "email": "ethan42411@gmail.com", "website": "http://single4.ml" @@ -202,5 +202,6 @@ "images": "圖片", "upload-image": "上傳圖片", "drag-and-drop-or-click-here": "拖曳您的圖片到這裡或是點選這裡選擇圖片", - "insert-image": "插入圖片" + "insert-image": "插入圖片", + "supported-image-file-types": "可以上傳的檔案格式" } diff --git a/plugins/about/languages/en_US.json b/plugins/about/languages/en_US.json new file mode 100644 index 00000000..f058c1fd --- /dev/null +++ b/plugins/about/languages/en_US.json @@ -0,0 +1,12 @@ +{ + "plugin-data": + { + "name": "About", + "description": "Little description about your site or yourself.", + "author": "Bludit", + "email": "", + "website": "https://github.com/dignajar/bludit-plugins", + "version": "0.6", + "releaseDate": "2015-11-13" + } +} \ No newline at end of file diff --git a/plugins/about/plugin.php b/plugins/about/plugin.php new file mode 100644 index 00000000..9e30b80f --- /dev/null +++ b/plugins/about/plugin.php @@ -0,0 +1,47 @@ +dbFields = array( + 'label'=>'About', + 'text'=>'' + ); + } + + public function form() + { + global $Language; + + $html = '
'; + $html .= ''; + $html .= ''; + $html .= '
'; + + $html .= '
'; + $html .= ''; + $html .= ''; + $html .= '
'; + + return $html; + } + + public function siteSidebar() + { + global $Language; + global $dbTags; + global $Url; + + $filter = $Url->filters('tag'); + + $html = '
'; + $html .= '

'.$this->getDbField('label').'

'; + $html .= '
'; + $html .= $this->getDbField('text'); + $html .= '
'; + $html .= '
'; + + return $html; + } +} \ No newline at end of file diff --git a/plugins/disqus/languages/de_DE.json b/plugins/disqus/languages/de_DE.json index 8c5a30d8..5b5f0747 100644 --- a/plugins/disqus/languages/de_DE.json +++ b/plugins/disqus/languages/de_DE.json @@ -8,4 +8,4 @@ "enable-disqus-on-pages": "Disqus auf Seiten verwenden", "enable-disqus-on-posts": "Disqus bei Beiträgen verwenden", "enable-disqus-on-default-home-page": "Disqus auf der Hauptseite verwenden" -} +} \ No newline at end of file diff --git a/plugins/disqus/languages/en_US.json b/plugins/disqus/languages/en_US.json index 2309f4b4..e53d65d6 100644 --- a/plugins/disqus/languages/en_US.json +++ b/plugins/disqus/languages/en_US.json @@ -6,8 +6,8 @@ "author": "Bludit", "email": "", "website": "https://github.com/dignajar/bludit-plugins", - "version": "0.3", - "releaseDate": "2015-10-02" + "version": "0.6", + "releaseDate": "2015-11-13" }, "disqus-shortname": "Disqus shortname", "enable-disqus-on-pages": "Enable Disqus on pages", diff --git a/plugins/disqus/languages/pl_PL.json b/plugins/disqus/languages/pl_PL.json index 6b8e58ba..13fb0fad 100644 --- a/plugins/disqus/languages/pl_PL.json +++ b/plugins/disqus/languages/pl_PL.json @@ -2,12 +2,7 @@ "plugin-data": { "name": "System komentarzy - Disqus", - "description": "System komentarzy Disqus przechowuje komentarze dla serwisów internetowych. Korzystanie z tej wtyczki wymaga rejestracji w serwisie disqus.com.", - "author": "Bludit", - "email": "", - "website": "https://github.com/dignajar/bludit-plugins", - "version": "0.3", - "releaseDate": "2015-10-02" + "description": "System komentarzy Disqus przechowuje komentarze dla serwisów internetowych. Korzystanie z tej wtyczki wymaga rejestracji w serwisie disqus.com." }, "disqus-shortname": "Nazwa użytkownika Disqus", "enable-disqus-on-pages": "Włącz Disqus na wszystkich stronach", diff --git a/plugins/googletools/languages/de_DE.json b/plugins/googletools/languages/de_DE.json index b9abb81d..8b3abce9 100644 --- a/plugins/googletools/languages/de_DE.json +++ b/plugins/googletools/languages/de_DE.json @@ -2,15 +2,10 @@ "plugin-data": { "name": "Google-Tools", - "description": "Dieses Plugin erzeugt den Meta-Tag, um deine Website mit den Google Webmasters Tools zu verbinden, und den Code für das JavaScript, der benötigt wird, um Google Analytics verwenden zu können.", - "author": "Bludit", - "email": "", - "website": "https://github.com/dignajar/bludit-plugins", - "version": "0.3", - "releaseDate": "2015-10-02" + "description": "Dieses Plugin erzeugt den Meta-Tag, um deine Website mit den Google Webmasters Tools zu verbinden, und den Code für das JavaScript, der benötigt wird, um Google Analytics verwenden zu können." }, "google-webmasters-tools": "Google Webmasters Tools", "google-analytics-tracking-id": "Google Analytics ID", "complete-this-field-with-the-google-site-verification": "Gib hier den Google Analytics-Tracking-Code ein, um zu bestätigen, dass die Website Dir gehört.", "complete-this-field-with-the-tracking-id": "Gib hier die Tracking ID ein." -} +} \ No newline at end of file diff --git a/plugins/googletools/languages/en_US.json b/plugins/googletools/languages/en_US.json index 2829cb21..0697e6e0 100644 --- a/plugins/googletools/languages/en_US.json +++ b/plugins/googletools/languages/en_US.json @@ -6,8 +6,8 @@ "author": "Bludit", "email": "", "website": "https://github.com/dignajar/bludit-plugins", - "version": "0.3", - "releaseDate": "2015-10-02" + "version": "0.6", + "releaseDate": "2015-11-13" }, "google-webmasters-tools": "Google Webmasters tools", "google-analytics-tracking-id": "Google Analytics Tracking ID", diff --git a/plugins/googletools/languages/pl_PL.json b/plugins/googletools/languages/pl_PL.json index 1124e2f5..a20abd2c 100644 --- a/plugins/googletools/languages/pl_PL.json +++ b/plugins/googletools/languages/pl_PL.json @@ -2,12 +2,7 @@ "plugin-data": { "name": "Narzędzia Google", - "description": "Wtyczka ta generuje kod metatagów pozwalający zweryfikować stronę z serwisem Narzędzia Google Dla Webmasterów oraz wygenerować kod JavaScript monitorujący ruch z usługą Google Analytics.", - "author": "Bludit", - "email": "", - "website": "https://github.com/dignajar/bludit-plugins", - "version": "0.3", - "releaseDate": "2015-10-02" + "description": "Wtyczka ta generuje kod metatagów pozwalający zweryfikować stronę z serwisem Narzędzia Google Dla Webmasterów oraz wygenerować kod JavaScript monitorujący ruch z usługą Google Analytics." }, "google-webmasters-tools": "Google Webmasters tools", "google-analytics-tracking-id": "Google Analytics Tracking ID", diff --git a/plugins/maintancemode/languages/en_US.json b/plugins/maintancemode/languages/en_US.json index cc1eb966..3bb095f6 100644 --- a/plugins/maintancemode/languages/en_US.json +++ b/plugins/maintancemode/languages/en_US.json @@ -6,8 +6,8 @@ "author": "Bludit", "email": "", "website": "https://github.com/dignajar/bludit-plugins", - "version": "0.3", - "releaseDate": "2015-10-02" + "version": "0.6", + "releaseDate": "2015-11-13" }, "enable-maintence-mode": "Enable maintence mode", diff --git a/plugins/maintancemode/languages/pl_PL.json b/plugins/maintancemode/languages/pl_PL.json index 441715d3..4472a53d 100644 --- a/plugins/maintancemode/languages/pl_PL.json +++ b/plugins/maintancemode/languages/pl_PL.json @@ -2,12 +2,7 @@ "plugin-data": { "name": "Tryb konserwacji", - "description": "Przełącz stronę w tryb konwersacji (wówczas działać będzie tylko kokpit).", - "author": "Bludit", - "email": "", - "website": "https://github.com/dignajar/bludit-plugins", - "version": "0.3", - "releaseDate": "2015-10-02" + "description": "Przełącz stronę w tryb konwersacji (wówczas działać będzie tylko kokpit)." }, "enable-maintence-mode": "Włącz tryb konwersacji", diff --git a/plugins/opengraph/languages/en_US.json b/plugins/opengraph/languages/en_US.json index e77e4055..56690f5a 100644 --- a/plugins/opengraph/languages/en_US.json +++ b/plugins/opengraph/languages/en_US.json @@ -6,7 +6,7 @@ "author": "Bludit", "email": "", "website": "https://github.com/dignajar/bludit-plugins", - "version": "0.3", - "releaseDate": "2015-10-02" + "version": "0.6", + "releaseDate": "2015-11-13" } } \ No newline at end of file diff --git a/plugins/opengraph/languages/pl_PL.json b/plugins/opengraph/languages/pl_PL.json index c34a49cb..41b92e0a 100644 --- a/plugins/opengraph/languages/pl_PL.json +++ b/plugins/opengraph/languages/pl_PL.json @@ -2,11 +2,6 @@ "plugin-data": { "name": "Open Graph", - "description": "Protokół Open Graph zezwala stronie na stosowanie meta tagów używanych w serwisach społecznościowych.", - "author": "Bludit", - "email": "", - "website": "https://github.com/dignajar/bludit-plugins", - "version": "0.3", - "releaseDate": "2015-10-02" + "description": "Protokół Open Graph zezwala stronie na stosowanie meta tagów używanych w serwisach społecznościowych." } } \ No newline at end of file diff --git a/plugins/opengraph/languages/zh_TW.json b/plugins/opengraph/languages/zh_TW.json index 18122e8b..0a59b71d 100644 --- a/plugins/opengraph/languages/zh_TW.json +++ b/plugins/opengraph/languages/zh_TW.json @@ -4,4 +4,4 @@ "name": "開放社交關係圖", "description": "開放社交關係圖協定可以讓任何網頁變成豐富的物件" } -} +} \ No newline at end of file diff --git a/plugins/pages/languages/de_DE.json b/plugins/pages/languages/de_DE.json index c699b09c..5e5930b6 100644 --- a/plugins/pages/languages/de_DE.json +++ b/plugins/pages/languages/de_DE.json @@ -1,8 +1,8 @@ { "plugin-data": { - "name": "Liste aller Seiten", - "description": "Auflistung aller Seiten." + "name": "Anzeige aller Seiten", + "description": "Anzeige aller Seiten in der Seitenleiste (bei Themes mit Seitenleiste)." }, "home": "Hauptseite", diff --git a/plugins/pages/languages/en_US.json b/plugins/pages/languages/en_US.json index 76669570..caf9858c 100644 --- a/plugins/pages/languages/en_US.json +++ b/plugins/pages/languages/en_US.json @@ -6,10 +6,10 @@ "author": "Bludit", "email": "", "website": "https://github.com/dignajar/bludit-plugins", - "version": "0.3", - "releaseDate": "2015-10-02" + "version": "0.6", + "releaseDate": "2015-11-13" }, - "home": "Home", - "show-home-link": "Show home link" + "home": "Home", + "show-home-link": "Show home link" } \ No newline at end of file diff --git a/plugins/pages/languages/fr_FR.json b/plugins/pages/languages/fr_FR.json index e74fe901..3efb4769 100644 --- a/plugins/pages/languages/fr_FR.json +++ b/plugins/pages/languages/fr_FR.json @@ -5,6 +5,6 @@ "description": "Constitue un menu avec les liens des pages dans la colonne du thème." }, - "home": "Accueil", - "show-home-link": "Afficher le lien de la page d’accueil" + "home": "Accueil", + "show-home-link": "Afficher le lien de la page d’accueil" } \ No newline at end of file diff --git a/plugins/pages/languages/pl_PL.json b/plugins/pages/languages/pl_PL.json index 1473cf84..74a469af 100644 --- a/plugins/pages/languages/pl_PL.json +++ b/plugins/pages/languages/pl_PL.json @@ -2,14 +2,9 @@ "plugin-data": { "name": "Lista stron", - "description": "Wyświetla listę stron znajdujących się w witrynie.", - "author": "Bludit", - "email": "", - "website": "https://github.com/dignajar/bludit-plugins", - "version": "0.3", - "releaseDate": "2015-10-02" + "description": "Wyświetla listę stron znajdujących się w witrynie." }, - "home": "Strona główna", - "show-home-link": "Pokaż odnośnik do strony głównek" + "home": "Strona główna", + "show-home-link": "Pokaż odnośnik do strony głównek" } \ No newline at end of file diff --git a/plugins/pages/languages/zh_TW.json b/plugins/pages/languages/zh_TW.json index 7ee59e60..e5a6ccb2 100644 --- a/plugins/pages/languages/zh_TW.json +++ b/plugins/pages/languages/zh_TW.json @@ -5,6 +5,6 @@ "description": "顯示所有頁面的列表" }, - "home": "首頁", - "show-home-link": "顯示首頁連結" + "home": "首頁", + "show-home-link": "顯示首頁連結" } \ No newline at end of file diff --git a/plugins/simplemde/languages/de_DE.json b/plugins/simplemde/languages/de_DE.json index 1f9261cf..2249bd5c 100644 --- a/plugins/simplemde/languages/de_DE.json +++ b/plugins/simplemde/languages/de_DE.json @@ -6,4 +6,4 @@ }, "toolbar": "Werkzeugleiste", "tab-size": "Abstände der Tabstopps" -} +} \ No newline at end of file diff --git a/plugins/simplemde/languages/en_US.json b/plugins/simplemde/languages/en_US.json index 55f8be9a..9425cf5c 100644 --- a/plugins/simplemde/languages/en_US.json +++ b/plugins/simplemde/languages/en_US.json @@ -6,8 +6,8 @@ "author": "NextStepWebs", "email": "", "website": "https://github.com/NextStepWebs/simplemde-markdown-editor", - "version": "1.8.0", - "releaseDate": "2015-10-29" + "version": "1.8.1", + "releaseDate": "2015-11-13" }, "toolbar": "Toolbar", "tab-size": "Tab size" diff --git a/plugins/simplemde/languages/pl_PL.json b/plugins/simplemde/languages/pl_PL.json index 2c1e492c..020c49fe 100644 --- a/plugins/simplemde/languages/pl_PL.json +++ b/plugins/simplemde/languages/pl_PL.json @@ -2,12 +2,7 @@ "plugin-data": { "name": "Edytor SimpleMDE", - "description": "Prosty, piękny i osadzony w JavaScript edytor markdown stworzony przez @WesCossick. Na potrzeby Bludit dostosowany przez Diego Najara.", - "author": "NextStepWebs", - "email": "", - "website": "https://github.com/NextStepWebs/simplemde-markdown-editor", - "version": "1.7.4", - "releaseDate": "2015-10-02" + "description": "Prosty, piękny i osadzony w JavaScript edytor markdown stworzony przez @WesCossick. Na potrzeby Bludit dostosowany przez Diego Najar." }, "toolbar": "Pasek narzędzi", "tab-size": "Rozmiar wcięcia" diff --git a/plugins/simplemde/plugin.php b/plugins/simplemde/plugin.php index 78be158e..f362c0a7 100644 --- a/plugins/simplemde/plugin.php +++ b/plugins/simplemde/plugin.php @@ -97,6 +97,9 @@ class pluginsimpleMDE extends Plugin { $html .= '$("#jsaddImage").on("click", function() { var filename = $("#jsimageList option:selected" ).text(); + if(!filename.trim()) { + return false; + } var text = simplemde.value(); simplemde.value(text + "![alt text]("+filename+")" + "\n"); });'; diff --git a/plugins/tags/languages/de_DE.json b/plugins/tags/languages/de_DE.json index c07b69f4..86bcf65d 100644 --- a/plugins/tags/languages/de_DE.json +++ b/plugins/tags/languages/de_DE.json @@ -1,7 +1,7 @@ { "plugin-data": { - "name": "Liste aller Schlagwörter", - "description": "Anzeige aller Schlagwörter." + "name": "Anzeige aller Schlagwörter", + "description": "Anzeige aller Schlagwörter in der Seitenleiste (bei Themes mit Seitenleiste)." } } \ No newline at end of file diff --git a/plugins/tags/languages/en_US.json b/plugins/tags/languages/en_US.json index 8b0e9b09..50beff32 100644 --- a/plugins/tags/languages/en_US.json +++ b/plugins/tags/languages/en_US.json @@ -6,7 +6,7 @@ "author": "Bludit", "email": "", "website": "https://github.com/dignajar/bludit-plugins", - "version": "0.3", - "releaseDate": "2015-10-02" + "version": "0.6", + "releaseDate": "2015-11-13" } } \ No newline at end of file diff --git a/plugins/tags/languages/pl_PL.json b/plugins/tags/languages/pl_PL.json index 604d1c54..ae5f30ad 100644 --- a/plugins/tags/languages/pl_PL.json +++ b/plugins/tags/languages/pl_PL.json @@ -2,11 +2,6 @@ "plugin-data": { "name": "Lista tagów", - "description": "Wyświetla wszystkie tagi w postaci listy.", - "author": "Bludit", - "email": "", - "website": "https://github.com/dignajar/bludit-plugins", - "version": "0.3", - "releaseDate": "2015-10-02" + "description": "Wyświetla wszystkie tagi w postaci listy." } } \ No newline at end of file diff --git a/plugins/tags/plugin.php b/plugins/tags/plugin.php index 4aef1b5d..179bd906 100644 --- a/plugins/tags/plugin.php +++ b/plugins/tags/plugin.php @@ -14,7 +14,7 @@ class pluginTags extends Plugin { global $Language; $html = '
'; - $html .= ''; + $html .= ''; $html .= ''; $html .= '
'; diff --git a/themes/pure/languages/de_DE.json b/themes/pure/languages/de_DE.json new file mode 100644 index 00000000..aab4edba --- /dev/null +++ b/themes/pure/languages/de_DE.json @@ -0,0 +1,12 @@ +{ + "theme-data": + { + "name": "Pure", + "description": "Einfaches und übersichtliches Theme unter Verwendung des Frameworks Pure.css. Website: http://purecss.io.", + "author": "Bludit", + "email": "", + "website": "https://github.com/dignajar/bludit-themes", + "version": "0.3", + "releaseDate": "2015-10-02" + } +} diff --git a/themes/pure/php/head.php b/themes/pure/php/head.php index 43d6a590..68824463 100644 --- a/themes/pure/php/head.php +++ b/themes/pure/php/head.php @@ -1,7 +1,5 @@ - - <?php echo $Site->title() ?> if( $Url->whereAmI()=='post' ) { Theme::keywords( $Post->tags() ); + Theme::description( $Post->description() ); } elseif( $Url->whereAmI()=='page' ) { Theme::keywords( $Page->tags() ); + Theme::description( $Page->description() ); + } + else { + Theme::description( $Site->description() ); } ?> diff --git a/themes/pure/php/home.php b/themes/pure/php/home.php index 89812dd3..d0bc82cf 100644 --- a/themes/pure/php/home.php +++ b/themes/pure/php/home.php @@ -23,7 +23,7 @@ echo $Language->get('Posted By').' '; if( Text::isNotEmpty($Post->authorFirstName()) && Text::isNotEmpty($Post->authorLastName()) ) { - echo $Post->authorFirstName().', '.$Post->authorLastName(); + echo $Post->authorFirstName().' '.$Post->authorLastName(); } else { echo $Post->username(); diff --git a/themes/pure/php/post.php b/themes/pure/php/post.php index d4f4436f..4f1c2011 100644 --- a/themes/pure/php/post.php +++ b/themes/pure/php/post.php @@ -21,7 +21,7 @@ echo $Language->get('Posted By').' '; if( Text::isNotEmpty($Post->authorFirstName()) && Text::isNotEmpty($Post->authorLastName()) ) { - echo $Post->authorFirstName().', '.$Post->authorLastName(); + echo $Post->authorFirstName().' '.$Post->authorLastName(); } else { echo $Post->username();