diff options
| -rwxr-xr-x | modules/Piwik.php | 17 | ||||
| -rw-r--r-- | plugins/Dashboard/Controller.php | 5 | ||||
| -rw-r--r-- | plugins/Dashboard/templates/index.tpl | 6 |
3 files changed, 7 insertions, 21 deletions
diff --git a/modules/Piwik.php b/modules/Piwik.php index eb30ef6570..89285398f1 100755 --- a/modules/Piwik.php +++ b/modules/Piwik.php @@ -97,7 +97,7 @@ class Piwik } if(!file_exists($directoryToCheck)) - { + { Piwik::mkdir($directoryToCheck, 0755, false); } @@ -981,24 +981,17 @@ class Piwik static public function createTables() { $db = Zend_Registry::get('db'); - $config = Zend_Registry::get('config'); $prefixTables = $config->database->tables_prefix; - - //Piwik::log("Creating ". implode(", ", self::getTablesNames())); - + + $tablesAlreadyInstalled = self::getTablesInstalled(); $tablesToCreate = self::getTablesCreateSql(); - unset($tablesToCreate['archive_blob']); unset($tablesToCreate['archive_numeric']); - - $tablesAlreadyInstalled = self::getTablesInstalled(); - + foreach($tablesToCreate as $tableName => $tableSql) { $tableName = $prefixTables . $tableName; - - // if the table doesn't exist already if(!in_array($tableName, $tablesAlreadyInstalled)) { $db->query( $tableSql ); @@ -1008,14 +1001,12 @@ class Piwik static public function install() { - // create directories Piwik::mkdir(Zend_Registry::get('config')->smarty->compile_dir); Piwik::mkdir(Zend_Registry::get('config')->smarty->cache_dir); } static public function uninstall() { - // delete tables $db = Zend_Registry::get('db'); $db->query( "DROP TABLE IF EXISTS ". implode(", ", self::getTablesNames()) ); } diff --git a/plugins/Dashboard/Controller.php b/plugins/Dashboard/Controller.php index 3f9cd1a6ad..f87c5339a5 100644 --- a/plugins/Dashboard/Controller.php +++ b/plugins/Dashboard/Controller.php @@ -130,12 +130,10 @@ class Piwik_Dashboard_Controller extends Piwik_Controller //in a 'master' controller for statistics (tracs #91) protected function setGeneralVariablesView($view) { - // date $view->date = $this->strDate; $oDate = new Piwik_Date($this->strDate); $view->prettyDate = $oDate->get("l jS F Y"); - // period $currentPeriod = Piwik_Common::getRequestVar('period'); $otherPeriodsAvailable = array('day','week','month','year'); @@ -147,10 +145,7 @@ class Piwik_Dashboard_Controller extends Piwik_Controller $view->period = $currentPeriod; $view->otherPeriods = $otherPeriodsAvailable; - - // other $view->idSite = Piwik_Common::getRequestVar('idSite'); - $view->userLogin = Piwik::getCurrentUserLogin(); $view->sites = Piwik_SitesManager_API::getSitesWithAtLeastViewAccess(); $view->url = Piwik_Url::getCurrentUrl(); diff --git a/plugins/Dashboard/templates/index.tpl b/plugins/Dashboard/templates/index.tpl index 7107947da3..db8a55b3a7 100644 --- a/plugins/Dashboard/templates/index.tpl +++ b/plugins/Dashboard/templates/index.tpl @@ -12,9 +12,9 @@ {/if}
piwik.availableWidgets = {$availableWidgets};
- piwik.idSite = {$idSite};
- piwik.period = "{$period}";
- piwik.currentDateStr = "{$date}";
+ piwik.idSite = decodeURIComponent("{$idSite}");
+ piwik.period = decodeURIComponent("{$period}");
+ piwik.currentDateStr = decodeURIComponent("{$date}");
</script>
<script type="text/javascript" src="plugins/Dashboard/templates/Dashboard.js"></script>
|