From 570856a9087def8ad5a890952c4ecab0c7b4b812 Mon Sep 17 00:00:00 2001
From: Danang Probo Sayekti <dan@danpros.com>
Date: Tue, 25 Feb 2014 18:23:55 +0700
Subject: [PATCH] Improve backup

Add blog title to the zip file. Improve the URL creation.
---
 .htaccess                                |   2 +-
 system/admin/admin.php                   |   6 ++
 system/admin/views/backup-start.html.php |  11 ++-
 system/includes/functions.php            | 149 ++++++++++++-------------------
 4 files changed, 75 insertions(+), 93 deletions(-)

diff --git a/.htaccess b/.htaccess
index a3f7810..0494820 100644
--- a/.htaccess
+++ b/.htaccess
@@ -84,7 +84,7 @@ DirectoryIndex index.php index.html index.htm
 # Pass all requests not referring directly to files in the filesystem to index.php.
   RewriteCond %{REQUEST_FILENAME} !-f
   RewriteCond %{REQUEST_FILENAME} !-d 
-  RewriteRule . index.php [L]
+  RewriteRule ^ index.php [L]
 
 </IfModule>
 
diff --git a/system/admin/admin.php b/system/admin/admin.php
index 112a994..24cc1cb 100644
--- a/system/admin/admin.php
+++ b/system/admin/admin.php
@@ -43,6 +43,7 @@ function edit_post($title, $tag, $url, $content, $oldfile, $destination = null)
 	$post_url = preg_replace('/[^A-Za-z0-9 ,.-]/u', '', strtolower($url));
 	$post_url = str_replace(' ', '-',$post_url);
 	$post_url = str_replace('--', '-',$post_url);
+	$post_url = str_replace('--', '-',$post_url);
 	$post_url = rtrim(ltrim($post_url, ',\.\-'), ',\.\-');
 	$post_content = '<!--t ' . $post_title . ' t-->' . "\n\n" . $content;
 		
