diff options
author | mattpiwik <matthieu.aubry@gmail.com> | 2008-08-04 03:53:22 +0400 |
---|---|---|
committer | mattpiwik <matthieu.aubry@gmail.com> | 2008-08-04 03:53:22 +0400 |
commit | 42b52b6d8a88b3fa4c4f3978c4e7bf00b1eac778 (patch) | |
tree | e60f0a9ebcbc8ab2c9f45031284bec17cc532523 /modules/PluginsFunctions | |
parent | 6e636d8a92748657ccb1dde7def6ad174a7c8b75 (diff) |
- renamed modules/ directory in core/
- cleaning admin UI
- adding widgetize module
- cleaning template architecture
git-svn-id: http://dev.piwik.org/svn/trunk@586 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'modules/PluginsFunctions')
-rw-r--r-- | modules/PluginsFunctions/AdminMenu.php | 33 | ||||
-rw-r--r-- | modules/PluginsFunctions/Menu.php | 106 | ||||
-rw-r--r-- | modules/PluginsFunctions/Sql.php | 34 | ||||
-rw-r--r-- | modules/PluginsFunctions/Widget.php | 18 |
4 files changed, 0 insertions, 191 deletions
diff --git a/modules/PluginsFunctions/AdminMenu.php b/modules/PluginsFunctions/AdminMenu.php deleted file mode 100644 index b450eb04f4..0000000000 --- a/modules/PluginsFunctions/AdminMenu.php +++ /dev/null @@ -1,33 +0,0 @@ -<?php -static $adminMenu = array(); - -function Piwik_GetAdminMenu() -{ - global $adminMenu; - foreach($adminMenu as $key => &$element) - { - if(is_null($element)) - { - unset($adminMenu[$key]); - } - } - return $adminMenu; -} - -function Piwik_AddAdminMenu( $adminMenuName, $url ) -{ - global $adminMenu; - - if(!isset($adminMenu[$adminMenuName])) - { - $adminMenu[$adminMenuName] = $url; - } -} - -function Piwik_RenameAdminMenuEntry($adminMenuOriginal, $adminMenuRenamed) -{ - global $adminMenu; - $save = $adminMenu[$adminMenuOriginal]; - unset($adminMenu[$adminMenuOriginal]); - $adminMenu[$adminMenuRenamed] = $save; -} diff --git a/modules/PluginsFunctions/Menu.php b/modules/PluginsFunctions/Menu.php deleted file mode 100644 index c120b868af..0000000000 --- a/modules/PluginsFunctions/Menu.php +++ /dev/null @@ -1,106 +0,0 @@ -<?php -static $mainMenu = array(); -static $menuEditsToApply = array(); -static $menuRenameToApply = array(); - -// we setup the main categories in a specific order -$mainMenu['Dashboard'] = null; -$mainMenu['General'] = null; -$mainMenu['Visitors'] = null; -$mainMenu['Actions'] = null; -$mainMenu['Referers'] = null; -$mainMenu['Live!'] = null; - - -function Piwik_GetMenu() -{ - global $mainMenu; - global $menuEditsToApply; - global $menuRenameToApply; - - // we apply the list of edits we've registered so far - foreach($menuEditsToApply as $edit) - { - $mainMenuToEdit = $edit[0]; - $subMenuToEdit = $edit[1]; - $newUrl = $edit[2]; - if(!isset($mainMenu[$mainMenuToEdit][$subMenuToEdit])) - { - Piwik_AddMenu($mainMenuToEdit, $subMenuToEdit, $newUrl); - } - else - { - $mainMenu[$mainMenuToEdit][$subMenuToEdit] = $newUrl; - } - } - - // we now apply the menu rename - foreach($menuRenameToApply as $rename) - { - $mainMenuOriginal = $rename[0]; - $subMenuOriginal = $rename[1]; - $mainMenuRenamed = $rename[2]; - $subMenuRenamed = $rename[3]; - if(isset($mainMenu[$mainMenuOriginal][$subMenuOriginal])) - { - $save = $mainMenu[$mainMenuOriginal][$subMenuOriginal]; - unset($mainMenu[$mainMenuOriginal][$subMenuOriginal]); - $mainMenu[$mainMenuRenamed][$subMenuRenamed] = $save; - } - } - - // we now do some cleaning on the menu - foreach($mainMenu as $key => &$element) - { - if(is_null($element)) - { - unset($mainMenu[$key]); - } - else - { - // we want to move some submenus in the first position - $priority = array('Overview','Evolution'); - foreach($priority as $name) - { - if(isset($element[$name])) - { - $newElement = array($name => $element[$name]); - unset($element[$name]); - $element = $newElement + $element; - } - } - $element['_url'] = current($element); - } - } - return $mainMenu; -} - - -function Piwik_AddMenu( $mainMenuName, $subMenuName, $url ) -{ - global $mainMenu; - - if(!isset($mainMenu[$mainMenuName])) - { - $mainMenu[$mainMenuName]['_url'] = $url; - } - if(!empty($subMenuName)) - { - $mainMenu[$mainMenuName][$subMenuName] = $url; - } - -} - -function Piwik_RenameMenuEntry($mainMenuOriginal, $subMenuOriginal, - $mainMenuRenamed, $subMenuRenamed) -{ - global $menuRenameToApply; - $menuRenameToApply[] = array($mainMenuOriginal, $subMenuOriginal, - $mainMenuRenamed, $subMenuRenamed); -} - -function Piwik_EditMenuUrl( $mainMenuToEdit, $subMenuToEdit, $newUrl ) -{ - global $menuEditsToApply; - $menuEditsToApply[] = array($mainMenuToEdit, $subMenuToEdit, $newUrl); -} diff --git a/modules/PluginsFunctions/Sql.php b/modules/PluginsFunctions/Sql.php deleted file mode 100644 index f169c4cf7e..0000000000 --- a/modules/PluginsFunctions/Sql.php +++ /dev/null @@ -1,34 +0,0 @@ -<?php - -/** - * Executes a SQL query on the DB and returns the Zend_Db_Statement object - * If you want to fetch data from the DB you should use the function Piwik_FetchAll() - * - * See also http://framework.zend.com/manual/en/zend.db.statement.html - * - * @param string $sqlQuery - * @param array Parameters to bind in the query, array( param1 => value1, param2 => value2) - * @return Zend_Db_Statement - */ -function Piwik_Query( $sqlQuery, $parameters = array()) -{ - return Zend_Registry::get('db')->query( $sqlQuery, $parameters); -} - -/** - * Executes the SQL Query and fetches all the rows from the database - * - * @param string $sqlQuery - * @param array Parameters to bind in the query, array( param1 => value1, param2 => value2) - * @return array (one row in the array per row fetched in the DB) - */ -function Piwik_FetchAll( $sqlQuery, $parameters = array()) -{ - return Zend_Registry::get('db')->fetchAll( $sqlQuery, $parameters ); -} - -function Piwik_FetchOne( $sqlQuery, $parameters = array()) -{ - return Zend_Registry::get('db')->fetchOne( $sqlQuery, $parameters ); -} - diff --git a/modules/PluginsFunctions/Widget.php b/modules/PluginsFunctions/Widget.php deleted file mode 100644 index 65e90d84fa..0000000000 --- a/modules/PluginsFunctions/Widget.php +++ /dev/null @@ -1,18 +0,0 @@ -<?php - -Piwik_AddAction('Menu', 'Piwik_BuildMenu'); - -static $widgets = array(); - -function Piwik_GetListWidgets() -{ - global $widgets; - return $widgets; -} - -function Piwik_AddWidget( $pluginName, $controllerMethodToCall, $widgetTitle ) -{ - global $widgets; - // get the plugin name from controller - $widgets[$pluginName][] = array( $widgetTitle, $controllerMethodToCall ); -} |