Merge pull request #2 from dignajar/master

Update from original #2
This commit is contained in:
Jory Phillips 2015-08-10 16:57:23 -07:00
commit 273d897ec3
31 changed files with 544 additions and 429 deletions

View File

@ -32,7 +32,7 @@ if($_Plugin===false) {
}
// Check if the plugin has the method form()
if($_Plugin->form()===false) {
if(!method_exists($_Plugin, 'form')) {
Redirect::page('admin', 'plugins');
}

View File

@ -18,10 +18,8 @@
if( $_SERVER['REQUEST_METHOD'] == 'POST' )
{
$username = Sanitize::html($_POST['username']);
$password = Sanitize::html($_POST['password']);
if( $Login->verifyUser($username, $password) )
// Verify User sanitize the input
if( $Login->verifyUser($_POST['username'], $_POST['password']) )
{
Redirect::page('admin', 'dashboard');
}

View File

@ -15,12 +15,12 @@
<script src="./js/kube.min.js"></script>
<!-- Plugins -->
<?php Theme::plugins('onAdminHead') ?>
<?php Theme::plugins('adminHead') ?>
</head>
<body>
<!-- Plugins -->
<?php Theme::plugins('onAdminBodyBegin') ?>
<?php Theme::plugins('adminBodyBegin') ?>
<!-- ALERT -->
<script>
@ -92,7 +92,7 @@ $(document).ready(function() {
?>
<!-- Plugins -->
<?php Theme::plugins('onAdminBodyEnd') ?>
<?php Theme::plugins('adminBodyEnd') ?>
<div id="footer">Bludit <?php echo BLUDIT_VERSION ?> | Load time <?php echo (microtime(true) - $loadTime) ?></div>

View File

@ -10,9 +10,15 @@
<link rel="stylesheet" href="./css/kube.min.css?version=<?php echo BLUDIT_VERSION ?>">
<link rel="stylesheet" href="./css/default.css?version=<?php echo BLUDIT_VERSION ?>">
<link rel="stylesheet" href="./css/css/font-awesome.css?version=<?php echo BLUDIT_VERSION ?>">
<!-- Plugins Login Head -->
<?php Theme::plugins('loginHead') ?>
</head>
<body>
<!-- Plugins Login Body Begin -->
<?php Theme::plugins('loginBodyBegin') ?>
<div id="head">
<nav class="navbar nav-fullwidth">
<h1>Bludit</h1>
@ -45,7 +51,10 @@
</div>
<div id="footer">Bludit <?php echo BLUDIT_VERSION ?> | Load time <?php echo (microtime(true) - $loadTime) ?></div>
<div id="footer">Bludit</div>
<!-- Plugins Login Body Begin -->
<?php Theme::plugins('loginBodyEnd') ?>
</body>
</html>

View File

@ -5,7 +5,7 @@
<form method="post" action="" class="forms">
<label>
<?php $Language->p('Username') ?>
<input type="text" name="username" class="width-50">
<input type="text" name="username" class="width-50" value="<?php echo (isset($_POST['username'])?$_POST['username']:'') ?>">
</label>
<label>
@ -29,7 +29,7 @@
<label>
Email
<input type="text" name="email" class="width-50">
<input type="text" name="email" class="width-50" value="<?php echo (isset($_POST['email'])?$_POST['email']:'') ?>">
<div class="forms-desc"><?php $Language->p('email-will-not-be-publicly-displayed') ?></div>
</label>

2
admin/views/manage-posts.php Normal file → Executable file
View File

@ -16,7 +16,7 @@
foreach($posts as $Post)
{
echo '<tr>';
echo '<td><a href="'.HTML_PATH_ADMIN_ROOT.'edit-post/'.$Post->key().'">'.($Post->published()?'':'['.$Language->g('Draft').'] ').($Post->title()?$Post->title():'['.$Language->g('Empty title').'] ').'</a></td>';
echo '<td><a href="'.HTML_PATH_ADMIN_ROOT.'edit-post/'.$Post->key().'">'.($Post->published()?'':'<span class="label label-outline label-red smaller">'.$Language->g('Draft').'</span> ').($Post->title()?$Post->title():'['.$Language->g('Empty title').'] ').'</a></td>';
echo '<td>'.$Post->dateCreated().'</td>';
echo '<td>'.$Post->timeago().'</td>';
echo '</tr>';

View File

@ -10,7 +10,7 @@
echo '<span class="version">'.$Language->g('Version').': '.$Plugin->version().'</span><span class="author">'.$Language->g('author').': <a targe="_blank" href="'.$Plugin->website().'">'.$Plugin->author().'</a></span>';
if($Plugin->installed()) {
if($Plugin->form()) {
if(method_exists($Plugin, 'form')) {
echo '<a href="'.HTML_PATH_ADMIN_ROOT.'configure-plugin/'.$Plugin->className().'" class="btn btn-smaller">'.$Language->g('Configure plugin').'</a>';
}
echo '<a href="'.HTML_PATH_ADMIN_ROOT.'uninstall-plugin/'.$Plugin->className().'" class="btn btn-red btn-smaller">'.$Language->g('Uninstall plugin').'</a>';

2
content/README Normal file
View File

@ -0,0 +1,2 @@
Set the correct permissions on this directory.
Check the documentation: http://docs.bludit.com/en/troubleshooting/writing-test-failure-err205

View File

@ -24,8 +24,8 @@ define('BLUDIT', true);
define('DS', DIRECTORY_SEPARATOR);
// PHP paths
define('PATH_ROOT', __DIR__.DS);
define('PATH_BOOT', PATH_ROOT.'kernel'.DS.'boot'.DS);
define('PATH_ROOT', __DIR__.DS);
define('PATH_BOOT', PATH_ROOT.'kernel'.DS.'boot'.DS);
// Init
require(PATH_BOOT.'init.php');

View File

@ -36,10 +36,29 @@ if(!defined('JSON_PRETTY_PRINT')) {
define('JSON_PRETTY_PRINT', 128);
}
// Helpers class
// Check if JSON encode and decode are enabled.
define('JSON', function_exists('json_encode'));
// Multibyte string / UTF-8
define('MB_STRING', extension_loaded('mbstring'));
define('CHARSET', 'UTF-8');
if(MB_STRING)
{
// Tell PHP that we're using UTF-8 strings until the end of the script.
mb_internal_encoding(CHARSET);
// Tell PHP that we'll be outputting UTF-8 to the browser.
mb_http_output(CHARSET);
}
// PHP Classes
include(PATH_HELPERS.'sanitize.class.php');
include(PATH_HELPERS.'valid.class.php');
include(PATH_HELPERS.'text.class.php');
include(PATH_ABSTRACT.'dbjson.class.php');
include(PATH_KERNEL.'dblanguage.class.php');
// ============================================================================
// FUNCTIONS
@ -125,8 +144,10 @@ function checkSystem()
return $stdOut;
}
function install($adminPassword, $email, $language)
function install($adminPassword, $email, $locale)
{
$Language = new dbLanguage($locale);
$stdOut = array();
// ============================================================================
@ -201,9 +222,9 @@ function install($adminPassword, $email, $language)
'title'=>'Bludit',
'slogan'=>'cms',
'description'=>'',
'footer'=>'Footer text - ©2015',
'language'=>$language,
'locale'=>$language,
'footer'=>'©2015',
'language'=>$locale,
'locale'=>$locale,
'timezone'=>'UTC',
'theme'=>'pure',
'adminTheme'=>'default',
@ -241,56 +262,56 @@ function install($adminPassword, $email, $language)
// File plugins/pages/db.php
$data = array(
'homeLink'=>true,
'label'=>'Pages'
'label'=>$Language->get('Pages')
);
file_put_contents(PATH_PLUGINS_DATABASES.'pages'.DS.'db.php', $dataHead.json_encode($data, JSON_PRETTY_PRINT), LOCK_EX);
// File index.txt for error page
$data = 'Title: Error
Content: The page has not been found.';
$data = 'Title: '.$Language->get('Error').'
Content: '.$Language->get('The page has not been found');
file_put_contents(PATH_PAGES.'error'.DS.'index.txt', $data, LOCK_EX);
// File index.txt for welcome post
$data = 'Title: First post
$data = 'Title: '.$Language->get('First post').'
Content:
Congratulations, you have installed **Bludit** successfully!
'.$Language->get('Congratulations you have successfully installed your Bludit').'
---
What\'s next:
'.$Language->get('Whats next').'
---
- Administrate your Bludit from the [admin area](./admin/)
- Follow Bludit on [Twitter](https://twitter.com/bludit) / [Facebook](https://www.facebook.com/pages/Bludit/239255789455913) / [Google+](https://plus.google.com/+Bluditcms)
- Visit the [forum](http://forum.bludit.com) for support
- Read the [documentation](http://docs.bludit.com) for more information
- Share with your friend :D';
- '.$Language->get('Manage your Bludit from the admin panel').'
- '.$Language->get('Follow Bludit on').' [Twitter](https://twitter.com/bludit) / [Facebook](https://www.facebook.com/pages/Bludit/239255789455913) / [Google+](https://plus.google.com/+Bluditcms)
- '.$Language->get('Visit the support forum').'
- '.$Language->get('Read the documentation for more information').'
- '.$Language->get('Share with your friends and enjoy');
file_put_contents(PATH_POSTS.$firstPostSlug.DS.'index.txt', $data, LOCK_EX);
return true;
}
function checkPOST($_POST)
function checkPOST($args)
{
// Check empty password
if(empty($_POST['password']))
if(empty($args['password']))
{
return '<div>The password field is empty</div>';
}
// Check invalid email
if( !Valid::email($_POST['email']) && ($_POST['noCheckEmail']=='0') )
if( !Valid::email($args['email']) && ($args['noCheckEmail']=='0') )
{
return '<div>Your email address is invalid.</div><div id="jscompleteEmail">Proceed anyway!</div>';
}
// Sanitize email
$email = sanitize::email($_POST['email']);
$email = sanitize::email($args['email']);
// Install Bludit
install($_POST['password'], $email, $_POST['language']);
install($args['password'], $email, $args['language']);
return true;
}

View File

@ -191,85 +191,4 @@ class Plugin {
// The user can define your own dbFields.
}
// EVENTS
public function form()
{
return false;
}
// Before the posts load.
public function beforePostsLoad()
{
return false;
}
// After the posts load.
public function afterPostsLoad()
{
return false;
}
// Before the pages load.
public function beforePagesLoad()
{
return false;
}
// After the pages load.
public function afterPagesLoad()
{
return false;
}
public function onSiteHead()
{
return false;
}
public function onSiteBodyBegin()
{
return false;
}
public function onSiteBodyEnd()
{
return false;
}
public function onAdminHead()
{
return false;
}
public function onAdminBodyBegin()
{
return false;
}
public function onAdminBodyEnd()
{
return false;
}
public function onSiteSidebar()
{
return false;
}
public function onAdminSidebar()
{
return false;
}
public function beforeSiteLoad()
{
return false;
}
public function afterSiteLoad()
{
return false;
}
}

View File

@ -48,10 +48,13 @@ else
if($Url->notFound() || !$Login->isLogged() || ($Url->slug()==='login') )
{
$layout['controller'] = 'login';
$layout['view'] = 'login';
$layout['template'] = 'login.php';
$layout['view'] = 'login';
$layout['template'] = 'login.php';
}
// Plugins before admin area loaded
Theme::plugins('beforeAdminLoad');
// Admin theme init.php
if( Sanitize::pathFile(PATH_ADMIN_THEMES, $Site->adminTheme().DS.'init.php') )
include(PATH_ADMIN_THEMES.$Site->adminTheme().DS.'init.php');
@ -63,4 +66,7 @@ else
// Load view and theme
if( Sanitize::pathFile(PATH_ADMIN_THEMES, $Site->adminTheme().DS.$layout['template']) )
include(PATH_ADMIN_THEMES.$Site->adminTheme().DS.$layout['template']);
// Plugins after admin area loaded
Theme::plugins('afterAdminLoad');
}

View File

@ -5,20 +5,29 @@
// ============================================================================
$plugins = array(
'onSiteHead'=>array(), // <html><head>HERE</head><body>...</body></html>
'onSiteBodyBegin'=>array(), // <html><head>...</head><body>HERE...</body></html>
'onSiteBodyEnd'=>array(), // <html><head>...</head><body>...HERE</body></html>
'onSiteSidebar'=>array(), // <html><head>...</head><body>...<sidebar>HERE</sidebar>...</body></html>
'onAdminHead'=>array(),
'onAdminBodyBegin'=>array(),
'onAdminBodyEnd'=>array(),
'onAdminSidebar'=>array(),
'siteHead'=>array(),
'siteBodyBegin'=>array(),
'siteBodyEnd'=>array(),
'siteSidebar'=>array(),
'beforeSiteLoad'=>array(),
'afterSiteLoad'=>array(),
'beforePostsLoad'=>array(),
'afterPostsLoad'=>array(),
'beforePagesLoad'=>array(),
'afterPagesLoad'=>array(),
'pageBegin'=>array(),
'pageEnd'=>array(),
'postBegin'=>array(),
'postEnd'=>array(),
'adminHead'=>array(),
'adminBodyBegin'=>array(),
'adminBodyEnd'=>array(),
'adminSidebar'=>array(),
'beforeAdminLoad'=>array(),
'afterAdminLoad'=>array(),
'loginHead'=>array(),
'loginBodyBegin'=>array(),
'loginBodyEnd'=>array(),
'all'=>array()
);
@ -81,11 +90,7 @@ function build_plugins()
{
foreach($pluginsEvents as $event=>$value)
{
/*
if($Plugin->onSiteHead()!==false)
array_push($plugins['onSiteHead'], $Plugin);
*/
if($Plugin->{$event}()!==false) {
if(method_exists($Plugin, $event)) {
array_push($plugins[$event], $Plugin);
}
}

View File

@ -52,6 +52,7 @@ class Text {
return $text;
}
/*
public static function cleanUrl($string, $separator='-')
{
// Delete characters
@ -72,6 +73,21 @@ class Text {
return $string;
}
*/
public static function cleanUrl($string, $separator='-')
{
if(function_exists('iconv')) {
$string = iconv('UTF-8', 'ASCII//TRANSLIT', $string);
}
$string = preg_replace("/[^a-zA-Z0-9\/_|+ -]/", '', $string);
$string = trim($string, '-');
$string = self::lowercase($string);
$string = preg_replace("/[\/_|+ -]+/", $separator, $string);
return $string;
}
// Replace all occurrences of the search string with the replacement string.
public static function replace($search, $replace, $string)

View File

@ -23,8 +23,8 @@ class Login {
{
Session::set('username', $username);
Session::set('role', $role);
Session::set('fingerPrint', $this->fingerPrint());
Session::set('sessionTime', time());
Session::set('fingerPrint', $this->fingerPrint());
Session::set('sessionTime', time());
Log::set(__METHOD__.LOG_SEP.'Set fingerPrint: '.$this->fingerPrint());
}
@ -52,6 +52,9 @@ class Login {
public function verifyUser($username, $password)
{
$username = Sanitize::html($username);
$password = Sanitize::html($password);
$username = trim($username);
$password = trim($password);

43
kernel/security.class.php Normal file
View File

@ -0,0 +1,43 @@
<?php defined('BLUDIT') or die('Bludit CMS.');
class Security extends dbJSON
{
private $dbFields = array(
'minutesBlocked'=>5,
'numberFailures'=>10
);
function __construct()
{
parent::__construct(PATH_DATABASES.'security.php');
}
public function addLoginFail()
{
$ip = $this->getUserIp();
// Save the database
$this->db[$ip] = (int)$this->db[$ip] + 1;
if( $this->save() === false ) {
Log::set(__METHOD__.LOG_SEP.'Error occurred when trying to save the database file.');
return false;
}
return true;
}
public function getUserIp()
{
// User IP
if(getenv('HTTP_X_FORWARDED_FOR'))
$ip = getenv('HTTP_X_FORWARDED_FOR');
elseif(getenv('HTTP_CLIENT_IP'))
$ip = getenv('HTTP_CLIENT_IP');
else
$ip = getenv('REMOTE_ADDR');
return $ip;
}
}

View File

@ -9,133 +9,141 @@
"website": ""
},
"username": "Username",
"password": "Password",
"confirm-password": "Confirm Password",
"editor": "Editor",
"dashboard": "Dashboard",
"role": "Role",
"post": "Post",
"posts": "Posts",
"users": "Users",
"administrator": "Administrator",
"add": "Add",
"cancel": "Cancel",
"content": "Content",
"title": "Title",
"no-parent": "No parent",
"edit-page": "Edit page",
"edit-post": "Edit post",
"add-a-new-user": "Add a new user",
"parent": "Parent",
"friendly-url": "Friendly URL",
"description": "Description",
"posted-by": "Posted by",
"tags": "Tags",
"position": "Position",
"save": "Save",
"draft": "Draft",
"delete": "Delete",
"registered": "Registered",
"Notifications": "Notifications",
"profile": "Profile",
"email": "Email",
"settings": "Settings",
"general": "General",
"advanced": "Advanced",
"regional": "Regional",
"about": "About",
"login": "Log in",
"logout": "Log out",
"manage": "Manage",
"themes": "Themes",
"prev-page": "Prev page",
"next-page": "Next page",
"configure-plugin": "Configure plugin",
"confirm-delete-this-action-cannot-be-undone": "Confirm delete, this action cannot be undone.",
"site-title": "Site title",
"site-slogan": "Site slogan",
"site-description": "Site description",
"footer-text": "Footer text",
"posts-per-page": "Posts per page",
"site-url": "Site url",
"writting-settings": "Writting settings",
"url-filters": "URL filters",
"page": "Page",
"pages": "Pages",
"home": "Home",
"welcome-back": "Welcome back",
"language": "Language",
"website": "Website",
"timezone": "Timezone",
"locale": "Locale",
"notifications": "Notifications",
"new-post": "New post",
"html-and-markdown-code-supported": "HTML and Markdown code supported",
"new-page": "New page",
"manage-posts": "Manage posts",
"published-date": "Published date",
"modified-date": "Modified date",
"empty-title": "Empty title",
"plugins": "Plugins",
"install-plugin": "Install plugin",
"uninstall-plugin": "Uninstall plugin",
"new-password": "New password",
"edit-user": "Edit user",
"publish-now": "Publish now",
"first-name": "First name",
"last-name": "Last name",
"bludit-version": "Bludit version",
"powered-by": "Powered by",
"recent-posts": "Recent Posts",
"manage-pages": "Manage pages",
"advanced-options": "Advanced options",
"user-deleted": "User deleted",
"page-added-successfully": "Page added successfully",
"post-added-successfully": "Post added successfully",
"the-post-has-been-deleted-successfully": "The post has been deleted successfully",
"the-page-has-been-deleted-successfully": "The page has been deleted successfully",
"username-or-password-incorrect": "Username or password incorrect",
"database-regenerated": "Database regenerated",
"the-changes-have-been-saved": "The changes have been saved",
"html-markdown-code-supported": "HTML and Markdown code supported.",
"enable-more-features-at": "Enable more features at",
"username-already-exists": "Username already exists",
"username-field-is-empty": "Username field is empty",
"the-password-and-confirmation-password-do-not-match":"The password and confirmation password do not match",
"user-has-been-added-successfully": "User has been added successfully",
"you-do-not-have-sufficient-permissions": "You do not have sufficient permissions to access this page, contact the administrator.",
"settings-advanced-writting-settings": "Settings->Advanced->Writting Settings",
"new-posts-and-pages-synchronized": "New posts and pages synchronized.",
"you-can-choose-the-users-privilege": "You can choose the user's privilege. The editor role only can write pages and posts.",
"email-will-not-be-publicly-displayed": "Email will not be publicly displayed. Recommended for recovery password and notifications.",
"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.",
"use-this-field-to-add-a-catchy-prhase": "Use this field to add a catchy prhase on your site.",
"you-can-add-a-site-description-to-provide": "You can add a site description to provide a short bio or description of your site.",
"you-can-add-a-small-text-on-the-bottom": "You can add a small text on the bottom of every page. eg: copyright, owner, dates, etc.",
"number-of-posts-to-show-per-page": "Number of posts to show per page.",
"the-url-of-your-site": "The URL of your site.",
"add-or-edit-description-tags-or": "Add or edit description, tags or modify the friendly URL.",
"select-your-sites-language": "Select your site's language.",
"select-a-timezone-for-a-correct": "Select a timezone for a correct date/time display on your site.",
"you-can-use-this-field-to-define-a-set-of": "You can use this field to define a set of parameters related to the languege, country and special preferences.",
"you-can-modify-the-url-which-identifies":"You can modify the URL which identifies a page or post using human-readable keywords. No more than 150 characters.",
"this-field-can-help-describe-the-content": "This field can help describe the content in a few words. No more than 150 characters.",
"write-the-tags-separeted-by-comma": "Write the tags separeted by comma. eg: tag1, tag2, tag3",
"delete": "Delete",
"delete-the-user-and-all-its-posts":"Delete the user and all its posts",
"delete-the-user-and-associate-its-posts-to-admin-user": "Delete the user and associate its posts to admin user",
"read-more": "Read more",
"show-blog": "Show blog",
"default-home-page": "Default home page",
"version": "Version",
"there-are-no-drafts": "There are no drafts.",
"create-a-new-article-for-your-blog":"Create a new article for your blog.",
"create-a-new-page-for-your-website":"Create a new page for your website.",
"invite-a-friend-to-collaborate-on-your-website":"Invite a friend to collaborate on your website.",
"change-your-language-and-region-settings":"Change your language and region settings.",
"language-and-timezone":"Language and timezone",
"author": "Author",
"start-here": "Start here",
"install-theme": "Install theme"
"username": "Username",
"password": "Password",
"confirm-password": "Confirm Password",
"editor": "Editor",
"dashboard": "Dashboard",
"role": "Role",
"post": "Post",
"posts": "Posts",
"users": "Users",
"administrator": "Administrator",
"add": "Add",
"cancel": "Cancel",
"content": "Content",
"title": "Title",
"no-parent": "No parent",
"edit-page": "Edit page",
"edit-post": "Edit post",
"add-a-new-user": "Add a new user",
"parent": "Parent",
"friendly-url": "Friendly URL",
"description": "Description",
"posted-by": "Posted by",
"tags": "Tags",
"position": "Position",
"save": "Save",
"draft": "Draft",
"delete": "Delete",
"registered": "Registered",
"Notifications": "Notifications",
"profile": "Profile",
"email": "Email",
"settings": "Settings",
"general": "General",
"advanced": "Advanced",
"regional": "Regional",
"about": "About",
"login": "Log in",
"logout": "Log out",
"manage": "Manage",
"themes": "Themes",
"prev-page": "Prev page",
"next-page": "Next page",
"configure-plugin": "Configure plugin",
"confirm-delete-this-action-cannot-be-undone": "Confirm delete, this action cannot be undone.",
"site-title": "Site title",
"site-slogan": "Site slogan",
"site-description": "Site description",
"footer-text": "Footer text",
"posts-per-page": "Posts per page",
"site-url": "Site url",
"writting-settings": "Writting settings",
"url-filters": "URL filters",
"page": "Page",
"pages": "Pages",
"home": "Home",
"welcome-back": "Welcome back",
"language": "Language",
"website": "Website",
"timezone": "Timezone",
"locale": "Locale",
"new-post": "New post",
"html-and-markdown-code-supported": "HTML and Markdown code supported",
"new-page": "New page",
"manage-posts": "Manage posts",
"published-date": "Published date",
"modified-date": "Modified date",
"empty-title": "Empty title",
"plugins": "Plugins",
"install-plugin": "Install plugin",
"uninstall-plugin": "Uninstall plugin",
"new-password": "New password",
"edit-user": "Edit user",
"publish-now": "Publish now",
"first-name": "First name",
"last-name": "Last name",
"bludit-version": "Bludit version",
"powered-by": "Powered by",
"recent-posts": "Recent Posts",
"manage-pages": "Manage pages",
"advanced-options": "Advanced options",
"user-deleted": "User deleted",
"page-added-successfully": "Page added successfully",
"post-added-successfully": "Post added successfully",
"the-post-has-been-deleted-successfully": "The post has been deleted successfully",
"the-page-has-been-deleted-successfully": "The page has been deleted successfully",
"username-or-password-incorrect": "Username or password incorrect",
"database-regenerated": "Database regenerated",
"the-changes-have-been-saved": "The changes have been saved",
"enable-more-features-at": "Enable more features at",
"username-already-exists": "Username already exists",
"username-field-is-empty": "Username field is empty",
"the-password-and-confirmation-password-do-not-match":"The password and confirmation password do not match",
"user-has-been-added-successfully": "User has been added successfully",
"you-do-not-have-sufficient-permissions": "You do not have sufficient permissions to access this page, contact the administrator.",
"settings-advanced-writting-settings": "Settings->Advanced->Writting Settings",
"new-posts-and-pages-synchronized": "New posts and pages synchronized.",
"you-can-choose-the-users-privilege": "You can choose the user's privilege. The editor role only can write pages and posts.",
"email-will-not-be-publicly-displayed": "Email will not be publicly displayed. Recommended for recovery password and notifications.",
"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.",
"use-this-field-to-add-a-catchy-prhase": "Use this field to add a catchy prhase on your site.",
"you-can-add-a-site-description-to-provide": "You can add a site description to provide a short bio or description of your site.",
"you-can-add-a-small-text-on-the-bottom": "You can add a small text on the bottom of every page. eg: copyright, owner, dates, etc.",
"number-of-posts-to-show-per-page": "Number of posts to show per page.",
"the-url-of-your-site": "The URL of your site.",
"add-or-edit-description-tags-or": "Add or edit description, tags or modify the friendly URL.",
"select-your-sites-language": "Select your site's language.",
"select-a-timezone-for-a-correct": "Select a timezone for a correct date/time display on your site.",
"you-can-use-this-field-to-define-a-set-of": "You can use this field to define a set of parameters related to the languege, country and special preferences.",
"you-can-modify-the-url-which-identifies":"You can modify the URL which identifies a page or post using human-readable keywords. No more than 150 characters.",
"this-field-can-help-describe-the-content": "This field can help describe the content in a few words. No more than 150 characters.",
"write-the-tags-separeted-by-comma": "Write the tags separeted by comma. eg: tag1, tag2, tag3",
"delete-the-user-and-all-its-posts":"Delete the user and all its posts",
"delete-the-user-and-associate-its-posts-to-admin-user": "Delete the user and associate its posts to admin user",
"read-more": "Read more",
"show-blog": "Show blog",
"default-home-page": "Default home page",
"version": "Version",
"there-are-no-drafts": "There are no drafts.",
"create-a-new-article-for-your-blog":"Create a new article for your blog.",
"create-a-new-page-for-your-website":"Create a new page for your website.",
"invite-a-friend-to-collaborate-on-your-website":"Invite a friend to collaborate on your website.",
"change-your-language-and-region-settings":"Change your language and region settings.",
"language-and-timezone":"Language and timezone",
"author": "Author",
"start-here": "Start here",
"install-theme": "Install theme",
"first-post": "First post",
"congratulations-you-have-successfully-installed-your-bludit": "Congratulations you have successfully installed your **Bludit**",
"whats-next": "What's Next",
"manage-your-bludit-from-the-admin-panel": "Manage your Bludit from the [admin area](./admin/)",
"follow-bludit-on": "Follow Bludit on",
"visit-the-support-forum": "Visit the [forum](http://forum.bludit.com) for support",
"read-the-documentation-for-more-information": "Read the [documentation](http://docs.bludit.com) for more information",
"share-with-your-friends-and-enjoy": "Share with your friends and enjoy",
"the-page-has-not-been-found": "The page has not been found.",
"error": "Error"
}

View File

@ -9,133 +9,140 @@
"website": ""
},
"username": "Usuario",
"password": "Contraseña",
"confirm-password": "Confirmar contraseña",
"editor": "Editor",
"dashboard": "Panel",
"role": "Rol",
"post": "Post",
"posts": "Posts",
"users": "Usuarios",
"administrator": "Administrador",
"add": "Agregar",
"cancel": "Cancel",
"content": "Contenido",
"title": "Titulo",
"no-parent": "Sin padre",
"edit-page": "Editar pagina",
"edit-post": "Editar post",
"add-a-new-user": "Agregar nuevo usuario",
"parent": "Parent",
"friendly-url": "Friendly URL",
"description": "Description",
"posted-by": "Posted by",
"tags": "Tags",
"position": "Position",
"save": "Save",
"draft": "Draft",
"delete": "Delete",
"registered": "Registered",
"Notifications": "Notifications",
"profile": "Profile",
"email": "Email",
"settings": "Settings",
"general": "General",
"advanced": "Advanced",
"regional": "Regional",
"about": "About",
"login": "Log in",
"logout": "Log out",
"manage": "Manage",
"themes": "Themes",
"prev-page": "Prev page",
"next-page": "Next page",
"configure-plugin": "Configure plugin",
"confirm-delete-this-action-cannot-be-undone": "Confirm delete, this action cannot be undone.",
"site-title": "Site title",
"site-slogan": "Site slogan",
"site-description": "Site description",
"footer-text": "Footer text",
"posts-per-page": "Posts per page",
"site-url": "Site url",
"writting-settings": "Writting settings",
"url-filters": "URL filters",
"page": "Page",
"pages": "Pages",
"home": "Home",
"welcome-back": "Welcome back",
"language": "Language",
"website": "Website",
"timezone": "Timezone",
"locale": "Locale",
"notifications": "Notifications",
"new-post": "New post",
"html-and-markdown-code-supported": "HTML and Markdown code supported",
"new-page": "New page",
"manage-posts": "Manage posts",
"published-date": "Published date",
"modified-date": "Modified date",
"empty-title": "Empty title",
"plugins": "Plugins",
"install-plugin": "Install plugin",
"uninstall-plugin": "Uninstall plugin",
"new-password": "New password",
"edit-user": "Edit user",
"publish-now": "Publish now",
"first-name": "First name",
"last-name": "Last name",
"bludit-version": "Bludit version",
"powered-by": "Powered by",
"recent-posts": "Recent Posts",
"manage-pages": "Manage pages",
"advanced-options": "Advanced options",
"user-deleted": "User deleted",
"page-added-successfully": "Page added successfully",
"post-added-successfully": "Post added successfully",
"the-post-has-been-deleted-successfully": "The post has been deleted successfully",
"the-page-has-been-deleted-successfully": "The page has been deleted successfully",
"username-or-password-incorrect": "Username or password incorrect",
"database-regenerated": "Database regenerated",
"the-changes-have-been-saved": "The changes have been saved",
"html-markdown-code-supported": "HTML and Markdown code supported.",
"enable-more-features-at": "Enable more features at",
"username-already-exists": "Username already exists",
"username-field-is-empty": "Username field is empty",
"the-password-and-confirmation-password-do-not-match":"The password and confirmation password do not match",
"user-has-been-added-successfully": "User has been added successfully",
"you-do-not-have-sufficient-permissions": "You do not have sufficient permissions to access this page, contact the administrator.",
"settings-advanced-writting-settings": "Settings->Advanced->Writting Settings",
"new-posts-and-pages-synchronized": "New posts and pages synchronized.",
"you-can-choose-the-users-privilege": "You can choose the user's privilege. The editor role only can write pages and posts.",
"email-will-not-be-publicly-displayed": "Email will not be publicly displayed. Recommended for recovery password and notifications.",
"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.",
"use-this-field-to-add-a-catchy-prhase": "Use this field to add a catchy prhase on your site.",
"you-can-add-a-site-description-to-provide": "You can add a site description to provide a short bio or description of your site.",
"you-can-add-a-small-text-on-the-bottom": "You can add a small text on the bottom of every page. eg: copyright, owner, dates, etc.",
"number-of-posts-to-show-per-page": "Number of posts to show per page.",
"the-url-of-your-site": "The URL of your site.",
"add-or-edit-description-tags-or": "Add or edit description, tags or modify the friendly URL.",
"select-your-sites-language": "Select your site's language.",
"select-a-timezone-for-a-correct": "Select a timezone for a correct date/time display on your site.",
"you-can-use-this-field-to-define-a-set-of": "You can use this field to define a set of parameters related to the languege, country and special preferences.",
"you-can-modify-the-url-which-identifies":"You can modify the URL which identifies a page or post using human-readable keywords. No more than 150 characters.",
"this-field-can-help-describe-the-content": "This field can help describe the content in a few words. No more than 150 characters.",
"write-the-tags-separeted-by-comma": "Write the tags separeted by comma. eg: tag1, tag2, tag3",
"delete": "Delete",
"delete-the-user-and-all-its-posts":"Delete the user and all its posts",
"delete-the-user-and-associate-its-posts-to-admin-user": "Delete the user and associate its posts to admin user",
"read-more": "Read more",
"show-blog": "Show blog",
"default-home-page": "Default home page",
"version": "Version",
"there-are-no-drafts": "There are no drafts.",
"create-a-new-article-for-your-blog":"Create a new article for your blog.",
"create-a-new-page-for-your-website":"Create a new page for your website.",
"invite-a-friend-to-collaborate-on-your-website":"Invite a friend to collaborate on your website.",
"change-your-language-and-region-settings":"Change your language and region settings.",
"language-and-timezone":"Language and timezone",
"author": "Author",
"start-here": "Start here",
"install-theme": "Install theme"
"username": "Usuario",
"password": "Contraseña",
"confirm-password": "Confirmar contraseña",
"editor": "Editor",
"dashboard": "Panel",
"role": "Rol",
"post": "Post",
"posts": "Posts",
"users": "Usuarios",
"administrator": "Administrador",
"add": "Agregar",
"cancel": "Cancel",
"content": "Contenido",
"title": "Titulo",
"no-parent": "Sin padre",
"edit-page": "Editar pagina",
"edit-post": "Editar post",
"add-a-new-user": "Agregar nuevo usuario",
"parent": "Padre",
"friendly-url": "URL Amistosa",
"description": "Descripcion",
"posted-by": "Publicado por",
"tags": "Etiquetas",
"position": "Posicion",
"save": "Guardar",
"draft": "Borrador",
"delete": "Eliminar",
"registered": "Registrado",
"Notifications": "Notificaciones",
"profile": "Perfil",
"email": "Correo electronico",
"settings": "Ajustes",
"general": "General",
"advanced": "Avanzado",
"regional": "Regional",
"about": "Acerca de",
"login": "Iniciar sesión",
"logout": "Cerrar sesión",
"manage": "Administrar",
"themes": "Temas",
"prev-page": "Pag. anterior",
"next-page": "Pag. siguiente",
"configure-plugin": "Configurar plugin",
"confirm-delete-this-action-cannot-be-undone": "Confirmar eliminacion, esta operacion no se puede deshacer.",
"site-title": "Titulo del sitio",
"site-slogan": "Slogan del sitio",
"site-description": "Descripcion del sitio",
"footer-text": "Texto de pie de pagina",
"posts-per-page": "Posts por pagina",
"site-url": "URL del sitio",
"writting-settings": "Ajustes de redaccion",
"url-filters": "Filtros URL",
"page": "Pagina",
"pages": "Paginas",
"home": "Inicio",
"welcome-back": "Bienvenido",
"language": "Lenguage",
"website": "Sitio web",
"timezone": "Zona horaria",
"locale": "Locale",
"new-post": "Nuevo post",
"new-page": "Nueva pagina",
"html-and-markdown-code-supported": "Codigo HTML y Markdown soportado",
"manage-posts": "Administrar posts",
"published-date": "Fecha de publicacion",
"modified-date": "Fecha de modificacion",
"empty-title": "Titulo vacio",
"plugins": "Plugins",
"install-plugin": "Instalar plugin",
"uninstall-plugin": "Desinstalar plugin",
"new-password": "Nueva contraseña",
"edit-user": "Editar usuario",
"publish-now": "Publicar",
"first-name": "Nombre",
"last-name": "Apellido",
"bludit-version": "Bludit version",
"powered-by": "Corriendo con",
"recent-posts": "Posts recientes",
"manage-pages": "Administrar paginas",
"advanced-options": "Opciones avanzadas",
"user-deleted": "Usuario eliminado",
"page-added-successfully": "Página agregada con éxito",
"post-added-successfully": "Post agregado con éxito ",
"the-post-has-been-deleted-successfully": "El post fue eliminado con exito",
"the-page-has-been-deleted-successfully": "La pagina fue eliminada con exito",
"username-or-password-incorrect": "Usuario o contraseña icorrectos",
"database-regenerated": "Base de datos regenerada",
"the-changes-have-been-saved": "Los cambios fueron guardados",
"enable-more-features-at": "Habilitar más funciones en",
"username-already-exists": "El usuario ya existe",
"username-field-is-empty": "El campo usuario esta vacio",
"the-password-and-confirmation-password-do-not-match":"Las contraseña no coiniciden",
"user-has-been-added-successfully": "El usuario fue creado con exito",
"you-do-not-have-sufficient-permissions": "No tiene suficientes permisos para acceder a esta pagina, contacte al administrador.",
"settings-advanced-writting-settings": "Ajustes->Avanzado->Ajustes de redaccion",
"new-posts-and-pages-synchronized": "Nuevos posts y paginas sincronizados.",
"you-can-choose-the-users-privilege": "You can choose the user's privilege. The editor role only can write pages and posts.",
"email-will-not-be-publicly-displayed": "Email will not be publicly displayed. Recommended for recovery password and notifications.",
"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.",
"use-this-field-to-add-a-catchy-prhase": "Use this field to add a catchy prhase on your site.",
"you-can-add-a-site-description-to-provide": "You can add a site description to provide a short bio or description of your site.",
"you-can-add-a-small-text-on-the-bottom": "You can add a small text on the bottom of every page. eg: copyright, owner, dates, etc.",
"number-of-posts-to-show-per-page": "Number of posts to show per page.",
"the-url-of-your-site": "The URL of your site.",
"add-or-edit-description-tags-or": "Add or edit description, tags or modify the friendly URL.",
"select-your-sites-language": "Seleccione el lenguage de su sitio.",
"select-a-timezone-for-a-correct": "Select a timezone for a correct date/time display on your site.",
"you-can-use-this-field-to-define-a-set-of": "You can use this field to define a set of parameters related to the languege, country and special preferences.",
"you-can-modify-the-url-which-identifies":"You can modify the URL which identifies a page or post using human-readable keywords. No more than 150 characters.",
"this-field-can-help-describe-the-content": "This field can help describe the content in a few words. No more than 150 characters.",
"write-the-tags-separeted-by-comma": "Write the tags separeted by comma. eg: tag1, tag2, tag3",
"delete-the-user-and-all-its-posts":"Delete the user and all its posts",
"delete-the-user-and-associate-its-posts-to-admin-user": "Delete the user and associate its posts to admin user",
"read-more": "Leer mas",
"show-blog": "Mostrar blog",
"default-home-page": "Pagina de inicio predeterminada",
"version": "Version",
"there-are-no-drafts": "No hay borradores.",
"create-a-new-article-for-your-blog":"Create a new article for your blog.",
"create-a-new-page-for-your-website":"Create a new page for your website.",
"invite-a-friend-to-collaborate-on-your-website":"Invite a friend to collaborate on your website.",
"change-your-language-and-region-settings":"Change your language and region settings.",
"language-and-timezone":"Lenguage y zona horaria",
"author": "Autor",
"start-here": "Comience aqui",
"install-theme": "Instalar tema",
"first-post": "Primer post",
"congratulations-you-have-successfully-installed-your-bludit": "Congratulations you have successfully installed your **Bludit**",
"whats-next": "Que sigue",
"manage-your-bludit-from-the-admin-panel": "Manage your Bludit from the [admin area](./admin/)",
"follow-bludit-on": "Siga Bludit en",
"visit-the-support-forum": "Visite el [foro](http://forum.bludit.com) para soporte",
"read-the-documentation-for-more-information": "Lea la [documentacion](http://docs.bludit.com) para mas informacion",
"share-with-your-friends-and-enjoy": "Comparti con tus amigos y a disfrutar",
"the-page-has-not-been-found": "La pagina no fue encontrada.",
"error": "Error"
}

View File

@ -69,7 +69,6 @@
"website": "Site",
"timezone": "Fuseau horaire",
"locale": "Localisation",
"notifications": "Notifications",
"new-post": "Nouvel article",
"html-and-markdown-code-supported": "Code HTML et Markdown pris en charge.",
"new-page": "Nouvelle page",
@ -98,7 +97,6 @@
"username-or-password-incorrect": "Nom dutilisateur ou mot de passe incorrect.",
"database-regenerated": "Base de données régénérée.",
"the-changes-have-been-saved": "Les modifications on était sauvegardées.",
"html-markdown-code-supported": "Code HTML et Markdown pris en charge.",
"enable-more-features-at": "Activer plus de fonctionnalités en vous rendant vers ",
"username-already-exists-or-is-empty": "Le nom dutilisateur existe déjà ou est inexistant.",
"username-field-is-empty": "Le champ utilisateur est vide !",
@ -122,7 +120,6 @@
"you-can-modify-the-url-which-identifies":"Vous pouvez modifier l'URL qui identifie une page ou un article, en utilisant des mots-clés lisibles. Pas plus de 150 caractères.",
"this-field-can-help-describe-the-content": "Ce champ peut aider à décrire le contenu en quelques mots. Pas plus de 150 caractères.",
"write-the-tags-separeted-by-comma": "Écrivez les tags en les séparant par une virgule. par exemple : tag1, tag2, tag3",
"delete": "Supprimer",
"delete-the-user-and-all-its-posts":"Supprimer lutilisateur et tous ses messages associés.",
"delete-the-user-and-associate-its-posts-to-admin-user": "Supprimez lutilisateur et associez ses messages à ladministrateur principal.",
"read-more": "Lire la suite...",
@ -136,5 +133,17 @@
"change-your-language-and-region-settings":"Modifiez vos paramètres linguistiques et régionaux.",
"language-and-timezone":"Langue et fuseau horaire",
"author": "Auteur",
"start-here": "Prise en main rapide"
"start-here": "Prise en main rapide",
"install-theme": "Installer ce thème",
"first-post": "Premier article",
"congratulations-you-have-successfully-installed-your-bludit": "Félicitations, vous avez correctement installé **Bludit**",
"whats-next": "pour la prochaine étape",
"manage-your-bludit-from-the-admin-panel": "Gérez Bludit dans la [zone dadministration](./admin/)",
"follow-bludit-on": "Suivez Bludit sur",
"visit-the-support-forum": "Visitez le [forum](http://forum.bludit.com) de support",
"read-the-documentation-for-more-information": "Lisez la [documentation](http://docs.bludit.com) pour plus dinformation",
"share-with-your-friends-and-enjoy": "Partagez avec vos amis et apprécier !",
"the-page-has-not-been-found": "La page na pas été trouvée.",
"error": "Erreur"
}

View File

@ -0,0 +1,15 @@
{
"plugin-data":
{
"name": "Maintenance mode",
"description": "Set your site on maintenance mode, you can access to admin area.",
"author": "Bludit",
"email": "",
"website": "http://www.bludit.com",
"version": "0.1",
"releaseDate": "2015-08-02"
},
"enable-maintence-mode": "Enable maintence mode",
"message": "Message"
}

View File

@ -0,0 +1,36 @@
<?php
class pluginMaintanceMode extends Plugin {
public function init()
{
$this->dbFields = array(
'enable'=>true,
'message'=>'Temporarily down for maintenance.'
);
}
public function form()
{
global $Language;
$html = '<div>';
$html .= '<input name="enable" id="jsenable" type="checkbox" value="true" '.($this->getDbField('enable')?'checked':'').'>';
$html .= '<label class="forCheckbox" for="jsenable">'.$Language->get('Enable maintence mode').'</label>';
$html .= '</div>';
$html .= '<div>';
$html .= '<label>'.$Language->get('Message').'</label>';
$html .= '<input name="message" id="jsmessage" type="text" value="'.$this->getDbField('message').'">';
$html .= '</div>';
return $html;
}
public function beforeSiteLoad()
{
if($this->getDbField('enable')) {
exit( $this->getDbField('message') );
}
}
}

View File

@ -2,7 +2,7 @@
class pluginOpenGraph extends Plugin {
public function onSiteHead()
public function siteHead()
{
global $Url, $Site;
global $Post, $Page;

View File

@ -27,7 +27,7 @@ class pluginPages extends Plugin {
return $html;
}
public function onSiteSidebar()
public function siteSidebar()
{
global $Language;
global $pagesParents;
@ -47,21 +47,24 @@ class pluginPages extends Plugin {
foreach($parents as $parent)
{
// Print the parent
$html .= '<li><a class="parent" href="'.$parent->permalink().'">'.$parent->title().'</a></li>';
// Check if the parent hash children
if(isset($pagesParents[$parent->key()]))
if($Site->homepage()!==$parent->key())
{
$children = $pagesParents[$parent->key()];
// Print the parent
$html .= '<li><a class="parent" href="'.$parent->permalink().'">'.$parent->title().'</a></li>';
// Print the children
$html .= '<li><ul>';
foreach($children as $child)
// Check if the parent hash children
if(isset($pagesParents[$parent->key()]))
{
$html .= '<li><a class="children" href="'.$child->permalink().'">— '.$child->title().'</a></li>';
$children = $pagesParents[$parent->key()];
// Print the children
$html .= '<li><ul>';
foreach($children as $child)
{
$html .= '<li><a class="children" href="'.$child->permalink().'">— '.$child->title().'</a></li>';
}
$html .= '</ul></li>';
}
$html .= '</ul></li>';
}
}

View File

@ -34,7 +34,7 @@ class pluginTinymce extends Plugin {
return $html;
}
public function onAdminHead()
public function adminHead()
{
global $Language;
global $Site;
@ -55,7 +55,7 @@ class pluginTinymce extends Plugin {
return $html;
}
public function onAdminBodyEnd()
public function adminBodyEnd()
{
global $Language;
global $Site;

View File

@ -8,8 +8,8 @@
</head>
<body>
<!-- Plugins -->
<?php Theme::plugins('onSiteBodyBegin') ?>
<!-- Plugins Site Body Begin -->
<?php Theme::plugins('siteBodyBegin') ?>
<!-- Layout -->
<div id="layout" class="pure-g">
@ -47,8 +47,8 @@
</div>
<!-- Plugins -->
<?php Theme::plugins('onSiteBodyEnd') ?>
<!-- Plugins Site Body End -->
<?php Theme::plugins('siteBodyEnd') ?>
</body>
</html>

View File

@ -47,7 +47,5 @@ html, button, input, select, textarea,
}
</style>
<!-- Plugins -->
<?php
Theme::plugins('onSiteHead');
?>
<!-- Plugins Site Head -->
<?php Theme::plugins('siteHead') ?>

View File

@ -4,6 +4,9 @@
<section class="post">
<!-- Plugins Post Begin -->
<?php Theme::plugins('postBegin') ?>
<!-- Post header -->
<header class="post-header">
@ -34,7 +37,7 @@
<!-- Post content -->
<div class="post-content">
<?php
// FALSE to get the first part of the post
// Call the method with FALSE to get the first part of the post
echo $Post->content(false)
?>
</div>
@ -43,10 +46,14 @@
<a class="read-more" href="<?php echo $Post->permalink() ?>"><?php $Language->printMe('Read more') ?></a>
<?php } ?>
<!-- Plugins Post End -->
<?php Theme::plugins('postEnd') ?>
</section>
<?php endforeach; ?>
<!-- Paginator for posts -->
<?php
echo Paginator::html();
?>

View File

@ -2,6 +2,9 @@
<section class="page">
<!-- Plugins Page Begin -->
<?php Theme::plugins('pageBegin') ?>
<!-- page header -->
<header class="page-header">
@ -17,4 +20,7 @@
<?php echo $Page->content() ?>
</div>
<!-- Plugins Page Begin -->
<?php Theme::plugins('pageEnd') ?>
</section>

View File

@ -2,6 +2,9 @@
<section class="post">
<!-- Plugins Post Begin -->
<?php Theme::plugins('postBegin') ?>
<!-- Post header -->
<header class="post-header">
@ -34,4 +37,7 @@
<?php echo $Post->content() ?>
</div>
<!-- Plugins Post End -->
<?php Theme::plugins('postEnd') ?>
</section>

View File

@ -1,7 +1,5 @@
<h1 class="title"><?php echo $Site->title() ?></h1>
<h2 class="slogan"><?php echo $Site->slogan() ?></h2>
<!-- Plugins -->
<?php
Theme::plugins('onSiteSidebar');
?>
<!-- Plugins Sidebar -->
<?php Theme::plugins('siteSidebar') ?>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB