Help:: -> Horde_Help::

diff --git a/babel/lib/base.php b/babel/lib/base.php
index 800251b..65e324a 100644 (file)
--- a/babel/lib/base.php
+++ b/babel/lib/base.php
@@ -48,9 +48,6 @@ require_once BABEL_BASE . '/lib/Translate.php';
 require_once BABEL_BASE . '/lib/Translate_Help.php';
 require_once BABEL_BASE . '/lib/Display.php';
 
-/* Help */
-require_once 'Horde/Help.php';
-
 /* Menu */
 require_once 'Horde/Menu.php';
 

diff --git a/chora/lib/base.php b/chora/lib/base.php
index 3332728..cc712ad 100644 (file)
--- a/chora/lib/base.php
+++ b/chora/lib/base.php
@@ -44,9 +44,6 @@ define('CHORA_TEMPLATES', $registry->get('templates'));
 $notification = &Notification::singleton();
 $notification->attach('status');
 
-// Horde base libraries.
-require_once 'Horde/Help.php';
-
 // Chora base library.
 require_once CHORA_BASE . '/lib/Chora.php';
 

diff --git a/fima/lib/base.php b/fima/lib/base.php
index bb9c2fb..c0dc84c 100644 (file)
--- a/fima/lib/base.php
+++ b/fima/lib/base.php
@@ -50,7 +50,6 @@ require_once FIMA_BASE . '/lib/Fima.php';
 require_once FIMA_BASE . '/lib/Driver.php';
 
 // Horde libraries.
-require_once 'Horde/Help.php';
 require_once 'Horde/History.php';
 
 // Start output compression.

