diff --git a/bl-kernel/abstract/dblist.class.php b/bl-kernel/abstract/dblist.class.php
index fb0e0669..9dd9d3a6 100644
--- a/bl-kernel/abstract/dblist.class.php
+++ b/bl-kernel/abstract/dblist.class.php
@@ -81,19 +81,16 @@ class dbList extends dbJSON
public function edit($oldKey, $newName)
{
$newKey = $this->generateKey($newName);
- if( isset($this->db[$newKey]) ) {
- Log::set(__METHOD__.LOG_SEP.'Error the key already exist');
- return false;
- }
$this->db[$newKey]['name'] = $newName;
$this->db[$newKey]['list'] = $this->db[$oldKey]['list'];
// Remove the old category
- unset( $this->db[$oldKey] );
+ if( $oldKey != $newKey ) {
+ unset( $this->db[$oldKey] );
+ }
$this->save();
-
return $newKey;
}
@@ -133,4 +130,9 @@ class dbList extends dbJSON
return 0;
}
+ public function exists($key)
+ {
+ return isset( $this->db[$key] );
+ }
+
}
\ No newline at end of file
diff --git a/bl-kernel/admin/controllers/dashboard.php b/bl-kernel/admin/controllers/dashboard.php
index baaf0c83..6f0ba3f5 100644
--- a/bl-kernel/admin/controllers/dashboard.php
+++ b/bl-kernel/admin/controllers/dashboard.php
@@ -3,88 +3,88 @@
// ============================================================================
// Functions
// ============================================================================
-function updateBludit()
-{
- global $Site;
- global $dbPosts;
- global $dbPages;
+// function updateBludit()
+// {
+// global $Site;
+// global $dbPosts;
+// global $dbPages;
- // Check if Bludit need to be update.
- if( ($Site->currentBuild() < BLUDIT_BUILD) || isset($_GET['update']) )
- {
- // LOG
- Log::set('UPDATE SYSTEM - Starting...');
+// // Check if Bludit need to be update.
+// if( ($Site->currentBuild() < BLUDIT_BUILD) || isset($_GET['update']) )
+// {
+// // LOG
+// Log::set('UPDATE SYSTEM - Starting...');
- // LOG
- Log::set('UPDATE SYSTEM - Checking posts.');
+// // LOG
+// Log::set('UPDATE SYSTEM - Checking posts.');
- // Update posts
- foreach($dbPosts->db as $key=>$post) {
+// // Update posts
+// foreach($dbPosts->db as $key=>$post) {
- // Dates
- $date = Date::format($post['date'], 'Y-m-d H:i', DB_DATE_FORMAT);
- if($date !== false) {
- $dbPosts->setPostDb($key, 'date', $date);
- }
+// // Dates
+// $date = Date::format($post['date'], 'Y-m-d H:i', DB_DATE_FORMAT);
+// if($date !== false) {
+// $dbPosts->setPostDb($key, 'date', $date);
+// }
- // Checksum
- if( empty($post['md5file']) ) {
- $checksum = md5_file(PATH_POSTS.$key.DS.FILENAME);
- $dbPosts->setPostDb($key, 'md5file', $checksum);
- }
- }
+// // Checksum
+// if( empty($post['md5file']) ) {
+// $checksum = md5_file(PATH_POSTS.$key.DS.FILENAME);
+// $dbPosts->setPostDb($key, 'md5file', $checksum);
+// }
+// }
- $dbPosts->save();
+// $dbPosts->save();
- // LOG
- Log::set('UPDATE SYSTEM - Checking pages.');
+// // LOG
+// Log::set('UPDATE SYSTEM - Checking pages.');
- // Update pages
- foreach($dbPages->db as $key=>$page) {
+// // Update pages
+// foreach($dbPages->db as $key=>$page) {
- $date = Date::format($page['date'], 'Y-m-d H:i', DB_DATE_FORMAT);
- if($date !== false) {
- $dbPages->setField($key, 'date', $date);
- }
+// $date = Date::format($page['date'], 'Y-m-d H:i', DB_DATE_FORMAT);
+// if($date !== false) {
+// $dbPages->setField($key, 'date', $date);
+// }
- // Checksum
- if( empty($post['md5file']) ) {
- $checksum = md5_file(PATH_PAGES.$key.DS.FILENAME);
- $dbPages->setField($key, 'md5file', $checksum);
- }
- }
+// // Checksum
+// if( empty($post['md5file']) ) {
+// $checksum = md5_file(PATH_PAGES.$key.DS.FILENAME);
+// $dbPages->setField($key, 'md5file', $checksum);
+// }
+// }
- $dbPages->save();
+// $dbPages->save();
- // LOG
- Log::set('UPDATE SYSTEM - Checking directories.');
+// // LOG
+// Log::set('UPDATE SYSTEM - Checking directories.');
- // --- Update directories ---
- $directories = array(
- PATH_POSTS,
- PATH_PAGES,
- PATH_PLUGINS_DATABASES,
- PATH_UPLOADS_PROFILES,
- PATH_UPLOADS_THUMBNAILS,
- PATH_TMP
- );
+// // --- Update directories ---
+// $directories = array(
+// PATH_POSTS,
+// PATH_PAGES,
+// PATH_PLUGINS_DATABASES,
+// PATH_UPLOADS_PROFILES,
+// PATH_UPLOADS_THUMBNAILS,
+// PATH_TMP
+// );
- foreach($directories as $dir) {
+// foreach($directories as $dir) {
- // Check if the directory is already created.
- if(!file_exists($dir)) {
- // Create the directory recursive.
- mkdir($dir, DIR_PERMISSIONS, true);
- }
- }
+// // Check if the directory is already created.
+// if(!file_exists($dir)) {
+// // Create the directory recursive.
+// mkdir($dir, DIR_PERMISSIONS, true);
+// }
+// }
- // Set and save the database.
- $Site->set(array('currentBuild'=>BLUDIT_BUILD));
+// // Set and save the database.
+// $Site->set(array('currentBuild'=>BLUDIT_BUILD));
- // LOG
- Log::set('UPDATE SYSTEM - Updated...');
- }
-}
+// // LOG
+// Log::set('UPDATE SYSTEM - Updated...');
+// }
+// }
// ============================================================================
// Main before POST
@@ -99,20 +99,7 @@ function updateBludit()
// ============================================================================
// Try update Bludit
-updateBludit();
-
-// Get draft posts and schedules
-$_draftPosts = array();
-$_scheduledPosts = array();
-foreach($posts as $Post)
-{
- if($Post->draft()) {
- array_push($_draftPosts, $Post);
- }
- elseif($Post->scheduled()) {
- array_push($_scheduledPosts, $Post);
- }
-}
+//updateBludit();
// Get draft pages
$_draftPages = array();
diff --git a/bl-kernel/admin/controllers/edit-category.php b/bl-kernel/admin/controllers/edit-category.php
index 785e8200..6f2bcce9 100644
--- a/bl-kernel/admin/controllers/edit-category.php
+++ b/bl-kernel/admin/controllers/edit-category.php
@@ -16,25 +16,23 @@ if($Login->role()!=='admin') {
function edit($oldCategoryKey, $newCategory)
{
global $Language;
- global $dbPosts;
global $dbPages;
global $dbCategories;
if( Text::isEmpty($oldCategoryKey) || Text::isEmpty($newCategory) ) {
- Alert::set($Language->g('Empty field'));
- Redirect::page('admin', 'categories');
+ Alert::set($Language->g('Empty fields'));
+ Redirect::page('categories');
}
-
+
if( $dbCategories->edit($oldCategoryKey, $newCategory) == false ) {
Alert::set($Language->g('Already exist a category'));
}
else {
$dbPages->changeCategory($oldCategoryKey, $newCategory);
- $dbPosts->changeCategory($oldCategoryKey, $newCategory);
Alert::set($Language->g('The changes have been saved'));
}
- Redirect::page('admin', 'categories');
+ Redirect::page('categories');
}
function delete($categoryKey)
@@ -45,8 +43,7 @@ function delete($categoryKey)
$dbCategories->remove($categoryKey);
Alert::set($Language->g('The changes have been saved'));
-
- Redirect::page('admin', 'categories');
+ Redirect::page('categories');
}
// ============================================================================
@@ -73,11 +70,11 @@ if( $_SERVER['REQUEST_METHOD'] == 'POST' )
$categoryKey = $layout['parameters'];
-if(!$dbCategories->exists($categoryKey)) {
+if( !$dbCategories->exists($categoryKey) ) {
Log::set(__METHOD__.LOG_SEP.'Error occurred when trying to get the category: '.$categoryKey);
- Redirect::page('admin', 'categories');
+ Redirect::page('categories');
}
$category = $dbCategories->getName($layout['parameters']);
-$layout['title'] .= ' - '.$Language->g('Edit category').' - '.$category;
+$layout['title'] .= ' - '.$Language->g('Edit Category').' - '.$category;
diff --git a/bl-kernel/admin/controllers/manage-posts.php b/bl-kernel/admin/controllers/manage-posts.php
deleted file mode 100644
index 37794c32..00000000
--- a/bl-kernel/admin/controllers/manage-posts.php
+++ /dev/null
@@ -1,21 +0,0 @@
-add($args);
- if($key)
- {
- // Re index categories
- //reIndexCategoriesPages();
+ if($key) {
+ // Re-index categories
+ reindexCategories();
- // Call the plugins after page created.
+ // Re-index tags
+ reindextags();
+
+ // Call the plugins after page created
Theme::plugins('afterPageCreate');
- // Alert the user
- Alert::set($Language->g('Page added successfully'));
- Redirect::page('admin', 'manage-pages');
+ // Create an alert
+ Alert::set( $Language->g('Page added successfully') );
+
+ // Redirect
+ Redirect::page('pages');
+
+ return true;
}
- else
- {
- Log::set(__METHOD__.LOG_SEP.'Error occurred when trying to create the page.');
+ else {
+ Log::set(__METHOD__.LOG_SEP.'Error occurred when trying to create the page');
+ Log::set(__METHOD__.LOG_SEP.'Cleaning database...');
+ $dbPages->delete($key);
}
+
+ return false;
}
// ============================================================================
diff --git a/bl-kernel/admin/controllers/manage-pages.php b/bl-kernel/admin/controllers/pages.php
similarity index 100%
rename from bl-kernel/admin/controllers/manage-pages.php
rename to bl-kernel/admin/controllers/pages.php
diff --git a/bl-kernel/admin/controllers/settings-advanced.php b/bl-kernel/admin/controllers/settings-advanced.php
index e7c4b1a9..949ee783 100644
--- a/bl-kernel/admin/controllers/settings-advanced.php
+++ b/bl-kernel/admin/controllers/settings-advanced.php
@@ -21,9 +21,9 @@ function setSettings($args)
// Add slash at the begin and end.
// This fields are in the settings->advanced mode
$args['url'] = Text::addSlashes($args['url'],false,true);
- $args['uriPost'] = Text::addSlashes($args['uriPost']);
$args['uriPage'] = Text::addSlashes($args['uriPage']);
$args['uriTag'] = Text::addSlashes($args['uriTag']);
+ $args['uriCategory'] = Text::addSlashes($args['uriCategory']);
if(($args['uriPost']==$args['uriPage']) || ($args['uriPost']==$args['uriTag']) || ($args['uriPage']==$args['uriTag']) )
{
diff --git a/bl-kernel/admin/controllers/settings-general.php b/bl-kernel/admin/controllers/settings-general.php
index f6372a52..dcca7fec 100644
--- a/bl-kernel/admin/controllers/settings-general.php
+++ b/bl-kernel/admin/controllers/settings-general.php
@@ -53,28 +53,10 @@ function setSettings($args)
if( $_SERVER['REQUEST_METHOD'] == 'POST' )
{
setSettings($_POST);
- Redirect::page('admin', $layout['controller']);
+ Redirect::page($layout['controller']);
}
// ============================================================================
// Main after POST
// ============================================================================
-// Default home page
-$_homePageList = array(''=>$Language->g('Show blog'));
-foreach($pagesParents as $parentKey=>$pageList)
-{
- foreach($pageList as $Page)
- {
- if($parentKey!==NO_PARENT_CHAR) {
- $parentTitle = $pages[$Page->parentKey()]->title().'->';
- }
- else {
- $parentTitle = '';
- }
-
- if($Page->published()) {
- $_homePageList[$Page->key()] = $Language->g('Page').': '.$parentTitle.$Page->title();
- }
- }
-}
diff --git a/bl-kernel/admin/controllers/settings-regional.php b/bl-kernel/admin/controllers/settings-regional.php
index f6372a52..0b482730 100644
--- a/bl-kernel/admin/controllers/settings-regional.php
+++ b/bl-kernel/admin/controllers/settings-regional.php
@@ -59,22 +59,3 @@ if( $_SERVER['REQUEST_METHOD'] == 'POST' )
// ============================================================================
// Main after POST
// ============================================================================
-
-// Default home page
-$_homePageList = array(''=>$Language->g('Show blog'));
-foreach($pagesParents as $parentKey=>$pageList)
-{
- foreach($pageList as $Page)
- {
- if($parentKey!==NO_PARENT_CHAR) {
- $parentTitle = $pages[$Page->parentKey()]->title().'->';
- }
- else {
- $parentTitle = '';
- }
-
- if($Page->published()) {
- $_homePageList[$Page->key()] = $Language->g('Page').': '.$parentTitle.$Page->title();
- }
- }
-}
diff --git a/bl-kernel/admin/themes/default/index.php b/bl-kernel/admin/themes/default/index.php
index 0c17fab7..3e1131d3 100644
--- a/bl-kernel/admin/themes/default/index.php
+++ b/bl-kernel/admin/themes/default/index.php
@@ -102,23 +102,17 @@ $(document).ready(function() {
- >
- p('New post') ?>
-
>
p('New page') ?>
- >
- p('Posts') ?>
-
>
- p('Pages') ?>
+ p('Pages') ?>
-
+
>
p('Users') ?>
@@ -131,7 +125,7 @@ $(document).ready(function() {
p('Advanced') ?>
>
- p('Language and timezone') ?>
+ p('Language') ?>
>
p('Plugins') ?>
diff --git a/bl-kernel/admin/views/categories.php b/bl-kernel/admin/views/categories.php
index a2fd129b..b2b41eb5 100644
--- a/bl-kernel/admin/views/categories.php
+++ b/bl-kernel/admin/views/categories.php
@@ -9,18 +9,18 @@ echo '
'.$L->g('Name').' |
- '.$L->g('Key').' |
+ '.$L->g('URL').' |
';
-$categories = $dbCategories->getAll();
+$categories = $dbCategories->getKeyNameArray();
foreach($categories as $categoryKey=>$category)
{
echo '';
echo ''.$category.' | ';
- echo ''.$categoryKey.' | ';
+ echo ''.DOMAIN.$Url->filters('category', false).$categoryKey.' | ';
echo '
';
}
diff --git a/bl-kernel/admin/views/dashboard.php b/bl-kernel/admin/views/dashboard.php
index 238a3c44..69bb9757 100644
--- a/bl-kernel/admin/views/dashboard.php
+++ b/bl-kernel/admin/views/dashboard.php
@@ -66,10 +66,6 @@
- p('Posts') ?> |
- count() ?> |
-
-
p('Pages') ?> |
count() ?> |
@@ -89,13 +85,10 @@
p('Drafts') ?>