diff --git a/bl-kernel/admin/themes/default/css/default.css b/bl-kernel/admin/themes/default/css/default.css
index 4b75e630..acd14999 100644
--- a/bl-kernel/admin/themes/default/css/default.css
+++ b/bl-kernel/admin/themes/default/css/default.css
@@ -368,7 +368,7 @@ table.statistics tr:last-child td {
#alert {
top: 0;
color: #ffffff;
- padding: 20px 60px;
+ padding: 8px 80px;
display: none;
position: fixed;
text-align: center;
diff --git a/bl-kernel/admin/themes/default/index.php b/bl-kernel/admin/themes/default/index.php
index 51ec1ceb..ddb6b3d9 100644
--- a/bl-kernel/admin/themes/default/index.php
+++ b/bl-kernel/admin/themes/default/index.php
@@ -150,6 +150,12 @@ $(document).ready(function() {
+
+
diff --git a/bl-kernel/admin/views/edit-page.php b/bl-kernel/admin/views/edit-page.php
index 7f8445e9..7e29e144 100644
--- a/bl-kernel/admin/views/edit-page.php
+++ b/bl-kernel/admin/views/edit-page.php
@@ -214,28 +214,28 @@ $(document).ready(function()
var text = $(this).val();
var parent = $("#jsparent").val();
- checkSlugPage(text, parent, key, $("#jsslug"));
+ generateSlug(text, parent, key, $("#jsslug"));
});
$("#jstitle").keyup(function() {
var text = $(this).val();
var parent = $("#jsparent").val();
- checkSlugPage(text, parent, key, $("#jsslug"));
+ generateSlug(text, parent, key, $("#jsslug"));
});
$("#jsparent").change(function() {
var parent = $(this).val();
var text = $("#jsslug").val();
- if(parent==NO_PARENT_CHAR) {
+ if (parent=="") {
$("#jsparentExample").text("");
}
else {
$("#jsparentExample").text(parent+"/");
}
- checkSlugPage(text, parent, key, $("#jsslug"));
+ generateSlug(text, parent, key, $("#jsslug"));
});
$("#jsdelete").click(function() {
diff --git a/bl-kernel/admin/views/new-page.php b/bl-kernel/admin/views/new-page.php
index b832f24e..7cdae762 100644
--- a/bl-kernel/admin/views/new-page.php
+++ b/bl-kernel/admin/views/new-page.php
@@ -193,28 +193,28 @@ $(document).ready(function()
var text = $(this).val();
var parent = $("#jsparent").val();
- checkSlugPage(text, parent, "", $("#jsslug"));
+ generateSlug(text, parent, "", $("#jsslug"));
});
$("#jstitle").keyup(function() {
var text = $(this).val();
var parent = $("#jsparent").val();
- checkSlugPage(text, parent, "", $("#jsslug"));
+ generateSlug(text, parent, "", $("#jsslug"));
});
$("#jsparent").change(function() {
var parent = $(this).val();
var text = $("#jsslug").val();
- if(parent==NO_PARENT_CHAR) {
+ if(parent=="") {
$("#jsparentExample").text("");
}
else {
$("#jsparentExample").text(parent+"/");
}
- checkSlugPage(text, parent, "", $("#jsslug"));
+ generateSlug(text, parent, "", $("#jsslug"));
});
// Button Save as draft
diff --git a/bl-kernel/admin/views/pages.php b/bl-kernel/admin/views/pages.php
index b3f46dfa..e4f422e6 100644
--- a/bl-kernel/admin/views/pages.php
+++ b/bl-kernel/admin/views/pages.php
@@ -51,7 +51,7 @@ echo '
}
for($i=1; $i<=Paginator::amountOfPages(); $i++) {
- echo '
'.$i.'';
+ echo ''.$i.'';
}
// Show next page link
diff --git a/bl-kernel/ajax/delete-file.php b/bl-kernel/ajax/delete-file.php
index d53e816d..a02b1c6c 100644
--- a/bl-kernel/ajax/delete-file.php
+++ b/bl-kernel/ajax/delete-file.php
@@ -8,7 +8,7 @@ header('Content-Type: application/json');
$filename = isset($_POST['filename']) ? $_POST['filename'] : '';
if( empty($filename) ) {
- echo json_encode( array('status'=>0, 'msg'=>'The filename is empty.') );
+ echo json_encode( array('status'=>1, 'msg'=>'The filename is empty.') );
exit;
}
@@ -21,13 +21,13 @@ if( Sanitize::pathFile(PATH_UPLOADS.$filename) ) {
// Delete the thumnails.
Filesystem::rmfile(PATH_UPLOADS_THUMBNAILS.$filename);
- echo json_encode( array('status'=>1, 'msg'=>'The file was deleted.') );
+ echo json_encode( array('status'=>0, 'msg'=>'The file was deleted.') );
exit;
}
exit(json_encode(array(
- 'status'=>0,
+ 'status'=>1,
'msg'=>'The file does not exist.'
)));
diff --git a/bl-kernel/ajax/slug.php b/bl-kernel/ajax/slug.php
index cc5355d6..8512074c 100644
--- a/bl-kernel/ajax/slug.php
+++ b/bl-kernel/ajax/slug.php
@@ -1,29 +1,17 @@
generateKey($text, $parent, true, $key);
-}
-elseif( $_POST['type']==='post' ) {
- $slug = $dbPosts->generateKey($text, $key);
-}
+$slug = $dbPages->generateKey($text, $parent, $returnSlug=true, $oldKey);
-exit(json_encode(array(
- 'status'=>1,
- 'slug'=>$slug
-)));
+exit(json_encode(
+ array(
+ 'status'=>0,
+ 'slug'=>$slug
+ )
+));
?>
\ No newline at end of file
diff --git a/bl-kernel/boot/admin.php b/bl-kernel/boot/admin.php
index 9cffaf5b..dbc5ffd1 100644
--- a/bl-kernel/boot/admin.php
+++ b/bl-kernel/boot/admin.php
@@ -17,23 +17,19 @@ $layout['parameters'] = implode('/', $explodeSlug);
// Disable Magic Quotes.
// Thanks, http://stackoverflow.com/questions/517008/how-to-turn-off-magic-quotes-on-shared-hosting
-if ( in_array( strtolower( ini_get( 'magic_quotes_gpc' ) ), array( '1', 'on' ) ) )
-{
+if ( in_array( strtolower( ini_get( 'magic_quotes_gpc' ) ), array( '1', 'on' ) ) ) {
$_POST = array_map('stripslashes', $_POST);
$_GET = array_map('stripslashes', $_GET);
$_COOKIE = array_map('stripslashes', $_COOKIE);
}
// --- AJAX ---
-if( $layout['slug']==='ajax' )
-{
- // Check if the user is loggued.
- if($Login->isLogged())
- {
+if ($layout['slug']==='ajax') {
+ if ($Login->isLogged()) {
// Rules: Security check CSRF
include(PATH_RULES.'99.security.php');
- // Load the ajax file.
+ // Load the ajax file
if( Sanitize::pathFile(PATH_AJAX, $layout['parameters'].'.php') ) {
include(PATH_AJAX.$layout['parameters'].'.php');
}
diff --git a/bl-kernel/js/functions.php b/bl-kernel/js/functions.php
index 22a80bba..e2d35257 100644
--- a/bl-kernel/js/functions.php
+++ b/bl-kernel/js/functions.php
@@ -19,41 +19,21 @@ echo '';
var ajaxRequest;
-function checkSlugPage(text, parent, oldKey, writeResponse)
-{
- parent = typeof parent !== 'undefined' ? parent : PARENT;
- oldKey = typeof oldKey !== 'undefined' ? oldKey : "";
-
- checkSlug("page", text, parent, oldKey, writeResponse);
-}
-
-function checkSlugPost(text, oldKey, writeResponse)
-{
- checkSlug("post", text, null, oldKey, writeResponse);
-}
-
-function checkSlug(type, text, parentPage, key, writeResponse)
-{
+function generateSlug(text, parentKey, currentKey, writeResponse) {
if(ajaxRequest) {
ajaxRequest.abort();
}
- if(type=="page")
- {
- ajaxRequest = $.ajax({
- type: "POST",
- data:{ tokenCSRF: tokenCSRF, type: "page", text: text, parent: parentPage, key: key},
- url: ""
- });
- }
- else
- {
- ajaxRequest = $.ajax({
- type: "POST",
- data:{ tokenCSRF: tokenCSRF, type: "post", text: text, key: key },
- url: ""
- });
- }
+ ajaxRequest = $.ajax({
+ type: "POST",
+ data: {
+ tokenCSRF: tokenCSRF,
+ text: text,
+ parentKey: parentKey,
+ currentKey: currentKey
+ },
+ url: ""
+ });
// Callback handler that will be called on success
ajaxRequest.done(function (response, textStatus, jqXHR){
diff --git a/bl-plugins/simplemde/plugin.php b/bl-plugins/simplemde/plugin.php
index 35c4a442..9c51522f 100644
--- a/bl-plugins/simplemde/plugin.php
+++ b/bl-plugins/simplemde/plugin.php
@@ -68,7 +68,7 @@ class pluginsimpleMDE extends Plugin {
$html .= '';
// Font-awesome is a dependency of SimpleMDE
- $html .= '';
+ $html .= '';
// SimpleMDE js
$html .= '';