Merge lp:~uranium235/pluck-cms/pluck-cms into lp:pluck-cms

[Uranium235]

Fix saving empty seo url file names.
Allow international characters in seo url again.

[Anders G. Jørgensen (spirit55555)]

review: Approve

=== modified file 'data/inc/editpage.php'
--- data/inc/editpage.php	2012-10-11 19:52:57 +0000
+++ data/inc/editpage.php	2012-10-21 14:28:19 +0000
@@ -28,22 +28,23 @@
 	if (!isset($_POST['hidden']))
 		$_POST['hidden'] = 'yes';
 
-	//Save the page, but only if a title has been entered.
-	if (!empty($_POST['title'])) {
+	//Save the page, but only if a title has been entered and it's seo url is not empty.
+	if (!empty($_POST['title']) && seo_url($_POST['title'])) {
 		//If we are editing an existing page, pass current seo-name.
 		if (isset($_GET['page'])) {
 			$seoname = save_page($_POST['title'], $_POST['content'], $_POST['hidden'], $_POST['sub_page'], $_POST['description'], $_POST['keywords'], $module_additional_data, $_GET['page']);
-		}
+		} else {
 		//If we are creating a new page, don't pass seo-name.
-		else
 			$seoname = save_page($_POST['title'], $_POST['content'], $_POST['hidden'], $_POST['sub_page'], $_POST['description'], $_POST['keywords'], $module_additional_data);
+		}
+		//If seoname is false, a file already exists with the same name
 		if (empty($seoname)) {
 			$error = show_error($lang['page']['name_exists'], 1, true);
 		}
-	}
-	//If no title has been chosen, set error.
-	else
+	} else {
+	//If no title has been chosen or the seo url for the title is empty, set error.
 		$error = show_error($lang['page']['no_title'], 1, true);
+	}
 
 	//Redirect to the new title only if it is a plain save.
 	if (isset($_POST['save']) && !isset($error)) {
 
=== modified file 'data/inc/functions.admin.php'
--- data/inc/functions.admin.php	2012-10-08 13:53:04 +0000
+++ data/inc/functions.admin.php	2012-10-21 14:28:19 +0000
@@ -175,7 +175,7 @@
 		sort($files, SORT_NUMERIC);
 		foreach ($files as $file) {
 			$pages[] = $patch.'/'.$file;
-			if (file_exists(PAGE_DIR.'/'.get_page_seoname($patch.'/'.$file)))
+			if (is_dir(PAGE_DIR.'/'.get_page_seoname($patch.'/'.$file)))
 				get_pages(PAGE_DIR.'/'.get_page_seoname($patch.'/'.$file), $pages);
 		}
 		unset($file);
@@ -504,6 +504,9 @@
 	run_hook('admin_save_page_meta', array(&$description, &$keywords));
 	run_hook('admin_save_page_module_additional_data', array(&$module_additional_data));
 
+	//Check if the seo url of the title is empty.
+	if (!seo_url($title))
+		return false;
 	//Check if a page already exists with the name.
 	if ((!isset($current_seoname) || $current_seoname != $subpage.seo_url($title)) && get_page_filename($subpage.seo_url($title)) != false)
 		return false;
 
=== modified file 'data/inc/functions.all.php'
--- data/inc/functions.all.php	2012-10-08 13:53:04 +0000
+++ data/inc/functions.all.php	2012-10-21 14:28:19 +0000
@@ -250,8 +250,8 @@
 	require ('data/inc/lib/url_replace.php');
 	//replace some non-ASCII international characters with their ASCII substitute
 	$url = strtr($url, $lang_url_replace);
-	//replace all sequences of characters that would have to be urlencoded (incl. "-" and ".") to a single "-"
-	$url = preg_replace('/[^0-9A-Za-z_]+/', '-', $url);
+	//replace all sequences of characters that would have to be urlencoded (incl. "-" and ".", excl. intl. chars) to a single "-"
+	$url = preg_replace('/[^0-9A-Za-z_\x80-\xFF]+/', '-', $url);
 	//remove "-" from the beginning and end of the string
 	$url = trim($url, '-');
 	//only use lower case