From a2a28b2b2cda5de92aceefbf1c5cc8258c6c5c0b Mon Sep 17 00:00:00 2001 From: Jan Schneider Date: Wed, 7 Apr 2010 09:56:23 +0200 Subject: [PATCH] Migrate to H4 (imp (at) lx-soft (dot) com, Request #8950). --- mnemo/data.php | 14 +++--- mnemo/lib/{api.php => Api.php} | 12 ++--- mnemo/lib/Application.php | 78 +++++++++++++++++++++++++++++++++ mnemo/lib/Block/summary.php | 13 +++--- mnemo/lib/Block/tree_menu.php | 21 +++++---- mnemo/lib/Driver/sql.php | 44 ++++++++----------- mnemo/lib/Mnemo.php | 36 +++++++-------- mnemo/lib/base.php | 61 -------------------------- mnemo/lib/prefs.php | 28 ------------ mnemo/lib/version.php | 1 - mnemo/list.php | 7 +-- mnemo/memo.php | 16 ++++--- mnemo/notepads/create.php | 5 ++- mnemo/notepads/delete.php | 5 ++- mnemo/notepads/edit.php | 5 ++- mnemo/notepads/index.php | 11 +++-- mnemo/search.php | 5 ++- mnemo/templates/common-header.inc | 14 +++--- mnemo/templates/list/header.inc | 2 +- mnemo/templates/list/memo_headers.inc | 4 +- mnemo/templates/list/memo_summaries.inc | 2 +- mnemo/templates/menu.inc | 3 +- mnemo/view.php | 12 ++--- 23 files changed, 199 insertions(+), 200 deletions(-) rename mnemo/lib/{api.php => Api.php} (97%) create mode 100644 mnemo/lib/Application.php delete mode 100644 mnemo/lib/base.php delete mode 100644 mnemo/lib/prefs.php delete mode 100644 mnemo/lib/version.php diff --git a/mnemo/data.php b/mnemo/data.php index 6a9ce0b9e..c9e64ac64 100644 --- a/mnemo/data.php +++ b/mnemo/data.php @@ -20,7 +20,8 @@ function _cleanup() } @define('MNEMO_BASE', dirname(__FILE__)); -require_once MNEMO_BASE . '/lib/base.php'; +require_once MNEMO_BASE . '/lib/Application.php'; +Horde_Registry::appInit('mnemo'); if (!$conf['menu']['import_export']) { require MNEMO_BASE . '/index.php'; @@ -36,9 +37,9 @@ $templates = array( Horde_Data::IMPORT_CSV => array($registry->get('templates', 'horde') . '/data/csvinfo.inc'), Horde_Data::IMPORT_MAPPED => array($registry->get('templates', 'horde') . '/data/csvmap.inc'), ); -if (Mnemo::hasPermission('max_notes') !== true && - Mnemo::hasPermission('max_notes') <= Mnemo::countMemos()) { - $message = @htmlspecialchars(sprintf(_("You are not allowed to create more than %d notes."), Mnemo::hasPermission('max_notes')), ENT_COMPAT, Horde_Nls::getCharset()); +if ($GLOBALS['injector']->getInstance('Horde_Perms')->hasAppPermission('max_notes') !== true && + $GLOBALS['injector']->getInstance('Horde_Perms')->hasAppPermission('max_notes') <= Mnemo::countMemos()) { + $message = @htmlspecialchars(sprintf(_("You are not allowed to create more than %d notes."), $GLOBALS['injector']->getInstance('Horde_Perms')->hasAppPermission('max_notes')), ENT_COMPAT, Horde_Nls::getCharset()); if (!empty($conf['hooks']['permsdenied'])) { $message = Horde::callHook('_perms_hook_denied', array('mnemo:max_notes'), 'horde', $message); } @@ -120,11 +121,11 @@ if (is_array($next_step)) { /* Create a Mnemo storage instance. */ $storage = &Mnemo_Driver::singleton($_SESSION['import_data']['target']); - $max_memos = Mnemo::hasPermission('max_notes'); + $max_memos = $GLOBALS['injector']->getInstance('Horde_Perms')->hasAppPermission('max_notes'); $num_memos = Mnemo::countMemos(); foreach ($next_step as $row) { if ($max_memos !== true && $num_memos >= $max_memos) { - $message = @htmlspecialchars(sprintf(_("You are not allowed to create more than %d notes."), Mnemo::hasPermission('max_notes')), ENT_COMPAT, Horde_Nls::getCharset()); + $message = @htmlspecialchars(sprintf(_("You are not allowed to create more than %d notes."), $GLOBALS['injector']->getInstance('Horde_Perms')->hasAppPermission('max_notes')), ENT_COMPAT, Horde_Nls::getCharset()); if (!empty($conf['hooks']['permsdenied'])) { $message = Horde::callHook('_perms_hook_denied', array('mnemo:max_notes'), 'horde', $message); } @@ -204,6 +205,7 @@ if (is_array($next_step)) { $title = _("Import/Export Notes"); require MNEMO_TEMPLATES . '/common-header.inc'; require MNEMO_TEMPLATES . '/menu.inc'; +$notification->notify(); if (isset($templates[$next_step])) { foreach ($templates[$next_step] as $template) { diff --git a/mnemo/lib/api.php b/mnemo/lib/Api.php similarity index 97% rename from mnemo/lib/api.php rename to mnemo/lib/Api.php index 413eec4b1..8f0717c5a 100644 --- a/mnemo/lib/api.php +++ b/mnemo/lib/Api.php @@ -5,7 +5,7 @@ * This file defines Mnemo's external API interface. Other applications can * interact with Mnemo through this API. * - * $Horde: mnemo/lib/api.php,v 1.99 2009/11/24 04:13:44 chuck Exp $ + * $Horde: mnemo/lib/api.php,v 1.99 2009-11-24 04:13:44 chuck Exp $ * * Copyright 2001-2009 The Horde Project (http://www.horde.org/) * @@ -106,14 +106,14 @@ function _mnemo_removeUserData($user) /* Get the share object for later deletion */ $share = $GLOBALS['mnemo_shares']->getShare($user); if (is_a($share, 'PEAR_Error')) { - Horde::logMessage($share->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($share->getMessage(), 'ERR'); unset($share); } else { $GLOBALS['display_notepads'] = array($user); $memos = Mnemo::listMemos(); if (is_a($memos, 'PEAR_Error')) { $hasError = true; - Horde::logMessage($mnemos->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($mnemos->getMessage(), 'ERR'); } else { $uids = array(); foreach ($memos as $memo) { @@ -134,7 +134,7 @@ function _mnemo_removeUserData($user) /* Remove entries 100 at a time. */ $all = $history->getByTimestamp('>', 0, array(), 'mnemo:' . $user); if (is_a($all, 'PEAR_Error')) { - Horde::logMessage($all, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($all, 'ERR'); } else { $all = array_keys($all); while (count($d = array_splice($all, 0, 100)) > 0) { @@ -148,7 +148,7 @@ function _mnemo_removeUserData($user) $result = $GLOBALS['mnemo_shares']->removeShare($share); if (is_a($result, 'PEAR_Error')) { $hasError = true; - Horde::logMessage($result->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result->getMessage(), 'ERR'); } } @@ -156,7 +156,7 @@ function _mnemo_removeUserData($user) $shares = $GLOBALS['mnemo_shares']->listShares($user); if (is_a($shares, 'PEAR_Error')) { $hasError = true; - Horde::logMessage($shares, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($shares, 'ERR'); } else { foreach ($shares as $share) { $share->removeUser($user); diff --git a/mnemo/lib/Application.php b/mnemo/lib/Application.php new file mode 100644 index 000000000..6378663af --- /dev/null +++ b/mnemo/lib/Application.php @@ -0,0 +1,78 @@ +getApp()); + + Mnemo::initialize(); + } + + /** + * Generate the menu to use on the prefs page. + * + * @return Horde_Menu A Horde_Menu object. + */ + public function prefsMenu() + { + return Mnemo::getMenu(); + } + +} + +// Mnemo libraries. +require_once MNEMO_BASE . '/lib/Mnemo.php'; +require_once MNEMO_BASE . '/lib/Driver.php'; + +// Start compression, if requested. +Horde::compressOutput(); diff --git a/mnemo/lib/Block/summary.php b/mnemo/lib/Block/summary.php index cd935fd33..1fe33da49 100644 --- a/mnemo/lib/Block/summary.php +++ b/mnemo/lib/Block/summary.php @@ -16,13 +16,17 @@ class Horde_Block_Mnemo_summary extends Horde_Block { function _title() { global $registry; - return Horde::link(Horde::url($registry->getInitialPage(), true)) . - htmlspecialchars($registry->get('name')) . ''; + + $label = !empty($this->_params['block_title']) + ? $this->_params['block_title'] + : $registry->get('name'); + return Horde::link(Horde::applicationUrl($registry->getInitialPage(), + true)) + . htmlspecialchars($label) . ''; } function _params() { - require_once dirname(__FILE__) . '/../base.php'; $cManager = new Horde_Prefs_CategoryManager(); $categories = array(); foreach ($cManager->get() as $c) { @@ -46,8 +50,7 @@ class Horde_Block_Mnemo_summary extends Horde_Block { function _content() { - require_once dirname(__FILE__) . '/../base.php'; - global $prefs; + global $registry, $prefs; $cManager = new Horde_Prefs_CategoryManager(); $colors = $cManager->colors(); diff --git a/mnemo/lib/Block/tree_menu.php b/mnemo/lib/Block/tree_menu.php index c74b957da..eacaac6ef 100644 --- a/mnemo/lib/Block/tree_menu.php +++ b/mnemo/lib/Block/tree_menu.php @@ -14,29 +14,34 @@ class Horde_Block_mnemo_tree_menu extends Horde_Block { function _buildTree(&$tree, $indent = 0, $parent = null) { - require_once dirname(__FILE__) . '/../base.php'; - global $registry; + $add = Horde::applicationUrl('memo.php')->add('actionID', 'add_memo'); + $icondir = (string)Horde_Themes::img(); + $tree->addNode($parent . '__new', $parent, _("New Note"), $indent + 1, false, array('icon' => 'add.png', - 'icondir' => $registry->getImageDir(), - 'url' => Horde::applicationUrl('memo.php?actionID=add_memo'))); + 'icondir' => $icondir, + 'url' => $add)); foreach (Mnemo::listNotepads() as $name => $notepad) { + if ($notepad->get('owner') != Horde_Auth::getAuth() && + !empty($GLOBALS['conf']['share']['hidden']) && + !in_array($notepad->getName(), $GLOBALS['display_notepads'])) { + continue; + } $tree->addNode($parent . $name . '__new', $parent . '__new', sprintf(_("in %s"), $notepad->get('name')), $indent + 2, false, array('icon' => 'add.png', - 'icondir' => $registry->getImageDir(), - 'url' => Horde_Util::addParameter(Horde::applicationUrl('memo.php?memolist=' . urlencode($name)), - 'actionID', 'add_memo'))); + 'icondir' => $icondir, + 'url' => Horde_Util::addParameter($add, array('memolist' => $name)))); } $tree->addNode($parent . '__search', @@ -45,7 +50,7 @@ class Horde_Block_mnemo_tree_menu extends Horde_Block { $indent + 1, false, array('icon' => 'search.png', - 'icondir' => $registry->getImageDir('horde'), + 'icondir' => (string)Horde_Themes::img(null, 'horde'), 'url' => Horde::applicationUrl('search.php'))); } diff --git a/mnemo/lib/Driver/sql.php b/mnemo/lib/Driver/sql.php index 18ee133e8..33203a070 100644 --- a/mnemo/lib/Driver/sql.php +++ b/mnemo/lib/Driver/sql.php @@ -156,8 +156,7 @@ class Mnemo_Driver_sql extends Mnemo_Driver { $values = array($this->_notepad, $noteId); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Mnemo_Driver_sql::get(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Mnemo_Driver_sql::get(): %s', $query), 'DEBUG'); /* Execute the query. */ $row = $this->_db->getRow($query, $values, DB_FETCHMODE_ASSOC); @@ -186,8 +185,7 @@ class Mnemo_Driver_sql extends Mnemo_Driver { $values = array($uid); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Mnemo_Driver_sql::getByUID(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Mnemo_Driver_sql::getByUID(): %s', $query), 'DEBUG'); /* Execute the query. */ $row = $this->_db->getRow($query, $values, DB_FETCHMODE_ASSOC); @@ -241,15 +239,14 @@ class Mnemo_Driver_sql extends Mnemo_Driver { Horde_String::convertCharset($uid, Horde_Nls::getCharset(), $this->_params['charset'])); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Mnemo_Driver_sql::add(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Mnemo_Driver_sql::add(): %s', $query), 'DEBUG'); /* Attempt the insertion query. */ $result = $this->_write_db->query($query, $values); /* Return an error immediately if the query failed. */ if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -293,14 +290,13 @@ class Mnemo_Driver_sql extends Mnemo_Driver { array_push($values, $this->_notepad, $noteId); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Mnemo_Driver_sql::modify(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Mnemo_Driver_sql::modify(): %s', $query), 'DEBUG'); /* Attempt the update query. */ $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -331,13 +327,12 @@ class Mnemo_Driver_sql extends Mnemo_Driver { $values = array($newNotepad, $this->_notepad, $noteId); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Mnemo_Driver_sql::move(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Mnemo_Driver_sql::move(): %s', $query), 'DEBUG'); /* Attempt the move query. */ $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -361,14 +356,13 @@ class Mnemo_Driver_sql extends Mnemo_Driver { $values = array($this->_notepad, $noteId); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Mnemo_Driver_sql::delete(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Mnemo_Driver_sql::delete(): %s', $query), 'DEBUG'); /* Attempt the delete query. */ $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -383,13 +377,12 @@ class Mnemo_Driver_sql extends Mnemo_Driver { function deleteAll() { - $query = 'DELETE FROM ' . $this->_params['table'] . - ' WHERE memo_owner = ?'; + $query = sprintf('DELETE FROM %s WHERE memo_owner = ?', + $this->_params['table']); $values = array($this->_notepad); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Mnemo_Driver_sql::deleteAll(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Mnemo_Driver_sql::deleteAll(): %s', $query), 'DEBUG'); /* Attempt the delete query. */ $result = $this->_write_db->query($query, $values); @@ -406,16 +399,16 @@ class Mnemo_Driver_sql extends Mnemo_Driver { function retrieve() { /* Build the SQL query. */ - $query = 'SELECT * FROM ' . $this->_params['table'] . - ' WHERE memo_owner = ?'; + $query = sprintf('SELECT * FROM %s WHERE memo_owner = ?', + $this->_params['table']); $values = array($this->_notepad); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Mnemo_Driver_sql::retrieve(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Mnemo_Driver_sql::retrieve(): %s', $query), 'DEBUG'); /* Execute the query. */ $result = $this->_db->query($query, $values); + if (is_a($result, 'PEAR_Error')) { return $result; } @@ -444,8 +437,7 @@ class Mnemo_Driver_sql extends Mnemo_Driver { $values = array($row['memo_uid'], $row['memo_owner'], $row['memo_id']); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Mnemo_Driver_sql adding missing UID: %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Mnemo_Driver_sql adding missing UID: %s', $query), 'DEBUG'); $this->_write_db->query($query, $values); } diff --git a/mnemo/lib/Mnemo.php b/mnemo/lib/Mnemo.php index ac820756a..51e9a00b4 100644 --- a/mnemo/lib/Mnemo.php +++ b/mnemo/lib/Mnemo.php @@ -67,7 +67,7 @@ class Mnemo { * * @see Mnemo_Driver::listMemos() */ - function listMemos($sortby = MNEMO_SORT_DESC, + public static function listMemos($sortby = MNEMO_SORT_DESC, $sortdir = MNEMO_SORT_ASCEND) { global $conf, $display_notepads; @@ -169,17 +169,15 @@ class Mnemo { * * @return array The memo lists. */ - function listNotepads($owneronly = false, $permission = Horde_Perms::SHOW) + public static function listNotepads($owneronly = false, $permission = Horde_Perms::SHOW) { if ($owneronly && !Horde_Auth::getAuth()) { return array(); } - $notepads = $GLOBALS['mnemo_shares']->listShares(Horde_Auth::getAuth(), $permission, $owneronly ? Horde_Auth::getAuth() : null, 0, 0, 'name'); if (is_a($notepads, 'PEAR_Error')) { - Horde::logMessage($notepads, __FILE__, __LINE__, PEAR_LOG_ERR); - $empty = array(); - return $empty; + Horde::logMessage($notepads, 'ERR'); + return array(); } return $notepads; @@ -189,7 +187,7 @@ class Mnemo { * Returns the default notepad for the current user at the specified * permissions level. */ - function getDefaultNotepad($permission = Horde_Perms::SHOW) + public static function getDefaultNotepad($permission = Horde_Perms::SHOW) { global $prefs; @@ -199,8 +197,9 @@ class Mnemo { if (isset($notepads[$default_notepad])) { return $default_notepad; } elseif ($prefs->isLocked('default_notepad')) { - return ''; + return Horde_Auth::getAuth(); } elseif (count($notepads)) { + reset($notepads); return key($notepads); } @@ -401,7 +400,7 @@ class Mnemo { /** * Initial app setup code. */ - function initialize() + public static function initialize() { // Update the preference for which notepads to display. If the // user doesn't have any selected notepads for view then fall @@ -467,37 +466,34 @@ class Mnemo { /** * Builds Mnemo's list of menu items. */ - function getMenu($returnType = 'object') + public static function getMenu() { global $conf, $registry, $print_link; $menu = new Horde_Menu(); $menu->add(Horde::applicationUrl('list.php'), _("_List Notes"), 'mnemo.png', null, null, null, basename($_SERVER['PHP_SELF']) == 'index.php' ? 'current' : null); + if (Mnemo::getDefaultNotepad(Horde_Perms::EDIT) && (!empty($conf['hooks']['permsdenied']) || - Mnemo::hasPermission('max_notes') === true || - Mnemo::hasPermission('max_notes') > Mnemo::countMemos())) { - $menu->add(Horde::applicationUrl('memo.php?actionID=add_memo'), _("_New Note"), 'add.png', null, null, null, Horde_Util::getFormData('memo') ? '__noselection' : null); + $GLOBALS['injector']->getInstance('Horde_Perms')->hasAppPermission('max_notes') === true || + $GLOBALS['injector']->getInstance('Horde_Perms')->hasAppPermission('max_notes') > Mnemo::countMemos())) { + $menu->add(Horde::applicationUrl(Horde_Util::addParameter('memo.php', 'actionID', 'add_memo')), _("_New Note"), 'add.png', null, null, null, Horde_Util::getFormData('memo') ? '__noselection' : null); } /* Search. */ - $menu->add(Horde::applicationUrl('search.php'), _("_Search"), 'search.png', $registry->getImageDir('horde')); + $menu->add(Horde::applicationUrl('search.php'), _("_Search"), 'search.png', Horde_Themes::img(null, 'horde')); /* Import/Export */ if ($conf['menu']['import_export']) { - $menu->add(Horde::applicationUrl('data.php'), _("_Import/Export"), 'data.png', $registry->getImageDir('horde')); + $menu->add(Horde::applicationUrl('data.php'), _("_Import/Export"), 'data.png', Horde_Themes::img(null, 'horde')); } /* Print */ if ($conf['menu']['print'] && isset($print_link)) { - $menu->add($print_link, _("_Print"), 'print.png', $registry->getImageDir('horde'), '_blank', 'popup(this.href); return false;'); + $menu->add(Horde::applicationUrl($print_link), _("_Print"), 'print.png', Horde_Themes::img(null, 'horde'), '_blank', 'popup(this.href); return false;'); } - if ($returnType == 'object') { return $menu; - } else { - return $menu->render(); - } } } diff --git a/mnemo/lib/base.php b/mnemo/lib/base.php deleted file mode 100644 index 9d1dfda11..000000000 --- a/mnemo/lib/base.php +++ /dev/null @@ -1,61 +0,0 @@ -pushApp('mnemo', !defined('AUTH_HANDLER')); -} catch (Horde_Exception $e) { - if ($e->getCode() == 'permission_denied') { - Horde::authenticationFailureRedirect(); - } - Horde::fatal($e, __FILE__, __LINE__, false); -} -$conf = &$GLOBALS['conf']; -define('MNEMO_TEMPLATES', $registry->get('templates')); - -// Notification system. -$notification = &Horde_Notification::singleton(); -$notification->attach('status'); - -// Find the base file path of Mnemo. -if (!defined('MNEMO_BASE')) { - define('MNEMO_BASE', dirname(__FILE__) . '/..'); -} - -// Mnemo libraries. -require_once MNEMO_BASE . '/lib/Mnemo.php'; -require_once MNEMO_BASE . '/lib/Driver.php'; - -// Start compression, if requested. -Horde::compressOutput(); - -// Create a share instance. -require_once 'Horde/Share.php'; -$GLOBALS['mnemo_shares'] = &Horde_Share::singleton($registry->getApp()); - -Mnemo::initialize(); diff --git a/mnemo/lib/prefs.php b/mnemo/lib/prefs.php deleted file mode 100644 index 8b8bb6785..000000000 --- a/mnemo/lib/prefs.php +++ /dev/null @@ -1,28 +0,0 @@ - - * @since Mnemo 2.0 - * @package Mnemo - */ - -function handle_notepadselect($updated) -{ - global $prefs; - - $default_notepad = Horde_Util::getFormData('default_notepad'); - if (!is_null($default_notepad)) { - $notepads = Mnemo::listNotepads(); - if (is_array($notepads) && array_key_exists($default_notepad, $notepads)) { - $prefs->setValue('default_notepad', $default_notepad); - $updated = true; - } - } - return $updated; -} diff --git a/mnemo/lib/version.php b/mnemo/lib/version.php deleted file mode 100644 index 5ce0926b5..000000000 --- a/mnemo/lib/version.php +++ /dev/null @@ -1 +0,0 @@ - diff --git a/mnemo/list.php b/mnemo/list.php index f1ea3310a..df9a08799 100644 --- a/mnemo/list.php +++ b/mnemo/list.php @@ -9,8 +9,8 @@ */ @define('MNEMO_BASE', dirname(__FILE__)); -require_once MNEMO_BASE . '/lib/base.php'; - +require_once MNEMO_BASE . '/lib/Application.php'; +Horde_Registry::appInit('mnemo'); /* Get the current action ID. */ $actionID = Horde_Util::getFormData('actionID'); @@ -61,6 +61,7 @@ Horde::addScriptFile('prototype.js', 'horde', true); Horde::addScriptFile('QuickFinder.js', 'horde', true); require MNEMO_TEMPLATES . '/common-header.inc'; require MNEMO_TEMPLATES . '/menu.inc'; +$notification->notify(); require MNEMO_TEMPLATES . '/list/header.inc'; if (count($memos)) { @@ -91,7 +92,7 @@ if (count($memos)) { $memourl = Horde_Util::addParameter( 'memo.php', array('memo' => $memo['memo_id'], 'memolist' => $memo['memolist_id'])); - $share = &$GLOBALS['mnemo_shares']->getShare($memo['memolist_id']); + $share = $GLOBALS['mnemo_shares']->getShare($memo['memolist_id']); $notepad = $memo['memolist_id']; if (!is_a($share, 'PEAR_Error')) { diff --git a/mnemo/memo.php b/mnemo/memo.php index bf9f8e872..7acc94f18 100644 --- a/mnemo/memo.php +++ b/mnemo/memo.php @@ -53,7 +53,8 @@ function showPassphrase($memo) } @define('MNEMO_BASE', dirname(__FILE__)); -require_once MNEMO_BASE . '/lib/base.php'; +require_once MNEMO_BASE . '/lib/Application.php'; +Horde_Registry::appInit('mnemo'); /* Redirect to the notepad view if no action has been requested. */ $memo_id = Horde_Util::getFormData('memo'); @@ -71,8 +72,8 @@ $cManager = new Horde_Prefs_CategoryManager(); switch ($actionID) { case 'add_memo': /* Check permissions. */ - if (Mnemo::hasPermission('max_notes') !== true && - Mnemo::hasPermission('max_notes') <= Mnemo::countMemos()) { + if ($GLOBALS['injector']->getInstance('Horde_Perms')->hasAppPermission('max_notes') !== true && + $GLOBALS['injector']->getInstance('Horde_Perms')->hasAppPermission('max_notes') <= Mnemo::countMemos()) { $message = @htmlspecialchars(sprintf(_("You are not allowed to create more than %d notes."), Mnemo::hasPermission('max_notes')), ENT_COMPAT, Horde_Nls::getCharset()); if (!empty($conf['hooks']['permsdenied'])) { $message = Horde::callHook('_perms_hook_denied', array('mnemo:max_notes'), 'horde', $message); @@ -129,7 +130,7 @@ case 'save_memo': $memo_passphrase = Horde_Util::getFormData('memo_passphrase'); $memo_passphrase2 = Horde_Util::getFormData('memo_passphrase2'); - $share = &$GLOBALS['mnemo_shares']->getShare($notepad_target); + $share = $GLOBALS['mnemo_shares']->getShare($notepad_target); if (is_a($share, 'PEAR_Error')) { $notification->push(sprintf(_("Access denied saving note: %s"), $share->getMessage()), 'horde.error'); } elseif (!$share->hasPermission(Horde_Auth::getAuth(), Horde_Perms::EDIT)) { @@ -192,13 +193,13 @@ case 'save_memo': $result = $storage->modify($memo_id, $memo_desc, $memo_body, $memo_category, $memo_passphrase); } else { /* Check permissions. */ - if (Mnemo::hasPermission('max_notes') !== true && - Mnemo::hasPermission('max_notes') <= Mnemo::countMemos()) { + if ($GLOBALS['injector']->getInstance('Horde_Perms')->hasAppPermission('max_notes') !== true && + $GLOBALS['injector']->getInstance('Horde_Perms')->hasAppPermission('max_notes') <= Mnemo::countMemos()) { header('Location: ' . Horde::applicationUrl('list.php', true)); exit; } /* Creating a new note. */ - $storage = &Mnemo_Driver::singleton($notepad_target); + $storage = Mnemo_Driver::singleton($notepad_target); $memo_desc = $storage->getMemoDescription($memo_body); $result = $memo_id = $storage->add($memo_desc, $memo_body, $memo_category, null, @@ -251,5 +252,6 @@ default: $notepads = Mnemo::listNotepads(false, Horde_Perms::EDIT); require MNEMO_TEMPLATES . '/common-header.inc'; require MNEMO_TEMPLATES . '/menu.inc'; +$notification->notify(); require MNEMO_TEMPLATES . '/memo/memo.inc'; require $registry->get('templates', 'horde') . '/common-footer.inc'; diff --git a/mnemo/notepads/create.php b/mnemo/notepads/create.php index 9ebc4087d..9fb8ce928 100644 --- a/mnemo/notepads/create.php +++ b/mnemo/notepads/create.php @@ -9,7 +9,9 @@ */ @define('MNEMO_BASE', dirname(dirname(__FILE__))); -require_once MNEMO_BASE . '/lib/base.php'; +require_once MNEMO_BASE . '/lib/Application.php'; +Horde_Registry::appInit('mnemo'); + require_once MNEMO_BASE . '/lib/Forms/CreateNotepad.php'; // Exit if this isn't an authenticated user or if the user can't @@ -38,5 +40,6 @@ if ($form->validate($vars)) { $title = $form->getTitle(); require MNEMO_TEMPLATES . '/common-header.inc'; require MNEMO_TEMPLATES . '/menu.inc'; +$notification->notify(); echo $form->renderActive($form->getRenderer(), $vars, 'create.php', 'post'); require $registry->get('templates', 'horde') . '/common-footer.inc'; diff --git a/mnemo/notepads/delete.php b/mnemo/notepads/delete.php index b7330957e..08d594d94 100644 --- a/mnemo/notepads/delete.php +++ b/mnemo/notepads/delete.php @@ -9,7 +9,9 @@ */ @define('MNEMO_BASE', dirname(dirname(__FILE__))); -require_once MNEMO_BASE . '/lib/base.php'; +require_once MNEMO_BASE . '/lib/Application.php'; +Horde_Registry::appInit('mnemo'); + require_once MNEMO_BASE . '/lib/Forms/DeleteNotepad.php'; // Exit if this isn't an authenticated user. @@ -56,5 +58,6 @@ if ($form->validate(new Horde_Variables($_POST))) { $title = $form->getTitle(); require MNEMO_TEMPLATES . '/common-header.inc'; require MNEMO_TEMPLATES . '/menu.inc'; +$notification->notify(); echo $form->renderActive($form->getRenderer(), $vars, 'delete.php', 'post'); require $registry->get('templates', 'horde') . '/common-footer.inc'; diff --git a/mnemo/notepads/edit.php b/mnemo/notepads/edit.php index d63ce7ab7..ddf5012eb 100644 --- a/mnemo/notepads/edit.php +++ b/mnemo/notepads/edit.php @@ -9,7 +9,9 @@ */ @define('MNEMO_BASE', dirname(dirname(__FILE__))); -require_once MNEMO_BASE . '/lib/base.php'; +require_once MNEMO_BASE . '/lib/Application.php'; +Horde_Registry::appInit('mnemo'); + require_once MNEMO_BASE . '/lib/Forms/EditNotepad.php'; // Exit if this isn't an authenticated user. @@ -55,5 +57,6 @@ $vars->set('description', $notepad->get('desc')); $title = $form->getTitle(); require MNEMO_TEMPLATES . '/common-header.inc'; require MNEMO_TEMPLATES . '/menu.inc'; +$notification->notify(); echo $form->renderActive($form->getRenderer(), $vars, 'edit.php', 'post'); require $registry->get('templates', 'horde') . '/common-footer.inc'; diff --git a/mnemo/notepads/index.php b/mnemo/notepads/index.php index 22685ac19..99bd00462 100644 --- a/mnemo/notepads/index.php +++ b/mnemo/notepads/index.php @@ -9,7 +9,8 @@ */ @define('MNEMO_BASE', dirname(dirname(__FILE__))); -require_once MNEMO_BASE . '/lib/base.php'; +require_once MNEMO_BASE . '/lib/Application.php'; +Horde_Registry::appInit('mnemo'); // Exit if this isn't an authenticated user. if (!Horde_Auth::getAuth()) { @@ -21,6 +22,7 @@ $edit_url_base = Horde::applicationUrl('notepads/edit.php'); $perms_url_base = Horde::url($registry->get('webroot', 'horde') . '/services/shares/edit.php?app=mnemo', true); $delete_url_base = Horde::applicationUrl('notepads/delete.php'); + $notepads = Mnemo::listNotepads(true); $sorted_notepads = array(); foreach ($notepads as $notepad) { @@ -28,14 +30,15 @@ foreach ($notepads as $notepad) { } asort($sorted_notepads); -$edit_img = Horde::img('edit.png', _("Edit"), null, $registry->getImageDir('horde')); -$perms_img = Horde::img('perms.png', _("Change Permissions"), null, $registry->getImageDir('horde')); -$delete_img = Horde::img('delete.png', _("Delete"), null, $registry->getImageDir('horde')); +$edit_img = Horde::img('edit.png', _("Edit"), null); +$perms_img = Horde::img('perms.png', _("Change Permissions"), null); +$delete_img = Horde::img('delete.png', _("Delete"), null); Horde::addScriptFile('popup.js', 'horde', true); Horde::addScriptFile('tables.js', 'horde', true); $title = _("Manage Notepads"); require MNEMO_TEMPLATES . '/common-header.inc'; require MNEMO_TEMPLATES . '/menu.inc'; +$notification->notify(); require MNEMO_TEMPLATES . '/notepad_list.php'; require $registry->get('templates', 'horde') . '/common-footer.inc'; diff --git a/mnemo/search.php b/mnemo/search.php index a2b122c30..1fde83014 100644 --- a/mnemo/search.php +++ b/mnemo/search.php @@ -13,12 +13,15 @@ */ @define('MNEMO_BASE', dirname(__FILE__)); -require_once MNEMO_BASE . '/lib/base.php'; +require_once MNEMO_BASE . '/lib/Application.php'; +Horde_Registry::appInit('mnemo'); + $title = _("Search"); $notification->push('document.getElementById(\'search_pattern\').focus();', 'javascript'); Horde::addScriptFile('prototype.js', 'horde', true); require MNEMO_TEMPLATES . '/common-header.inc'; require MNEMO_TEMPLATES . '/menu.inc'; +$notification->notify(); require MNEMO_TEMPLATES . '/search/search.inc'; require MNEMO_TEMPLATES . '/panel.inc'; require $registry->get('templates', 'horde') . '/common-footer.inc'; diff --git a/mnemo/templates/common-header.inc b/mnemo/templates/common-header.inc index bc395084e..ba35a3717 100644 --- a/mnemo/templates/common-header.inc +++ b/mnemo/templates/common-header.inc @@ -20,18 +20,14 @@ if (!empty($refresh_time) && ($refresh_time > 0) && !empty($refresh_url)) { Horde::includeScriptFiles(); -$bc = Horde_Util::nonInputVar('bodyClass'); -if ($prefs->getValue('show_panel')) { - if ($bc) { - $bc .= ' '; - } - $bc .= 'rightPanel'; -} +$bc = $prefs->getValue('show_panel') + ? 'rightPanel' + : ''; ?> <?php echo htmlspecialchars($page_title) ?> - - + + diff --git a/mnemo/templates/list/header.inc b/mnemo/templates/list/header.inc index 5f4d722c9..a2bd0c3d3 100644 --- a/mnemo/templates/list/header.inc +++ b/mnemo/templates/list/header.inc @@ -1,7 +1,7 @@
- " onclick="$('quicksearchL').hide(); $('quicksearch').show(); $('quicksearchT').focus(); return false;">getImageDir('horde')) ?> + " onclick="$('quicksearchL').hide(); $('quicksearch').show(); $('quicksearchT').focus(); return false;">