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

comments, bug fixes for buildpages by tags

This commit is contained in:
Diego Najar 2019-02-28 19:55:06 +01:00
parent c16741808f
commit e548d75e3e
7 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bl-kernel/abstract/dbjson.class.php
View File

@ -30,11 +30,9 @@ class dbJSON {
// Unserialize, JSON to Array // Unserialize, JSON to Array
$array = $this->unserialize($implode); $array = $this->unserialize($implode);
if (empty($array)) { if (empty($array)) {
$this->db = array(); $this->db = array();
$this->dbBackup = array(); $this->dbBackup = array();
Log::set(__METHOD__.LOG_SEP.'Error trying to read the JSON file: '.$file, LOG_TYPE_ERROR);
} else { } else {
$this->db = $array; $this->db = $array;
$this->dbBackup = $array; $this->dbBackup = $array;
@ -100,7 +98,8 @@ class dbJSON {
{ {
// NULL is returned if the json cannot be decoded // NULL is returned if the json cannot be decoded
$decode = json_decode($data, true); $decode = json_decode($data, true);
if (empty($decode)) { if ($decode===NULL) {
Log::set(__METHOD__.LOG_SEP.'Error trying to read the JSON file: '.$this->file, LOG_TYPE_ERROR);
return false; return false;
} }
return $decode; return $decode;

2
bl-kernel/abstract/dblist.class.php
View File

@ -126,7 +126,7 @@ class dbList extends dbJSON
} }
// Sort the categories by "Natural order" // Sort the categories by "Natural order"
private function sortAlphanumeric() public function sortAlphanumeric()
{ {
// Sort key alphanumeric strings, a01, a10, b10, c02 // Sort key alphanumeric strings, a01, a10, b10, c02
return ksort($this->db); return ksort($this->db);

2
bl-kernel/admin/themes/gris

@ -1 +1 @@
Subproject commit e0b144877b87f41d08a634f812726da5c887918c Subproject commit f616042ccc0eaa37dab6a0c3ad67bb022574952b

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

@ -9,7 +9,7 @@ define('BLUDIT_BUILD', '20190228');
// Debug mode // Debug mode
// Change to FALSE, for prevent warning or errors on browser // Change to FALSE, for prevent warning or errors on browser
define('DEBUG_MODE', TRUE); define('DEBUG_MODE', TRUE);
define('DEBUG_TYPE', 'INFO'); // INFO, TRACE define('DEBUG_TYPE', 'TRACE'); // INFO, TRACE
error_reporting(0); // Turn off all error reporting error_reporting(0); // Turn off all error reporting
if (DEBUG_MODE) { if (DEBUG_MODE) {
// Turn on all error reporting // Turn on all error reporting

5
bl-kernel/functions.php
View File

@ -118,7 +118,12 @@ function buildPagesFor($for, $categoryKey=false, $tagKey=false) {
foreach ($list as $pageKey) { foreach ($list as $pageKey) {
try { try {
$page = new Page($pageKey); $page = new Page($pageKey);
if ( ($page->type()=='published') ||
($page->type()=='sticky') ||
($page->type()=='static')
) {
array_push($content, $page); array_push($content, $page);
}
} catch (Exception $e) { } catch (Exception $e) {
// continue // continue
} }

2
bl-kernel/pages.class.php
View File

@ -8,7 +8,7 @@ class Pages extends dbJSON {
'description'=>'', 'description'=>'',
'username'=>'', 'username'=>'',
'tags'=>array(), 'tags'=>array(),
'type'=>'published', // published, draft, sticky, scheduled 'type'=>'published', // published, static, draft, sticky, scheduled
'date'=>'', 'date'=>'',
'dateModified'=>'', 'dateModified'=>'',
'position'=>0, 'position'=>0,

3
bl-kernel/tags.class.php
View File

@ -31,9 +31,8 @@ class Tags extends dbList {
} }
} }
// Sort database by alphabet
ksort($tagsIndex);
$this->db = $tagsIndex; $this->db = $tagsIndex;
$this->sortAlphanumeric();
return $this->save(); return $this->save();
} }