@@ -92,6 +93,7 @@ function edit_page($title, $url, $content, $oldfile, $destination = null) {
 	$post_url = preg_replace('/[^A-Za-z0-9 ,.-]/u', '', strtolower($url));
 	$post_url = str_replace(' ', '-',$post_url);
 	$post_url = str_replace('--', '-',$post_url);
+	$post_url = str_replace('--', '-',$post_url);
 	$post_url = rtrim(ltrim($post_url, ',\.\-'), ',\.\-');
 	$post_content = '<!--t ' . $post_title . ' t-->' . "\n\n" . $content;
 		
@@ -132,6 +134,7 @@ function add_post($title, $tag, $url, $content, $user) {
 	$post_url = preg_replace('/[^A-Za-z0-9 ,.-]/u', '', strtolower($url));
 	$post_url = str_replace(' ', '-',$post_url);
 	$post_url = str_replace('--', '-',$post_url);
+	$post_url = str_replace('--', '-',$post_url);
 	$post_url = rtrim(ltrim($post_url, ' \,\.\-'), ' \,\.\-');
 	$post_content = '<!--t ' . $post_title . ' t-->' . "\n\n" . $content;
 	
@@ -161,6 +164,7 @@ function add_page($title, $url, $content) {
 	$post_url = preg_replace('/[^A-Za-z0-9 ,.-]/u', '', strtolower($url));
 	$post_url = str_replace(' ', '-',$post_url);
 	$post_url = str_replace('--', '-',$post_url);
+	$post_url = str_replace('--', '-',$post_url);
 	$post_url = rtrim(ltrim($post_url, ',\.\-'), ',\.\-');
 	$post_content = '<!--t ' . $post_title . ' t-->' . "\n\n" . $content;
 	
@@ -250,6 +254,7 @@ function migrate($title, $time, $tags, $content, $url, $user, $source) {
 	$post_url = preg_replace('/[^A-Za-z0-9 ,.-]/u', '', strtolower($url));
 	$post_url = str_replace(' ', '-',$post_url);
 	$post_url = str_replace('--', '-',$post_url);
+	$post_url = str_replace('--', '-',$post_url);
 	$post_url = rtrim(ltrim($post_url, ',\.\-'), ',\.\-');
 	if(!empty($source)) {
 		$post_content = '<!--t ' . $post_title . ' t-->' . "\n\n" . $content . "\n\n" . 'Source: <a target="_blank" href="' . $source . '">' . $title . '</a>';
@@ -304,6 +309,7 @@ function get_feed($feed_url, $credit, $message=null) {
 			$url = preg_replace('/[^A-Za-z0-9 .-]/u', '', strtolower($title));
 			$url = str_replace(' ', '-',$url);
 			$url = str_replace('--', '-',$url);
+			$url = str_replace('--', '-',$url);
 			$url = rtrim($url, ',\.\-');
 			$url = ltrim($url, ',\.\-');
 			if ($credit == 'yes') {
diff --git a/system/admin/views/backup-start.html.php b/system/admin/views/backup-start.html.php
index 84454fd..4141b80 100644
--- a/system/admin/views/backup-start.html.php
+++ b/system/admin/views/backup-start.html.php
@@ -1,14 +1,21 @@
 <?php
 
+$title = config('blog.title');
+$name = preg_replace('/[^A-Za-z0-9 ,.-]/u', '', strtolower($title));
+$name = str_replace(' ', '-',$name);
+$name = str_replace('--', '-',$name);
+$name = str_replace('--', '-',$name);
+$name = rtrim(ltrim($name, ' \,\.\-'), ' \,\.\-');
+
 $timestamp = date('Y-m-d-H-i-s');
 $dir = 'backup';
 
 if(is_dir($dir)) {
-	Zip('content/', 'backup/content_' . $timestamp . '.zip', true);
+	Zip('content/', 'backup/' . $name . '_' . $timestamp . '.zip', true);
 }
 else {
 	mkdir($dir, 0777, true);
-	Zip('content/', 'backup/content_' . $timestamp . '.zip', true);
+	Zip('content/', 'backup/' . $name . '_' . $timestamp . '.zip', true);
 }
 
 $redirect = site_url() . 'admin/backup';
diff --git a/system/includes/functions.php b/system/includes/functions.php
index a0e4b5d..aabeaa8 100644
--- a/system/includes/functions.php
+++ b/system/includes/functions.php
@@ -891,40 +891,8 @@ function recent_comments(){
 			var heading ='<h3>Comments</h3>';
 			document.write(heading);
 		</script>
-		<script type="text/javascript" src="http://{$disqus}.disqus.com/recent_comments_widget.js?num_items=5&hide_avatars=0&avatar_size=48&excerpt_length=200&hide_mods=0"></script>
-		<style>
-			li.dsq-widget-item {
-				border-bottom: 1px solid #ebebeb;
-				margin:0;
-				margin-bottom:10px;
-				padding:0;
-				padding-bottom:10px;
-			}
-			a.dsq-widget-user {
-				font-weight:normal;
-			}
-			img.dsq-widget-avatar {
-				margin-right:10px; 
-			}
-			.dsq-widget-comment {
-				display:block;
-				padding-top:5px;
-			}
-			.dsq-widget-comment p {
-				display:block;
-				margin:0;
-			}
-			p.dsq-widget-meta {
-				padding-top:5px;
-				margin:0;
-			}
-			#dsq-combo-widget.grey #dsq-combo-content .dsq-combo-box {
-				background: transparent;
-			}
-			#dsq-combo-widget.grey #dsq-combo-tabs li {
-				background: none repeat scroll 0 0 #DDDDDD;
-			}
-		</style>
+		<script type="text/javascript" src="//{$disqus}.disqus.com/recent_comments_widget.js?num_items=5&hide_avatars=0&avatar_size=48&excerpt_length=200&hide_mods=0"></script>
+		<style>li.dsq-widget-item {border-bottom: 1px solid #ebebeb;margin:0;margin-bottom:10px;padding:0;padding-bottom:10px;}a.dsq-widget-user {font-weight:normal;}img.dsq-widget-avatar {margin-right:10px; }.dsq-widget-comment {display:block;padding-top:5px;}.dsq-widget-comment p {display:block;margin:0;}p.dsq-widget-meta {padding-top:5px;margin:0;}#dsq-combo-widget.grey #dsq-combo-content .dsq-combo-box {background: transparent;}#dsq-combo-widget.grey #dsq-combo-tabs li {background: none repeat scroll 0 0 #DDDDDD;}</style>
 EOF;
 	if (!empty($disqus) && $comment == 'disqus') {
 		return $script;
@@ -990,31 +958,29 @@ function menu(){
 		$links = explode('|', $menu);
 		
 		echo '<ul class="nav">';
-		if($req == site_path() . '/') {
-			echo '<li class="item first active"><a href="' . site_url() . '">' .config('breadcrumb.home'). '</a></li>';
-		}
-		else {
-			echo '<li class="item first"><a href="' . site_url() . '">' .config('breadcrumb.home'). '</a></li>';
-		}
 		
 		$i = 0; 
 		$len = count($links);
 		
 		foreach($links as $link) {
 		
-			if ($i == $len - 1) {
+			if ($i == 0) {
+				$class = 'item first';
+			} 
+			elseif ($i == $len - 1) {
 				$class = 'item last';
 			}
 			else {
 				$class = 'item';
 			}
-			$i++;
+			
+			$i++;	
 			
 			$anc = explode('->', $link);
 			
 			if(isset($anc[0]) && isset($anc[1])) {
 			
-				if(strpos($link, site_url()) !== false) {
+				if(strpos(rtrim($anc[1],'/').'/', site_url()) !== false) {
 					$id = substr($link, strrpos($link, '/')+1 );
 					$file = 'content/static/' . $id . '.md';
 					if(file_exists($file)) {
@@ -1026,7 +992,14 @@ function menu(){
 						}
 					}
 					else {
-						echo '<li class="' . $class . '"><a href="' . $anc[1] . '">' . $anc[0] . '</a></li>';
+						if (rtrim($anc[1],'/').'/' == site_url()) {
+							if($req == site_path() . '/') {
+								echo '<li class="' . $class . ' active"><a href="' . site_url() . '">' .config('breadcrumb.home'). '</a></li>';
+							}
+							else {
+								echo '<li class="' . $class . '"><a href="' . site_url() . '">' .config('breadcrumb.home'). '</a></li>';
+							}
+						}
 					}
 				}
 				else {
@@ -1112,6 +1085,7 @@ function get_menu() {
 		else {
 			echo '<li class="item first"><a href="' . site_url() . '">' .config('breadcrumb.home'). '</a></li>';
 		}
+		echo '</ul>';
 	
 	}
 	
@@ -1448,53 +1422,48 @@ function generate_json($posts){
 	return json_encode($posts);
 }
 
-
 // Create Zip files
-function Zip($source, $destination, $include_dir = false)
-{
-
-    if (!extension_loaded('zip') || !file_exists($source)) {
-        return false;
-    }
-
-    if (file_exists($destination)) {
-        unlink ($destination);
-    }
-
-    $zip = new ZipArchive();
-    if (!$zip->open($destination, ZIPARCHIVE::CREATE)) {
-        return false;
-    }
-
-    if (is_dir($source) === true)
-    {
-
-        $files = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($source), RecursiveIteratorIterator::SELF_FIRST);
-
-        foreach ($files as $file)
-        {
-            $file = str_replace('\\', '/', $file);
-
-            // Ignore "." and ".." folders
-            if( in_array(substr($file, strrpos($file, '/')+1), array('.', '..')) )
-                continue;
-
-            if (is_dir($file) === true)
-            {
-                $zip->addEmptyDir(str_replace($source . '/', '', $file . '/'));
-            }
-            else if (is_file($file) === true)
-            {
-                $zip->addFromString(str_replace($source . '/', '', $file), file_get_contents($file));
-            }
-        }
-    }
-    else if (is_file($source) === true)
-    {
-        $zip->addFromString(basename($source), file_get_contents($source));
-    }
-
-    return $zip->close();
+function Zip($source, $destination, $include_dir = false) {
+
+	if (!extension_loaded('zip') || !file_exists($source)) {
+		return false;
+	}
+
+	if (file_exists($destination)) {
+		unlink ($destination);
+	}
+
+	$zip = new ZipArchive();
+	
+	if (!$zip->open($destination, ZIPARCHIVE::CREATE)) {
+		return false;
+	}
+
+	if (is_dir($source) === true) {
+
+		$files = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($source), RecursiveIteratorIterator::SELF_FIRST);
+
+		foreach ($files as $file) {
+			$file = str_replace('\\', '/', $file);
+
+			// Ignore "." and ".." folders
+			if( in_array(substr($file, strrpos($file, '/')+1), array('.', '..')) )
+				continue;
+
+			if (is_dir($file) === true) {
+				$zip->addEmptyDir(str_replace($source . '/', '', $file . '/'));
+			}
+			else if (is_file($file) === true) {
+				$zip->addFromString(str_replace($source . '/', '', $file), file_get_contents($file));
+			}
+		}
+		
+	}
+	else if (is_file($source) === true) {
+		$zip->addFromString(basename($source), file_get_contents($source));
+	}
+
+	return $zip->close();
 }
 
 // TRUE if the current page is the front page.