r31k/bludit
2
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Merge branch 'master' into patch-1

Browse Source
This commit is contained in:
Diego Najar 2018-10-23 23:52:27 +02:00 committed by GitHub
commit 24ebc57269
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
33 changed files with 67 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bl-kernel/admin/controllers/logout.php
View File

@ -21,5 +21,5 @@
// ============================================================================
if ($login->logout()) {
Redirect::home();
Redirect::admin();
}

2
bl-kernel/boot/init.php
View File

@ -179,7 +179,7 @@ define('HTML_PATH_UPLOADS_THUMBNAILS', HTML_PATH_UPLOADS.'thumbnails/');
define('HTML_PATH_PLUGINS', HTML_PATH_ROOT.'bl-plugins/');
// --- Objects with dependency ---
$language = $language = new Language( $site->language() );
$language = new Language( $site->language() );
$url->checkFilters( $site->uriFilters() );
// --- CONSTANTS with dependency ---

2
bl-kernel/boot/variables.php
View File

@ -96,7 +96,7 @@ define('SESSION_COOKIE_LIFE_TIME', 0);
$GLOBALS['ALERT_DISSAPEAR_IN'] = 3; // Seconds
// Number of images to show in the media manager per page
$GLOBALS['MEDIA_MANAGER_NUMBER_OF_FILES'] = 2;
$GLOBALS['MEDIA_MANAGER_NUMBER_OF_FILES'] = 5;
// Sort the image by date
$GLOBALS['MEDIA_MANAGER_SORT_BY_DATE'] = true;

4
bl-kernel/helpers/redirect.class.php
View File

@ -22,4 +22,8 @@ class Redirect {
self::url(HTML_PATH_ROOT);
}
public static function admin()
{
self::url(HTML_PATH_ADMIN_ROOT);
}
}

5
bl-kernel/pagex.class.php
View File

@ -73,10 +73,7 @@ class Page {
return $content;
}
$contentRaw = $this->contentRaw();
// Parse pre code with htmlentities
$content = Text::pre2htmlentities($contentRaw);
$content = $this->contentRaw();
// Parse Markdown
$parsedown = new Parsedown();

3
bl-languages/ar_MA.json
View File

@ -363,5 +363,6 @@
"hello": "Hello",
"there-are-no-images-for-the-page": "There are no images for the page.",
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found"
}

3
bl-languages/bg_BG.json
View File

@ -363,5 +363,6 @@
"hello": "Hello",
"there-are-no-images-for-the-page": "There are no images for the page.",
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found"
}

3
bl-languages/cs_CZ.json
View File

@ -364,5 +364,6 @@
"hello": "Hello",
"there-are-no-images-for-the-page": "There are no images for the page.",
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found"
}

3
bl-languages/de_CH.json
View File

@ -364,5 +364,6 @@
"hello": "Hallo",
"there-are-no-images-for-the-page": "There are no images for the page.",
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found"
}

3
bl-languages/de_DE.json
View File

@ -364,5 +364,6 @@
"hello": "Hallo",
"there-are-no-images-for-the-page": "There are no images for the page.",
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found"
}

3
bl-languages/en.json
View File

@ -364,5 +364,6 @@
"hello": "Hello",
"there-are-no-images-for-the-page": "There are no images for the page.",
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found"
}

3
bl-languages/es.json
View File

@ -363,5 +363,6 @@
"hello": "Hola",
"there-are-no-images-for-the-page": "No hay imágenes para la página.",
"select-cover-image": "Seleccionar imagen de portada",
"this-plugin-depends-on-the-following-plugins": "Este plugin depende de los siguientes plugins."
"this-plugin-depends-on-the-following-plugins": "Este plugin depende de los siguientes plugins.",
"no-pages-found": "No pages found"
}

3
bl-languages/fa_IR.json
View File

@ -363,5 +363,6 @@
"hello": "Hello",
"there-are-no-images-for-the-page": "There are no images for the page.",
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found"
}

3
bl-languages/fi_FI.json
View File

@ -363,5 +363,6 @@
"hello": "Hello",
"there-are-no-images-for-the-page": "There are no images for the page.",
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found"
}

3
bl-languages/fr_FR.json
View File

@ -364,5 +364,6 @@
"hello": "Salut",
"there-are-no-images-for-the-page": "There are no images for the page.",
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found"
}

