No OneTemporary
Actions

Size

11 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/program/steps/settings/edit_folder.inc b/program/steps/settings/edit_folder.inc
	index cd2372790..fdb38e602 100644
	--- a/program/steps/settings/edit_folder.inc
	+++ b/program/steps/settings/edit_folder.inc
	@@ -1,311 +1,311 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/settings/edit_folder.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2009, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| Provide functionality to create/edit a folder \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Aleksander Machniak <alec@alec.pl> \|
	+-----------------------------------------------------------------------+
	*/

	// WARNING: folder names in UI are encoded with RCMAIL_CHARSET

	function rcmail_folder_form($attrib)
	{
	global $RCMAIL;

	$storage = $RCMAIL->get_storage();

	// edited folder name (empty in create-folder mode)
	$mbox = trim(get_input_value('_mbox', RCUBE_INPUT_GPC, true));
	$mbox_imap = rcube_charset_convert($mbox, RCMAIL_CHARSET, 'UTF7-IMAP');

	// predefined path for new folder
	$parent = trim(get_input_value('_path', RCUBE_INPUT_GPC, true));
	$parent_imap = rcube_charset_convert($parent, RCMAIL_CHARSET, 'UTF7-IMAP');

	$threading_supported = $storage->get_capability('THREAD');
	$delimiter = $storage->get_hierarchy_delimiter();

	// Get mailbox parameters
	if (strlen($mbox)) {
	$options = rcmail_folder_options($mbox_imap);
	$namespace = $storage->get_namespace();

	$path = explode($delimiter, $mbox_imap);
	$folder = array_pop($path);
	$path = implode($delimiter, $path);
	$folder = rcube_charset_convert($folder, 'UTF7-IMAP');

	$hidden_fields = array('name' => '_mbox', 'value' => $mbox);
	}
	else {
	$options = array();
	$path = $parent_imap;

	// allow creating subfolders of INBOX folder
	if ($path == 'INBOX') {
	$path = $storage->mod_folder($path, 'in');
	}
	}

	// remove personal namespace prefix
	if (strlen($path)) {
	$path_id = $path;
	$path = $storage->mod_folder($path.$delimiter);
	if ($path[strlen($path)-1] == $delimiter) {
	$path = substr($path, 0, -1);
	}
	}

	$form = array();

	// General tab
	$form['props'] = array(
	'name' => rcube_label('properties'),
	);

	// Location (name)
	if ($options['protected']) {
	- $foldername = Q(str_replace($delimiter, ' » ', rcmail_localize_folderpath($mbox_imap)));
	+ $foldername = str_replace($delimiter, ' » ', Q(rcmail_localize_folderpath($mbox_imap)));
	}
	else if ($options['norename']) {
	$foldername = Q($folder);
	}
	else {
	if (isset($_POST['_name']))
	$folder = trim(get_input_value('_name', RCUBE_INPUT_POST, true));

	$foldername = new html_inputfield(array('name' => '_name', 'id' => '_name', 'size' => 30));
	$foldername = $foldername->show($folder);

	if ($options['special']) {
	$foldername .= ' (' . Q(rcmail_localize_foldername($mbox_imap)) .')';
	}
	}

	$form['props']['fieldsets']['location'] = array(
	'name' => rcube_label('location'),
	'content' => array(
	'name' => array(
	'label' => rcube_label('foldername'),
	'value' => $foldername,
	),
	),
	);

	if (!empty($options) && ($options['norename'] \|\| $options['protected'])) {
	// prevent user from moving folder
	$hidden_path = new html_hiddenfield(array('name' => '_parent', 'value' => $path));
	$form['props']['fieldsets']['location']['content']['name']['value'] .= $hidden_path->show();
	}
	else {
	$selected = isset($_POST['_parent']) ? $_POST['_parent'] : $path_id;
	$exceptions = array($mbox_imap);

	// Exclude 'prefix' namespace from parent folders list (#1488349)
	// If INBOX. namespace exists, folders created as INBOX subfolders
	// will be listed at the same level - selecting INBOX as a parent does nothing
	if ($prefix = $storage->get_namespace('prefix')) {
	$exceptions[] = substr($prefix, 0, -1);
	}

	$select = rcmail_mailbox_select(array(
	'name' => '_parent',
	'noselection' => '---',
	'realnames' => false,
	'maxlength' => 150,
	'unsubscribed' => true,
	'skip_noinferiors' => true,
	'exceptions' => $exceptions,
	));

	$form['props']['fieldsets']['location']['content']['path'] = array(
	'label' => rcube_label('parentfolder'),
	'value' => $select->show($selected),
	);
	}

	// Settings
	$form['props']['fieldsets']['settings'] = array(
	'name' => rcube_label('settings'),
	);

	// Settings: threading
	if ($threading_supported && ($mbox_imap == 'INBOX' \|\| (!$options['noselect'] && !$options['is_root']))) {
	$select = new html_select(array('name' => '_viewmode', 'id' => '_listmode'));
	$select->add(rcube_label('list'), 0);
	$select->add(rcube_label('threads'), 1);

	if (isset($_POST['_viewmode'])) {
	$value = (int) $_POST['_viewmode'];
	}
	else if (strlen($mbox_imap)) {
	$a_threaded = $RCMAIL->config->get('message_threading', array());
	$value = (int) isset($a_threaded[$mbox_imap]);
	}

	$form['props']['fieldsets']['settings']['content']['viewmode'] = array(
	'label' => rcube_label('listmode'),
	'value' => $select->show($value),
	);
	}
	/*
	// Settings: sorting column
	$select = new html_select(array('name' => '_sortcol', 'id' => '_sortcol'));
	$select->add(rcube_label('nonesort'), '');
	$select->add(rcube_label('arrival'), 'arrival');
	$select->add(rcube_label('sentdate'), 'date');
	$select->add(rcube_label('subject'), 'subject');
	$select->add(rcube_label('fromto'), 'from');
	$select->add(rcube_label('replyto'), 'replyto');
	$select->add(rcube_label('cc'), 'cc');
	$select->add(rcube_label('size'), 'size');

	$value = isset($_POST['_sortcol']) ? $_POST['_sortcol'] : '';

	$form['props']['fieldsets']['settings']['content']['sortcol'] = array(
	'label' => rcube_label('listsorting'),
	'value' => $select->show($value),
	);

	// Settings: sorting order
	$select = new html_select(array('name' => '_sortord', 'id' => '_sortord'));
	$select->add(rcube_label('asc'), 'ASC');
	$select->add(rcube_label('desc'), 'DESC');

	$value = isset($_POST['_sortord']) ? $_POST['_sortord'] : '';

	$form['props']['fieldsets']['settings']['content']['sortord'] = array(
	'label' => rcube_label('listorder'),
	'value' => $select->show(),
	);
	*/
	// Information (count, size) - Edit mode
	if (strlen($mbox)) {
	// Number of messages
	$form['props']['fieldsets']['info'] = array(
	'name' => rcube_label('info'),
	'content' => array()
	);

	if ((!$options['noselect'] && !$options['is_root']) \|\| $mbox_imap == 'INBOX') {
	$msgcount = $storage->count($mbox_imap, 'ALL', true, false);

	// Size
	if ($msgcount) {
	// create link with folder-size command
	$onclick = sprintf("return %s.command('folder-size', '%s', this)",
	JS_OBJECT_NAME, JQ($mbox_imap));
	$size = html::a(array('href' => '#', 'onclick' => $onclick,
	'id' => 'folder-size'), rcube_label('getfoldersize'));
	}
	else {
	// no messages -> zero size
	$size = 0;
	}

	$form['props']['fieldsets']['info']['content']['count'] = array(
	'label' => rcube_label('messagecount'),
	'value' => (int) $msgcount
	);
	$form['props']['fieldsets']['info']['content']['size'] = array(
	'label' => rcube_label('size'),
	'value' => $size,
	);
	}

	// show folder type only if we have non-private namespaces
	if (!empty($namespace['shared']) \|\| !empty($namespace['others'])) {
	$form['props']['fieldsets']['info']['content']['foldertype'] = array(
	'label' => rcube_label('foldertype'),
	'value' => rcube_label($options['namespace'] . 'folder'));
	}
	}

	// Allow plugins to modify folder form content
	$plugin = $RCMAIL->plugins->exec_hook('folder_form',
	array('form' => $form, 'options' => $options,
	'name' => $mbox_imap, 'parent_name' => $parent_imap));

	$form = $plugin['form'];

	// Set form tags and hidden fields
	list($form_start, $form_end) = get_form_tags($attrib, 'save-folder', null, $hidden_fields);

	unset($attrib['form'], $attrib['id']);

	// return the complete edit form as table
	$out = "$form_start\n";

	// Create form output
	foreach ($form as $tab) {
	if (!empty($tab['fieldsets']) && is_array($tab['fieldsets'])) {
	$content = '';
	foreach ($tab['fieldsets'] as $fieldset) {
	$subcontent = rcmail_get_form_part($fieldset, $attrib);
	if ($subcontent) {
	$content .= html::tag('fieldset', null, html::tag('legend', null, Q($fieldset['name'])) . $subcontent) ."\n";
	}
	}
	}
	else {
	$content = rcmail_get_form_part($tab, $attrib);
	}

	if ($content) {
	$out .= html::tag('fieldset', null, html::tag('legend', null, Q($tab['name'])) . $content) ."\n";
	}
	}

	$out .= "\n$form_end";

	$RCMAIL->output->set_env('messagecount', (int) $msgcount);

	return $out;
	}

	function rcmail_get_form_part($form, $attrib = array())
	{
	$content = '';

	if (is_array($form['content']) && !empty($form['content'])) {
	$table = new html_table(array('cols' => 2));
	foreach ($form['content'] as $col => $colprop) {
	$colprop['id'] = '_'.$col;
	$label = !empty($colprop['label']) ? $colprop['label'] : rcube_label($col);

	$table->add('title', html::label($colprop['id'], Q($label)));
	$table->add(null, $colprop['value']);
	}
	$content = $table->show($attrib);
	}
	else {
	$content = $form['content'];
	}

	return $content;
	}


	//$OUTPUT->set_pagetitle(rcube_label('folders'));

	// register UI objects
	$OUTPUT->add_handlers(array(
	'folderdetails' => 'rcmail_folder_form',
	));

	$OUTPUT->add_label('nonamewarning');

	$OUTPUT->send('folderedit');

File Metadata

Mime Type: text/x-diff
Expires: Sat, Mar 1, 8:10 AM (1 d, 11 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 166331
Default Alt Text: (11 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions