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

Merge 9647beb1e1d118f21c76a531587c1255e792ca00 into 3ff2ac0d53a999e824ed2da50e9dc1a4c8ee686b

Browse Source
This commit is contained in:
krasimir-georgiev 2016-11-22 07:39:57 +00:00 committed by GitHub
commit 88831b9db6
10 changed files with 230 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -1,5 +0,0 @@
.DS_Store
bl-content/databases
bl-content/pages
bl-content/posts
bl-content/uploads

26
bl-kernel/admin/themes/default/init.php
View File

@ -102,6 +102,32 @@ class HTML {
$args['type'] = 'password';
self::formInputText($args);
}
public static function formCheckbox($args)
{
$id = 'js'.$args['name'];
$class = empty($args['class']) ? '' : 'class="'.$args['class'].'"';
$placeholder = empty($args['placeholder']) ? '' : 'placeholder="'.$args['placeholder'].'"';
$html = '<div class="uk-form-row">';
if(!empty($args['label'])) {
$html .= '<label for="'.$id.'" class="uk-form-label">'.$args['label'].'</label>';
}
$html .= '<div class="uk-form-controls">';
// without the hidden field it doesn't send any post value when the checkbox is not checked
$html .= "<input type='hidden' value='0' name='".$args['name']."'>";
$html .= '<input type="checkbox" id="'.$id.'" name="'.$args['name'].'" '.$class.' '.$placeholder.' value=1 '.($args['checked']?"checked":"").' />';
if(!empty($args['tip'])) {
$html .= '<p class="uk-form-help-block">'.$args['tip'].'</p>';
}
$html .= '</div>';
$html .= '</div>';
echo $html;
}
public static function formTextarea($args)
{

7
bl-kernel/admin/views/settings-advanced.php
View File

@ -20,6 +20,13 @@ HTML::formOpen(array('class'=>'uk-form-horizontal'));
'tip'=>$L->g('number-of-posts-to-show-per-page')
));
HTML::formCheckbox(array(
'name'=>'shuffleIdeticalTags',
'label'=>$L->g('Shufle posts with identical tags'),
'checked'=>$Site->shuffleIdeticalTags(),
'class'=>'uk-width-1-3 uk-form-medium',
));
HTML::formSelect(array(
'name'=>'homepage',
'label'=>$L->g('Default home page'),

57
bl-kernel/dbposts.class.php
View File

@ -103,6 +103,7 @@ class dbPosts extends dbJSON
public function add($args)
{
global $Site;
$dataForDb = array(); // This data will be saved in the database
$dataForFile = array(); // This data will be saved in the file
@ -190,6 +191,10 @@ class dbPosts extends dbJSON
// Sort posts before save
$this->sortByDate();
if($Site->shuffleIdeticalTags()){
$this->mixTags();
}
if( $this->save() === false ) {
// Trying to rollback
@ -402,6 +407,58 @@ class dbPosts extends dbJSON
return true;
}
// Mix the posts so that neighbour posts have different Tags -
// helpfull if you want to show diverse content. Case studies for example
public function mixTags()
{
$previousValue = null;
$finalArray=array();
$buffeArray=array();
// Get array keys
$arrayKeys = array_keys($this->db);
// Fetch last array key
$lastArrayKey = array_pop($arrayKeys);
foreach($this->db as $key=>$row){
foreach($buffeArray as $bufferKey=>$bufferRow){
// Get buffer array keys
$finalArrayKeys = array_keys($finalArray);
// Fetch last array key
$finalArraylastArrayKey = array_pop($finalArrayKeys);
if($bufferRow['tags']!=$finalArray[$finalArraylastArrayKey]['tags']){
$finalArray[$bufferKey]=$bufferRow;
unset($buffeArray[$bufferKey]);
}
}
$finalArrayKeys = array_keys($finalArray);
// Fetch last array key
$finalArraylastArrayKey = array_pop($finalArrayKeys);
if(empty($finalArray)){
$finalArray[$key]=$row;
}
elseif($row['tags']==$finalArray[$finalArraylastArrayKey]['tags']){
$buffeArray[$key]=$row;
}
else{
$finalArray[$key]=$row;
}
//reached the end so no other choice but to add the remaining buffer
if($key == $lastArrayKey) {
$finalArray=array_merge($finalArray,$buffeArray);
}
$previousValue = $row;
}
$this->db=$finalArray;
return true;
}
private function sortLowToHigh($a, $b) {
return $a['date']>$b['date'];
}

7
bl-kernel/dbsite.class.php
View File

@ -8,6 +8,7 @@ class dbSite extends dbJSON
'description'=> array('inFile'=>false, 'value'=>''),
'footer'=> array('inFile'=>false, 'value'=>'I wanna be a pirate!'),
'postsperpage'=> array('inFile'=>false, 'value'=>''),
'shuffleIdeticalTags'=> array('inFile'=>false, 'value'=>''),
'language'=> array('inFile'=>false, 'value'=>'en'),
'locale'=> array('inFile'=>false, 'value'=>'en_US'),
'timezone'=> array('inFile'=>false, 'value'=>'America/Argentina/Buenos_Aires'),
@ -239,6 +240,12 @@ class dbSite extends dbJSON
return $this->getField('postsperpage');
}
// Returns if tags mix is enabled.
public function shuffleIdeticalTags()
{
return $this->getField('shuffleIdeticalTags');
}
// Returns the current language.
public function language()
{

23
bl-kernel/functions.php
View File

@ -105,6 +105,27 @@ function buildPostsForPage($pageNumber=0, $amount=POSTS_PER_PAGE_ADMIN, $removeU
array_push($posts, $Post);
}
}
return $posts;
}
function buildTagPosts($tag,$amount=3, $pageNumber=0){
global $dbTags;
$posts=array();
$tag=str_replace(" ", "-",$tag);
$keys= $dbTags->getList($pageNumber, $amount, $tag);
foreach($keys as $key=>$value) {
$Post = buildPost($key);
if($Post==false){
break;
}
$posts['itms'][$key]=$Post->vars;
$posts['itms'][$key]['permalink']=$Post->permalink();
}
$posts['count']=$dbTags->countPostsByTag($tag);
$posts['page']=$pageNumber;
return $posts;
}
@ -193,7 +214,7 @@ function buildAllPages()
// Remove the error page
unset($list['error']);
// Sorte pages
// Sort pages
uasort($list, 'sortPages');
foreach($list as $key=>$db)

8
bl-kernel/url.class.php
View File

@ -20,7 +20,13 @@ class Url
$explode = explode('?', $decode);
$this->uri = $explode[0];
$this->parameters = $_GET;
// deal with server config when missing the get params
if(empty($_GET)){
isset($explode[1]) ? parse_str($explode[1], $this->parameters):"";
}
else{
$this->parameters=$_GET;
}
$this->uriStrlen = Text::length($this->uri);

57
bl-plugins/api/plugin.php
View File

@ -33,25 +33,30 @@ class pluginAPI extends Plugin {
$html .= '</div>';
$html .= '<div>';
$html .= '<p><b>Show all posts:</b> <a href="'.DOMAIN_BASE.'api/show/all/posts/'.$this->getDbField('authKey').'">'.DOMAIN_BASE.'api/show/all/posts/'.$this->getDbField('authKey').'</a></p>';
$html .= '<p><b>Show all posts:</b> <a href="'.DOMAIN_BASE.'api/show/all/posts?key='.$this->getDbField('authKey').'">'.DOMAIN_BASE.'api/show/all/posts?key='.$this->getDbField('authKey').'</a></p>';
$html .= '<div class="tip">Get all posts from this site.</div>';
$html .= '</div>';
$html .= '<div>';
$html .= '<p><b>Show all pages:</b> <a href="'.DOMAIN_BASE.'api/show/all/pages/'.$this->getDbField('authKey').'">'.DOMAIN_BASE.'api/show/all/pages/'.$this->getDbField('authKey').'</a></p>';
$html .= '<p><b>Show all pages:</b> <a href="'.DOMAIN_BASE.'api/show/all/pages?key='.$this->getDbField('authKey').'">'.DOMAIN_BASE.'api/show/all/pages?key='.$this->getDbField('authKey').'</a></p>';
$html .= '<div class="tip">Get all pages from this site.</div>';
$html .= '</div>';
$html .= '<div>';
$html .= '<p><b>Show post:</b> <a href="'.DOMAIN_BASE.'api/show/post/{POST-NAME}">'.DOMAIN_BASE.'api/show/post/{POST-NAME}</a></p>';
$html .= '<p><b>Show post:</b> <a href="'.DOMAIN_BASE.'api/show/post/POST-NAME?key='.$this->getDbField('authKey').'">'.DOMAIN_BASE.'api/show/post/{POST-NAME}?key='.$this->getDbField('authKey').'</a></p>';
$html .= '<div class="tip">Get a particular post, change the {POST-NAME} with the post friendly url.</div>';
$html .= '</div>';
$html .= '<div>';
$html .= '<p><b>Show page:</b> <a href="'.DOMAIN_BASE.'api/show/page/{PAGE-NAME}">'.DOMAIN_BASE.'api/show/page/{PAGE-NAME}</a></p>';
$html .= '<p><b>Show page:</b> <a href="'.DOMAIN_BASE.'api/show/page/PAGE-NAME?key='.$this->getDbField('authKey').'">'.DOMAIN_BASE.'api/show/page/{PAGE-NAME}?key='.$this->getDbField('authKey').'</a></p>';
$html .= '<div class="tip">Get a particular page, change the {PAGE-NAME} with the page friendly url.</div>';
$html .= '</div>';
$html .= '<div>';
$html .= '<p><b>Show posts by tag filter:</b> <a href="'.DOMAIN_BASE.'api/show/tag/TAG-NAME/PER-PAGE/PAGE-NUM?key='.$this->getDbField('authKey').'">'.DOMAIN_BASE.'api/show/tag/{TAG-NAME}/{PER-PAGE}/{PAGE-NUM}?key='.$this->getDbField('authKey').'</a></p>';
$html .= '<div class="tip">Get all posts filterd by a tag name , per page limit and page number.</div>';
$html .= '</div>';
return $html;
}
@ -134,6 +139,14 @@ class pluginAPI extends Plugin {
return json_encode($tmp);
}
private function getTagPosts($tag,$amount=3,$pageNumber=0)
{
$posts = buildTagPosts($tag,$amount,$pageNumber);
return json_encode($posts);
}
private function getPage($key)
{
// Generate the object Page
@ -177,6 +190,8 @@ class pluginAPI extends Plugin {
return false;
}
header('Content-Type: application/json');
// Remove the first part of the URI
$URI = mb_substr($URI, $length);
@ -190,14 +205,6 @@ class pluginAPI extends Plugin {
// Get parameters
$parameters = explode('/', $URI);
for($i=0; $i<3; $i++) {
if(empty($parameters[$i])) {
return false;
} else {
// Sanizite
$parameters[$i] = Sanitize::html($parameters[$i]);
}
}
// Default JSON
$json = json_encode(array(
@ -206,16 +213,20 @@ class pluginAPI extends Plugin {
'message'=>'Check the parameters'
));
if(!isset($_GET['key']) OR $_GET['key']!==$this->getDbField('authKey') ){
exit($json);
}
for($i=0; $i<count($parameters); $i++) {
// Sanizite
$parameters[$i] = Sanitize::html($parameters[$i]);
}
if($parameters[0]==='show') {
if($parameters[1]==='all') {
// Authentication key from the URI
$authKey = $parameters[3];
// Compare keys
if( $authKey===$this->getDbField('authKey') ) {
if($parameters[2] === 'posts') {
$json = $this->getAllPosts();
}
@ -223,6 +234,13 @@ class pluginAPI extends Plugin {
$json = $this->getAllPages();
}
}
elseif($parameters[1]==='tag') {
if(isset($parameters[2]) AND isset($parameters[3])AND isset($parameters[4])){
$tag = $parameters[2];
$limit = $parameters[3];
$page = $parameters[4];
$json = $this->getTagPosts($tag,$limit,$page);
}
}
elseif($parameters[1]==='post' || $parameters[1]==='page') {
@ -236,9 +254,6 @@ class pluginAPI extends Plugin {
}
}
}
// Print the JSON
header('Content-Type: application/json');
exit($json);
}
}

33
bl-plugins/tags/plugin.php
View File

@ -6,8 +6,15 @@ class pluginTags extends Plugin {
{
$this->dbFields = array(
'label'=>'Tags',
'sort'=>'date'
'sort'=>'date',
'link'=>''
);
$this->dbTokens = array(
"[postUrl]",
"[tagName]",
"[tagCount]"
);
}
public function form()
@ -34,6 +41,13 @@ class pluginTags extends Plugin {
$html .= '</select>';
$html .= '</div>';
$html .= '<div>';
$html .= '<label>'.$Language->get('Customize link').'</label>';
$html .= '<input name="link" id="jslink" type="text" value="'.$this->getDbField('link').'">';
$html .= '<pre>available tokens '. implode(', ', $this->dbTokens).' <br/>'.
htmlspecialchars('<a href="[token1]#content" >[token2] [token3]</a>').'</pre>';
$html .= '</div>';
return $html;
}
@ -72,10 +86,25 @@ class pluginTags extends Plugin {
});
}
foreach($tagArray as $tagKey=>$fields)
{
// Print the parent
$html .= '<li><a href="'.HTML_PATH_ROOT.$filter.'/'.$fields['tagKey'].'">'.$fields['name'].' ('.$fields['count'].')</a></li>';
$link='<a href="'.HTML_PATH_ROOT.$filter.'/'.$fields['tagKey'].'">'.$fields['name'].' ('.$fields['count'].')</a>';
if(!empty($this->getDbField('link'))){
$replacments=array(
"[postUrl]"=>HTML_PATH_ROOT.$filter.'/'.$fields['tagKey'], html_entity_decode($this->getDbField('link')),
"[tagName]"=>$fields['name'],
"[tagCount]"=>$fields['count']
);
$link= html_entity_decode($this->getDbField('link'));
foreach($this->dbTokens as $token){
$link= str_replace($token,$replacments[$token],$link);
}
}
$html .= "<li>$link</li>";
}
$html .= '</ul>';
$html .= '</div>';