- Few updates in the messaging

- in DBStats API, table name is not bound using ? in the query, so it has to be escaped

10 files changed, 27 insertions, 16 deletions

diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php
index 824e8a73f2..76f4325be3 100644
--- a/plugins/CoreUpdater/Controller.php
+++ b/plugins/CoreUpdater/Controller.php
@@ -221,7 +221,7 @@ class Piwik_CoreUpdater_Controller extends Piwik_Controller
 	private function doWelcomeUpdates($view, $componentsWithUpdateFile)
 	{
 		$view->new_piwik_version = Piwik_Version::VERSION;
-
+		$view->commandUpgradePiwik = "<br/><code>php ".Piwik_Common::getPathToPiwikRoot()."/index.php </code>";
 		$pluginNamesToUpdate = array();
 		$coreToUpdate = false;
 
diff --git a/plugins/CoreUpdater/templates/update_welcome.tpl b/plugins/CoreUpdater/templates/update_welcome.tpl
index c36e5751c1..7662d76f18 100644
--- a/plugins/CoreUpdater/templates/update_welcome.tpl
+++ b/plugins/CoreUpdater/templates/update_welcome.tpl
@@ -26,7 +26,7 @@
 		<p>{'CoreUpdater_TheFollowingPluginsWillBeUpgradedX'|translate:$listOfPlugins}</p>
 	{/if}
 
-	<p>{'CoreUpdater_TheUpgradeProcessMayFail'|translate}</p>
+	<p>{'CoreUpdater_TheUpgradeProcessMayFailExecuteCommand'|translate:$commandUpgradePiwik}</p>
 	<p>{'CoreUpdater_TheUpgradeProcessMayTakeAWhilePleaseBePatient'|translate}</p>
 
 	<br>
diff --git a/plugins/DBStats/API.php b/plugins/DBStats/API.php
index 3c8bd71b14..9b308a35fa 100644
--- a/plugins/DBStats/API.php
+++ b/plugins/DBStats/API.php
@@ -50,8 +50,11 @@ class Piwik_DBStats_API
 		Piwik::checkUserIsSuperUser();
 		$db = Zend_Registry::get('db');
 		// http://dev.mysql.com/doc/refman/5.1/en/show-table-status.html
-		$tables = $db->fetchAll("SHOW TABLE STATUS LIKE '". $table."'");
+		$tables = $db->fetchAll("SHOW TABLE STATUS LIKE ". $db->quote($table));
 
+		if(!isset($tables[0])) {
+			throw new Exception('Error, table or field not found');
+		}
 		if ($field == '')
 		{
 			return $tables[0];
diff --git a/plugins/DBStats/templates/DBStats.tpl b/plugins/DBStats/templates/DBStats.tpl
index 2a65c22fc7..bcc3e0bb9b 100644
--- a/plugins/DBStats/templates/DBStats.tpl
+++ b/plugins/DBStats/templates/DBStats.tpl
@@ -6,7 +6,9 @@
 
 <h2>{'DBStats_DatabaseUsage'|translate}</h2>
 {assign var=totalSize value=$tablesStatus.Total.Total_length}
-<p>{'DBStats_MainDescription'|translate:$totalSize}</p>
+<p>{'DBStats_MainDescription'|translate:$totalSize}
+<br/>
+{'DBStats_LearnMore'|translate:"<a href='misc/redirectToUrl.php?url=http://piwik.org/docs/setup-auto-archiving/' target='_blank'>Piwik Auto Archiving</a>"}</p>
 <table class="adminTable">
 	<thead>
 		<th>{'DBStats_Table'|translate}</th>
diff --git a/plugins/Feedback/templates/sent.tpl b/plugins/Feedback/templates/sent.tpl
index 65495497bf..e453a0d650 100644
--- a/plugins/Feedback/templates/sent.tpl
+++ b/plugins/Feedback/templates/sent.tpl
@@ -16,7 +16,7 @@ body {
 #success {
 	color: #38D73B;
 	text-align: center;
-	border: 2px solid red;
+	border: 2px solid #38D73B;
 	margin: 10px;
 	padding: 10px;
 }
diff --git a/plugins/Installation/templates/databaseCheck.tpl b/plugins/Installation/templates/databaseCheck.tpl
index 0817fe4b77..39854a6fe8 100644
--- a/plugins/Installation/templates/databaseCheck.tpl
+++ b/plugins/Installation/templates/databaseCheck.tpl
@@ -22,7 +22,7 @@
 	<tr>
 		<td colspan="2">
 			<small>
-				<span style="color:orange">{'Installation_ConnectionCharacterSetNotUtf8'|translate}</span>
+				<span style="color:#FF7F00">{'Installation_ConnectionCharacterSetNotUtf8'|translate}</span>
 			</small>
 		</td>
 	</tr>
@@ -35,7 +35,7 @@
 	<tr>
 		<td colspan="2">
 			<small>
-				<span style="color:orange">{'Installation_TimezoneMismatch'|translate}</span>
+				<span style="color:#FF7F00">{'Installation_TimezoneMismatch'|translate:"<a href='misc/redirectToUrl.php?url=http://piwik.org/FAQ/troubleshooting/#faq_58' target='_blank'>FAQ</a>"}.</span>
 			</small>
 		</td>
 	</tr>
diff --git a/plugins/Installation/templates/displayJavascriptCode.tpl b/plugins/Installation/templates/displayJavascriptCode.tpl
index 41f5fa6c53..62bf40a4b0 100644
--- a/plugins/Installation/templates/displayJavascriptCode.tpl
+++ b/plugins/Installation/templates/displayJavascriptCode.tpl
@@ -36,9 +36,10 @@ $(document).ready( function(){
 {$javascriptTag}
 </code>
 
-<h1>{'Installation_QuickHelp'|translate}:</h1>
+<h1>{'Installation_JsTagHelpTitle'|translate}</h1>
 {include file=SitesManager/templates/JavascriptTagHelp.tpl}
-<ul>
-<li>{'Installation_JsTagArchivingHelp'|translate}</li>
+
+<br/>
+<h1>{'Installation_LargePiwikInstances'|translate}</h1>
+{'Installation_JsTagArchivingHelp'|translate}
 <!-- <li>Link to help with the main blog engines wordpress/drupal/myspace/blogspot</li> -->
-</ul>
diff --git a/plugins/Installation/templates/structure.tpl b/plugins/Installation/templates/structure.tpl
index 4c77c63d80..098d8da0dc 100644
--- a/plugins/Installation/templates/structure.tpl
+++ b/plugins/Installation/templates/structure.tpl
@@ -225,6 +225,8 @@ input {
 		
 		<div class="both"></div>
 		
+		<br/>
+		<br/>
 		<h3>{'Installation_InstallationStatus'|translate}</h3>
 		
 		<div id="progressbar"></div>
diff --git a/plugins/Live/API.php b/plugins/Live/API.php
index 488455d39c..383ed63a74 100644
--- a/plugins/Live/API.php
+++ b/plugins/Live/API.php
@@ -304,6 +304,7 @@ class Piwik_Live_API
 	
 
 	/*
+	 * TODO should be refactored with function below
 	 * @return array
 	 */
 	private function loadLastVisitorDetailsInLastXMinFromDatabase($visitorId = null, $idSite = null, $limit = 1000, $minIdVisit = false, $minutes = 0 )
@@ -345,11 +346,12 @@ class Piwik_Live_API
 				FROM " . Piwik::prefixTable('log_visit') . "
 				$sqlWhere 
 				ORDER BY idvisit DESC
-				LIMIT " . $limit;
+				LIMIT " . (int)$limit;
 		return Piwik_FetchAll($sql, $whereBind);
 	}
 	
 	/*
+	 * TODO should be refactored with function above
 	 * @return array
 	 */
 	private function loadLastVisitorDetailsInLastXDaysFromDatabase($visitorId = null, $idSite = null, $limit = 1000, $minIdVisit = false, $days = 0 )
@@ -391,12 +393,12 @@ class Piwik_Live_API
 				FROM " . Piwik::prefixTable('log_visit') . "
 				$sqlWhere 
 				ORDER BY idvisit DESC
-				LIMIT " . $limit;
-				
+				LIMIT " . (int)$limit;
 		return Piwik_FetchAll($sql, $whereBind);
 	}
 	
 	/*
+	 * TODO should be refactored with function above
 	 * @return array
 	 */
 	private function loadLastVisitedPagesInLastXMinFromDatabase($visitorId = null, $idSite = null, $limit = null, $minIdVisit = false, $minutes = 0 )
@@ -443,6 +445,7 @@ class Piwik_Live_API
 	}	
 		
 	/*
+	 * TODO should be refactored with function above
 	 * @return array
 	 */
 	private function loadLastVisitedPagesInLastXDaysFromDatabase($visitorId = null, $idSite = null, $limit = null, $minIdVisit = false, $days = 0 )
diff --git a/plugins/SitesManager/templates/SitesManager.tpl b/plugins/SitesManager/templates/SitesManager.tpl
index fd3f42bfca..d21ac253be 100644
--- a/plugins/SitesManager/templates/SitesManager.tpl
+++ b/plugins/SitesManager/templates/SitesManager.tpl
@@ -60,13 +60,13 @@
 	</table>
 	{if $isSuperUser}	
 	<div class="addRowSite"><a href="#"><img src='plugins/UsersManager/images/add.png' alt="" /> {'SitesManager_AddSite'|translate}</a></div>
+	{/if}
 	<div class="ui-widget">
-		<div class="ui-state-highlight ui-corner-all" style="margin-top:20px; padding:0 .7em;">
+		<div class="ui-state-highlight ui-corner-all" style="margin-top:20px; padding:0 .7em; width:400px">
 			<p style="font-size:62.5%;"><span class="ui-icon ui-icon-info" style="float:left;margin-right:.3em;"></span>
 			{'SitesManager_AliasUrlHelp'|translate}</p>
 		</div>
 	</div>
-	{/if}
 {/if}
 
 {include file="CoreAdminHome/templates/footer.tpl"}