From 965cc98e6f4da9ec6e93ebf207bb2ee056876194 Mon Sep 17 00:00:00 2001
From: Cameron <cameron@e107coders.org>
Date: Sun, 9 Dec 2012 02:47:03 -0800
Subject: [PATCH] SEF Url default prefs added. Minor GUI fix to e_latest

---
 .../shortcodes/batch/admin_shortcodes.php     |  4 +-
 e107_core/xml/default_install.xml             | 88 ++++++++++++++++++-
 2 files changed, 86 insertions(+), 6 deletions(-)

diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php
index 0d2da000b..e2d322e62 100644
--- a/e107_core/shortcodes/batch/admin_shortcodes.php
+++ b/e107_core/shortcodes/batch/admin_shortcodes.php
@@ -321,9 +321,9 @@ class admin_shortcodes
 					$comments_pending = $sql -> db_Count("comments", "(*)", "WHERE comment_blocked = 2 ");
 
 					$text = "<div class='left'><div style='padding-bottom: 2px;'>".E_16_NEWS.($submitted_news ? " <a href='".e_ADMIN."newspost.php?mode=sub&amp;action=list'>".ADLAN_LAT_2.": $submitted_news</a>" : ' '.ADLAN_LAT_2.': 0').'</div>';
-					$text .= "<div style='padding-bottom: 2px;'>".E_16_COMMENT.($comments_pending ? " <a href='".e_ADMIN_ABS."comment.php?searchquery=&filter_options=comment_blocked__2'>".ADLAN_LAT_9.": $comments_pending</a>" : " ".ADLAN_LAT_9.": ".$comments_pending)."</div>";		
+					$text .= "<div style='padding-bottom: 2px;'>".E_16_COMMENT. " <a href='".e_ADMIN_ABS."comment.php?searchquery=&filter_options=comment_blocked__2'>".ADLAN_LAT_9.": $comments_pending</a></div>";		
 		
-					$text .= "<div style='padding-bottom: 2px;'>".E_16_UPLOADS.($active_uploads ? " <a href='".e_ADMIN."upload.php'>".ADLAN_LAT_7.": $active_uploads</a>" : ' '.ADLAN_LAT_7.': '.$active_uploads).'</div>';
+					$text .= "<div style='padding-bottom: 2px;'>".E_16_UPLOADS." <a href='".e_ADMIN."upload.php'>".ADLAN_LAT_7.": $active_uploads</a></div>";
 
 					
 					// for BC only. 
diff --git a/e107_core/xml/default_install.xml b/e107_core/xml/default_install.xml
index 63229db73..d9e508878 100644
--- a/e107_core/xml/default_install.xml
+++ b/e107_core/xml/default_install.xml
@@ -232,10 +232,90 @@ City, State, Country
 		<core name="upload_class">255</core>
 		<core name="upload_enabled">0</core>
 		<core name="upload_maxfilesize"></core>
-		<core name="url_aliases"><![CDATA[array()]]></core>
-		<core name="url_config"><![CDATA[array()]]></core>
-		<core name="url_locations"><![CDATA[array()]]></core>
-		<core name="url_modules"><![CDATA[array()]]></core>
+		<core name='url_aliases'><![CDATA[array (
+)]]></core>
+		<core name='url_config'><![CDATA[array (
+  'index' => 'core',
+  'news' => 'core',
+  'page' => 'core',
+  'search' => 'core',
+  'system' => 'core',
+  'user' => 'core',
+  'forum' => 'plugin',
+  'gallery' => 'plugin/rewrite',
+  'tagwords' => 'plugin',
+)]]></core>
+		<core name='url_disable_pathinfo'>1</core>
+		<core name='url_error_redirect'>0</core>
+		<core name='url_locations'><![CDATA[array (
+  'index' => 
+  array (
+    0 => 'core',
+  ),
+  'news' => 
+  array (
+    0 => 'core',
+    1 => 'core/sef_full',
+    2 => 'core/sef_noid',
+    3 => 'core/sef',
+  ),
+  'page' => 
+  array (
+    0 => 'core',
+    1 => 'core/sef_noid',
+    2 => 'core/sef',
+  ),
+  'search' => 
+  array (
+    0 => 'core',
+    1 => 'core/rewrite',
+  ),
+  'system' => 
+  array (
+    0 => 'core',
+    1 => 'core/rewrite',
+  ),
+  'user' => 
+  array (
+    0 => 'core',
+    1 => 'core/rewrite',
+  ),
+  'forum' => 
+  array (
+    0 => 'plugin',
+    1 => 'plugin/rewrite',
+  ),
+  'gallery' => 
+  array (
+    0 => 'plugin',
+    1 => 'plugin/rewrite',
+  ),
+  'tagwords' => 
+  array (
+    0 => 'plugin',
+  ),
+)]]></core>
+		<core name='url_main_module'></core>
+		<core name='url_modules'><![CDATA[array (
+  'core' => 
+  array (
+    0 => 'index',
+    1 => 'news',
+    2 => 'page',
+    3 => 'search',
+    4 => 'system',
+    5 => 'user',
+  ),
+  'plugin' => 
+  array (
+    0 => 'forum',
+    1 => 'gallery',
+    2 => 'tagwords',
+  ),
+  'override' => 
+  array (
+  ),
+)]]></core>
 		<core name="url_sef_translate">dashl</core> 
 		<core name="useGeshi">0</core>
 		<core name="use_coppa">1</core>