Merge pull request 'Fix issues #25 and #26' (#27) from issue#26 into master

Reviewed-on: #27

blog/by_tag/index.php

@@ -4,65 +4,57 @@
 
   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-->";
-
+  function read_tags($tags_file){
-  //if(file_exists("tags.csv")){
+    if (filesize($tags_file) == 0){
-    //echo "<ul id=\"tag_menu\">\n";
+      echo "<br/>\n<br/>";
-    //$csv = array_map('str_getcsv', file("tags.csv"));
+      return;
-    //array_walk($csv, function(&$a) use ($csv) {
+    }
-      //$a = array_combine($csv[0], $a);
+    $tags_csv = array_map('str_getcsv', file('tags.csv'));
-    //});
+    $tags_rows = sizeof($tags_csv);
-    //array_shift($csv); # remove column header
+    $tags_coloums = sizeof($tags_csv[0]);
-    //foreach ($csv as $row){
+    //echo "<pre>\n";
-      //$counter = 0;
+    //print_r($tags_csv);
-      //foreach ($row as $item){
+    //echo $tags_coloums . "\n" . $tags_rows . "\n";
-        //$counter++;
+    //echo "</pre>\n";
-        //if ($counter == 1){
+    echo "<ul id=\"tag_menu\">\n";
-          //echo "\t<li id=\"" . $item . "\">" . $item . " <a id=\"" . $item . "\"></a>\n";
+    $coloum_number = 0;
-        //} elseif ($counter % 2 == 0) {
+    for ($row_number = 0; $row_number <= $tags_coloums; $row_number++){
-          //if ($item == ""){
+      //echo $row_number;
-            //break;
+      $section_title = $tags_csv[0][$coloum_number];
-          //} else {
+      echo "\t<li id=\"" . $section_title . "\"><b>" . $section_title . " </b>\n";
-            //echo "\t\t<ol><a href=\"" . $item . "\">";
+      for ($row = 1; $row < $tags_coloums; $row++){
-          //}
+        //echo "rn: " . $row . "\ncn:" . $coloum_number ." ";
-        //} elseif ($counter % 2 != 0) {
+        $tag_content = $tags_csv[$row][$coloum_number];
-          //echo $item . "</a></ol>\n";
+        if ($tag_content == ""){
-        //}
+          break;
-      //}
+        } else {
-      //echo "\t</li>\n";
+          if ($row % 2 != 0){
-    //}
+            echo "\t\t<ol><a href=\"" . $tag_content . "\">";
-    //echo "</ul>\n";
+          } elseif ($row % 2 == 0){
-  //}
+              echo $tag_content . "</a></ol>\n";
-  
+          }
-  # Tags rewrite
-  $tags_csv = array_map('str_getcsv', file('tags.csv'));
-  $tags_rows = sizeof($tags_csv);
-  $tags_coloums = sizeof($tags_csv[0]);
-  //echo "<pre>\n";
-  //print_r($tags_csv);
-  //echo $tags_coloums . "\n" . $tags_rows . "\n";
-  //echo "</pre>\n";
-  echo "<ul id=\"tag_menu\">\n";
-  $coloum_number = 0;
-  for ($row_number = 0; $row_number <= $tags_coloums; $row_number++){
-    //echo $row_number;
-    $section_title = $tags_csv[0][$coloum_number];
-    echo "\t<li id=\"" . $section_title . "\"><b>" . $section_title . " </b>\n";
-    for ($row = 1; $row < $tags_coloums; $row++){
-      //echo "rn: " . $row . "\ncn:" . $coloum_number ." ";
-      $tag_content = $tags_csv[$row][$coloum_number];
-      if ($tag_content == ""){
-        break;
-      } else {
-        if ($row % 2 != 0){
-          echo "\t\t<ol><a href=\"" . $tag_content . "\">";
-        } elseif ($row % 2 == 0){
-            echo $tag_content . "</a></ol>\n";
         }
       }
+      echo "\t</li>\n";
+      $coloum_number++;
     }
-    echo "\t</li>\n";
+    echo "</ul>\n";
-    $coloum_number++;
+  }
+  
+  
+  # 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');
   }
-  echo "</ul>\n";
   include_once ($_SERVER['DOCUMENT_ROOT'].'/common/php/footer.php');
 ?>

common/php/article.php

@@ -22,20 +22,17 @@
   
   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_raw = fopen('author', 'r');
-	  $author_name = fread($author_name_raw, filesize('author'));
+    $author_name = fread($author_name_raw, filesize('author'));
-	  $author_name = str_replace("\n", "", $author_name);
+    $author_name = str_replace("\n", "", $author_name);
-	  $byline_path = $_SERVER['DOCUMENT_ROOT'].'blog/authors/'.$author_name.'/byline.md';
+    $byline_path = $_SERVER['DOCUMENT_ROOT'].'blog/authors/'.$author_name.'/byline.md';
-	  if (file_exists($byline_path)){
+    if (file_exists($byline_path)){
-		  echo "<div class =\"byline\">\n"
+      echo "<div class =\"byline\">\n"
-			  . read_md($byline_path)
+        . read_md($byline_path)
-		  	."</div><!--End byline div-->\n";
+        ."</div><!--End byline div-->\n";
-	  } else {
+    }
-		  echo "<h2>No byline</h2>";
+    fclose($author_name_raw);
-		  echo "<p>$byline_path</p>";
-	  }
-	  fclose($author_name_raw);
   }
   if ($tag_data != NULL){
     $page_tags = str_getcsv($tag_data);

common/php/header.php

@@ -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.
+  function Title() {
-    //~ $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);
     $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'){

common/php/page_menu.php

@@ -18,11 +18,12 @@ function remove_sorting_number($link_title){
 $dir = '.';
 // Check if the directory exists
 if (file_exists($dir) && is_dir($dir) ) {
-    // Get the files of the directory as an array
+  // Get the files of the directory as an array
-    $scan_arr = scandir($dir);
+  $scan_arr = scandir($dir);
-    $files_arr = array_diff($scan_arr, array('.','..','index.php','common','.htaccess') );
+  $files_arr = array_diff($scan_arr, array('.','..','index.php','common','.htaccess') );
-    // echo "<pre>"; print_r( $files_arr ); echo "</pre>";
+  // echo "<pre>"; print_r( $files_arr ); echo "</pre>";
-    // Get each files of our directory with line break
+  // 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";