'; foreach ($languages as $language) - if($use_vars_instead_of_ids) + if ($use_vars_instead_of_ids) $output .= '
!['.$language['name'].'](../img/l/'.(int)($language['id_lang']).'.jpg "'.$language['name'].'")
';
else
$output .= ' ';
diff --git a/classes/ModuleGraphEngine.php b/classes/ModuleGraphEngine.php
index 274deff68..5eb593a63 100644
--- a/classes/ModuleGraphEngine.php
+++ b/classes/ModuleGraphEngine.php
@@ -27,13 +27,13 @@
abstract class ModuleGraphEngineCore extends Module
{
- protected $_type;
+ protected $_type;
public function __construct($type)
{
$this->_type = $type;
}
-
+
public function install()
{
if (!parent::install())
@@ -44,24 +44,25 @@ abstract class ModuleGraphEngineCore extends Module
public static function getGraphEngines()
{
$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
- SELECT m.`name`
- FROM `'._DB_PREFIX_.'module` m
- LEFT JOIN `'._DB_PREFIX_.'hook_module` hm ON hm.`id_module` = m.`id_module`
- LEFT JOIN `'._DB_PREFIX_.'hook` h ON hm.`id_hook` = h.`id_hook`
- WHERE h.`name` = \'GraphEngine\'');
-
- $arrayEngines = array();
- foreach ($result AS $module)
- {
+ SELECT m.`name`
+ FROM `'._DB_PREFIX_.'module` m
+ LEFT JOIN `'._DB_PREFIX_.'hook_module` hm ON hm.`id_module` = m.`id_module`
+ LEFT JOIN `'._DB_PREFIX_.'hook` h ON hm.`id_hook` = h.`id_hook`
+ WHERE h.`name` = \'displayAdminStatsGraphEngine\'
+ ');
+
+ $array_engines = array();
+ foreach ($result as $module)
+ {
$instance = Module::getInstanceByName($module['name']);
if (!$instance)
continue;
- $arrayEngines[$module['name']] = array($instance->displayName, $instance->description);
+ $array_engines[$module['name']] = array($instance->displayName, $instance->description);
}
-
- return $arrayEngines;
+
+ return $array_engines;
}
-
+
abstract public function createValues($values);
abstract public function setSize($width, $height);
abstract public function setLegend($legend);
diff --git a/classes/ModuleGridEngine.php b/classes/ModuleGridEngine.php
index 18932c0e6..81ef96ee8 100644
--- a/classes/ModuleGridEngine.php
+++ b/classes/ModuleGridEngine.php
@@ -27,40 +27,42 @@
abstract class ModuleGridEngineCore extends Module
{
- protected $_type;
+ protected $_type;
public function __construct($type)
{
$this->_type = $type;
}
-
+
public function install()
{
if (!parent::install())
return false;
return Configuration::updateValue('PS_STATS_GRID_RENDER', $this->name);
}
-
+
public static function getGridEngines()
{
$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
- SELECT m.`name`
- FROM `'._DB_PREFIX_.'module` m
- LEFT JOIN `'._DB_PREFIX_.'hook_module` hm ON hm.`id_module` = m.`id_module`
- LEFT JOIN `'._DB_PREFIX_.'hook` h ON hm.`id_hook` = h.`id_hook`
- WHERE h.`name` = \'GridEngine\'');
-
- $arrayEngines = array();
- foreach ($result AS $module)
- {
+ SELECT m.`name`
+ FROM `'._DB_PREFIX_.'module` m
+ LEFT JOIN `'._DB_PREFIX_.'hook_module` hm ON hm.`id_module` = m.`id_module`
+ LEFT JOIN `'._DB_PREFIX_.'hook` h ON hm.`id_hook` = h.`id_hook`
+ WHERE h.`name` = \'displayAdminStatsGridEngine\'
+ ');
+
+ $array_engines = array();
+ foreach ($result as $module)
+ {
$instance = Module::getInstanceByName($module['name']);
if (!$instance)
continue;
- $arrayEngines[$module['name']] = array($instance->displayName, $instance->description);
- }
- return $arrayEngines;
+ $array_engines[$module['name']] = array($instance->displayName, $instance->description);
+ }
+
+ return $array_engines;
}
-
+
abstract public function setValues($values);
abstract public function setTitle($title);
abstract public function setSize($width, $height);
diff --git a/admin-dev/tabs/AdminStats.php b/controllers/admin/AdminStatsController.php
similarity index 91%
rename from admin-dev/tabs/AdminStats.php
rename to controllers/admin/AdminStatsController.php
index 518816a9d..e1d566036 100644
--- a/admin-dev/tabs/AdminStats.php
+++ b/controllers/admin/AdminStatsController.php
@@ -25,11 +25,6 @@
* International Registered Trademark & Property of PrestaShop SA
*/
-
-include_once(dirname(__FILE__).'/AdminStatsTab.php');
-
-class AdminStats extends AdminStatsTab
+class AdminStatsControllerCore extends AdminStatsTabControllerCore
{
-}
-
-
+}
\ No newline at end of file
diff --git a/controllers/admin/AdminStatsTabController.php b/controllers/admin/AdminStatsTabController.php
new file mode 100644
index 000000000..1e14a723b
--- /dev/null
+++ b/controllers/admin/AdminStatsTabController.php
@@ -0,0 +1,232 @@
+
+* @copyright 2007-2011 PrestaShop SA
+* @version Release: $Revision: 7307 $
+* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*/
+abstract class AdminStatsTabControllerCore extends AdminPreferencesControllerCore
+{
+ public function init()
+ {
+ parent::init();
+
+ $this->action = 'view';
+ $this->display = 'view';
+ }
+
+ public function initContent()
+ {
+ if ($this->display == 'view')
+ {
+ // Some controllers use the view action without an object
+ if ($this->className)
+ $this->loadObject(true);
+ $this->content .= $this->initView();
+ }
+
+ $this->content .= $this->displayCalendar();
+ $this->content .= $this->displayEngines();
+ $this->content .= $this->displayMenu();
+ $this->content .= $this->displayStats();
+
+
+ $this->context->smarty->assign(array(
+ 'content' => $this->content,
+ 'url_post' => self::$currentIndex.'&token='.$this->token,
+ ));
+ }
+
+ public function displayCalendar()
+ {
+ return $this->displayCalendarForm(array(
+ 'Calendar' => $this->l('Calendar', 'AdminStatsTab'),
+ 'Day' => $this->l('Day', 'AdminStatsTab'),
+ 'Month' => $this->l('Month', 'AdminStatsTab'),
+ 'Year' => $this->l('Year', 'AdminStatsTab'),
+ 'From' => $this->l('From:', 'AdminStatsTab'),
+ 'To' => $this->l('To:', 'AdminStatsTab'),
+ 'Save' => $this->l('Save', 'AdminStatsTab')
+ ));
+ }
+
+ public function displayCalendarForm($translations)
+ {
+ $tpl = $this->context->smarty->createTemplate('stats/calendar.tpl');
+
+ $tpl->assign(array(
+ 'current' => self::$currentIndex,
+ 'token' => $this->token,
+ 'translations' => $translations,
+ 'datepickerFrom' => Tools::getValue('datepickerFrom', $this->context->employee->stats_date_from),
+ 'datepickerTo' => Tools::getValue('datepickerTo', $this->context->employee->stats_date_to)
+ ));
+
+ return $tpl->fetch();
+ }
+
+ protected function displayEngines()
+ {
+ $tpl = $this->context->smarty->createTemplate('stats/engines.tpl');
+
+ $tpl->assign(array(
+ 'current' => self::$currentIndex,
+ 'token' => $this->token,
+ 'graph_engine' => Configuration::get('PS_STATS_RENDER'),
+ 'grid_engine' => Configuration::get('PS_STATS_GRID_RENDER'),
+ 'array_graph_engines' => ModuleGraphEngine::getGraphEngines(),
+ 'array_grid_engines' => ModuleGridEngine::getGridEngines()
+ ));
+
+ return $tpl->fetch();
+ }
+
+ public function displayMenu()
+ {
+ $tpl = $this->context->smarty->createTemplate('stats/menu.tpl');
+
+ $modules = $this->getModules();
+ $module_instance = array();
+ foreach ($modules as $module)
+ $module_instance[$module['name']] = Module::getInstanceByName($module['name']);
+
+ $tpl->assign(array(
+ 'current' => self::$currentIndex,
+ 'token' => $this->token,
+ 'modules' => $modules,
+ 'module_instance' => $module_instance
+ ));
+
+ return $tpl->fetch();
+ }
+
+ private function getModules()
+ {
+ $sql = 'SELECT h.`name` AS hook, m.`name`
+ FROM `'._DB_PREFIX_.'module` m
+ LEFT JOIN `'._DB_PREFIX_.'hook_module` hm ON hm.`id_module` = m.`id_module`
+ LEFT JOIN `'._DB_PREFIX_.'hook` h ON hm.`id_hook` = h.`id_hook`
+ WHERE h.`name` LIKE \'displayAdminStatsModules\'
+ AND m.`active` = 1
+ GROUP BY hm.id_module
+ ORDER BY hm.`position`';
+ return Db::getInstance()->executeS($sql);
+ }
+
+ public function displayStats()
+ {
+ $tpl = $this->context->smarty->createTemplate('stats/stats.tpl');
+
+ if (!($module_name = Tools::getValue('module')) && $module_instance = Module::getInstanceByName('statsforecast') AND $module_instance->active)
+ $module_name = 'statsforecast';
+
+ if ($module_name)
+ {
+ $_GET['module'] = $module_name;
+
+ if (!isset($module_instance))
+ $module_instance = Module::getInstanceByName($module_name);
+
+ if ($module_instance && $module_instance->active)
+ $hook = Hook::exec('AdminStatsModules', NULL, $module_instance->id);
+ }
+
+ $tpl->assign(array(
+ 'module_name' => $module_name,
+ 'module_instance' => $module_instance,
+ 'hook' => $hook
+ ));
+
+ return $tpl->fetch();
+ }
+
+ public function postProcess()
+ {
+ $this->context = Context::getContext();
+ if (Tools::isSubmit('submitDatePicker'))
+ {
+ if (!Validate::isDate($from = Tools::getValue('datepickerFrom')) || !Validate::isDate($to = Tools::getValue('datepickerTo')))
+ $this->_errors[] = Tools::displayError('Date specified is invalid');
+ }
+ if (Tools::isSubmit('submitDateDay'))
+ {
+ $from = date('Y-m-d');
+ $to = date('Y-m-d');
+ }
+ if (Tools::isSubmit('submitDateDayPrev'))
+ {
+ $yesterday = time() - 60 * 60 * 24;
+ $from = date('Y-m-d', $yesterday);
+ $to = date('Y-m-d', $yesterday);
+ }
+ if (Tools::isSubmit('submitDateMonth'))
+ {
+ $from = date('Y-m-01');
+ $to = date('Y-m-t');
+ }
+ if (Tools::isSubmit('submitDateMonthPrev'))
+ {
+ $m = (date('m') == 1 ? 12 : date('m') - 1);
+ $y = ($m == 12 ? date('Y') - 1 : date('Y'));
+ $from = $y.'-'.$m.'-01';
+ $to = $y.'-'.$m.date('-t', mktime(12, 0, 0, $m, 15, $y));
+ }
+ if (Tools::isSubmit('submitDateYear'))
+ {
+ $from = date('Y-01-01');
+ $to = date('Y-12-31');
+ }
+ if (Tools::isSubmit('submitDateYearPrev'))
+ {
+ $from = (date('Y') - 1).date('-01-01');
+ $to = (date('Y') - 1).date('-12-31');
+ }
+ if (isset($from) && isset($to) && !count($this->_errors))
+ {
+ $this->context->employee->stats_date_from = $from;
+ $this->context->employee->stats_date_to = $to;
+ $this->context->employee->update();
+ Tools::redirectAdmin($_SERVER['REQUEST_URI']);
+ }
+ if (Tools::getValue('submitSettings'))
+ {
+ if ($this->tabAccess['edit'] === '1')
+ {
+ self::$currentIndex .= '&module='.Tools::getValue('module');
+ Configuration::updateValue('PS_STATS_RENDER', Tools::getValue('PS_STATS_RENDER', Configuration::get('PS_STATS_RENDER')));
+ Configuration::updateValue('PS_STATS_GRID_RENDER', Tools::getValue('PS_STATS_GRID_RENDER', Configuration::get('PS_STATS_GRID_RENDER')));
+ }
+ else
+ $this->_errors[] = Tools::displayError('You do not have permission to edit here.');
+ }
+ if (count($this->_errors))
+ AdminTab::displayErrors();
+ }
+
+ protected function getDate()
+ {
+ $year = isset($this->context->cookie->stats_year) ? $this->context->cookie->stats_year : date('Y');
+ $month = isset($this->context->cookie->stats_month) ? sprintf('%02d', $this->context->cookie->stats_month) : '%';
+ $day = isset($this->context->cookie->stats_day) ? sprintf('%02d', $this->context->cookie->stats_day) : '%';
+ return $year.'-'.$month.'-'.$day;
+ }
+}
\ No newline at end of file
diff --git a/modules/pagesnotfound/pagesnotfound.php b/modules/pagesnotfound/pagesnotfound.php
index 22d08312a..1652107c5 100644
--- a/modules/pagesnotfound/pagesnotfound.php
+++ b/modules/pagesnotfound/pagesnotfound.php
@@ -30,43 +30,43 @@ if (!defined('_PS_VERSION_'))
class Pagesnotfound extends Module
{
- private $_html = '';
+ private $_html = '';
- function __construct()
- {
- $this->name = 'pagesnotfound';
- $this->tab = 'analytics_stats';
- $this->version = 1.0;
+ public function __construct()
+ {
+ $this->name = 'pagesnotfound';
+ $this->tab = 'analytics_stats';
+ $this->version = 1.0;
$this->author = 'PrestaShop';
$this->need_instance = 0;
- parent::__construct();
-
- $this->displayName = $this->l('Pages not found');
- $this->description = $this->l('Display the pages requested by your visitors but not found.');
- }
+ parent::__construct();
- function install()
+ $this->displayName = $this->l('Pages not found');
+ $this->description = $this->l('Display the pages requested by your visitors but not found.');
+ }
+
+ public function install()
{
- if (!parent::install() OR !$this->registerHook('top') OR !$this->registerHook('AdminStatsModules'))
+ if (!parent::install() || !$this->registerHook('top') || !$this->registerHook('AdminStatsModules'))
return false;
return Db::getInstance()->execute('
CREATE TABLE `'._DB_PREFIX_.'pagenotfound` (
- id_pagenotfound INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
- id_shop INTEGER UNSIGNED NOT NULL DEFAULT \'1\',
- id_group_shop INTEGER UNSIGNED NOT NULL DEFAULT \'1\',
- request_uri VARCHAR(256) NOT NULL,
- http_referer VARCHAR(256) NOT NULL,
- date_add DATETIME NOT NULL,
- PRIMARY KEY(id_pagenotfound),
- INDEX (`date_add`)
+ id_pagenotfound INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
+ id_shop INTEGER UNSIGNED NOT NULL DEFAULT \'1\',
+ id_group_shop INTEGER UNSIGNED NOT NULL DEFAULT \'1\',
+ request_uri VARCHAR(256) NOT NULL,
+ http_referer VARCHAR(256) NOT NULL,
+ date_add DATETIME NOT NULL,
+ PRIMARY KEY(id_pagenotfound),
+ INDEX (`date_add`)
) ENGINE='._MYSQL_ENGINE_.' DEFAULT CHARSET=utf8;');
}
- function uninstall()
- {
- return (parent::uninstall() AND Db::getInstance()->execute('DROP TABLE `'._DB_PREFIX_.'pagenotfound`'));
- }
+ public function uninstall()
+ {
+ return (parent::uninstall() && Db::getInstance()->execute('DROP TABLE `'._DB_PREFIX_.'pagenotfound`'));
+ }
private function getPages()
{
@@ -81,7 +81,7 @@ class Pagesnotfound extends Module
foreach ($result as $row)
{
$row['http_referer'] = parse_url($row['http_referer'], PHP_URL_HOST).parse_url($row['http_referer'], PHP_URL_PATH);
- if (!isset($row['http_referer']) OR empty($row['http_referer']))
+ if (!isset($row['http_referer']) || empty($row['http_referer']))
$row['http_referer'] = '--';
if (!isset($pages[$row['request_uri']]))
$pages[$row['request_uri']] = array('nb' => 0);
@@ -92,14 +92,14 @@ class Pagesnotfound extends Module
return $pages;
}
- function hookAdminStatsModules()
- {
+ public function hookAdminStatsModules()
+ {
if (Tools::isSubmit('submitTruncatePNF'))
{
Db::getInstance()->execute('TRUNCATE `'._DB_PREFIX_.'pagenotfound`');
$this->_html .= '
'.$this->l('Pages not found has been emptied.').' '.$this->l('Pages not found have been deleted.').'
'.$this->l('CSV Export').'