20xd6/simple_blog
2
0
Fork 1
Code Issues 10 Pull Requests 2 Projects Releases Wiki Activity

Compare commits

merge into: 20xd6:issue#7
Branches Tags
20xd6:master
20xd6:update_fonts
20xd6:issue#5
20xd6:issue#26
20xd6:issue#10
20xd6:issue#18
20xd6:issue#9
20xd6:issue#7
20xd6:issue#2
20xd6:issue#8
20xd6:issue#3
...
pull from: 20xd6:master
Branches Tags
20xd6:update_fonts
20xd6:issue#5
20xd6:master
20xd6:issue#26
20xd6:issue#10
20xd6:issue#18
20xd6:issue#9
20xd6:issue#7
20xd6:issue#2
20xd6:issue#8
20xd6:issue#3

15 Commits
issue#7 ... master

Author SHA1 Message Date
20xd6
7734de9fa4 Merge pull request 'Fix issues #25 and #26' (#27) from issue#26 into master 
Reviewed-on: #27
 2022-08-09 14:15:37 -04:00
20xd6
470773721a Stop parsing if the author isn't found 2022-08-09 14:10:44 -04:00
20xd6
5d7b4cc121 Add a size check before attempting to parse the author 
The author file is now checked to insure it's non-zero before attempting
to parse it for the author who's byline will be displayed at the bottom
of the post.
 2022-08-09 14:07:40 -04:00
20xd6
efe61157e8 Merge pull request 'Cleanup header.php' (#22) from issue#10 into master 
Reviewed-on: #22
 2022-07-31 17:12:49 -04:00
20xd6
5016fa8ce8 Cleanup header.php 
Cleanup debugging code for issue #10
 2022-07-31 17:10:41 -04:00
20xd6
206f94f5db Fix variable being tested for empty file in PR #21 2022-07-27 22:11:36 -04:00
20xd6
7ff2cf1d0f Resolve issue #9 (#21) 2022-07-27 20:17:34 -04:00
manfromhuh
f80bc8dafa File permissions change, check for non-zero tags.csv for issue #9 
The tags index.php file now checks for the tags.csv to be non-zero as
well as existing.
Updated the permission of the generated tags.csv file to allow the CMS
to updated it with out requiring root/sudo permissions.
 2022-07-27 20:08:55 -04:00
manfromhuh
32f7d23ee4 Merge pull request 'Merge upstream master' (#4) from 20xd6/simple_blog:master into master 
Reviewed-on: manfromhuh/simple_blog#4
 2022-07-27 13:02:23 -04:00
20xd6
015c5ef6db Fix for issue #18 
The page generation now checks for the size of $file_arr and only
generates a menu if the size os greater than 0.
 2022-07-26 13:33:49 -04:00
20xd6
4958a76f9a Remove old csv reading code. 2022-07-26 13:29:08 -04:00
20xd6
b01c237d5d Merge pull request 'Update tags index to handle issue #9' (#20) from issue#9 into master 
Reviewed-on: #20
 2022-07-26 13:10:05 -04:00
20xd6
dd3405137f Update tags index to handle issue # 9 
Now checks for the file and either copies a backup or creates a blank
file.
 2022-07-26 13:06:52 -04:00
20xd6
25f1887590 Merge pull request 'issue #7' (#19) from issue#7 into master 
Reviewed-on: #19
 2022-07-26 11:28:32 -04:00
manfromhuh
d2861f1203 Merge pull request 'Merge with upstream' (#3) from 20xd6/simple_blog:master into master 
Reviewed-on: manfromhuh/simple_blog#3
 2022-07-26 10:42:54 -04:00
4 changed files with 67 additions and 85 deletions
Show Stats Expand all files Collapse all files

52
blog/by_tag/index.php Normal file → Executable file
View File

@ -4,36 +4,11 @@
echo "<article><h1 id=\"page_title\">Posts by Tag</h1></article>";
echo "<div id=\"search_inputs\"><input type=\"text\" id=\"tag_sort\" onkeyup=\"tag_search()\" placeholder=\"Search Tags...\" title=\"Type a tage to search\"><input id=\"search_toggle\" type=\"button\" value=\"Search Titles\" onclick=\"search_toggle()\"></div><!--End Div Search Inputs-->";
//if(file_exists("tags.csv")){
//echo "<ul id=\"tag_menu\">\n";
//$csv = array_map('str_getcsv', file("tags.csv"));
//array_walk($csv, function(&$a) use ($csv) {
//$a = array_combine($csv[0], $a);
//});
//array_shift($csv); # remove column header
//foreach ($csv as $row){
//$counter = 0;
//foreach ($row as $item){
//$counter++;
//if ($counter == 1){
//echo "\t<li id=\"" . $item . "\">" . $item . " <a id=\"" . $item . "\"></a>\n";
//} elseif ($counter % 2 == 0) {
//if ($item == ""){
//break;
//} else {
//echo "\t\t<ol><a href=\"" . $item . "\">";
//}
//} elseif ($counter % 2 != 0) {
//echo $item . "</a></ol>\n";
//}
//}
//echo "\t</li>\n";
//}
//echo "</ul>\n";
//}
# Tags rewrite
function read_tags($tags_file){
if (filesize($tags_file) == 0){
echo "<br/>\n<br/>";
return;
}
$tags_csv = array_map('str_getcsv', file('tags.csv'));
$tags_rows = sizeof($tags_csv);
$tags_coloums = sizeof($tags_csv[0]);
@ -64,5 +39,22 @@
$coloum_number++;
}
echo "</ul>\n";
}
# Tags rewrite
if (file_exists('tags.csv')){
read_tags('tags.csv');
} elseif( file_exists('tags.csv.bak') ){
if (copy('tags.csv.bak', './tags.csv')) {
read_tags('tags.csv');
}
}else {
$empty_csv = fopen("tags.csv", "w") or die("Cannot write new tags.csv file.");
fwrite($empty_csv, "");
fclose($empty_csv);
chmod('./tags.csv', 0666);
read_tags('tags.csv');
}
include_once ($_SERVER['DOCUMENT_ROOT'].'/common/php/footer.php');
?>

5
common/php/article.php
View File

@ -22,7 +22,7 @@
echo "\n</div><!--End of print-content div-->\n";
echo("<nav class=\"jmenu\"><div class=\"pmenu\"><ul id=\"back_btn\"><li><a href='..'>Back</a></li></ul></div></nav>\n");
if (file_exists('author')){
if (file_exists('author') && (filesize('author') != 0)){
$author_name_raw = fopen('author', 'r');
$author_name = fread($author_name_raw, filesize('author'));
$author_name = str_replace("\n", "", $author_name);
@ -31,9 +31,6 @@
echo "<div class =\"byline\">\n"
. read_md($byline_path)
."</div><!--End byline div-->\n";
} else {
echo "<h2>No byline</h2>";
echo "<p>$byline_path</p>";
}
fclose($author_name_raw);
}

11
common/php/header.php
View File

@ -2,20 +2,11 @@
<html lang="en-US">
<?php
//Sets the page title based on the name of the current directory
function Title() {//Needs cleanup.
//~ $new_title = $_SERVER['REQUEST_URI'];
//~ $new_title = preg_replace("/^^\//i", "", $new_title);
//~ $new_title = preg_replace("/\//i", "", $new_title);
//~ $page_title = $_SERVER['REQUEST_URI'];
//~ $page_title = preg_replace("/^(.*)\//i", "", $page_title);
function Title() {
$page_title = basename($_SERVER['SCRIPT_FILENAME'], '.php');
//~ echo($page_title);
if(strtolower($page_title) == 'index'){
parse_str($_SERVER['REQUEST_URI'], $page_uri);
$page_path = parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH);
//~ echo($page_path);
//~ $folder_name = sizeof($page_path);
$folder_name = explode("/", trim($page_path, "/"));
$page_title = $folder_name[(sizeof($folder_name) - 1)];
} elseif(strtolower($page_title) == 'homepage'){

2
common/php/page_menu.php
View File

@ -23,6 +23,7 @@ if (file_exists($dir) && is_dir($dir) ) {
$files_arr = array_diff($scan_arr, array('.','..','index.php','common','.htaccess') );
// echo "<pre>"; print_r( $files_arr ); echo "</pre>";
// Get each files of our directory with line break
if (sizeof($files_arr) != 0 ) {
foreach ($files_arr as $file) {
//Get the file path
$file_path = "./".$file;
@ -41,6 +42,7 @@ if (file_exists($dir) && is_dir($dir) ) {
$link_title = remove_sorting_number($link_title);//Removes the number used to keep articles in post order from the displayed title.
echo("<ul><li><a href='$file'> $link_title </a></li></ul>\n");//Output the result.
}
}
}
else {
echo "Directory does not exists";