diff --git a/framework/Model/lib/Horde/Form/Renderer/Xhtml.php b/framework/Model/lib/Horde/Form/Renderer/Xhtml.php
index ff877e5..218ce81 100644 (file)
--- a/framework/Model/lib/Horde/Form/Renderer/Xhtml.php
+++ b/framework/Model/lib/Horde/Form/Renderer/Xhtml.php
@@ -393,7 +393,7 @@ try {
         if ($var->hasHelp()) {
             global $registry;
             if (isset($registry) && is_a($registry, 'Registry')) {
-                $help = Help::link($GLOBALS['registry']->getApp(), $var->getHelp());
+                $help = Horde_Help::link($GLOBALS['registry']->getApp(), $var->getHelp());
             } else {
                 $help = @htmlspecialchars($var->getHelp());
             }

diff --git a/imp/compose.php b/imp/compose.php
index 3494df4..48e4363 100644 (file)
--- a/imp/compose.php
+++ b/imp/compose.php
@@ -60,7 +60,6 @@ function &_getIMPContents($index, $mailbox)
 $compose_page = true;
 $session_control = 'netscape';
 require_once dirname(__FILE__) . '/lib/base.php';
-require_once 'Horde/Help.php';
 require_once 'Horde/Identity.php';
 require_once 'Horde/Text/Filter.php';
 
@@ -859,7 +858,7 @@ if ($redirect) {
 
             if ($first_to) {
                 $first_to = false;
-                $entry['help'] = Help::link('imp', 'compose-to');
+                $entry['help'] = Horde_Help::link('imp', 'compose-to');
             } else {
                 $entry['help'] = null;
             }
@@ -870,7 +869,7 @@ if ($redirect) {
     } else {
         $t->set('input_tabindex', ++$tabindex);
         $t->set('input_value', htmlspecialchars($header['to']));
-        $t->set('help', Help::link('imp', 'compose-to'));
+        $t->set('help', Horde_Help::link('imp', 'compose-to'));
     }
 
     $template_output = $t->fetch(IMP_TEMPLATES . '/compose/redirect.html');
@@ -943,10 +942,10 @@ if ($redirect) {
     if ($conf['user']['allow_folders'] && !$readonly_drafts) {
         $t->set('save_draft_ak', Horde::getAccessKeyAndTitle(_("Save _Draft")));
     }
-    $t->set('help_buttons', Help::link('imp', 'compose-buttons'));
+    $t->set('help_buttons', Horde_Help::link('imp', 'compose-buttons'));
     $t->set('di_locked', $prefs->isLocked('default_identity'));
     if ($t->get('di_locked')) {
-        $t->set('help_compose-from', Help::link('imp', 'compose-from'));
+        $t->set('help_compose-from', Horde_Help::link('imp', 'compose-from'));
         $t->set('fromaddr_locked', $prefs->isLocked('from_addr'));
         try {
             $t->set('from', htmlspecialchars($identity->getFromLine(null, Horde_Util::getFormData('from'))));
@@ -959,7 +958,7 @@ if ($redirect) {
     } else {
         $select_list = $identity->getSelectList();
         $t->set('identity_label', Horde::label('identity', _("_Identity")));
-        $t->set('help_compose-from', Help::link('imp', 'compose-identity'));
+        $t->set('help_compose-from', Horde_Help::link('imp', 'compose-identity'));
         $t->set('last_identity', $identity->getDefault());
         $t->set('count_select_list', count($select_list) > 1);
         if (count($select_list) > 1) {
@@ -1015,7 +1014,7 @@ if ($redirect) {
 
                 if ($first_addr) {
                     $first_addr = false;
-                    $entry['help'] = Help::link('imp', 'compose-' . $val);
+                    $entry['help'] = Horde_Help::link('imp', 'compose-' . $val);
                 } else {
                     $entry['help'] = null;
                 }
@@ -1026,7 +1025,7 @@ if ($redirect) {
             $addr['multiple'] = false;
             $addr['input_tabindex'] = ++$tabindex;
             $addr['input_value'] = htmlspecialchars($header[$val]);
-            $addr['help_compose'] = Help::link('imp', 'compose-' . $val);
+            $addr['help_compose'] = Horde_Help::link('imp', 'compose-' . $val);
         }
         $address_array[] = $addr;
     }
@@ -1035,7 +1034,7 @@ if ($redirect) {
     $t->set('subject_label', Horde::label('subject', _("S_ubject")));
     $t->set('subject_tabindex', ++$tabindex);
     $t->set('subject', htmlspecialchars($header['subject']));
-    $t->set('help-subject', Help::link('imp', 'compose-subject'));
+    $t->set('help-subject', Horde_Help::link('imp', 'compose-subject'));
 
     $t->set('set_priority', $prefs->getValue('set_priority'));
     $t->set('unlocked_charset', !$prefs->isLocked('sending_charset'));
@@ -1047,7 +1046,7 @@ if ($redirect) {
             $charset_array[] = array('value' => $charset, 'selected' => (strtolower($charset) == strtolower($encoding)), 'label' => $label);
         }
         $t->set('charset_array', $charset_array);
-        $t->set('help_compose_charset', Help::link('imp', 'compose-charset'));
+        $t->set('help_compose_charset', Horde_Help::link('imp', 'compose-charset'));
     }
     if ($t->get('set_priority')) {
         $t->set('priority_label', Horde::label('priority', _("_Priority")));
@@ -1066,7 +1065,7 @@ if ($redirect) {
             $priority_option[] = array('val' => $key, 'label' => $val, 'selected' => ($priority == $key));
         }
         $t->set('pri_opt', $priority_option);
-        $t->set('help_priority', Help::link('imp', 'compose-priority'));
+        $t->set('help_priority', Horde_Help::link('imp', 'compose-priority'));
     }
 
     $t->set('stationery', !empty($stationery_list));
@@ -1111,7 +1110,7 @@ if ($redirect) {
         );
     }
     $t->set('compose_options', $compose_options);
-    $t->set('help_options', Help::link('imp', 'compose-options'));
+    $t->set('help_options', Horde_Help::link('imp', 'compose-options'));
 
     $t->set('ssm', ($conf['user']['allow_folders'] && !$prefs->isLocked('save_sent_mail')));
     if ($t->get('ssm')) {
@@ -1163,12 +1162,12 @@ if ($redirect) {
     if ($t->get('use_encrypt')) {
         $t->set('encrypt_label', Horde::label('encrypt_options', _("Encr_yption Options")));
         $t->set('encrypt_options', IMP::encryptList($encrypt_options));
-        $t->set('help-encrypt', Help::link('imp', 'compose-options-encrypt'));
+        $t->set('help-encrypt', Horde_Help::link('imp', 'compose-options-encrypt'));
         $t->set('pgp_options', ($prefs->getValue('use_pgp') && $prefs->getValue('pgp_public_key')));
         if ($t->get('pgp_options')) {
             $t->set('pgp_attach_pubkey', Horde_Util::getFormData('pgp_attach_pubkey', $prefs->getValue('pgp_attach_pubkey')));
             $t->set('pap', Horde::label('pap', _("Attach a copy of your PGP public key to the message?")));
-            $t->set('help-pubkey', Help::link('imp', 'pgp-compose-attach-pubkey'));
+            $t->set('help-pubkey', Horde_Help::link('imp', 'pgp-compose-attach-pubkey'));
         }
     }
     if ($registry->hasMethod('contacts/ownVCard')) {
@@ -1189,7 +1188,7 @@ if ($redirect) {
             }
         }
         $t->set('attach_size', number_format($imp_compose->maxAttachmentSize(), 0, $localeinfo['decimal_point'], $localeinfo['thousands_sep']));
-        $t->set('help-attachments', Help::link('imp', 'compose-attachments'));
+        $t->set('help-attachments', Horde_Help::link('imp', 'compose-attachments'));
 
         $save_attach = $prefs->getValue('save_attachments');
         $show_link_attach = ($conf['compose']['link_attachments'] && !$conf['compose']['link_all_attachments']);
@@ -1200,11 +1199,11 @@ if ($redirect) {
             $attach_options = array();
             if ($show_save_attach) {
                 $save_attach_val = Horde_Util::getFormData('save_attachments_select', ($save_attach == 'prompt_yes'));
-                $attach_options[] = array('label' => _("Save Attachments with message in sent-mail folder?"), 'name' => 'save_attachments_select', 'select_yes' => ($save_attach_val == 1), 'select_no' => ($save_attach_val == 0), 'help' => Help::link('imp', 'compose-save-attachments'));
+                $attach_options[] = array('label' => _("Save Attachments with message in sent-mail folder?"), 'name' => 'save_attachments_select', 'select_yes' => ($save_attach_val == 1), 'select_no' => ($save_attach_val == 0), 'help' => Horde_Help::link('imp', 'compose-save-attachments'));
             }
             if ($show_link_attach) {
                 $link_attach_val = Horde_Util::getFormData('link_attachments');
-                $attach_options[] = array('label' => _("Link Attachments?"), 'name' => 'link_attachments', 'select_yes' => ($link_attach_val == 1), 'select_no' => ($link_attach_val == 0), 'help' => Help::link('imp', 'compose-link-attachments'));
+                $attach_options[] = array('label' => _("Link Attachments?"), 'name' => 'link_attachments', 'select_yes' => ($link_attach_val == 1), 'select_no' => ($link_attach_val == 0), 'help' => Horde_Help::link('imp', 'compose-link-attachments'));
             }
             $t->set('attach_options', $attach_options);
         }
@@ -1238,7 +1237,7 @@ if ($redirect) {
             if ($t->get('perc_attach')) {
                 $t->set('perc_attach', sprintf(_("%s%% of allowed size"), number_format($imp_compose->sizeOfAttachments() / $conf['compose']['attach_size_limit'] * 100, 2, $localeinfo['decimal_point'], $localeinfo['thousands_sep'])));
             }
-            $t->set('help-current-attachments', Help::link('imp', 'compose-current-attachments'));
+            $t->set('help-current-attachments', Horde_Help::link('imp', 'compose-current-attachments'));
         }
     }
 

diff --git a/imp/filterprefs.php b/imp/filterprefs.php
index d10947a..c109721 100644 (file)
--- a/imp/filterprefs.php
+++ b/imp/filterprefs.php
@@ -10,7 +10,6 @@
  */
 
 require_once dirname(__FILE__) . '/lib/base.php';
-require_once 'Horde/Help.php';
 require_once 'Horde/Prefs/UI.php';
 
 $result = Horde::loadConfiguration('prefs.php', array('prefGroups', '_prefs'), 'imp');
@@ -92,7 +91,7 @@ if (!$blacklist_link && !$whitelist_link && !$filters_link) {
             $links[] = array(
                 'img' => Horde::img('filters.png', $val['g']),
                 'link' => Horde::link(Horde::url($val['l'])),
-                'help' => Help::link('imp', $val['h']),
+                'help' => Horde_Help::link('imp', $val['h']),
                 'text' => $val['g']
             );
         }
@@ -115,7 +114,7 @@ if (!$blacklist_link && !$whitelist_link && !$filters_link) {
                 'key' => $key,
                 'checked' => $prefs->getValue($val['p']),
                 'label' => Horde::label('filter_' . $key, $val['g']),
-                'help' => isset($val['h']) ? Help::link('imp', $val['h']) : null
+                'help' => isset($val['h']) ? Horde_Help::link('imp', $val['h']) : null
             );
         }
     }

diff --git a/imp/folders.php b/imp/folders.php
index 768a8e2..6125a57 100644 (file)
--- a/imp/folders.php
+++ b/imp/folders.php
@@ -35,7 +35,6 @@ function _image($name, $alt, $type)
 }
 
 require_once dirname(__FILE__) . '/lib/base.php';
-require_once 'Horde/Help.php';
 Horde::addScriptFile('prototype.js', 'horde', true);
 Horde::addScriptFile('folders.js', 'imp', true);
 
@@ -397,7 +396,7 @@ if ($prefs->getValue('subscribe')) {
 $a_template->set('nav_poll', !$prefs->isLocked('nav_poll') && !$prefs->getValue('nav_poll_all'));
 $a_template->set('notrash', !$prefs->getValue('use_trash'));
 $a_template->set('file_upload', $_SESSION['imp']['file_upload']);
-$a_template->set('help', Help::link('imp', 'folder-options'));
+$a_template->set('help', Horde_Help::link('imp', 'folder-options'));
 $a_template->set('expand_all', Horde::widget(Horde_Util::addParameter($folders_url, array('actionID' => 'expand_all_folders', 'folders_token' => $folders_token)), _("Expand All Folders"), 'widget', '', '', _("Expand All"), true));
 $a_template->set('collapse_all', Horde::widget(Horde_Util::addParameter($folders_url, array('actionID' => 'collapse_all_folders', 'folders_token' => $folders_token)), _("Collapse All Folders"), 'widget', '', '', _("Collapse All"), true));
 

diff --git a/imp/pgp.php b/imp/pgp.php
index 30f35dc..f2b1426 100644 (file)
--- a/imp/pgp.php
+++ b/imp/pgp.php
@@ -308,7 +308,6 @@ if (is_a($result, 'PEAR_Error')) {
 }
 extract($result);
 
-require_once 'Horde/Help.php';
 require_once 'Horde/Prefs/UI.php';
 $app = 'imp';
 $chunk = Horde_Util::nonInputVar('chunk');
@@ -321,23 +320,23 @@ if ($prefs->getValue('use_pgp')) {
     Horde::addScriptFile('prototype.js', 'horde', true);
     Horde::addScriptFile('imp.js', 'imp', true);
     $t->set('pgpactive', true);
-    $t->set('overview-help', Help::link('imp', 'pgp-overview'));
+    $t->set('overview-help', Horde_Help::link('imp', 'pgp-overview'));
     $t->set('attach_pubkey_notlocked', !$prefs->isLocked('pgp_attach_pubkey'));
     if ($t->get('attach_pubkey_notlocked')) {
         $t->set('attach_pubkey', $prefs->getValue('pgp_attach_pubkey'));
-        $t->set('attach_pubkey-help', Help::link('imp', 'pgp-option-attach-pubkey'));
+        $t->set('attach_pubkey-help', Horde_Help::link('imp', 'pgp-option-attach-pubkey'));
     }
     $t->set('scan_body_notlocked', !$prefs->isLocked('pgp_scan_body'));
     if ($t->get('scan_body_notlocked')) {
         $t->set('scan_body', $prefs->getValue('pgp_scan_body'));
-        $t->set('scan_body-help', Help::link('imp', 'pgp-option-scan-body'));
+        $t->set('scan_body-help', Horde_Help::link('imp', 'pgp-option-scan-body'));
     }
     $t->set('verify_notlocked', !$prefs->isLocked('pgp_verify'));
     if ($t->get('verify_notlocked')) {
         $t->set('pgp_verify', $prefs->getValue('pgp_verify'));
-        $t->set('pgp_verify-help', Help::link('imp', 'pgp-option-verify'));
+        $t->set('pgp_verify-help', Horde_Help::link('imp', 'pgp-option-verify'));
     }
-    $t->set('manage_pubkey-help', Help::link('imp', 'pgp-manage-pubkey'));
+    $t->set('manage_pubkey-help', Horde_Help::link('imp', 'pgp-manage-pubkey'));
 
     $t->set('empty_pubkey_list', empty($pubkey_list));
     if (!$t->get('empty_pubkey_list')) {
@@ -361,10 +360,10 @@ if ($prefs->getValue('use_pgp')) {
         if (!$t->get('no_source')) {
             $cacheSess = &Horde_SessionObjects::singleton();
             $t->set('public_import_url', Horde_Util::addParameter(Horde_Util::addParameter($selfURL, 'actionID', 'import_public_key'), 'reload', $cacheSess->storeOid($selfURL, false)));
-            $t->set('import_pubkey-help', Help::link('imp', 'pgp-import-pubkey'));
+            $t->set('import_pubkey-help', Horde_Help::link('imp', 'pgp-import-pubkey'));
         }
     }
-    $t->set('personalkey-help', Help::link('imp', 'pgp-overview-personalkey'));
+    $t->set('personalkey-help', Horde_Help::link('imp', 'pgp-overview-personalkey'));
 
     $t->set('secure_check', !$secure_check);
     if ($secure_check) {
@@ -373,27 +372,27 @@ if ($prefs->getValue('use_pgp')) {
             $t->set('viewpublic', Horde::link(Horde_Util::addParameter($selfURL, 'actionID', 'view_personal_public_key'), _("View Personal Public Key"), null, 'view_key'));
             $t->set('infopublic', Horde::link(Horde_Util::addParameter($selfURL, 'actionID', 'info_personal_public_key'), _("Information on Personal Public Key"), null, 'info_key'));
             $t->set('sendkey', Horde::link(Horde_Util::addParameter($selfURL, 'actionID', 'send_public_key'), _("Send Key to Public Keyserver")));
-            $t->set('personalkey-public-help', Help::link('imp', 'pgp-personalkey-public'));
+            $t->set('personalkey-public-help', Horde_Help::link('imp', 'pgp-personalkey-public'));
             $passphrase = $imp_pgp->getPassphrase('personal');
             $t->set('passphrase', (empty($passphrase)) ? Horde::link('#', _("Enter Passphrase"), null, null, IMP::passphraseDialogJS('PGPPersonal') . ';return false;') . _("Enter Passphrase") : Horde::link(Horde_Util::addParameter($selfURL, 'actionID', 'unset_passphrase'), _("Unload Passphrase")) . _("Unload Passphrase"));
             $t->set('viewprivate', Horde::link(Horde_Util::addParameter($selfURL, 'actionID', 'view_personal_private_key'), _("View Personal Private Key"), null, 'view_key'));
             $t->set('infoprivate', Horde::link(Horde_Util::addParameter($selfURL, 'actionID', 'info_personal_private_key'), _("Information on Personal Private Key"), null, 'info_key'));
-            $t->set('personalkey-private-help', Help::link('imp', 'pgp-personalkey-private'));
+            $t->set('personalkey-private-help', Horde_Help::link('imp', 'pgp-personalkey-private'));
             $t->set('deletekeypair', addslashes(_("Are you sure you want to delete your keypair? (This is NOT recommended!)")));
-            $t->set('personalkey-delete-help', Help::link('imp', 'pgp-personalkey-delete'));
+            $t->set('personalkey-delete-help', Horde_Help::link('imp', 'pgp-personalkey-delete'));
         } else {
             require_once 'Horde/Identity.php';
             $imp_identity = &Identity::singleton(array('imp', 'imp'));
             $t->set('fullname', $imp_identity->getFullname());
-            $t->set('personalkey-create-name-help', Help::link('imp', 'pgp-personalkey-create-name'));
-            $t->set('personalkey-create-comment-help', Help::link('imp', 'pgp-personalkey-create-comment'));
+            $t->set('personalkey-create-name-help', Horde_Help::link('imp', 'pgp-personalkey-create-name'));
+            $t->set('personalkey-create-comment-help', Horde_Help::link('imp', 'pgp-personalkey-create-comment'));
             $t->set('fromaddr', $imp_identity->getFromAddress());
-            $t->set('personalkey-create-email-help', Help::link('imp', 'pgp-personalkey-create-email'));
-            $t->set('personalkey-create-keylength-help', Help::link('imp', 'pgp-personalkey-create-keylength'));
-            $t->set('personalkey-create-passphrase-help', Help::link('imp', 'pgp-personalkey-create-passphrase'));
+            $t->set('personalkey-create-email-help', Horde_Help::link('imp', 'pgp-personalkey-create-email'));
+            $t->set('personalkey-create-keylength-help', Horde_Help::link('imp', 'pgp-personalkey-create-keylength'));
+            $t->set('personalkey-create-passphrase-help', Horde_Help::link('imp', 'pgp-personalkey-create-passphrase'));
             $t->set('keygen',  addslashes(_("Key generation may take a long time to complete.  Continue with key generation?")));
             $t->set('personal_import_url', Horde_Util::addParameter($selfURL, 'actionID', 'import_personal_public_key'));
-            $t->set('personalkey-create-actions-help', Help::link('imp', 'pgp-personalkey-create-actions'));
+            $t->set('personalkey-create-actions-help', Horde_Help::link('imp', 'pgp-personalkey-create-actions'));
         }
     }
 
@@ -401,7 +400,7 @@ if ($prefs->getValue('use_pgp')) {
     $t->set('use_pgp_locked', $prefs->isLocked('use_pgp'));
     if (!$t->get('use_pgp_locked')) {
         $t->set('use_pgp_label', Horde::label('use_pgp', _("Enable PGP functionality?")));
-        $t->set('use_pgp_help', Help::link('imp', 'pgp-overview'));
+        $t->set('use_pgp_help', Horde_Help::link('imp', 'pgp-overview'));
     }
 }
 $t->set('prefsurl', IMP::prefsURL(true));

diff --git a/imp/search.php b/imp/search.php
index 57c980e..08d0202 100644 (file)
--- a/imp/search.php
+++ b/imp/search.php
@@ -17,7 +17,6 @@
  */
 
 require_once dirname(__FILE__) . '/lib/base.php';
-require_once 'Horde/Help.php';
 
 /* Redirect back to the mailbox if searching is not allowed. */
 if ($_SESSION['imp']['protocol'] == 'pop') {
@@ -163,7 +162,7 @@ if (!$edit_query_vfolder) {
                     . '</a>'));
     }
 }
-$t->set('search_help', Help::link('imp', 'search'));
+$t->set('search_help', Horde_Help::link('imp', 'search'));
 $t->set('match_or', $search['match'] == 'or');
 $t->set('label_or', Horde::label('search_match_or', _("Match Any Query")));
 $t->set('match_and', ($search['match'] == null) || ($search['match'] == 'and'));

diff --git a/imp/smime.php b/imp/smime.php
index 440c330..998094b 100644 (file)
--- a/imp/smime.php
+++ b/imp/smime.php
@@ -225,7 +225,6 @@ if (is_a($result, 'PEAR_Error')) {
 }
 extract($result);
 
-require_once 'Horde/Help.php';
 require_once 'Horde/Prefs/UI.php';
 $app = 'imp';
 $chunk = Horde_Util::nonInputVar('chunk');
@@ -245,16 +244,16 @@ try {
 /* If S/MIME preference not active, do NOT show S/MIME Admin screen. */
 $t = new IMP_Template();
 $t->setOption('gettext', true);
-$t->set('use_smime_help', Help::link('imp', 'smime-overview'));
+$t->set('use_smime_help', Horde_Help::link('imp', 'smime-overview'));
 if ($openssl_check && $prefs->getValue('use_smime')) {
     Horde::addScriptFile('imp.js', 'imp', true);
     $t->set('smimeactive', true);
-    $t->set('manage_pubkey-help', Help::link('imp', 'smime-manage-pubkey'));
+    $t->set('manage_pubkey-help', Horde_Help::link('imp', 'smime-manage-pubkey'));
 
     $t->set('verify_notlocked', !$prefs->isLocked('smime_verify'));
     if ($t->get('verify_notlocked')) {
         $t->set('smime_verify', $prefs->getValue('smime_verify'));
-        $t->set('smime_verify-help', Help::link('imp', 'smime-option-verify'));
+        $t->set('smime_verify-help', Horde_Help::link('imp', 'smime-option-verify'));
     }
 
     $t->set('empty_pubkey_list', empty($pubkey_list));
@@ -279,10 +278,10 @@ if ($openssl_check && $prefs->getValue('use_smime')) {
         if (!$t->get('no_source')) {
             $cacheSess = &Horde_SessionObjects::singleton();
             $t->set('public_import_url', Horde_Util::addParameter(Horde_Util::addParameter($selfURL, 'actionID', 'import_public_key'), 'reload', $cacheSess->storeOid($selfURL, false)));
-            $t->set('import_pubkey-help', Help::link('imp', 'smime-import-pubkey'));
+            $t->set('import_pubkey-help', Horde_Help::link('imp', 'smime-import-pubkey'));
         }
     }
-    $t->set('personalkey-help', Help::link('imp', 'smime-overview-personalkey'));
+    $t->set('personalkey-help', Horde_Help::link('imp', 'smime-overview-personalkey'));
 
     $t->set('secure_check', is_a($secure_check, 'PEAR_Error'));
     if (!$t->get('secure_check')) {
@@ -294,10 +293,10 @@ if ($openssl_check && $prefs->getValue('use_smime')) {
             $t->set('passphrase', empty($passphrase) ? Horde::link('#', _("Enter Passphrase"), null, null, IMP::passphraseDialogJS('SMIMEPersonal') . ';return false;') . _("Enter Passphrase") : Horde::link(Horde_Util::addParameter($selfURL, 'actionID', 'unset_passphrase'), _("Unload Passphrase")) . _("Unload Passphrase"));
             $t->set('viewprivate', Horde::link(Horde_Util::addParameter($selfURL, 'actionID', 'view_personal_private_key'), _("View Personal Private Key"), null, 'view_key'));
             $t->set('deletekeypair', addslashes(_("Are you sure you want to delete your keypair? (This is NOT recommended!)")));
-            $t->set('personalkey-delete-help', Help::link('imp', 'smime-delete-personal-certs'));
+            $t->set('personalkey-delete-help', Horde_Help::link('imp', 'smime-delete-personal-certs'));
         } else {
             $t->set('personal_import_url', Horde_Util::addParameter($selfURL, 'actionID', 'import_personal_certs'));
-            $t->set('import-cert-help', Help::link('imp', 'smime-import-personal-certs'));
+            $t->set('import-cert-help', Horde_Help::link('imp', 'smime-import-personal-certs'));
         }
     }
 } else {

diff --git a/ingo/forward.php b/ingo/forward.php
index 52176ed..30bc6c4 100644 (file)
--- a/ingo/forward.php
+++ b/ingo/forward.php
@@ -11,7 +11,6 @@
  */
 
 require_once dirname(__FILE__) . '/lib/base.php';
-require_once 'Horde/Help.php';
 
 /* Redirect if forward is not available. */
 if (!in_array(Ingo_Storage::ACTION_FORWARD, $_SESSION['ingo']['script_categories'])) {
@@ -95,7 +94,7 @@ $form_title = _("Forward");
 if (!empty($fwd_rule['disable'])) {
     $form_title .= ' [<span class="form-error">' . _("Disabled") . '</span>]';
 }
-$form_title .= ' ' . Help::link('ingo', 'forward');
+$form_title .= ' ' . Horde_Help::link('ingo', 'forward');
 $form->setTitle($form_title);
 
 $title = _("Forwards Edit");

diff --git a/ingo/spam.php b/ingo/spam.php
index 41eea1e..7d34555 100644 (file)
--- a/ingo/spam.php
+++ b/ingo/spam.php
@@ -154,7 +154,7 @@ $form_title = _("Spam Filtering");
 if (!empty($spam_rule['disable'])) {
     $form_title .= ' [<span class="form-error">' . _("Disabled") . '</span>]';
 }
-$form_title .= ' ' . Help::link('ingo', 'spam');
+$form_title .= ' ' . Horde_Help::link('ingo', 'spam');
 $form->setTitle($form_title);
 
 $title = _("Spam Filtering");

diff --git a/ingo/templates/blacklist/blacklist.inc b/ingo/templates/blacklist/blacklist.inc
index f17b829..5d068f9 100644 (file)
--- a/ingo/templates/blacklist/blacklist.inc
+++ b/ingo/templates/blacklist/blacklist.inc
@@ -5,7 +5,7 @@
 
 <h1 class="header">
  <?php echo _("Blacklist") ?>
- <?php echo Help::link('ingo', 'blacklist') ?>
+ <?php echo Horde_Help::link('ingo', 'blacklist') ?>
 <?php if (!empty($bl_rule['disable'])): ?>
   &nbsp;[<span style="color:red"><?php echo _("Disabled") ?></span>]
 <?php endif; ?>
@@ -24,7 +24,7 @@
       <?php echo $folder_list ?>
     </td>
     <td width="40" align="right">
-      <?php echo Help::link('ingo', 'blacklist-action') ?>&nbsp;
+      <?php echo Horde_Help::link('ingo', 'blacklist-action') ?>&nbsp;
     </td>
   </tr>
   <tr class="item1">
@@ -33,7 +33,7 @@
       <textarea name="blacklist" id="blacklist" rows="15" cols="80"><?php echo htmlspecialchars(implode("\n", $blacklist->getBlacklist())) ?></textarea>
     </td>
     <td width="40" align="right">
-      <?php echo Help::link('ingo', 'blacklist-addresses') ?>&nbsp;
+      <?php echo Horde_Help::link('ingo', 'blacklist-addresses') ?>&nbsp;
     </td>
   </tr>
   <tr>

diff --git a/ingo/templates/filters/header.inc b/ingo/templates/filters/header.inc
index 18ffc28..55851b3 100644 (file)
--- a/ingo/templates/filters/header.inc
+++ b/ingo/templates/filters/header.inc
@@ -14,7 +14,7 @@ function moveFromTo(from, to, upurl, downurl)
 <?php Horde_Util::pformInput() ?>
 <input type="hidden" name="actionID" value="" />
 <div class="header">
- <?php echo _("Existing Rules") . ' ' . Help::link('ingo', 'filters_rules') ?>
+ <?php echo _("Existing Rules") . ' ' . Horde_Help::link('ingo', 'filters_rules') ?>
 </div>
 
 <table width="100%" cellspacing="0" class="striped">

diff --git a/ingo/templates/filters/settings.inc b/ingo/templates/filters/settings.inc
index 4dc135f..cf24c38 100644 (file)
--- a/ingo/templates/filters/settings.inc
+++ b/ingo/templates/filters/settings.inc
@@ -14,7 +14,7 @@
       <input type="checkbox" id="show_filter_msg" name="show_filter_msg"<?php if ($prefs->getValue('show_filter_msg')) echo ' checked="checked"' ?> />&nbsp;
       <?php echo Horde::label('show_filter_msg', _("Display detailed notification when each filter is applied?")) ?>
     </td><td class="item" align="right" width="1%">
-      <?php echo Help::link('ingo', 'pref-show_filter_msg') ?>
+      <?php echo Horde_Help::link('ingo', 'pref-show_filter_msg') ?>
     </td>
   </tr><tr>
     <td class="item" align="left" width="99%"><?php echo Horde::label('filter_seen', _("Filter Options")) ?>&nbsp;
@@ -24,7 +24,7 @@
         <option value="<?php echo Ingo_Script::FILTER_SEEN ?>"<?php if ($flags_val == Ingo_Script::FILTER_SEEN) echo ' selected="selected"' ?>><?php echo _("Filter Only Seen Messages") ?></option>
       </select>
     </td><td class="item" align="right" width="1%">
-      <?php echo Help::link('ingo', 'pref-filter_seen') ?>
+      <?php echo Horde_Help::link('ingo', 'pref-filter_seen') ?>
     </td>
   </tr><tr>
     <td colspan="2" class="control">

diff --git a/ingo/templates/rule/footer.inc b/ingo/templates/rule/footer.inc
index e183f3a..f3276c7 100644 (file)
--- a/ingo/templates/rule/footer.inc
+++ b/ingo/templates/rule/footer.inc
@@ -1,7 +1,7 @@
       </table>
     </td>
     <td width="40" align="right">
-      <?php echo Help::link('ingo', 'rule-matches') ?>&nbsp;
+      <?php echo Horde_Help::link('ingo', 'rule-matches') ?>&nbsp;
     </td>
   </tr>
 
@@ -15,7 +15,7 @@
       <?php echo $actionvaluelabel ?>
       <?php echo $actionvalue ?>
     </td><td width="40" align="right">
-      <?php echo Help::link('ingo', 'rule-action') ?>&nbsp;
+      <?php echo Horde_Help::link('ingo', 'rule-action') ?>&nbsp;
     </td>
   </tr>
 
@@ -39,7 +39,7 @@
       </table>
     </td>
     <td width="40" align="right">
-      <?php echo Help::link('ingo', 'rule-mark') ?>&nbsp;
+      <?php echo Horde_Help::link('ingo', 'rule-mark') ?>&nbsp;
     </td>
   </tr>
 <?php endif; ?>
@@ -50,7 +50,7 @@
       <input type="checkbox" id="stop" name="stop" value="1"<?php echo ($rule['stop']) ? ' checked="checked"' : '' ?> /> <?php echo Horde::label('stop', _("Stop checking if this rule matches?")) ?>
     </td>
     <td width="40" align="right">
-      <?php echo Help::link('ingo', 'rule-stop') ?>&nbsp;
+      <?php echo Horde_Help::link('ingo', 'rule-stop') ?>&nbsp;
     </td>
   </tr>
 <?php endif; ?>

diff --git a/ingo/templates/rule/header.inc b/ingo/templates/rule/header.inc
index 44ddd17..73a2f37 100644 (file)
--- a/ingo/templates/rule/header.inc
+++ b/ingo/templates/rule/header.inc
@@ -24,7 +24,7 @@ function delete_condition(num)
 <div class="header">
  <?php echo _("Filter Rule") ?>
  <?php if (!empty($rule['disable'])): ?>[<span style="form-error"><?php echo _("Disabled") ?></span>]<?php endif; ?>
- <?php echo Help::link('ingo', 'rule') ?>
+ <?php echo Horde_Help::link('ingo', 'rule') ?>
 </div>
 
 <table width="100%" cellspacing="0">
@@ -33,7 +33,7 @@ function delete_condition(num)
       <?php echo Horde::label('name', _("Rule Name:")) ?> <input class="input" id="name" name="name" size="50" value="<?php echo (isset($rule['name'])) ? @htmlspecialchars($rule['name'], ENT_COMPAT, NLS::getCharset()) : '' ?>" />
     </td>
     <td width="40" class="rightAlign">
-      <?php echo Help::link('ingo', 'rule-name') ?>&nbsp;
+      <?php echo Horde_Help::link('ingo', 'rule-name') ?>&nbsp;
     </td>
   </tr>
 
@@ -45,7 +45,7 @@ function delete_condition(num)
       <input id="any" onclick="document.rule.submit(); return true;" type="radio" name="combine" value="<?php echo Ingo_Storage::COMBINE_ANY ?>"<?php echo ($rule['combine'] == Ingo_Storage::COMBINE_ANY) ? ' checked="checked"' : '' ?> /><?php echo Horde::label('any', _("Any of the following")) ?>
     </td>
     <td width="40" class="rightAlign">
-      <?php echo Help::link('ingo', 'rule-combine') ?>&nbsp;
+      <?php echo Horde_Help::link('ingo', 'rule-combine') ?>&nbsp;
     </td>
   </tr>
 

diff --git a/ingo/templates/whitelist/whitelist.inc b/ingo/templates/whitelist/whitelist.inc
index c240a2c..d8e651d 100644 (file)
--- a/ingo/templates/whitelist/whitelist.inc
+++ b/ingo/templates/whitelist/whitelist.inc
@@ -3,7 +3,7 @@
 <input type="hidden" name="actionID" value="rule_update" />
 <h1 class="header">
   <?php echo _("Whitelist") ?>
-  <?php echo Help::link('ingo', 'whitelist') ?>
+  <?php echo Horde_Help::link('ingo', 'whitelist') ?>
 <?php if (!empty($wl_rule['disable'])): ?>
   &nbsp;[<span style="color:red"><?php echo _("Disabled") ?></span>]
 <?php endif; ?>
@@ -15,7 +15,7 @@
       <textarea name="whitelist" id="whitelist" rows="15" cols="80"><?php echo htmlspecialchars(implode("\n", $whitelist->getWhitelist())) ?></textarea>
     </td>
     <td align="right">
-      <?php echo Help::link('ingo', 'whitelist-addresses') ?>&nbsp;
+      <?php echo Horde_Help::link('ingo', 'whitelist-addresses') ?>&nbsp;
     </td>
   </tr>
   <tr>

diff --git a/ingo/vacation.php b/ingo/vacation.php
index ec30f02..c7a7ce6 100644 (file)
--- a/ingo/vacation.php
+++ b/ingo/vacation.php
@@ -11,7 +11,6 @@
  */
 
 require_once dirname(__FILE__) . '/lib/base.php';
-require_once 'Horde/Help.php';
 
 /* Redirect if vacation is not available. */
 if (!in_array(Ingo_Storage::ACTION_VACATION, $_SESSION['ingo']['script_categories'])) {
@@ -149,7 +148,7 @@ $form_title = _("Vacation");
 if (!empty($vac_rule['disable'])) {
     $form_title .= ' [<span class="form-error">' . _("Disabled") . '</span>]';
 }
-$form_title .= ' ' . Help::link('ingo', 'vacation');
+$form_title .= ' ' . Horde_Help::link('ingo', 'vacation');
 $form->setTitle($form_title);
 
 $title = _("Vacation Edit");

diff --git a/kronolith/lib/base.php b/kronolith/lib/base.php
index 7768b2f..5243d3f 100644 (file)
--- a/kronolith/lib/base.php
+++ b/kronolith/lib/base.php
@@ -42,9 +42,6 @@ if (is_a(($pushed = $registry->pushApp('kronolith', !defined('AUTH_HANDLER'))),
 $conf = &$GLOBALS['conf'];
 define('KRONOLITH_TEMPLATES', $registry->get('templates'));
 
-/* Horde framework libraries. */
-require_once 'Horde/Help.php';
-
 /* Notification system. */
 $notification = &Notification::singleton();
 require_once KRONOLITH_BASE . '/lib/Notification/Listener/status.php';

diff --git a/kronolith/templates/calendar_info.php b/kronolith/templates/calendar_info.php
index d6fc3ef..aaf778a 100644 (file)
--- a/kronolith/templates/calendar_info.php
+++ b/kronolith/templates/calendar_info.php
@@ -35,6 +35,6 @@
 <?php echo htmlspecialchars(Kronolith::embedCode($calendar->getName())); ?>
 </p>
 <?php if (Horde::showService('help')) {
-    echo '<p>' . Help::link('kronolith', 'embed') . ' ' . _("Learn how to embed other calendar views.") . '</p>';
+    echo '<p>' . Horde_Help::link('kronolith', 'embed') . ' ' . _("Learn how to embed other calendar views.") . '</p>';
 } ?>
 <?php endif; ?>

diff --git a/kronolith/templates/contacts/contacts.inc b/kronolith/templates/contacts/contacts.inc
index fe2c45b..cb4997b 100644 (file)
--- a/kronolith/templates/contacts/contacts.inc
+++ b/kronolith/templates/contacts/contacts.inc
@@ -196,6 +196,6 @@ window.onload = function() {
 <div class="rightAlign">
   <input type="button" class="button" onclick="updateMessage();" value="<?php echo _("Add to attendees") ?>" />
   <input type="button" class="button" onclick="window.close();" value="<?php echo _("Close window") ?>" />
-  <?php echo Help::link('kronolith', 'invite-addressbook') ?>
+  <?php echo Horde_Help::link('kronolith', 'invite-addressbook') ?>
 </div>
 </form>

diff --git a/kronolith/templates/perms/perms.inc b/kronolith/templates/perms/perms.inc
index 26413ab..2490337 100644 (file)
--- a/kronolith/templates/perms/perms.inc
+++ b/kronolith/templates/perms/perms.inc
@@ -8,7 +8,7 @@
     <span class="rightFloat">
       <a href="#" onclick="javascript:window.close();" style="cursor:pointer"><?php echo Horde::img('close.png', _("Close Window"), '', $registry->getImageDir('horde')) ?></a>
     </span>
-    <?php echo Horde::img('perms.png', '', '', $registry->getImageDir('horde')) . '&nbsp;' . sprintf(_("Edit permissions for %s"), htmlspecialchars($share->get('name'))) . '&nbsp;' . Help::link('kronolith', 'shares') ?>
+    <?php echo Horde::img('perms.png', '', '', $registry->getImageDir('horde')) . '&nbsp;' . sprintf(_("Edit permissions for %s"), htmlspecialchars($share->get('name'))) . '&nbsp;' . Horde_Help::link('kronolith', 'shares') ?>
   </td>
 </tr>
 <tr><td colspan="7">&nbsp;</td></tr>