3
bl-languages/gr.json
View File

@ -364,5 +364,6 @@
"hello": "Hello",
"there-are-no-images-for-the-page": "There are no images for the page.",
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found"
}

3
bl-languages/he_IL.json
View File

@ -364,5 +364,6 @@
"hello": "Hello",
"there-are-no-images-for-the-page": "There are no images for the page.",
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found"
}

3
bl-languages/hu_HU.json
View File

@ -363,5 +363,6 @@
"hello": "Hello",
"there-are-no-images-for-the-page": "There are no images for the page.",
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found"
}

3
bl-languages/it_IT.json
View File

@ -363,5 +363,6 @@
"hello": "Hello",
"there-are-no-images-for-the-page": "There are no images for the page.",
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found"
}

3
bl-languages/ja_JP.json
View File

@ -364,5 +364,6 @@
"hello": "Hello",
"there-are-no-images-for-the-page": "There are no images for the page.",
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found"
}

3
bl-languages/ms_MY.json
View File

@ -363,5 +363,6 @@
"hello": "Hello",
"there-are-no-images-for-the-page": "There are no images for the page.",
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found"
}

3
bl-languages/nl_NL.json
View File

@ -363,5 +363,6 @@
"hello": "Hello",
"there-are-no-images-for-the-page": "There are no images for the page.",
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found"
}

3
bl-languages/pl_PL.json
View File

@ -364,5 +364,6 @@
"hello": "Cześć",
"there-are-no-images-for-the-page": "There are no images for the page.",
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found"
}

3
bl-languages/pt_BR.json
View File

@ -364,5 +364,6 @@
"hello": "Hello",
"there-are-no-images-for-the-page": "There are no images for the page.",
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found"
}

3
bl-languages/pt_PT.json
View File

@ -364,5 +364,6 @@
"hello": "Hello",
"there-are-no-images-for-the-page": "There are no images for the page.",
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found"
}

3
bl-languages/ro_RO.json
View File

@ -360,5 +360,6 @@
"hello": "Hello",
"there-are-no-images-for-the-page": "There are no images for the page.",
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found"
}

5
bl-languages/ru_RU.json
View File

@ -364,5 +364,6 @@
"hello": "Привет",
"there-are-no-images-for-the-page": "There are no images for the page.",
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
}
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found"
}

5
bl-languages/tr_TR.json
View File

@ -365,5 +365,6 @@
"hello": "Merhaba",
"there-are-no-images-for-the-page": "Sayfa için resim yok.",
"select-cover-image": "Kapak resmini seç",
"this-plugin-depends-on-the-following-plugins": "Bu eklenti aşağıdaki eklentilere bağlıdır."
}
"this-plugin-depends-on-the-following-plugins": "Bu eklenti aşağıdaki eklentilere bağlıdır.",
"no-pages-found": "No pages found"
}

3
bl-languages/uk_UA.json
View File

@ -364,5 +364,6 @@
"hello": "Вітаю",
"there-are-no-images-for-the-page": "There are no images for the page.",
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found"
}

3
bl-languages/vi_VN.json
View File

@ -363,5 +363,6 @@
"hello": "Hello",
"there-are-no-images-for-the-page": "There are no images for the page.",
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found"
}

3
bl-languages/zh_CN.json
View File

@ -363,5 +363,6 @@
"hello": "Hello",
"there-are-no-images-for-the-page": "There are no images for the page.",
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found"
}

3
bl-languages/zh_TW.json
View File

@ -363,5 +363,6 @@
"hello": "Hello",
"there-are-no-images-for-the-page": "There are no images for the page.",
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found"
}

4
bl-plugins/search/plugin.php
View File

@ -35,7 +35,7 @@ class pluginSearch extends Plugin {
public function siteSidebar()
{
global $L;
$html = '<div class="plugin plugin-search">';
$html .= '<h2 class="plugin-label">'.$this->getValue('label').'</h2>';
$html .= '<div class="plugin-content">';
@ -124,6 +124,8 @@ class pluginSearch extends Plugin {
if ($this->webhook($webhook, false, false)) {
global $url;
global $WHERE_AM_I;
$WHERE_AM_I = 'search';
// Get the pre-defined variable from the rule 69.pages.php
// We change the content to show in the website