From 363514e30bcc31bf4055d39c9d90044b0e63ff3a Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 01 Aug 2011 04:15:22 -0400
Subject: [PATCH] - Move rcmail_localize_folderpath() to main.inc
---
program/steps/settings/edit_folder.inc | 24 ------------
program/include/main.inc | 49 ++++++++++++++++++++++++
2 files changed, 49 insertions(+), 24 deletions(-)
diff --git a/program/include/main.inc b/program/include/main.inc
index 26bc8cd..140f1be 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -1469,6 +1469,31 @@
}
+function rcmail_localize_folderpath($path)
+{
+ global $RCMAIL;
+
+ $protect_folders = $RCMAIL->config->get('protect_default_folders');
+ $default_folders = (array) $RCMAIL->config->get('default_imap_folders');
+ $delimiter = $RCMAIL->imap->get_hierarchy_delimiter();
+ $path = explode($delimiter, $path);
+ $result = array();
+
+ foreach ($path as $idx => $dir) {
+ $directory = implode($delimiter, array_slice($path, 0, $idx+1));
+ if ($protect_folders && in_array($directory, $default_folders)) {
+ unset($result);
+ $result[] = rcmail_localize_foldername($directory);
+ }
+ else {
+ $result[] = rcube_charset_convert($dir, 'UTF7-IMAP');
+ }
+ }
+
+ return implode($delimiter, $result);
+}
+
+
function rcmail_quota_display($attrib)
{
global $OUTPUT;
@@ -2345,3 +2370,27 @@
$RCMAIL->output->set_env('autocomplete_min_length', $RCMAIL->config->get('autocomplete_min_length'));
$RCMAIL->output->add_label('autocompletechars');
}
+
+function rcmail_localize_folderpath($path)
+{
+ global $RCMAIL;
+
+ $protect_folders = $RCMAIL->config->get('protect_default_folders');
+ $default_folders = (array) $RCMAIL->config->get('default_imap_folders');
+ $delimiter = $RCMAIL->imap->get_hierarchy_delimiter();
+ $path = explode($delimiter, $path);
+ $result = array();
+
+ foreach ($path as $idx => $dir) {
+ $directory = implode($delimiter, array_slice($path, 0, $idx+1));
+ if ($protect_folders && in_array($directory, $default_folders)) {
+ unset($result);
+ $result[] = rcmail_localize_foldername($directory);
+ }
+ else {
+ $result[] = rcube_charset_convert($dir, 'UTF7-IMAP');
+ }
+ }
+
+ return implode($delimiter, $result);
+}
diff --git a/program/steps/settings/edit_folder.inc b/program/steps/settings/edit_folder.inc
index 710c3ff..fe9cdc0 100644
--- a/program/steps/settings/edit_folder.inc
+++ b/program/steps/settings/edit_folder.inc
@@ -289,30 +289,6 @@
return $content;
}
-function rcmail_localize_folderpath($path)
-{
- global $RCMAIL;
-
- $protect_folders = $RCMAIL->config->get('protect_default_folders');
- $default_folders = (array) $RCMAIL->config->get('default_imap_folders');
- $delimiter = $RCMAIL->imap->get_hierarchy_delimiter();
- $path = explode($delimiter, $path);
- $result = array();
-
- foreach ($path as $idx => $dir) {
- $directory = implode($delimiter, array_slice($path, 0, $idx+1));
- if ($protect_folders && in_array($directory, $default_folders)) {
- unset($result);
- $result[] = rcmail_localize_foldername($directory);
- }
- else {
- $result[] = rcube_charset_convert($dir, 'UTF7-IMAP');
- }
- }
-
- return implode($delimiter, $result);
-}
-
//$OUTPUT->set_pagetitle(rcube_label('folders'));
--
Gitblit v1.9.1