EGroupware Enterprise Collaboration

Author: ralfbecker
Date: Fri Sep 29 21:55:44 2006
New Revision: 22557

URL: http://www.egroupware.org/viewvc?rev=3D3D22557&view=3D3Drev
Log:
new link widget

Modified:
    trunk/projectmanager/templates/default/app.css

Modified: trunk/projectmanager/templates/default/app.css
URL: http://www.egroupware.org/viewvc/trunk/projectmanager/templates/defaul=
=3D
t/app.css?rev=3D3D22557&r1=3D3D22556&r2=3D3D22557&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/projectmanager/templates/default/app.css (original)
+++ trunk/projectmanager/templates/default/app.css Fri Sep 29 21:55:44 2006
@@ -1,4 +1,4 @@
 =2EredItalic { color: red; font-style: italic; }
 =2Eplanned { font-style: italic; font-size: 95%; }
-=2EsolidBorder table { border: 2px solid black; }
+div.solidBorder { border: 2px solid black; }
 =2EdivSidebox { width: 190px; }

Author: ralfbecker
Date: Fri Sep 29 21:55:00 2006
New Revision: 22556

URL: http://www.egroupware.org/viewvc?rev=3D3D22556&view=3D3Drev
Log:
- link widgets uses now ajax to search
- new sub-type to search and select an entry of a selectable or given app
- more to come

Added:
    trunk/etemplate/templates/default/link_widget.add.xet
    trunk/etemplate/templates/default/link_widget.entry.xet
    trunk/etemplate/templates/default/link_widget.to.xet
Removed:
    trunk/etemplate/templates/default/link_widget.create.xet
    trunk/etemplate/templates/default/link_widget.search.xet
Modified:
    trunk/etemplate/inc/class.link_widget.inc.php
    trunk/etemplate/setup/etemplates.inc.php
    trunk/etemplate/templates/default/app.css

Modified: trunk/etemplate/inc/class.link_widget.inc.php
URL: http://www.egroupware.org/viewvc/trunk/etemplate/inc/class.link_widget=
=3D
.inc.php?rev=3D3D22556&r1=3D3D22555&r2=3D3D22556&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/etemplate/inc/class.link_widget.inc.php (original)
+++ trunk/etemplate/inc/class.link_widget.inc.php Fri Sep 29 21:55:00 2006
@@ -25,6 +25,8 @@
 	 * - link-string: comma-separated list of link-titles with a link to its =
=3D
view method, value is like get_links() =3D

 	 *	or array with keys to_app and to_id (widget calls then get_links itsel=
=3D
f)
 	 * - link-add:    Add a new entry of the select app, which is already lin=
=3D
ked to a given entry
+	 * - link-entry:  Allow to select an entry of a selectable or in options =
=3D
specified app
+	 * - link-apps:   Select an app registerd in the link system, options: ''=
=3D
 or 'add'
 	 *
 	 *<code>
 	 * $content[$name] =3D3D array(
@@ -52,8 +54,9 @@
 		 * @var array exported methods of this class
 		 */
 		var $public_functions =3D3D array(
-			'pre_process' =3D3D> True,
-			'post_process' =3D3D> True
+			'pre_process'  =3D3D> True,
+			'post_process' =3D3D> True,
+			'ajax_search'  =3D3D> True,
 		);
 		/**
 		 * @var array availible extensions and there names for the editor
@@ -63,14 +66,18 @@
 			'link-to'     =3D3D> 'LinkTo',
 			'link-list'   =3D3D> 'LinkList',
 			'link-string' =3D3D> 'LinkString',
-			'link-add'    =3D3D> 'LinkEntry',
+			'link-add'    =3D3D> 'LinkAdd',
+			'link-entry'  =3D3D> 'LinkEntry',
+			'link-apps'   =3D3D> 'LinkApps',
 		);
 		/**
 		 * @var boolean $debug switches debug-messages on and off
 		 */
 		var $debug =3D3D False;
 		/**
-		 * @var object $link reference to the link class
+		 * reference to the link class
+		 * =3D

+		 * @var bolink
 		 */
 		var $link;
 =3D

@@ -79,7 +86,7 @@
 		 *
 		 * @param string $ui '' for html
 		 */
-		function link_widget($ui)
+		function link_widget($ui=3D3D'')
 		{
 			if (!is_object($GLOBALS['egw']->link))
 			{
@@ -103,7 +110,7 @@
 		 */
 		function pre_process($name,&$value,&$cell,&$readonlys,&$extension_data,&=
=3D
$tmpl)
 		{
-			$type =3D3D $cell['type'];
+			$extension_data['type'] =3D3D $type =3D3D $cell['type'];
 			$help =3D3D $cell['help'] ? ($value['help'] ? $value['help'] : $cell['h=
el=3D
p']) : lang('view this linked entry in its application');
 =3D

 			if (($type =3D3D=3D3D 'link-to' || $type =3D3D=3D3D 'link-add') && ($ce=
ll['read=3D
only'] || $readonlys))
@@ -113,7 +120,7 @@
 				$cell =3D3D $tmpl->empty_cell();
 				return;
 			}
-			if (!is_array($value) && $type !=3D3D 'link-string' && $type !=3D3D 'li=
nk')
+			if (!is_array($value) && in_array($type,array('link-to','link-list','li=
=3D
nk-add')))
 			{
 				$value =3D3D array(
 					'to_id' =3D3D> $value,
@@ -126,7 +133,7 @@
 				echo "<p>start: $cell[type][$name]::pre_process: value =3D3D"; _debug_=
ar=3D
ray($value);
 				echo "extension_data[$cell[type]][$name] =3D3D"; _debug_array($extensi=
on=3D
_data);
 			}
-			switch ($type =3D3D $cell['type'])
+			switch ($cell['type'])
 			{
 			case 'link':
 				$cell['readonly'] =3D3D True;	// set it readonly to NOT call our post_=
pr=3D
ocess function
@@ -223,6 +230,13 @@
 				break;
 =3D

 			case 'link-to':
+				$GLOBALS['egw_info']['flags']['include_xajax'] =3D3D true;
+				if ($value['search_label'] && $extension_data['search_label'] !=3D3D $=
va=3D
lue['search_label']) $value['search_label'] =3D3D lang($value['search_label=
']=3D
);
+				$extension_data =3D3D $value;
+				$tpl =3D3D& new etemplate('etemplate.link_widget.to');
+				if ($value['link_label']) $tpl->set_cell_attribute('create','label',$v=
=3D
alue['link_label']);
+				if ($value['search_label']) $tpl->set_cell_attribute('search','label',=
=3D
$value['search_label']);
+				/* old request code
 				$value['msg'] =3D3D '';
 				if ($value['button'] =3D3D=3D3D 'search' && count($ids =3D3D $this->li=
nk->qu=3D
ery($value['app'],$value['query'])))
 				{
@@ -258,7 +272,7 @@
 					}
 					$tpl->set_cell_attribute('comment','onchange',"set_style_by_class('*'=
=3D
,'hide_comment','display',this.checked ? 'block' : 'none');");
 					unset($value['comment']);
-				}
+				}*/
 				break;
 =3D

 			case 'link-list':
@@ -309,6 +323,63 @@
 					}
 				}
 				break;
+
+			case 'link-entry':
+				$GLOBALS['egw_info']['flags']['include_xajax'] =3D3D true;
+				$tpl =3D3D& new etemplate('etemplate.link_widget.entry');
+				if ($value)	// show pre-selected entry in select-box and not the search
+				{
+					// add selected-entry plus "new search" to the selectbox-options
+					if (($app =3D3D $cell['size']))
+					{
+						$id =3D3D $value;
+					}
+					else
+					{
+						list($app,$id) =3D3D explode(':',$value);
+					}
+					if ($id && ($title =3D3D $this->link->title($app,$id)))
+					{
+						$selectbox =3D3D& $tpl->get_widget_by_name('id');
+						$selectbox['sel_options'] =3D3D array(
+							$id =3D3D> $title,
+							'' =3D3D> lang('new search').' ...',
+						);
+						// remove link_hide class from select-box-line
+						$span =3D3D& $tpl->get_cell_attribute('select_line','span');
+						$span =3D3D str_replace('link_hide','',$span);
+						// add link_hide class to search_line
+						$span =3D3D& $tpl->get_cell_attribute('search_line','span');
+						$span .=3D3D ' link_hide';
+						unset($span);
+					}
+				}
+				if (($extension_data['app'] =3D3D $cell['size']))	// no app-selection,=
 u=3D
sing app given in $cell['size']
+				{
+					$tpl->disable_cells('app');	=3D

+					$onchange =3D3D& $tpl->get_cell_attribute('search','onclick');
+					$onchange =3D3D str_replace("document.getElementById(form::name('app'=
))=3D
.value",'\''.$cell['size'].'\'',$onchange);
+					unset($onchange);
+				}
+				$value =3D3D array(
+					'app'        =3D3D> $cell['size'],
+					'no_app_sel' =3D3D> !!$cell['size'],
+					'id'         =3D3D> $value,
+				);
+				break;
+				=3D

+			case 'link-apps':
+				$apps =3D3D $this->link->app_list($cell['size']);
+				if (!$apps)	// cant do an add without apps or already created entry
+				{
+					$cell =3D3D $tmpl->empty_cell();
+					return;
+				}
+				asort($apps);	// sort them alphabetic
+				$cell['sel_options'] =3D3D $apps;
+				$cell['no_lang'] =3D3D True;	// already translated
+				$cell['type'] =3D3D 'select';
+				return true;
 			}
 			$cell['size'] =3D3D $cell['name'];
 			$cell['type'] =3D3D 'template';
@@ -345,6 +416,16 @@
 		{
 			//echo "<p>link_widget::post_process('$name',value=3D3D".print_r($value=
,t=3D
rue).",ext=3D3D".print_r($extension_data,true).",$loop,,value_in=3D3D".prin=
t_r(=3D
$value_in,true)."</p>\n";
 =3D

+			switch($extension_data['type'])
+			{
+				case 'link-entry':
+					$value =3D3D $extension_data['app'] ? $value_in['id'] : $value['app']=
.'=3D
:'.$value_in['id'];
+					return !!$value_in['id'];
+					=3D

+				case 'link-apps':
+					$value =3D3D $value_in;
+					return !!$value;
+			}
 			$buttons =3D3D array('search','create','new','upload','attach');
 			while (!$button && list(,$bname) =3D3D each($buttons))
 			{
@@ -374,7 +455,7 @@
 					{
 						$link_id =3D3D $this->link->link($value['to_app'],$value['to_id'],
 							$value['app'],$value['id'],$value['remark']);
-						$value['remark'] =3D3D '';
+						$value['remark'] =3D3D $value['query'] =3D3D '';
 =3D

 						if (isset($value['primary']) && !$value['anz_links'] )
 						{
@@ -405,6 +486,7 @@
 						{
 							$value['primary'] =3D3D $link_id;
 						}
+						unset($value['comment']);
 						unset($value['file']);
 					}
 					else
@@ -437,4 +519,46 @@
 			}
 			return True;
 		}
+		=3D

+		/**
+		 * ajax callback to search in $app for $pattern, result is displayed in =
=3D
$id
+		 *
+		 * @param string $app app-name to search
+		 * @param string $pattern search-pattern
+		 * @param string $id_res id of selectbox to show the result
+		 * @param string $id_hide id(s) of the search-box/-line to hide after a =
=3D
successful search
+		 * @param string $id_show id(s) of the select-box/-line to show after a =
=3D
successful search
+		 * @param string $id_input id of the search input-field
+		 */
+		function ajax_search($app,$pattern,$id_res,$id_hide,$id_show,$id_input)
+		{
+			$response =3D3D new xajaxResponse();
+			//$args =3D3D func_get_args(); $response->addAlert("link_widget::ajax_s=
ea=3D
rch('".implode("','",$args)."')");
+			=3D

+			if (!($found =3D3D $this->link->query($app,$pattern =3D3D=3D3D lang('Se=
arch')=3D
 ? '' : $pattern)))	// ignore the blur-text
+			{
+				$response->addAlert(lang('Nothing found - try again !!!'));
+				$response->addScript("document.getElementById('$id_input').select();");
+			}
+			else
+			{
+				$script =3D3D "var select =3D3D document.getElementById('$id_res');\ns=
elec=3D
t=2Eoptions.length=3D3D0;\n";
+				foreach($found as $id =3D3D> $title)
+				{
+					$script .=3D3D "select.options[select.options.length] =3D3D new Optio=
n('"=3D
.addslashes($title)."','$id');\n";
+				}
+				$script .=3D3D "select.options[select.options.length] =3D3D new Option=
('".=3D
addslashes(lang('New search').' ...')."','');\n";
+				foreach(explode(',',$id_show) as $id)
+				{
+					$script .=3D3D "document.getElementById('$id').style.display=3D3D'inl=
ine'=3D
;\n";
+				}
+				foreach(explode(',',$id_hide) as $id)
+				{
+					$script .=3D3D "document.getElementById('$id').style.display=3D3D'non=
e';\=3D
n";
+				}
+				//$response->addAlert($script);
+				$response->addScript($script);
+			}
+			return $response->getXML();
+		}
 	}

Modified: trunk/etemplate/setup/etemplates.inc.php
URL: http://www.egroupware.org/viewvc/trunk/etemplate/setup/etemplates.inc.=
=3D
php?rev=3D3D22556&r1=3D3D22555&r2=3D3D22556&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/etemplate/setup/etemplates.inc.php (original)
+++ trunk/etemplate/setup/etemplates.inc.php Fri Sep 29 21:55:00 2006
@@ -2,7 +2,7 @@
 	/**
 	 * eGroupWare - eTemplates for Application etemplate
 	 * http://www.egroupware.org =3D

-	 * generated by soetemplate::dump4setup() 2006-09-25 18:00
+	 * generated by soetemplate::dump4setup() 2006-09-29 23:54
 	 *
 	 * @license http://opensource.org/licenses/gpl-license.php GPL - GNU Gene=
=3D
ral Public License
 	 * @package etemplate
@@ -117,11 +117,16 @@
 $templ_data[] =3D3D array('name' =3D3D> 'etemplate.link_widget.add','templ=
ate'=3D
 =3D3D> '','lang' =3D3D> '','group' =3D3D> '0','version' =3D3D> '1.2.001','=
data' =3D
=3D3D> 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a=
:2=3D
:{s:1:"A";a:5:{s:4:"type";s:6:"select";s:4:"name";s:3:"app";s:4:"help";s:43=
=3D
:"Add a new entry of the selected application";s:5:"label";s:7:"Add new";s:=
=3D
7:"no_lang";s:1:"1";}s:1:"B";a:5:{s:4:"type";s:6:"button";s:5:"label";s:3:"=
=3D
Add";s:4:"name";s:3:"add";s:4:"help";s:43:"Add a new entry of the selected =
=3D
application";s:7:"onclick";s:64:"eval(this.form.elements[form::name(\'app\'=
=3D
)].value); return false;";}}}s:4:"rows";i:1;s:4:"cols";i:2;}}','size' =3D3D=
> =3D
'','style' =3D3D> '.redItalic { font-style: italic; color: red; }
 =2Ehide_comment { display: none; }','modified' =3D3D> '1131618647',);
 =3D

+$templ_data[] =3D3D array('name' =3D3D> 'etemplate.link_widget.add','templ=
ate'=3D
 =3D3D> '','lang' =3D3D> '','group' =3D3D> '0','version' =3D3D> '1.3.001','=
data' =3D
=3D3D> 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a=
:2=3D
:{s:1:"A";a:5:{s:4:"type";s:6:"select";s:4:"name";s:3:"app";s:4:"help";s:43=
=3D
:"Add a new entry of the selected application";s:5:"label";s:7:"Add new";s:=
=3D
7:"no_lang";s:1:"1";}s:1:"B";a:5:{s:4:"type";s:6:"button";s:5:"label";s:3:"=
=3D
Add";s:4:"name";s:3:"add";s:4:"help";s:43:"Add a new entry of the selected =
=3D
application";s:7:"onclick";s:64:"eval(this.form.elements[form::name(\'app\'=
=3D
)].value); return false;";}}}s:4:"rows";i:1;s:4:"cols";i:2;}}','size' =3D3D=
> =3D
'','style' =3D3D> '','modified' =3D3D> '1159565080',);
+
 $templ_data[] =3D3D array('name' =3D3D> 'etemplate.link_widget.add-test','=
temp=3D
late' =3D3D> '','lang' =3D3D> '','group' =3D3D> '0','version' =3D3D> '','da=
ta' =3D3D>=3D
 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:=
=3D
1:"A";a:2:{s:4:"type";s:8:"link-add";s:4:"name";s:3:"add";}}}s:4:"rows";i:1=
=3D
;s:4:"cols";i:1;}}','size' =3D3D> '','style' =3D3D> '','modified' =3D3D> '1=
131620=3D
509',);
 =3D

 $templ_data[] =3D3D array('name' =3D3D> 'etemplate.link_widget.attach','te=
mpla=3D
te' =3D3D> '','lang' =3D3D> '','group' =3D3D> '0','version' =3D3D> '0.9.15.=
001','da=3D
ta' =3D3D> 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:2:{s:=
2:=3D
"c1";s:6:"row_on";s:2:"c2";s:7:"row_off";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";=
=3D
s:5:"label";s:5:"label";s:4:"File";}s:1:"B";a:4:{s:4:"type";s:5:"label";s:4=
=3D
:"span";s:11:",like_input";s:7:"no_lang";s:1:"1";s:4:"name";s:10:"file[path=
=3D
]";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Attach";s:4:"name=
=3D
";s:6:"attach";s:4:"help";s:29:"click here to attach the file";}s:1:"D";a:4=
=3D
:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:3:"new";s:4=
=3D
:"help";s:36:"start a new search, cancel this link";}}i:2;a:4:{s:1:"A";a:2:=
=3D
{s:4:"type";s:5:"label";s:5:"label";s:7:"Comment";}s:1:"B";a:5:{s:4:"type";=
=3D
s:4:"text";s:4:"size";s:5:"50,50";s:4:"span";s:3:"all";s:4:"name";s:6:"rema=
=3D
rk";s:4:"help";s:28:"optional note about the Link";}s:1:"C";a:1:{s:4:"type"=
=3D
;s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:2;s:4:"co=
=3D
ls";i:4;}}','size' =3D3D> '','style' =3D3D> '.like_input { background: whit=
e; b=3D
order: medium groove black; padding-left: 3px; padding-right: 3px; }','modi=
=3D
fied' =3D3D> '1035118591',);
 =3D

 $templ_data[] =3D3D array('name' =3D3D> 'etemplate.link_widget.create','te=
mpla=3D
te' =3D3D> '','lang' =3D3D> '','group' =3D3D> '0','version' =3D3D> '0.9.15.=
001','da=3D
ta' =3D3D> 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:2:{s:=
2:=3D
"c1";s:6:"row_on";s:2:"c2";s:7:"row_off";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";=
=3D
s:5:"label";s:4:"name";s:3:"app";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:7:=
=3D
"no_lang";s:1:"1";s:4:"name";s:2:"id";s:4:"help";s:28:"Select an entry to l=
=3D
ink with";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Link";s:4:=
=3D
"name";s:6:"create";s:4:"help";s:29:"click here to create the Link";}s:1:"D=
=3D
";a:4:{s:4:"type";s:6:"button";s:5:"label";s:10:"New search";s:4:"name";s:3=
=3D
:"new";s:4:"help";s:36:"start a new search, cancel this link";}}i:2;a:4:{s:=
=3D
1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Comment";}s:1:"B";a:5:{s=
=3D
:4:"type";s:4:"text";s:4:"size";s:5:"50,50";s:4:"span";s:3:"all";s:4:"name"=
=3D
;s:6:"remark";s:4:"help";s:28:"optional note about the Link";}s:1:"C";a:1:{=
=3D
s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i=
=3D
:2;s:4:"cols";i:4;}}','size' =3D3D> '','style' =3D3D> '','modified' =3D3D> =
'10350=3D
43515',);
+
+$templ_data[] =3D3D array('name' =3D3D> 'etemplate.link_widget.entry','tem=
plat=3D
e' =3D3D> '','lang' =3D3D> '','group' =3D3D> '0','version' =3D3D> '1.3.001'=
,'data' =3D
=3D3D> 'a:1:{i:0;a:7:{s:4:"type";s:3:"box";s:4:"data";a:2:{i:0;a:0:{}i:1;a:=
1:=3D
{s:1:"A";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"=
=3D
size";s:1:"2";i:1;a:7:{s:4:"type";s:3:"box";s:4:"size";s:6:"3,,0,0";i:1;a:3=
=3D
:{s:4:"type";s:9:"link-apps";s:4:"name";s:3:"app";s:4:"help";s:28:"Select a=
=3D
pplication to search";}i:2;a:3:{s:4:"type";s:4:"text";s:4:"name";s:5:"query=
=3D
";s:4:"blur";s:6:"Search";}s:4:"span";s:11:",box_inline";s:4:"name";s:11:"s=
=3D
earch_line";i:3;a:5:{s:4:"type";s:6:"button";s:4:"name";s:6:"search";s:5:"l=
=3D
abel";s:1:">";s:4:"help";s:30:"Click here to start the search";s:7:"onclick=
=3D
";s:256:"xajax_doXMLHTTP(\'etemplate.link_widget.ajax_search\',document.get=
=3D
ElementById(form::name(\'app\')).value,document.getElementById(form::name(\=
=3D
'query\')).value,form::name(\'id\'),form::name(\'search_line\'),form::name(=
=3D
\'select_line\'),form::name(\'query\')); return false;";}}i:2;a:5:{s:4:"typ=
=3D
e";s:3:"box";s:4:"size";s:1:"1";s:4:"span";s:22:",link_select link_hide";i:=
=3D
1;a:4:{s:4:"type";s:6:"select";s:4:"name";s:2:"id";s:8:"onchange";s:167:"if=
=3D
 (!this.value) { document.getElementById(form::name(\'search_line\')).style=
=3D
.display=3D3D\'inline\'; document.getElementById(form::name(\'select_line\'=
))=3D
.style.display=3D3D\'none\';}";s:7:"no_lang";s:1:"1";}s:4:"name";s:11:"sele=
ct=3D
_line";}}}','size' =3D3D> '','style' =3D3D> '.link_hide { display: none; }
+','modified' =3D3D> '1159544478',);
 =3D

 $templ_data[] =3D3D array('name' =3D3D> 'etemplate.link_widget.list','temp=
late=3D
' =3D3D> '','lang' =3D3D> '','group' =3D3D> '0','version' =3D3D> '0.9.15.00=
3','data=3D
' =3D3D> 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:2:{s:1:=
"D=3D
";s:10:",!@primary";s:2:"c1";s:3:"nmr";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:=
=3D
5:"label";s:4:"name";s:11:"${row}[app]";}s:1:"B";a:4:{s:4:"type";s:4:"hbox"=
=3D
;s:4:"size";s:5:"2,0,0";i:1;a:5:{s:4:"type";s:5:"label";s:4:"size";s:14:",@=
=3D
${row}[view]";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"${row}[title]";s:4:"he=
=3D
lp";s:41:"view this linked entry in its application";}i:2;a:4:{s:4:"type";s=
=3D
:5:"label";s:4:"span";s:15:",note_following";s:7:"no_lang";s:1:"1";s:4:"nam=
=3D
e";s:14:"${row}[remark]";}}s:1:"C";a:5:{s:4:"type";s:6:"button";s:4:"size";=
=3D
s:10:"delete.png";s:5:"label";s:6:"Unlink";s:4:"name";s:26:"unlink[$row_con=
=3D
t[link_id]]";s:4:"help";s:39:"Remove this link (not the entry itself)";}s:1=
=3D
:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:18:"$row_cont[link_id]";s:4:"=
=3D
name";s:7:"primary";s:4:"help";s:45:"Select a primary contact, to show in t=
=3D
he list";}}}s:4:"rows";i:1;s:4:"cols";i:4;s:4:"size";s:12:",,,whiteback";}}=
=3D
','size' =3D3D> ',,,whiteback','style' =3D3D> '.whiteback { background: whi=
te; }
 =2Enote_following { font-style: italic; padding-left: 5px; }','modified' =
=3D3D=3D
> '1035126186',);
@@ -131,8 +136,19 @@
 =3D

 $templ_data[] =3D3D array('name' =3D3D> 'etemplate.link_widget.search','te=
mpla=3D
te' =3D3D> '','lang' =3D3D> '','group' =3D3D> '0','version' =3D3D> '1.0.0.0=
01','dat=3D
a' =3D3D> 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:5:{s:2=
:"=3D
c1";s:6:"row_on";s:2:"c3";s:7:"row_off";s:2:"h3";s:10:",@no_files";s:2:"c2"=
=3D
;s:6:"row_on";s:2:"h2";s:6:",!@msg";}i:1;a:3:{s:1:"A";a:5:{s:4:"type";s:6:"=
=3D
select";s:5:"label";s:6:"Search";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"app"=
=3D
;s:4:"help";s:26:"Select an App to search in";}s:1:"B";a:4:{s:4:"type";s:4:=
=3D
"text";s:4:"size";s:2:"25";s:4:"name";s:5:"query";s:4:"help";s:22:"Enter a =
=3D
search pattern";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Sear=
=3D
ch";s:4:"name";s:6:"search";s:4:"help";s:30:"Click here to start the search=
=3D
";}}i:2;a:3:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redIt=
=3D
alic";s:4:"name";s:3:"msg";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type=
=3D
";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:3;a:3:{s:1:"A";a:2:{=
=3D
s:4:"type";s:5:"label";s:5:"label";s:11:"attach file";}s:1:"B";a:3:{s:4:"ty=
=3D
pe";s:4:"file";s:4:"name";s:4:"file";s:4:"help";s:69:"Enter filename to upl=
=3D
oad and attach, use [Browse...] to search for it";}s:1:"C";a:4:{s:4:"type";=
=3D
s:6:"button";s:5:"label";s:6:"Upload";s:4:"name";s:6:"upload";s:4:"help";s:=
=3D
29:"Click here to upload the file";}}}s:4:"rows";i:3;s:4:"cols";i:3;}}','si=
=3D
ze' =3D3D> '','style' =3D3D> '.error_msg { font-style: italic; color: red; =
}','=3D
modified' =3D3D> '1113223869',);
 =3D

-$templ_data[] =3D3D array('name' =3D3D> 'etemplate.link_widget.search','te=
mpla=3D
te' =3D3D> '','lang' =3D3D> '','group' =3D3D> '0','version' =3D3D> '1.2.001=
','data'=3D
 =3D3D> 'a:2:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:5:{s:2:"=
c1=3D
";s:6:"row_on";s:2:"c3";s:7:"row_off";s:2:"h3";s:10:",@no_files";s:2:"c2";s=
=3D
:6:"row_on";s:2:"h2";s:6:",!@msg";}i:1;a:4:{s:1:"A";a:4:{s:4:"type";s:6:"se=
=3D
lect";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"app";s:4:"help";s:26:"Select an=
=3D
 App to search in";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"32";=
=3D
s:4:"name";s:5:"query";s:4:"help";s:22:"Enter a search pattern";s:8:"tabind=
=3D
ex";i:99;}s:1:"C";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Search";s:4=
=3D
:"name";s:6:"search";s:4:"help";s:30:"Click here to start the search";s:4:"=
=3D
span";s:3:"all";s:8:"tabindex";i:100;}s:1:"D";a:1:{s:4:"type";s:5:"label";}=
=3D
}i:2;a:4:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItali=
=3D
c";s:4:"name";s:3:"msg";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s=
=3D
:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:=
=3D
5:"label";}}i:3;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"=
=3D
Attach file";}s:1:"B";a:4:{s:4:"type";s:4:"file";s:4:"name";s:4:"file";s:4:=
=3D
"help";s:69:"Enter filename to upload and attach, use [Browse...] to search=
=3D
 for it";s:4:"size";s:2:"12";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"lab=
=3D
el";s:6:"Attach";s:4:"name";s:6:"attach";s:4:"help";s:29:"Click here to att=
=3D
ach the file";}s:1:"D";a:3:{s:4:"type";s:8:"checkbox";s:4:"name";s:7:"comme=
=3D
nt";s:4:"help";s:28:"optional note about the Link";}}}s:4:"rows";i:3;s:4:"c=
=3D
ols";i:4;}i:1;a:6:{s:4:"type";s:4:"text";s:4:"name";s:6:"remark";s:4:"size"=
=3D
;s:5:"50,50";s:4:"span";s:13:",hide_comment";s:5:"label";s:7:"Comment";s:4:=
=3D
"help";s:28:"optional note about the Link";}}','size' =3D3D> '','style' =3D=
3D> =3D
'=2EredItalic { font-style: italic; color: red; }
+$templ_data[] =3D3D array('name' =3D3D> 'etemplate.link_widget.search','te=
mpla=3D
te' =3D3D> '','lang' =3D3D> '','group' =3D3D> '0','version' =3D3D> '1.2.001=
','data'=3D
 =3D3D> 'a:2:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:5:{s:2:"=
c1=3D
";s:6:"row_on";s:2:"c3";s:7:"row_off";s:2:"h3";s:10:",@no_files";s:2:"c2";s=
=3D
:6:"row_on";s:2:"h2";s:6:",!@msg";}i:1;a:4:{s:1:"A";a:4:{s:4:"type";s:6:"se=
=3D
lect";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"app";s:4:"help";s:26:"Select an=
=3D
 App to search in";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"32";=
=3D
s:4:"name";s:5:"query";s:4:"help";s:22:"Enter a search pattern";s:8:"tabind=
=3D
ex";i:99;}s:1:"C";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Search";s:4=
=3D
:"name";s:6:"search";s:4:"help";s:30:"Click here to start the search";s:4:"=
=3D
span";s:3:"all";s:8:"tabindex";i:100;}s:1:"D";a:1:{s:4:"type";s:5:"label";}=
=3D
}i:2;a:4:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItali=
=3D
c";s:4:"name";s:3:"msg";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s=
=3D
:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:=
=3D
5:"label";}}i:3;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"=
=3D
Attach file";}s:1:"B";a:4:{s:4:"type";s:4:"file";s:4:"name";s:4:"file";s:4:=
=3D
"help";s:69:"Enter filename to upload and attach, use [Browse...] to search=
=3D
 for it";s:4:"size";s:2:"12";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"lab=
=3D
el";s:6:"Attach";s:4:"name";s:6:"attach";s:4:"help";s:29:"Click here to att=
=3D
ach the file";}s:1:"D";a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:7:"comme=
=3D
nt";s:4:"help";s:28:"optional note about the Link";s:8:"onchange";s:81:"set=
=3D
_style_by_class(\'*\',\'hide_comment\',\'display\',this.checked ? \'block\'=
=3D
 : \'none\');";}}}s:4:"rows";i:3;s:4:"cols";i:4;}i:1;a:6:{s:4:"type";s:4:"t=
=3D
ext";s:4:"name";s:6:"remark";s:4:"size";s:5:"50,50";s:4:"span";s:13:",hide_=
=3D
comment";s:5:"label";s:7:"Comment";s:4:"help";s:28:"optional note about the=
=3D
 Link";}}','size' =3D3D> '','style' =3D3D> '.redItalic { font-style: italic=
; co=3D
lor: red; }
 =2Ehide_comment { display: none; }','modified' =3D3D> '1131608831',);
+
+$templ_data[] =3D3D array('name' =3D3D> 'etemplate.link_widget.to','templa=
te' =3D
=3D3D> '','lang' =3D3D> '','group' =3D3D> '0','version' =3D3D> '1.3.000','d=
ata' =3D3D=3D
> 'a:1:{i:0;a:7:{s:4:"type";s:3:"box";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:=
=3D
1:"A";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"siz=
=3D
e";s:1:"2";i:1;a:6:{s:4:"type";s:3:"box";s:4:"size";s:6:"3,,0,0";i:1;a:5:{s=
=3D
:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:9:"link-apps"=
=3D
;s:4:"name";s:3:"app";s:4:"help";s:28:"Select application to search";s:5:"l=
=3D
abel";s:13:"@search_label";}i:2;a:2:{s:4:"type";s:4:"text";s:4:"name";s:5:"=
=3D
query";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"name";s:5:"query";s:5:"label"=
=3D
;s:1:">";s:4:"help";s:6:"Search";s:7:"onclick";s:256:"xajax_doXMLHTTP(\'ete=
=3D
mplate.link_widget.ajax_search\',document.getElementById(form::name(\'app\'=
=3D
)).value,document.getElementById(form::name(\'query\')).value,form::name(\'=
=3D
id\'),form::name(\'search_line\'),form::name(\'select_line\'),form::name(\'=
=3D
query\')); return false;";}}i:2;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:2:{=
=3D
i:0;a:1:{s:2:"h1";s:10:",@no_files";}i:1;a:3:{s:1:"A";a:5:{s:4:"type";s:4:"=
=3D
file";s:4:"name";s:4:"file";s:4:"help";s:69:"Enter filename to upload and a=
=3D
ttach, use [Browse...] to search for it";s:4:"size";s:2:"12";s:5:"label";s:=
=3D
11:"attach file";}s:1:"B";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Att=
=3D
ach";s:4:"name";s:6:"attach";s:4:"help";s:29:"Click here to attach the file=
=3D
";}s:1:"C";a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:7:"comment";s:4:"hel=
=3D
p";s:28:"optional note about the Link";s:8:"onchange";s:88:"document.getEle=
=3D
mentById(form::name(\'remark\')).style.display=3D3Dthis.checked?\'block\':\=
'n=3D
one\';";}}}s:4:"rows";i:1;s:4:"cols";i:3;}s:4:"name";s:11:"search_line";i:3=
=3D
;a:6:{s:4:"type";s:4:"text";s:4:"name";s:6:"remark";s:4:"size";s:5:"50,50";=
=3D
s:4:"span";s:13:",hide_comment";s:4:"help";s:28:"optional note about the Li=
=3D
nk";s:4:"blur";s:7:"Comment";}}i:2;a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:=
=3D
1:"3";s:4:"span";s:22:",link_select link_hide";i:1;a:4:{s:4:"type";s:6:"sel=
=3D
ect";s:4:"name";s:2:"id";s:8:"onchange";s:167:"if (!this.value) { document.=
=3D
getElementById(form::name(\'search_line\')).style.display=3D3D\'inline\'; d=
oc=3D
ument.getElementById(form::name(\'select_line\')).style.display=3D3D\'none\=
';=3D
}";s:7:"no_lang";s:1:"1";}s:4:"name";s:11:"select_line";i:2;a:4:{s:4:"type"=
=3D
;s:6:"button";s:5:"label";s:4:"Link";s:4:"name";s:6:"create";s:4:"help";s:2=
=3D
9:"click here to create the Link";}i:3;a:6:{s:4:"type";s:4:"text";s:4:"size=
=3D
";s:5:"50,50";s:4:"name";s:6:"remark";s:4:"help";s:28:"optional note about =
=3D
the Link";s:4:"blur";s:7:"comment";s:4:"span";s:13:",link_comment";}}}}','s=
=3D
ize' =3D3D> '','style' =3D3D> '.link_select select { }
+=2Elink_comment { display: block; }
+=2Elink_hide { display: none; }
+=2EredItalic { font-style: italic; color: red; }
+=2Ehide_comment input { display: none; }','modified' =3D3D> '1159559249',);
+
+$templ_data[] =3D3D array('name' =3D3D> 'etemplate.link_widget.to','templa=
te' =3D
=3D3D> '','lang' =3D3D> '','group' =3D3D> '0','version' =3D3D> '1.3.001','d=
ata' =3D3D=3D
> 'a:1:{i:0;a:8:{s:4:"type";s:3:"box";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:=
=3D
1:"A";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"siz=
=3D
e";s:1:"3";i:1;a:5:{s:4:"type";s:3:"box";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s=
=3D
:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:9:"link-apps"=
=3D
;s:4:"name";s:3:"app";s:4:"help";s:28:"Select application to search";s:5:"l=
=3D
abel";s:13:"@search_label";}i:2;a:3:{s:4:"type";s:4:"text";s:4:"name";s:5:"=
=3D
query";s:4:"blur";s:6:"Search";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"name"=
=3D
;s:5:"query";s:5:"label";s:1:">";s:4:"help";s:30:"Click here to start the s=
=3D
earch";s:7:"onclick";s:281:"xajax_doXMLHTTP(\'etemplate.link_widget.ajax_se=
=3D
arch\',document.getElementById(form::name(\'app\')).value,document.getEleme=
=3D
ntById(form::name(\'query\')).value,form::name(\'id\'),form::name(\'search_=
=3D
line\'),form::name(\'remark\')+\',\'+form::name(\'select_line\'),form::name=
=3D
(\'query\')); return false;";}}i:2;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:=
=3D
2:{i:0;a:1:{s:2:"h1";s:10:",@no_files";}i:1;a:3:{s:1:"A";a:5:{s:4:"type";s:=
=3D
4:"file";s:4:"name";s:4:"file";s:4:"help";s:69:"Enter filename to upload an=
=3D
d attach, use [Browse...] to search for it";s:4:"size";s:2:"12";s:5:"label"=
=3D
;s:11:"attach file";}s:1:"B";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"=
=3D
Attach";s:4:"name";s:6:"attach";s:4:"help";s:29:"Click here to attach the f=
=3D
ile";}s:1:"C";a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:7:"comment";s:4:"=
=3D
help";s:28:"optional note about the Link";s:8:"onchange";s:88:"document.get=
=3D
ElementById(form::name(\'remark\')).style.display=3D3Dthis.checked?\'block\=
':=3D
\'none\';";}}}s:4:"rows";i:1;s:4:"cols";i:3;}s:4:"name";s:11:"search_line";=
=3D
}i:2;a:6:{s:4:"type";s:3:"box";s:4:"size";s:1:"2";s:4:"span";s:22:",link_se=
=3D
lect link_hide";i:1;a:4:{s:4:"type";s:6:"select";s:4:"name";s:2:"id";s:8:"o=
=3D
nchange";s:227:"if (!this.value) { document.getElementById(form::name(\'sea=
=3D
rch_line\')).style.display=3D3D\'inline\'; document.getElementById(form::na=
me=3D
(\'remark\')).style.display=3D3Ddocument.getElementById(form::name(\'select=
_l=3D
ine\')).style.display=3D3D\'none\';}";s:7:"no_lang";s:1:"1";}s:4:"name";s:1=
1:=3D
"select_line";i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Link";s:4:"=
=3D
name";s:6:"create";s:4:"help";s:29:"click here to create the Link";}}i:3;a:=
=3D
6:{s:4:"type";s:4:"text";s:4:"name";s:6:"remark";s:4:"size";s:5:"50,50";s:4=
=3D
:"span";s:13:",hide_comment";s:4:"help";s:28:"optional note about the Link"=
=3D
;s:4:"blur";s:7:"Comment";}}}','size' =3D3D> '','style' =3D3D> '.link_selec=
t { =3D
white-space: nowrap; }
+=2Elink_hide { display: none; }
+=2Ehide_comment input { display: none; width: 99%; }
+','modified' =3D3D> '1159565799',);
 =3D

 $templ_data[] =3D3D array('name' =3D3D> 'etemplate.nextm*','template' =3D3=
D> '',=3D
'lang' =3D3D> '','group' =3D3D> '0','version' =3D3D> '','data' =3D3D> 'a:1:=
{i:0;a:4=3D
:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:1:{s:4=
=3D
:"type";s:5:"label";}}}s:4:"rows";i:1;s:4:"cols";i:1;}}','size' =3D3D> '','=
st=3D
yle' =3D3D> '','modified' =3D3D> '1155977979',);
 =3D


Modified: trunk/etemplate/templates/default/app.css
URL: http://www.egroupware.org/viewvc/trunk/etemplate/templates/default/app=
=3D
.css?rev=3D3D22556&r1=3D3D22555&r2=3D3D22556&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/etemplate/templates/default/app.css (original)
+++ trunk/etemplate/templates/default/app.css Fri Sep 29 21:55:00 2006
@@ -1,5 +1,5 @@
 /* $Id$ */
 =2EredItalic { color: red; font-style: italic; }
 =2Egray { color: gray; }
-=2EclickWidgetToEdit { cursor: pointer; }
+=2EclickWidgetToEdit { cursor: pointer; display: inline; }
 =2EclickWidgetToEdit:hover { background-color: pink; }

Added: trunk/etemplate/templates/default/link_widget.add.xet
URL: http://www.egroupware.org/viewvc/trunk/etemplate/templates/default/lin=
=3D
k_widget.add.xet?rev=3D3D22556&view=3D3Dauto
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/etemplate/templates/default/link_widget.add.xet (added)
+++ trunk/etemplate/templates/default/link_widget.add.xet Fri Sep 29 21:55:=
=3D
00 2006
@@ -1,0 +1,20 @@
+<?xml version=3D3D"1.0"?>
+<!-- $Id$ -->
+<overlay>
+	<template id=3D3D"etemplate.link_widget.add" template=3D3D"" lang=3D3D"" =
group=3D
=3D3D"0" version=3D3D"1.3.001">
+		<grid>
+			<columns>
+				<column/>
+				<column/>
+			</columns>
+			<rows>
+				<row>
+					<menulist>
+						<menupopup id=3D3D"app" statustext=3D3D"Add a new entry of the selec=
ted =3D
application" label=3D3D"Add new" no_lang=3D3D"1"/>
+					</menulist>
+					<button label=3D3D"Add" id=3D3D"add" statustext=3D3D"Add a new entry =
of the=3D
 selected application" onclick=3D3D"eval(this.form.elements[form::name('app=
')=3D
]=2Evalue); return false;"/>
+				</row>
+			</rows>
+		</grid>
+	</template>
+</overlay>

Added: trunk/etemplate/templates/default/link_widget.entry.xet
URL: http://www.egroupware.org/viewvc/trunk/etemplate/templates/default/lin=
=3D
k_widget.entry.xet?rev=3D3D22556&view=3D3Dauto
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/etemplate/templates/default/link_widget.entry.xet (added)
+++ trunk/etemplate/templates/default/link_widget.entry.xet Fri Sep 29 21:5=
=3D
5:00 2006
@@ -1,0 +1,22 @@
+<?xml version=3D3D"1.0"?>
+<!-- $Id$ -->
+<overlay>
+	<template id=3D3D"etemplate.link_widget.entry" template=3D3D"" lang=3D3D"=
" grou=3D
p=3D3D"0" version=3D3D"1.3.001">
+		<box rows=3D3D"1" cols=3D3D"1">
+			<box options=3D3D"0,0" class=3D3D"box_inline" id=3D3D"search_line">
+				<link-apps id=3D3D"app" statustext=3D3D"Select application to search"/>
+				<textbox id=3D3D"query" blur=3D3D"Search"/>
+				<button id=3D3D"search" label=3D3D"&gt;" statustext=3D3D"Click here to=
 start=3D
 the search" onclick=3D3D"xajax_doXMLHTTP('etemplate.link_widget.ajax_searc=
h'=3D
,document.getElementById(form::name('app')).value,document.getElementById(f=
=3D
orm::name('query')).value,form::name('id'),form::name('search_line'),form::=
=3D
name('select_line'),form::name('query')); return false;"/>
+			</box>
+			<box class=3D3D"link_select link_hide" id=3D3D"select_line">
+				<menulist>
+					<menupopup id=3D3D"id" onchange=3D3D"if (!this.value) { document.getE=
leme=3D
ntById(form::name('search_line')).style.display=3D3D'inline'; document.getE=
le=3D
mentById(form::name('select_line')).style.display=3D3D'none';}" no_lang=3D3=
D"1"=3D
/>
+				</menulist>
+			</box>
+		</box>
+		<styles>
+			.link_hide { display: none; }
+
+		</styles>
+	</template>
+</overlay>

Added: trunk/etemplate/templates/default/link_widget.to.xet
URL: http://www.egroupware.org/viewvc/trunk/etemplate/templates/default/lin=
=3D
k_widget.to.xet?rev=3D3D22556&view=3D3Dauto
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/etemplate/templates/default/link_widget.to.xet (added)
+++ trunk/etemplate/templates/default/link_widget.to.xet Fri Sep 29 21:55:0=
=3D
0 2006
@@ -1,0 +1,42 @@
+<?xml version=3D3D"1.0"?>
+<!-- $Id$ -->
+<overlay>
+	<template id=3D3D"etemplate.link_widget.to" template=3D3D"" lang=3D3D"" g=
roup=3D
=3D3D"0" version=3D3D"1.3.001">
+		<box rows=3D3D"1" cols=3D3D"1">
+			<box options=3D3D"0,0" id=3D3D"search_line">
+				<hbox>
+					<link-apps id=3D3D"app" statustext=3D3D"Select application to search"=
 lab=3D
el=3D3D"@search_label"/>
+					<textbox id=3D3D"query" blur=3D3D"Search"/>
+					<button id=3D3D"query" label=3D3D"&gt;" statustext=3D3D"Click here to=
 start=3D
 the search" onclick=3D3D"xajax_doXMLHTTP('etemplate.link_widget.ajax_searc=
h'=3D
,document.getElementById(form::name('app')).value,document.getElementById(f=
=3D
orm::name('query')).value,form::name('id'),form::name('search_line'),form::=
=3D
name('remark')+','+form::name('select_line'),form::name('query')); return f=
=3D
alse;"/>
+				</hbox>
+				<grid>
+					<columns>
+						<column/>
+						<column/>
+						<column/>
+					</columns>
+					<rows>
+						<row disabled=3D3D"@no_files">
+							<file id=3D3D"file" statustext=3D3D"Enter filename to upload and at=
tach=3D
, use [Browse...] to search for it" options=3D3D"12" label=3D3D"attach file=
"/>
+							<button label=3D3D"Attach" id=3D3D"attach" statustext=3D3D"Click he=
re to =3D
attach the file"/>
+							<checkbox id=3D3D"comment" statustext=3D3D"optional note about the =
Link=3D
" onchange=3D3D"document.getElementById(form::name('remark')).style.display=
=3D
=3D3Dthis.checked?'block':'none';"/>
+						</row>
+					</rows>
+				</grid>
+			</box>
+			<box class=3D3D"link_select link_hide" id=3D3D"select_line">
+				<menulist>
+					<menupopup id=3D3D"id" onchange=3D3D"if (!this.value) { document.getE=
leme=3D
ntById(form::name('search_line')).style.display=3D3D'inline'; document.getE=
le=3D
mentById(form::name('remark')).style.display=3D3Ddocument.getElementById(fo=
rm=3D
::name('select_line')).style.display=3D3D'none';}" no_lang=3D3D"1"/>
+				</menulist>
+				<button label=3D3D"Link" id=3D3D"create" statustext=3D3D"click here to=
 creat=3D
e the Link"/>
+			</box>
+			<textbox id=3D3D"remark" size=3D3D"50" maxlength=3D3D"50" class=3D3D"hi=
de_comme=3D
nt" statustext=3D3D"optional note about the Link" blur=3D3D"Comment"/>
+		</box>
+		<styles>
+			.link_select { white-space: nowrap; }
+=2Elink_hide { display: none; }
+=2Ehide_comment input { display: none; width: 99%; }
+
+		</styles>
+	</template>
+</overlay>

Author: ralfbecker
Date: Fri Sep 29 21:47:29 2006
New Revision: 22555

URL: http://www.egroupware.org/viewvc?rev=3D3D22555&view=3D3Drev
Log:
- allow to set id for box, hbox, vbox and grid
- new function js_pseudo_funcs used for onchange and onclick:
  + form::name('name'): translates name in hirashical form-name used by ete=
=3D
mplate
  + egw::link('url','vars'): calls $egw->link()
  + confirm('message'): translates 'message'

Modified:
    trunk/etemplate/inc/class.uietemplate.inc.php

Modified: trunk/etemplate/inc/class.uietemplate.inc.php
URL: http://www.egroupware.org/viewvc/trunk/etemplate/inc/class.uietemplate=
=3D
.inc.php?rev=3D3D22555&r1=3D3D22554&r2=3D3D22555&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/etemplate/inc/class.uietemplate.inc.php (original)
+++ trunk/etemplate/inc/class.uietemplate.inc.php Fri Sep 29 21:47:29 2006
@@ -33,11 +33,18 @@
 	class etemplate extends boetemplate
 	{
 		/**
-		 * @var int/string=3D3D'' integer debug-level or template-name or cell-t=
yp=3D
e or '' =3D3D off
+		 * integer debug-level or template-name or cell-type or '' =3D3D off
 		 * 1=3D3Dcalls to show and process_show, 2=3D3Dcontent after process_sho=
w,
 		 * 3=3D3Dcalls to show_cell and process_show_cell
+		 * =3D

+		 * @var int/string
 		 */
 		var $debug;
+		/**
+		 * Instance of the html class
+		 *
+		 * @var html
+		 */
 		var $html;	/* instance of html-class */
 		var $xslt =3D3D false;	/* do we run in the xslt framework (true) or the =
re=3D
gular eGW one (false) */
 		var $class_conf =3D3D array('nmh' =3D3D> 'th','nmr0' =3D3D> 'row_on','nm=
r1' =3D
=3D3D> 'row_off');
@@ -706,6 +713,7 @@
 				}
 				$rows[$row] =3D3D $row_data;
 			}
+			if (!$rows) return '';
 =3D

 			list($width,$height,,,,,$overflow) =3D3D $options =3D3D explode(',',$gr=
id['=3D
size']);
 			if ($overflow && $height)
@@ -713,7 +721,8 @@
 				$options[1] =3D3D '';	// set height in div only
 			}
 			$html =3D3D $this->html->table($rows,$this->html->formatOptions($option=
s,=3D
'width,height,border,class,cellspacing,cellpadding').
-				$this->html->formatOptions($grid['span'],',class')/*TEST-RB,$no_table_=
=3D
tr*/);
+				$this->html->formatOptions($grid['span'],',class').
+				$this->html->formatOptions($grid['name']?$this->form_name($cname,$grid=
=3D
['name']):'','id'));
 =3D

 			if (!empty($overflow)) {
 				if (is_numeric($height)) $height .=3D3D 'px';
@@ -889,18 +898,13 @@
 				{
 					$options .=3D3D " onFocus=3D3D\"$onFocus\" onBlur=3D3D\"$onBlur\"";
 				}
-				if ($cell['onchange'] && $cell['type'] !=3D3D 'button') // values !=3D=
3D '=3D
1' can only set by a program (not in the editor so fa
+				if ($cell['onchange'] && $cell['type'] !=3D3D 'button')
 				{
 					if (strchr($cell['onchange'],'$') || $cell['onchange']{0} =3D3D=3D3D =
'@')
 					{
 						$cell['onchange'] =3D3D $this->expand_name($cell['onchange'],$show_c=
,$=3D
show_row,$content['.c'],$content['.row'],$content);
 					}
-					if (preg_match('/confirm\(["\']{1}(.*)["\']{1}\)/',$cell['onchange'],=
=3D
$matches))
-					{
-						$cell['onchange'] =3D3D preg_replace('/confirm\(["\']{1}(.*)["\']{1}=
\)=3D
/',
-							'confirm(\''.addslashes(lang($matches[1])).'\')',$cell['onchange']);
-					}
-					$options .=3D3D ' onChange=3D3D"'.($cell['onchange']=3D3D=3D3D'1'?'th=
is.form.=3D
submit();':$cell['onchange']).'"';
+					$options .=3D3D ' onChange=3D3D"'.($cell['onchange'] =3D3D=3D3D '1' ?=
 'this.f=3D
orm.submit();' : $this->js_pseudo_funcs($cell['onchange'],$cname)).'"';
 				}
 			}
 			if ($form_name !=3D3D '')
@@ -1074,22 +1078,7 @@
 					if ($cell['onclick'] &&
 						($onclick =3D3D $this->expand_name($cell['onclick'],$show_c,$show_ro=
w,=3D
$content['.c'],$content['.row'],$content)))
 					{
-						=3D

-						if (preg_match("/egw::link\\('([^']+)','([^']+)'\\)/",$onclick,$matc=
=3D
hes))
-						{
-							$url =3D3D $GLOBALS['egw']->link($matches[1],$matches[2]);
-							$onclick =3D3D preg_replace('/egw::link\(\'([^\']+)\',\'([^\']+)\'\=
)/=3D
','\''.$url.'\'',$onclick);
-						}
-						elseif (preg_match("/form::name\\('([^']+)'\\)/",$onclick,$matches))
-						{
-							$onclick =3D3D preg_replace("/form::name\\('([^']+)'\\)/",'\''.$thi=
s-=3D
>form_name($cname,$matches[1]).'\'',$onclick);
-						}
-						elseif (preg_match('/confirm\(["\']{1}(.*)["\']{1}\)/',$cell['onclic=
=3D
k'],$matches))
-						{
-							$question =3D3D lang($matches[1]).(substr($matches[1],-1) !=3D3D '?=
' ? =3D
'?' : '');	// add ? if not there, saves extra phrase
-							$onclick =3D3D preg_replace('/confirm\(["\']{1}(.*)["\']{1}\)/','co=
nf=3D
irm(\''.addslashes($question).'\')',$onclick);
-							//$onclick =3D3D "return confirm('".str_replace('\'','\\\'',$this->=
ht=3D
ml->htmlspecialchars($question))."');";
-						}
+						$onclick =3D3D $this->js_pseudo_funcs($onclick,$cname);
 					}
 					if ($this->java_script() && ($cell['onchange'] !=3D3D '' || $img && !=
$r=3D
eadonly) && !$cell['needed']) // use a link instead of a button
 					{
@@ -1422,11 +1411,13 @@
 					if ($box_anz > 1 && $orient)	// a single cell is NOT placed into a ta=
=3D
ble
 					{
 						$html =3D3D $this->html->table($rows,$this->html->formatOptions($cel=
l_=3D
options,',,cellpadding,cellspacing').
-							$this->html->formatOptions($cell['span'],',class').
+							$this->html->formatOptions($class,'class').
+							($type !=3D3D 'groupbox' && $cell['name'] ? ' id=3D3D"'.$form_name.=
'"' =3D
: '').
 							($cell['align'] && $orient !=3D3D 'horizontal' || $sub_cell_has_ali=
gn=3D
 ? ' width=3D3D"100%"' : ''));	// alignment only works if table has full wi=
dth
+						$class =3D3D '';	// otherwise we create an extra div
 					}
 					// put the class of the box-cell, into the the class of this cell
-					elseif ($box_item_class)
+					elseif ($box_item_class && $box_anz =3D3D=3D3D 1)
 					{
 						$class =3D3D ($class ? $class . ' ' : '') . $box_item_class;
 					}
@@ -1436,16 +1427,17 @@
 						{
 							$label =3D3D lang($label);
 						}
-						$html =3D3D $this->html->fieldset($html,$label);
+						$html =3D3D $this->html->fieldset($html,$label,$cell['name'] ? ' id=
=3D3D=3D
"'.$form_name.'"' : '');
 					}
 					elseif (!$orient)
 					{
 						$html =3D3D $this->html->div($html,$this->html->formatOptions(array(
 								$cell['height'],
 								$cell['width'],
-								$cell['class'],
-								$cell['name']
+								$class,
+								$cell['name'] ? $form_name : '',
 							),'height,widht,class,id')). ($html ? '' : '</div>');
+						$class =3D3D '';	// otherwise we create an extra div
 					}
 					if ($box_anz > 1)	// small docu in the html-source
 					{
@@ -1578,6 +1570,41 @@
 				return $this->html->div($html,' ondblclick=3D3D"'.$handler.'"','clickW=
id=3D
getToEdit');
 			}
 			return $html;
+		}
+
+		/**
+		 * Resolve javascript pseudo functions: =3D

+		 * - egw::link('$l','$p') calls $egw->link($l,$p)
+		 * - form::name('name') returns expanded name/id taking into account the=
=3D
 name at that point of the template hierashy
+		 * - confirm('message') translates 'message' and adds a '?' if not prese=
=3D
nt
+		 * =3D

+		 * @param string $on onclick, onchange, ... action
+		 * @param string $cname name-prefix / name-space
+		 * @return string
+		 */
+		function js_pseudo_funcs($on,$cname)
+		{
+			if (preg_match("/egw::link\\('([^']+)','([^']+)'\\)/",$on,$matches))
+			{
+				$url =3D3D $GLOBALS['egw']->link($matches[1],$matches[2]);
+				$on =3D3D str_replace($matches[0],'\''.$url.'\'',$on);
+				//$on =3D3D preg_replace('/egw::link\(\'([^\']+)\',\'([^\']+)\'\)/','\=
''=3D
.$url.'\'',$on);
+			}
+			if (preg_match_all("/form::name\\('([^']+)'\\)/",$on,$matches))
+			{
+				foreach($matches[1] as $n =3D3D> $matche_name)
+				{
+					$matches[1][$n] =3D3D '\''.$this->form_name($cname,$matche_name).'\'';
+				}
+				$on =3D3D str_replace($matches[0],$matches[1],$on);
+			}
+			if (preg_match('/confirm\(["\']{1}(.*)["\']{1}\)/',$on,$matches))
+			{
+				$question =3D3D lang($matches[1]).(substr($matches[1],-1) !=3D3D '?' ?=
 '?'=3D
 : '');	// add ? if not there, saves extra phrase
+				$on =3D3D str_replace($matches[0],'confirm(\''.addslashes($question).'=
\'=3D
)',$on);
+				//$on =3D3D preg_replace('/confirm\(["\']{1}(.*)["\']{1}\)/','confirm(=
\'=3D
'=2Eaddslashes($question).'\')',$on);
+			}
+			return $on;
 		}
 =3D

 		/**

Author: mipmip
Date: Fri Sep 29 15:37:52 2006
New Revision: 22554

URL: http://www.egroupware.org/viewvc?rev=3D3D22554&view=3D3Drev
Log:
default  posts today

Modified:
    trunk/jinn/plugins/db_fields_plugins/__date/class.date.php

Modified: trunk/jinn/plugins/db_fields_plugins/__date/class.date.php
URL: http://www.egroupware.org/viewvc/trunk/jinn/plugins/db_fields_plugins/=
=3D
__date/class.date.php?rev=3D3D22554&r1=3D3D22553&r2=3D3D22554&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/jinn/plugins/db_fields_plugins/__date/class.date.php (original)
+++ trunk/jinn/plugins/db_fields_plugins/__date/class.date.php Fri Sep 29 1=
=3D
5:37:52 2006
@@ -49,7 +49,7 @@
 			unset($value);
 		 }
 =3D

-		 if(!$value && $config['defdate']=3D3D=3D3D'today') =3D

+		 if(!$value && $config['defdate']!=3D3D'null') =3D

 		 {
 			$value=3D3D$today; 		=3D

 		 }

Author: mipmip
Date: Fri Sep 29 14:05:10 2006
New Revision: 22553

URL: http://www.egroupware.org/viewvc?rev=3D3D22553&view=3D3Drev
Log:
fixed list view

Modified:
    trunk/jinn/plugins/db_fields_plugins/__date/class.date.php

Modified: trunk/jinn/plugins/db_fields_plugins/__date/class.date.php
URL: http://www.egroupware.org/viewvc/trunk/jinn/plugins/db_fields_plugins/=
=3D
__date/class.date.php?rev=3D3D22553&r1=3D3D22552&r2=3D3D22553&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/jinn/plugins/db_fields_plugins/__date/class.date.php (original)
+++ trunk/jinn/plugins/db_fields_plugins/__date/class.date.php Fri Sep 29 1=
=3D
4:05:10 2006
@@ -136,11 +136,11 @@
 =3D

 	  function listview_read($value,$conf_array,$where_val_enc)
 	  {
-/*		 if($value=3D3D=3D3D'0000-00-00')
+		 if($value=3D3D=3D3D'0000-00-00' || !$value)
 		 {
-			return $value;
+			return ;
 		 }
-*/
+
 		 $months_arr[0]=3D3D'';
 		 $months_arr[1]=3D3D'jan';
 		 $months_arr[2]=3D3D'feb';

Author: mipmip
Date: Fri Sep 29 13:51:48 2006
New Revision: 22552

URL: http://www.egroupware.org/viewvc?rev=3D3D22552&view=3D3Drev
Log:
some date plugin tweaks

Modified:
    trunk/jinn/plugins/db_fields_plugins/__date/class.date.php
    trunk/jinn/plugins/db_fields_plugins/__date/register.php
    trunk/jinn/plugins/db_fields_plugins/__date/tpl/date.formview_edit.tpl.=
=3D
php

Modified: trunk/jinn/plugins/db_fields_plugins/__date/class.date.php
URL: http://www.egroupware.org/viewvc/trunk/jinn/plugins/db_fields_plugins/=
=3D
__date/class.date.php?rev=3D3D22552&r1=3D3D22551&r2=3D3D22552&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/jinn/plugins/db_fields_plugins/__date/class.date.php (original)
+++ trunk/jinn/plugins/db_fields_plugins/__date/class.date.php Fri Sep 29 1=
=3D
3:51:48 2006
@@ -38,33 +38,40 @@
 =3D

 	  function formview_edit($field_name,$value,$config,$attr_arr)
 	  {
-			if (!is_object($GLOBALS['phpgw']->jscalendar))
-			{
-			   $GLOBALS['phpgw']->jscalendar =3D3D CreateObject('phpgwapi.jscalenda=
r'=3D
);
-			}
-	 		$today =3D3D date('Y-m-d');//$GLOBALS['phpgw_info']['user']['preferenc=
es=3D
']['common']['dateformat']);
-			if($value=3D3D=3D3D'0000-00-00') $value=3D3D$today; 		=3D

-			//		if($value=3D3D=3D3D'0000-00') $value=3D3D$today; 		=3D

-			if(!$value) $value=3D3D$today; 		=3D

+		 if (!is_object($GLOBALS['phpgw']->jscalendar))
+		 {
+			$GLOBALS['phpgw']->jscalendar =3D3D CreateObject('phpgwapi.jscalendar');
+		 }
+		 $today =3D3D date('Y-m-d');
+		//echo  $GLOBALS['phpgw_info']['user']['preferences']['common']['datefor=
=3D
mat']);
+		 if($value=3D3D=3D3D'0000-00-00')
+		 {
+			unset($value);
+		 }
 =3D

-			list($tyear,$tmonth,$tday)=3D3Dexplode('-',$today);
-			=3D

-			list($year,$month,$day)=3D3Dexplode('-',$value);
-			=3D

-			$this->tplsav2->addPath('template',$this->plug_root.'/tpl');
-	 		$months_arr[0]=3D3D'';
-			$months_arr[1]=3D3D'januari';
-			$months_arr[2]=3D3D'februari';
-			$months_arr[3]=3D3D'maart';
-			$months_arr[4]=3D3D'april';
-			$months_arr[5]=3D3D'mei';
-			$months_arr[6]=3D3D'juni';
-			$months_arr[7]=3D3D'juli';
-			$months_arr[8]=3D3D'augustus';
-			$months_arr[9]=3D3D'september';
-			$months_arr[10]=3D3D'oktober';
-			$months_arr[11]=3D3D'november';
-			$months_arr[12]=3D3D'december';
+		 if(!$value && $config['defdate']=3D3D=3D3D'today') =3D

+		 {
+			$value=3D3D$today; 		=3D

+		 }
+
+		 list($tyear,$tmonth,$tday)=3D3Dexplode('-',$today);
+
+		 list($year,$month,$day)=3D3Dexplode('-',$value);
+
+		 $this->tplsav2->addPath('template',$this->plug_root.'/tpl');
+		 $months_arr[0]=3D3D'';
+		 $months_arr[1]=3D3D'januari';
+		 $months_arr[2]=3D3D'februari';
+		 $months_arr[3]=3D3D'maart';
+		 $months_arr[4]=3D3D'april';
+		 $months_arr[5]=3D3D'mei';
+		 $months_arr[6]=3D3D'juni';
+		 $months_arr[7]=3D3D'juli';
+		 $months_arr[8]=3D3D'augustus';
+		 $months_arr[9]=3D3D'september';
+		 $months_arr[10]=3D3D'oktober';
+		 $months_arr[11]=3D3D'november';
+		 $months_arr[12]=3D3D'december';
 =3D

 		 if($config[style] =3D3D=3D3D 'DHTML-Calendar')
 		 {
@@ -74,11 +81,9 @@
 			$input .=3D3D $GLOBALS['phpgw']->jscalendar->input($field_name,'',$year=
,$=3D
month,$day);
 =3D

 			return $input;
-
 		 }
 		 else
 		 {
-
 			$stripped_name=3D3Dsubstr($field_name,6);	=3D

 =3D

 			//die(var_dump($input));
@@ -100,13 +105,13 @@
 =3D

 	  function on_save_filter($field_name,$HTTP_POST_VARS,$HTTP_POST_FILES,$c=
=3D
onfig)
 	  {
-			if (!is_object($GLOBALS['phpgw']->jscalendar))
-			{
-			   $GLOBALS['phpgw']->jscalendar =3D3D CreateObject('phpgwapi.jscalenda=
r'=3D
);
-			}
+		 if (!is_object($GLOBALS['phpgw']->jscalendar))
+		 {
+			$GLOBALS['phpgw']->jscalendar =3D3D CreateObject('phpgwapi.jscalendar');
+		 }
 =3D

-			=3D

-	 	 if($config[style] =3D3D=3D3D 'DHTML-Calendar')
+
+		 if($config[style] =3D3D=3D3D 'DHTML-Calendar')
 		 {
 			$date =3D3D $HTTP_POST_VARS[$field_name];
 			$new_date_arr =3D3D $GLOBALS['phpgw']->jscalendar->input2date($date);
@@ -114,19 +119,28 @@
 		 }
 		 else
 		 {
-		 $new_date =3D3D $HTTP_POST_VARS['DATE_YY'.$field_name].'-'.$HTTP_POST_V=
AR=3D
S['DATE_MM'.$field_name].'-'.$HTTP_POST_VARS['DATE_DD'.$field_name];
-	  }
+			$new_date =3D3D $HTTP_POST_VARS['DATE_YY'.$field_name].'-'.$HTTP_POST_V=
AR=3D
S['DATE_MM'.$field_name].'-'.$HTTP_POST_VARS['DATE_DD'.$field_name];
+		 }
 		 if($new_date) return $new_date;
 		 return '-1'; /* return -1 when there no value to give but the function =
=3D
finished succesfully */
 	  }
 =3D

 	  function formview_read($value,$conf_array)
 	  {
+		 if($value=3D3D=3D3D'0000-00-00')
+		 {
+			unset($value);
+		 }
 		 return $this->listview_read($value,$conf_array,'');
 	  }
 =3D

 	  function listview_read($value,$conf_array,$where_val_enc)
 	  {
+/*		 if($value=3D3D=3D3D'0000-00-00')
+		 {
+			return $value;
+		 }
+*/
 		 $months_arr[0]=3D3D'';
 		 $months_arr[1]=3D3D'jan';
 		 $months_arr[2]=3D3D'feb';

Modified: trunk/jinn/plugins/db_fields_plugins/__date/register.php
URL: http://www.egroupware.org/viewvc/trunk/jinn/plugins/db_fields_plugins/=
=3D
__date/register.php?rev=3D3D22552&r1=3D3D22551&r2=3D3D22552&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/jinn/plugins/db_fields_plugins/__date/register.php (original)
+++ trunk/jinn/plugins/db_fields_plugins/__date/register.php Fri Sep 29 13:=
=3D
51:48 2006
@@ -27,31 +27,38 @@
 =3D

 	$this->registry->plugins['date']['name']			=3D3D 'date';
 	$this->registry->plugins['date']['title']			=3D3D 'Date plugin';
-	$this->registry->plugins['date']['version']			=3D3D '0.1.3';
+	$this->registry->plugins['date']['version']			=3D3D '0.1.4';
 	$this->registry->plugins['date']['author']			=3D3D 'Pim Snel, Rob van Kra=
an=3D
en';
 	$this->registry->plugins['date']['description']		=3D3D 'create date input=
 b=3D
ox and date storage method, (At this time Dutch only)';
 	$this->registry->plugins['date']['enable']			=3D3D 1;
 	$this->registry->plugins['date']['db_field_hooks']	=3D3D array('date','da=
te=3D
time');
  =3D

     $option=3D3Darray(
-	   '0'=3D3D>'OldWay',
-	   '1'=3D3D>'DHTML-Calendar'
+	   'OldWay'=3D3D>'OldWay',
+	   'DHTML-Calendar'=3D3D>'DHTML-Calendar'
    );
 =3D

    // We need a template in stead of this auto configure array
-  /* $this->registry->plugins['date']['config2']		=3D3D array
+   $this->registry->plugins['date']['config2']		=3D3D array
    (
 	  'style' =3D3D> array(
 		 'name' =3D3D> 'style',
 		 'label' =3D3D> lang('The old style or the new way with the DHTML calend=
ar=3D
'),
 		 'type' =3D3D> 'select',
 		 'select_arr' =3D3D> $option
+	  ),
+	  'defdate'=3D3D>array(
+		 'name' =3D3D> 'defdate',
+		 'label' =3D3D> lang('Default date'),
+		 'type' =3D3D> 'radio',
+		 'radio_arr'=3D3D>array('null'=3D3D>lang('Null'),'today'=3D3D>lang('Toda=
y')),
 	  )
-   );*/
+   );
+   /*
    $this->registry->plugins['date']['config']		=3D3D array
    (
 	  'style'=3D3D> array( array('OldWay','DHTML-Calendar'),'select','')  =3D

    );
 =3D

- =3D

+ */
  ?>

Modified: trunk/jinn/plugins/db_fields_plugins/__date/tpl/date.formview_edi=
=3D
t=2Etpl.php
URL: http://www.egroupware.org/viewvc/trunk/jinn/plugins/db_fields_plugins/=
=3D
__date/tpl/date.formview_edit.tpl.php?rev=3D3D22552&r1=3D3D22551&r2=3D3D225=
52&vie=3D
w=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/jinn/plugins/db_fields_plugins/__date/tpl/date.formview_edit.tpl.=
=3D
php (original)
+++ trunk/jinn/plugins/db_fields_plugins/__date/tpl/date.formview_edit.tpl.=
=3D
php Fri Sep 29 13:51:48 2006
@@ -1,7 +1,7 @@
 Het is vandaag <?php echo($this->tday);?> <?php echo($this->tmonth);?> <?p=
=3D
hp echo($this->tyear);?><br>
 <select name=3D3D"<?php echo('DATE_DD'.$this->field_name);?>">
    <option value=3D3D""></option>
-   <?php for ($d=3D3D0;$d <=3D3D31;$d++):?>
+   <?php for ($d=3D3D1;$d <=3D3D31;$d++):?>
    <option value=3D3D"<?php echo($d);?>" <?php if($d =3D3D=3D3D $this->day=
){echo=3D
'selected=3D3D"selected"';}?>><?php echo($d);?></option>
    <?php endfor?>
 </select>

Author: nelius_weiss
Date: Fri Sep 29 08:49:31 2006
New Revision: 22551

URL: http://www.egroupware.org/viewvc?rev=3D3D22551&view=3D3Drev
Log:
mess protection if something went wrong in tmp dir...

Modified:
    trunk/infolog/inc/class.boinfolog.inc.php

Modified: trunk/infolog/inc/class.boinfolog.inc.php
URL: http://www.egroupware.org/viewvc/trunk/infolog/inc/class.boinfolog.inc=
=3D
.php?rev=3D3D22551&r1=3D3D22550&r2=3D3D22551&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/infolog/inc/class.boinfolog.inc.php (original)
+++ trunk/infolog/inc/class.boinfolog.inc.php Fri Sep 29 08:49:31 2006
@@ -660,6 +660,7 @@
 			{
 				foreach ((array)$contacts as $contact)
 				{
+					if(!is_readable($attachment['tmp_name'])) continue;
 					$this->link->link('infolog',$info['link_to']['to_id'],'addressbook',$=
=3D
contact['id']);
 				}
 			}

Author: lkneschke
Date: Fri Sep 29 06:43:57 2006
New Revision: 22550

URL: http://www.egroupware.org/viewvc?rev=3D3D22550&view=3D3Drev
Log:
fix problem when trying to edit signature

Modified:
    trunk/felamimail/inc/class.uipreferences.inc.php
    trunk/felamimail/inc/class.uiwidgets.inc.php

Modified: trunk/felamimail/inc/class.uipreferences.inc.php
URL: http://www.egroupware.org/viewvc/trunk/felamimail/inc/class.uipreferen=
=3D
ces.inc.php?rev=3D3D22550&r1=3D3D22549&r2=3D3D22550&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/felamimail/inc/class.uipreferences.inc.php (original)
+++ trunk/felamimail/inc/class.uipreferences.inc.php Fri Sep 29 06:43:57 20=
=3D
06
@@ -495,18 +495,12 @@
 			);
 			$this->t->set_var('url_addSignature', $GLOBALS['egw']->link('/index.php=
=3D
',$linkData));
 			=3D

-			$linkData =3D3D array
-			(
-				'menuaction'    =3D3D> 'felamimail.uipreferences.editSignature'
-			);
-			$urlEditSignature =3D3D $GLOBALS['egw']->link('/index.php',$linkData);
-			=3D

 			$this->t->set_var('url_image_add',$GLOBALS['egw']->common->image('phpgw=
=3D
api','new'));
 			$this->t->set_var('url_image_delete',$GLOBALS['egw']->common->image('ph=
=3D
pgwapi','delete'));
 			=3D

 			$signatures =3D3D $this->bopreferences->getListOfSignatures();
-
-			$this->t->set_var('table', $signatures ? $this->uiwidgets->createSignat=
=3D
ureTable($signatures) : '');
+			=3D

+			$this->t->set_var('table', $this->uiwidgets->createSignatureTable($sign=
=3D
atures));
 			=3D

 			$this->t->pparse("out","main");			=3D

 			$this->bofelamimail->closeConnection();

Modified: trunk/felamimail/inc/class.uiwidgets.inc.php
URL: http://www.egroupware.org/viewvc/trunk/felamimail/inc/class.uiwidgets.=
=3D
inc.php?rev=3D3D22550&r1=3D3D22549&r2=3D3D22550&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/felamimail/inc/class.uiwidgets.inc.php (original)
+++ trunk/felamimail/inc/class.uiwidgets.inc.php Fri Sep 29 06:43:57 2006
@@ -166,6 +166,12 @@
 		}
 		=3D

 		function createSignatureTable($_signatureList) {
+			$linkData =3D3D array
+			(
+				'menuaction'    =3D3D> 'felamimail.uipreferences.editSignature'
+			);
+			$urlEditSignature =3D3D $GLOBALS['egw']->link('/index.php',$linkData);
+			=3D

 			if(is_array($_signatureList) && !empty($_signatureList)) {
 				foreach($_signatureList as $signature) {
 					$tableRows[] =3D3D array(

Author: ralfbecker
Date: Fri Sep 29 06:33:11 2006
New Revision: 22549

URL: http://www.egroupware.org/viewvc?rev=3D3D22549&view=3D3Drev
Log:
quiten error if no signature exist

Modified:
    trunk/felamimail/inc/class.uipreferences.inc.php

Modified: trunk/felamimail/inc/class.uipreferences.inc.php
URL: http://www.egroupware.org/viewvc/trunk/felamimail/inc/class.uipreferen=
=3D
ces.inc.php?rev=3D3D22549&r1=3D3D22548&r2=3D3D22549&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/felamimail/inc/class.uipreferences.inc.php (original)
+++ trunk/felamimail/inc/class.uipreferences.inc.php Fri Sep 29 06:33:11 20=
=3D
06
@@ -505,8 +505,8 @@
 			$this->t->set_var('url_image_delete',$GLOBALS['egw']->common->image('ph=
=3D
pgwapi','delete'));
 			=3D

 			$signatures =3D3D $this->bopreferences->getListOfSignatures();
-			=3D

-			$this->t->set_var('table', $this->uiwidgets->createSignatureTable($sign=
=3D
atures));
+
+			$this->t->set_var('table', $signatures ? $this->uiwidgets->createSignat=
=3D
ureTable($signatures) : '');
 			=3D

 			$this->t->pparse("out","main");			=3D

 			$this->bofelamimail->closeConnection();

Author: lkneschke
Date: Fri Sep 29 06:25:20 2006
New Revision: 22548

URL: http://www.egroupware.org/viewvc?rev=3D3D22548&view=3D3Drev
Log:
made skiping trough messages working again

Modified:
    trunk/felamimail/inc/class.ajaxfelamimail.inc.php
    trunk/felamimail/inc/class.bofelamimail.inc.php
    trunk/felamimail/inc/class.bosieve.inc.php
    trunk/felamimail/inc/class.socaching.inc.php
    trunk/felamimail/inc/class.uidisplay.inc.php
    trunk/felamimail/inc/class.uifelamimail.inc.php
    trunk/felamimail/inc/class.uisieve.inc.php
    trunk/felamimail/inc/class.uiwidgets.inc.php
    trunk/felamimail/js/jscode/viewMainScreen.js
    trunk/felamimail/templates/default/app.css
    trunk/felamimail/templates/default/mainscreen.tpl
    trunk/felamimail/templates/default/view_message.tpl

Modified: trunk/felamimail/inc/class.ajaxfelamimail.inc.php
URL: http://www.egroupware.org/viewvc/trunk/felamimail/inc/class.ajaxfelami=
=3D
mail.inc.php?rev=3D3D22548&r1=3D3D22547&r2=3D3D22548&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/felamimail/inc/class.ajaxfelamimail.inc.php (original)
+++ trunk/felamimail/inc/class.ajaxfelamimail.inc.php Fri Sep 29 06:25:20 2=
=3D
006
@@ -224,8 +224,7 @@
 		}
 		=3D

 		function flagMessages($_flag, $_messageList) {
-			$this->bofelamimail->flagMessages($_flag, $_messageList['msg']);
-			$GLOBALS['egw']->session->commit_session();
+			$this->bofelamimail->flagMessages($_flag, $_messageList);
 =3D

 			return $this->generateMessageList($this->sessionData['mailbox']);
 		}

Modified: trunk/felamimail/inc/class.bofelamimail.inc.php
URL: http://www.egroupware.org/viewvc/trunk/felamimail/inc/class.bofelamima=
=3D
il.inc.php?rev=3D3D22548&r1=3D3D22547&r2=3D3D22548&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/felamimail/inc/class.bofelamimail.inc.php (original)
+++ trunk/felamimail/inc/class.bofelamimail.inc.php Fri Sep 29 06:25:20 2006
@@ -47,6 +47,9 @@
 		var $htmlOptions;
 =3D

 		var $sessionData;
+		=3D

+		// the current selected user profile
+		var $profileID =3D3D 0;
 =3D

 		function bofelamimail($_displayCharset=3D3D'iso-8859-1')
 		{
@@ -179,10 +182,10 @@
 		function appendMessage($_folderName, $_header, $_body, $_flags)
 		{
 			$imapServer =3D3D& $this->mailPreferences->getIncomingServer(0);
+			#print "<pre>$_header.$_body</pre>";
 			$mailboxString =3D3D $imapServer->getMailboxString($_folderName);
 			$header =3D3D str_replace("\n","\r\n",$_header);
 			$body   =3D3D str_replace("\n","\r\n",$_body);
-			#print "<pre>". htmlentities($header.$body) ."</pre>";
 			$result =3D3D @imap_append($this->mbox, $mailboxString, "$header"."$bod=
y"=3D
, $_flags);
 			#print imap_last_error();exit;
 			return $result;
@@ -430,6 +433,9 @@
 					$result =3D3D imap_clearflag_full ($this->mbox, $msglist, "\\Answered=
",=3D
 ST_UID);
 					break;
 			}
+			=3D

+			$this->sessionData['folderStatus'][$this->profileID][$this->sessionData=
=3D
['mailbox']]['uidValidity'] =3D3D 0;
+			$this->saveSessionData();
 			=3D

 			#error_log(imap_last_error());
 			#print "Result: $result<br>";
@@ -1247,6 +1253,7 @@
 			$mailboxString =3D3D $icServer->getMailboxString($_folderName);
 			=3D

 			$sortResult =3D3D $this->getSortedList($icServer, $_folderName, $_sort,=
 $=3D
_reverse, $_filter);
+		#	_debug_array($sortResult);
 		#	error_log(count($sortResult));
 			$total =3D3D count($sortResult);
 			$sortResult =3D3D array_slice($sortResult, $_startMessage-1, $_numberOf=
Me=3D
ssages);
@@ -1426,17 +1433,35 @@
 			}
 		}
 		=3D

+		function getNextMessage($_foldername, $_id) {
+			#_debug_array($this->sessionData['folderStatus'][$this->profileID][$_fo=
=3D
ldername]['sortResult']);
+			#print "ID: $_id<br>";
+			$position =3D3D array_search($_id, $this->sessionData['folderStatus'][$=
th=3D
is->profileID][$_foldername]['sortResult']);
+			if($position !=3D3D=3D3D false) {
+				$retValue =3D3D array();
+				=3D

+				if(isset($this->sessionData['folderStatus'][$this->profileID][$_folder=
=3D
name]['sortResult'][$position-1])) {
+					$retValue['previous'] =3D3D $this->sessionData['folderStatus'][$this-=
>p=3D
rofileID][$_foldername]['sortResult'][$position-1];
+				}
+				if(isset($this->sessionData['folderStatus'][$this->profileID][$_folder=
=3D
name]['sortResult'][$position+1])) {
+					$retValue['next'] =3D3D $this->sessionData['folderStatus'][$this->pro=
fi=3D
leID][$_foldername]['sortResult'][$position+1];
+				}
+				=3D

+				return $retValue;
+			}
+			=3D

+			return false;
+		}
+		=3D

 		function getIMAPACL($_folderName)
 		{
-			if(!$icServer =3D3D $this->mailPreferences->getIncomingServer(0))
-			{
+			if(!$icServer =3D3D $this->mailPreferences->getIncomingServer(0)) {
 				return false;
 			}
 			=3D

 			$acl =3D3D array();
 			$mailboxString =3D3D $icServer->getMailboxString($_folderName);
-			if(function_exists('imap_getacl'))
-			{
+			if(($icServer->supportsCapability('ACL')) && (function_exists('imap_get=
=3D
acl'))) {
 				$acl =3D3D imap_getacl ($this->mbox, $_folderName);
 			}
 			=3D

@@ -1780,6 +1805,13 @@
 			return $this->icServer->getQuota('INBOX');
 		}
 		=3D

+		// converts a imap id into a imap uid
+		function idToUid($_mailbox, $_id) {
+			$this->reopen($_mailbox);
+			=3D

+			return imap_uid($this->mbox, $_id);
+		}
+		=3D

 		function imap_createmailbox($_folderName, $_subscribe =3D3D False)
 		{
 			if(!$icServer =3D3D $this->mailPreferences->getIncomingServer(0))

Modified: trunk/felamimail/inc/class.bosieve.inc.php
URL: http://www.egroupware.org/viewvc/trunk/felamimail/inc/class.bosieve.in=
=3D
c=2Ephp?rev=3D3D22548&r1=3D3D22547&r2=3D3D22548&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/felamimail/inc/class.bosieve.inc.php (original)
+++ trunk/felamimail/inc/class.bosieve.inc.php Fri Sep 29 06:25:20 2006
@@ -53,7 +53,7 @@
 				exit();
 			}
 =3D

-			if(PEAR::isError($error =3D3D $this->login($username, $password  , null=
 ,=3D
 '', false ) ) ){
+			if(PEAR::isError($error =3D3D $this->login($username, $password) ) ){
 				echo "  there was an error trying to connect to the server. The error =
=3D
is: " . $error->getMessage()  . "<br>";
 				exit();
 			}

Modified: trunk/felamimail/inc/class.socaching.inc.php
URL: http://www.egroupware.org/viewvc/trunk/felamimail/inc/class.socaching.=
=3D
inc.php?rev=3D3D22548&r1=3D3D22547&r2=3D3D22548&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/felamimail/inc/class.socaching.inc.php (original)
+++ trunk/felamimail/inc/class.socaching.inc.php Fri Sep 29 06:25:20 2006
@@ -176,7 +176,9 @@
 			if($_filter)
 			{
 				$filter =3D3D $this->getFilterSQL($_filter);
-				$where[] =3D3D $filter;
+				if(!empty($filter)) {
+					$where[] =3D3D $filter;
+				}
 			}
 			=3D

 			$this->db->select($this->cache_table,'count(*)',$where,__LINE__,__FILE_=
=3D
_);

Modified: trunk/felamimail/inc/class.uidisplay.inc.php
URL: http://www.egroupware.org/viewvc/trunk/felamimail/inc/class.uidisplay.=
=3D
inc.php?rev=3D3D22548&r1=3D3D22547&r2=3D3D22548&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/felamimail/inc/class.uidisplay.inc.php (original)
+++ trunk/felamimail/inc/class.uidisplay.inc.php Fri Sep 29 06:25:20 2006
@@ -44,13 +44,19 @@
 		=3D

 		// the object storing the data about the incoming imap server
 		var $icServer=3D3D0;
+		=3D

+		// the non permanent id of the message
+		var $id;
+		=3D

+		// the permanent id of the message
+		var $uid;
 =3D

 		function uidisplay()
 		{
 			$this->t 		=3D3D& CreateObject('phpgwapi.Template',EGW_APP_TPL);
 			$this->displayCharset   =3D3D $GLOBALS['egw']->translation->charset();
 			$this->bofelamimail	=3D3D& CreateObject('felamimail.bofelamimail',$this=
->=3D
displayCharset);
-			$this->bofilter 	=3D3D& CreateObject('felamimail.bofilter');
+			#$this->bofilter 	=3D3D& CreateObject('felamimail.bofilter');
 			$this->bopreferences	=3D3D& CreateObject('felamimail.bopreferences');
 			$this->kses		=3D3D& CreateObject('phpgwapi.kses');
 			$this->botranslation	=3D3D& CreateObject('phpgwapi.translation');
@@ -61,32 +67,40 @@
 			=3D

 			$this->mailbox		=3D3D $this->bofelamimail->sessionData['mailbox'];
 			$this->sort		=3D3D $this->bofelamimail->sessionData['sort'];
-			$this->activeFilter	=3D3D $activeFilter =3D3D (isset($this->bofelamimai=
l->s=3D
essionData['activeFilter'])?$this->bofelamimail->sessionData['activeFilter'=
=3D
]:-1);
-			=3D

-			$this->uid		=3D3D $_GET['uid'];
-			=3D

-			if(isset($_GET['part']) &&
-				is_numeric($_GET['part']))
-			{
-				$this->partID =3D3D $_GET['part'];
-			} else {
-				$this->partID =3D3D 0;
-			}
-
-			$icServer =3D3D $this->mailPreferences->getIncomingServer(0);
-
-			$this->bocaching	=3D3D& CreateObject('felamimail.bocaching',
-							$icServer->host,
-							$icServer->username,
-							$this->mailbox);
+			#$this->activeFilter	=3D3D $activeFilter =3D3D (isset($this->bofelamima=
il->=3D
sessionData['activeFilter'])?$this->bofelamimail->sessionData['activeFilter=
=3D
']:-1);
+			=3D

+			if(isset($_GET['uid'])) {
+				$this->uid	=3D3D (int)$_GET['uid'];
+			}
+			=3D

+			if(isset($_GET['id'])) {
+				$this->id	=3D3D (int)$_GET['id'];
+			}
+			=3D

+			if(isset($this->id) && !isset($this->uid)) {
+				if($uid =3D3D $this->bofelamimail->idToUid($this->mailbox, $this->id))=
 {
+					$this->uid =3D3D $uid;
+				}
+			}
+			=3D

+			if(isset($_GET['part'])) {
+				$this->partID =3D3D (int)$_GET['part'];
+			}
+
+			#$icServer =3D3D $this->mailPreferences->getIncomingServer(0);
+
+			#$this->bocaching	=3D3D& CreateObject('felamimail.bocaching',
+			#				$icServer->host,
+			#				$icServer->username,
+			#				$this->mailbox);
 =3D

 			$this->rowColor[0] =3D3D $GLOBALS['egw_info']["theme"]["bg01"];
 			$this->rowColor[1] =3D3D $GLOBALS['egw_info']["theme"]["bg02"];
 =3D

-			if($_GET['showHeader'] =3D3D=3D3D "false") {
-				$this->bofelamimail->sessionData['showHeader'] =3D3D 'False';
-				$this->bofelamimail->saveSessionData();
-			}
+			#if($_GET['showHeader'] =3D3D=3D3D "false") {
+			#	$this->bofelamimail->sessionData['showHeader'] =3D3D 'False';
+			#	$this->bofelamimail->saveSessionData();
+			#}
 			=3D

 		}
 		=3D

@@ -138,13 +152,17 @@
 			$uiWidgets	=3D3D& CreateObject('felamimail.uiwidgets');
 			// (regis) seems to be necessary to reopen...
 			$this->bofelamimail->reopen($this->mailbox);
+#			print "$this->mailbox, $this->uid, $partID<br>";
 			$headers	=3D3D $this->bofelamimail->getMessageHeader($this->mailbox, $t=
hi=3D
s->uid, $partID);
+#			_debug_array($headers);exit;
 			$rawheaders	=3D3D $this->bofelamimail->getMessageRawHeader($this->uid, =
$p=3D
artID);
 			$bodyParts	=3D3D $this->bofelamimail->getMessageBody($this->uid,'',$par=
tI=3D
D);
 			$attachments	=3D3D $this->bofelamimail->getMessageAttachments($this->ui=
d,=3D
$partID);
-			$filterList 	=3D3D $this->bofilter->getFilterList();
-			$filter 	=3D3D $filterList[$this->activeFilter];
-			$nextMessage	=3D3D $this->bocaching->getNextMessage($this->uid, $this->=
so=3D
rt, $filter);
+#			$filterList 	=3D3D $this->bofilter->getFilterList();
+#			$filter 	=3D3D $filterList[$this->activeFilter];
+#			$nextMessage	=3D3D $this->bocaching->getNextMessage($this->uid, $this-=
>s=3D
ort, $filter);
+			$nextMessage	=3D3D $this->bofelamimail->getNextMessage($this->mailbox, =
$t=3D
his->id);
+#			_debug_array($nextMessage); exit;
 =3D

 			$webserverURL	=3D3D $GLOBALS['egw_info']['server']['webserver_url'];
 =3D

@@ -358,7 +376,7 @@
 					(
 						'menuaction'	=3D3D> 'felamimail.uidisplay.display',
 						'showHeader'	=3D3D> 'false',
-						'uid'		=3D3D> $nextMessage['previous']
+						'id'		=3D3D> $nextMessage['previous']
 					);
 					$previousURL =3D3D $GLOBALS['egw']->link('/index.php',$linkData);
 					$previousURL =3D3D "window.location.href =3D3D '$previousURL'";
@@ -374,7 +392,7 @@
 					(
 						'menuaction'	=3D3D> 'felamimail.uidisplay.display',
 						'showHeader'	=3D3D> 'false',
-						'uid'		=3D3D> $nextMessage['next']
+						'id'		=3D3D> $nextMessage['next']
 					);
 					$nextURL =3D3D $GLOBALS['egw']->link('/index.php',$linkData);
 					$nextURL =3D3D "window.location.href =3D3D '$nextURL'";
@@ -810,14 +828,13 @@
 		function displayBody()
 		{
 			$partID		=3D3D $_GET['part'];
+
 			$transformdate	=3D3D& CreateObject('felamimail.transformdate');
 			$htmlFilter	=3D3D& CreateObject('felamimail.htmlfilter');
 			$uiWidgets	=3D3D& CreateObject('felamimail.uiwidgets');
 			// (regis) seems to be necessary to reopen...
 			$this->bofelamimail->reopen($this->mailbox);
 			$bodyParts	=3D3D $this->bofelamimail->getMessageBody($this->uid,'',$par=
tI=3D
D);
-			$filterList 	=3D3D $this->bofilter->getFilterList();
-			$filter 	=3D3D $filterList[$this->activeFilter];
 =3D

 			$webserverURL	=3D3D $GLOBALS['egw_info']['server']['webserver_url'];
 =3D


Modified: trunk/felamimail/inc/class.uifelamimail.inc.php
URL: http://www.egroupware.org/viewvc/trunk/felamimail/inc/class.uifelamima=
=3D
il.inc.php?rev=3D3D22548&r1=3D3D22547&r2=3D3D22548&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/felamimail/inc/class.uifelamimail.inc.php (original)
+++ trunk/felamimail/inc/class.uifelamimail.inc.php Fri Sep 29 06:25:20 2006
@@ -400,19 +400,19 @@
 					'tooltip'	=3D3D> lang('compose'),
 				),
 				'read_small'		=3D3D> array(
-					'action'	=3D3D> "flagMessages('read',xajax.getFormValues('formMessage=
Li=3D
st'))",
+					'action'	=3D3D> "flagMessages('read')",
 					'tooltip'	=3D3D> lang('mark selected as read'),
 				),
 				'unread_small'		=3D3D> array(
-					'action'	=3D3D> "flagMessages('unread',xajax.getFormValues('formMessa=
ge=3D
List'))",
+					'action'	=3D3D> "flagMessages('unread')",
 					'tooltip'	=3D3D> lang('mark selected as unread'),
 				),
 				'unread_flagged_small'	=3D3D> array(
-					'action'	=3D3D> "flagMessages('flagged',xajax.getFormValues('formMess=
ag=3D
eList'))",
+					'action'	=3D3D> "flagMessages('flagged')",
 					'tooltip'	=3D3D> lang('mark selected as flagged'),
 				),
 				'read_flagged_small'	=3D3D> array(
-					'action'	=3D3D> "flagMessages('unflagged',xajax.getFormValues('formMe=
ss=3D
ageList'))",
+					'action'	=3D3D> "flagMessages('unflagged')",
 					'tooltip'	=3D3D> lang('mark selected as unflagged'),
 				),
 				'delete'		=3D3D> array(

Modified: trunk/felamimail/inc/class.uisieve.inc.php
URL: http://www.egroupware.org/viewvc/trunk/felamimail/inc/class.uisieve.in=
=3D
c=2Ephp?rev=3D3D22548&r1=3D3D22547&r2=3D3D22548&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/felamimail/inc/class.uisieve.inc.php (original)
+++ trunk/felamimail/inc/class.uisieve.inc.php Fri Sep 29 06:25:20 2006
@@ -38,6 +38,10 @@
 =3D

 		function uisieve()
 		{
+			if(empty($GLOBALS['egw_info']['user']['preferences']['felamimail']['sie=
=3D
veScriptName'])) {
+				$GLOBALS['egw']->preferences->add('felamimail','sieveScriptName','fela=
=3D
mimail', 'forced');
+				$GLOBALS['egw']->preferences->save_repository();
+			}
 			$this->scriptName =3D3D (!empty($GLOBALS['egw_info']['user']['preferenc=
es=3D
']['felamimail']['sieveScriptName'])) ? $GLOBALS['egw_info']['user']['prefe=
=3D
rences']['felamimail']['sieveScriptName'] : 'felamimail' ;
 =3D

 			$this->displayCharset	=3D3D $GLOBALS['egw']->translation->charset();
@@ -682,7 +686,7 @@
 			$this->t->set_var('url_back',$GLOBALS['egw']->link('/index.php',$linkDa=
=3D
ta));
 =3D

 			$this->t->pfp("out","header");
-			=3D

+
 		#LK	$this->bosieve->disconnect();
 		}
 =3D


Modified: trunk/felamimail/inc/class.uiwidgets.inc.php
URL: http://www.egroupware.org/viewvc/trunk/felamimail/inc/class.uiwidgets.=
=3D
inc.php?rev=3D3D22548&r1=3D3D22547&r2=3D3D22548&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/felamimail/inc/class.uiwidgets.inc.php (original)
+++ trunk/felamimail/inc/class.uiwidgets.inc.php Fri Sep 29 06:25:20 2006
@@ -166,7 +166,7 @@
 		}
 		=3D

 		function createSignatureTable($_signatureList) {
-			if(is_array($_signatureList)) {
+			if(is_array($_signatureList) && !empty($_signatureList)) {
 				foreach($_signatureList as $signature) {
 					$tableRows[] =3D3D array(
 						'1'	=3D3D> $GLOBALS['egw']->html->checkbox('signatureID', false, $si=
gn=3D
ature['signatureid']),
@@ -318,16 +318,19 @@
 						'icServer'	=3D3D> 0,
 						'folder'	=3D3D> base64_encode($GLOBALS['egw_info']['user']['preferen=
ce=3D
s']['felamimail']['draftFolder']),
 						'uid'		=3D3D> $header['uid'],
+						'id'		=3D3D> $header['id'],
 					);
 					$this->t->set_var('url_read_message', $GLOBALS['egw']->link('/index.p=
=3D
hp',$linkData));
 =3D

 					$windowName =3D3D 'composeFromDraft_'.$header['uid'];
 					$this->t->set_var('read_message_windowName', $windowName);
 				} else {
+				#	_debug_array($header);
 					$linkData =3D3D array (
 						'menuaction'    =3D3D> 'felamimail.uidisplay.display',
 						'showHeader'	=3D3D> 'false',
-						'uid'		=3D3D> $header['uid']
+						'uid'		=3D3D> $header['uid'],
+						'id'		=3D3D> $header['id'],
 					);
 					$this->t->set_var('url_read_message', $GLOBALS['egw']->link('/index.p=
=3D
hp',$linkData));
 =3D


Modified: trunk/felamimail/js/jscode/viewMainScreen.js
URL: http://www.egroupware.org/viewvc/trunk/felamimail/js/jscode/viewMainSc=
=3D
reen.js?rev=3D3D22548&r1=3D3D22547&r2=3D3D22548&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/felamimail/js/jscode/viewMainScreen.js (original)
+++ trunk/felamimail/js/jscode/viewMainScreen.js Fri Sep 29 06:25:20 2006
@@ -143,13 +143,39 @@
 	xajax_doXMLHTTP('felamimail.ajaxfelamimail.extendedSearch',_selectBox.opt=
=3D
ions[_selectBox.selectedIndex].value);
 }
 =3D

-function flagMessages(_flag, _messageList)
+function flagMessages(_flag)
 {
-	resetMessageSelect();
+	var selectedMessages =3D3D new Array();
+	var selectedCheckBoxes =3D3D new Array();
+	=3D

+	resetMessageSelect();
+	=3D

+	//alert(_messageList);
+	for(i=3D3D0; i< document.forms.formMessageList.elements.length; i++) {
+		if(document.forms.formMessageList.elements[i].checked) {
+			selectedMessages.push(document.forms.formMessageList.elements[i].value);
+			selectedCheckBoxes.push(document.forms.formMessageList.elements[i]);
+		}
+	}
+//	alert(_flag);
+//	switch(_flag) {
+//		case 'read':
+//			for(i=3D3D0; i< selectedMessages.length; i++) {
+//				document.getElementById('row_' + selectedMessages[i]).style.fontWeig=
=3D
ht=3D3D'normal';
+//				selectedCheckBoxes[i].checked =3D3D false;
+//			}
+//			break;
+//		case 'unread':
+//			for(i=3D3D0; i< selectedMessages.length; i++) {
+//				document.getElementById('row_' + selectedMessages[i]).style.fontWeig=
=3D
ht=3D3D'bold';
+//				selectedCheckBoxes[i].checked =3D3D false;
+//			}
+//			break;
+//	}
 =3D

 	setStatusMessage('<span style=3D3D"font-weight: bold;">' + lang_updating_=
me=3D
ssage_status + '</span>');
 	document.getElementById('divMessageList').innerHTML =3D3D '';
-	xajax_doXMLHTTP("felamimail.ajaxfelamimail.flagMessages",_flag,_messageLi=
=3D
st);
+	xajax_doXMLHTTP("felamimail.ajaxfelamimail.flagMessages", _flag, selected=
=3D
Messages);
 	=3D

 	fm_startTimerMessageListUpdate(refreshTimeOut);
 }

Modified: trunk/felamimail/templates/default/app.css
URL: http://www.egroupware.org/viewvc/trunk/felamimail/templates/default/ap=
=3D
p=2Ecss?rev=3D3D22548&r1=3D3D22547&r2=3D3D22548&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/felamimail/templates/default/app.css (original)
+++ trunk/felamimail/templates/default/app.css Fri Sep 29 06:25:20 2006
@@ -436,3 +436,67 @@
 	background-repeat:no-repeat;
 	background-position: center center;
 }
+
+#navbarDIV {
+	position:absolute;
+	top:0px;
+	height:30px;
+	left:0px;
+	right:0px;
+	border: solid white 1px;
+	border-right: solid black 1px;
+	border-bottom: solid black 1px;
+}
+
+#subjectDIV {
+	position:absolute; =3D

+	background-color:#ffffff; =3D

+	top:32px; =3D

+	height:20px; =3D

+	width:100%; =3D

+	font-weight:bold; =3D

+	text-align:left; =3D

+	line-height:20px;
+}
+
+#headerDIV {
+	position:absolute; =3D

+	background-color:#efefdf; =3D

+	top:52px; =3D

+	height:80px; =3D

+	left:0px; =3D

+	right:0px; =3D

+	border-top: 1px solid silver; =3D

+	border-bottom: 1px solid silver; =3D

+	overflow:hidden;
+}
+
+=2EbodyDIV {
+	position:absolute; =3D

+	background-color:white; =3D

+	top:134px; =3D

+	bottom:0px; =3D

+	width:100%; =3D

+	border-top: 1px solid #efefdf;
+}
+
+=2EbodyDIVAttachment {
+	bottom:80px; =3D

+}
+
+#messageIFRAME {
+	width:100%;
+	border:0px solid black; =3D

+	height:100%;
+}
+
+#attachmentDIV {
+	position:absolute; =3D

+	background-color:#efefdf; =3D

+	bottom:0px; =3D

+	height:80px; =3D

+	width:100%; =3D

+	border-top: 1px solid silver; =3D

+	overflow:auto;
+}
+

Modified: trunk/felamimail/templates/default/mainscreen.tpl
URL: http://www.egroupware.org/viewvc/trunk/felamimail/templates/default/ma=
=3D
inscreen.tpl?rev=3D3D22548&r1=3D3D22547&r2=3D3D22548&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/felamimail/templates/default/mainscreen.tpl (original)
+++ trunk/felamimail/templates/default/mainscreen.tpl Fri Sep 29 06:25:20 2=
=3D
006
@@ -43,7 +43,7 @@
 				{navbarButtonsLeft}
 			</div>
 		</td>
-		<td align=3D3D"right" width=3D3D"80px">
+		<td align=3D3D"right" width=3D3D"70px">
 			{select_search}
 		</td>
 		<td align=3D3D"right">
@@ -114,7 +114,7 @@
 =3D

 			<!-- Start MessageList -->
 =3D

-			<form id=3D3D"formMessageList">			=3D

+			<form name=3D3D"formMessageList" id=3D3D"formMessageList">			=3D

 			<div id=3D3D"divMessageList" style=3D3D"overflow:auto; height:460px; ma=
rgin=3D
-left:0px; margin-right:0px; margin-top:0px; margin-bottom: 0px; z-index:90=
=3D
; border : 1px solid Silver;">
 				<!-- <table BORDER=3D3D"0" style=3D3D"width:98%; ppadding-left:2; tabl=
e-la=3D
yout: fixed;" cellspacing=3D3D"100" cellpadding=3D3D"100"> -->
 					{header_rows}
@@ -162,7 +162,7 @@
 <!-- END status_row_tpl -->
 =3D

 <!-- BEGIN header_row_felamimail -->
-	<tr class=3D3D"{row_css_class}" onMouseOver=3D3D"style.backgroundColor=3D=
3D'#dd=3D
dddd';" onMouseOut=3D3D"javascript:style.backgroundColor=3D3D'#FFFFFF';">
+	<tr id=3D3D"row_{message_uid}" class=3D3D"{row_css_class}" onMouseOver=3D=
3D"sty=3D
le.backgroundColor=3D3D'#dddddd';" onMouseOut=3D3D"javascript:style.backgro=
undC=3D
olor=3D3D'#FFFFFF';">
 		<td class=3D3D"mainscreenRow" width=3D3D"20px" align=3D3D"left" valign=
=3D3D"top">
 			<input  style=3D3D"width:12px; height:12px; border: none; margin: 1px;"=
 c=3D
lass=3D3D"{row_css_class}" type=3D3D"checkbox" id=3D3D"msgSelectInput" name=
=3D3D"ms=3D
g[]" value=3D3D"{message_uid}" =3D

 			onclick=3D3D"toggleFolderRadio(this, refreshTimeOut)" {row_selected}>
@@ -190,7 +190,7 @@
 <!-- END header_row_felamimail -->
 =3D

 <!-- BEGIN header_row_outlook -->
-	<tr class=3D3D"{row_css_class}" onMouseOver=3D3D"style.backgroundColor=3D=
3D'#dd=3D
dddd';" onMouseOut=3D3D"javascript:style.backgroundColor=3D3D'#FFFFFF';" >
+	<tr id=3D3D"row_{message_uid}" class=3D3D"{row_css_class}" onMouseOver=3D=
3D"sty=3D
le.backgroundColor=3D3D'#dddddd';" onMouseOut=3D3D"javascript:style.backgro=
undC=3D
olor=3D3D'#FFFFFF';" >
 		<td class=3D3D"mainscreenRow" width=3D3D"20px" align=3D3D"left" valign=
=3D3D"top">
 			<input  style=3D3D"width:12px; height:12px; border: none; margin: 1px;"=
 c=3D
lass=3D3D"{row_css_class}" type=3D3D"checkbox" id=3D3D"msgSelectInput" name=
=3D3D"ms=3D
g[]" value=3D3D"{message_uid}" =3D

 			onclick=3D3D"toggleFolderRadio(this, refreshTimeOut)" {row_selected}>

Modified: trunk/felamimail/templates/default/view_message.tpl
URL: http://www.egroupware.org/viewvc/trunk/felamimail/templates/default/vi=
=3D
ew_message.tpl?rev=3D3D22548&r1=3D3D22547&r2=3D3D22548&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/felamimail/templates/default/view_message.tpl (original)
+++ trunk/felamimail/templates/default/view_message.tpl Fri Sep 29 06:25:20=
=3D
 2006
@@ -3,17 +3,17 @@
 self.focus();
 </script>
 <!-- {print_navbar} -->
-<div id=3D3D"navbarDIV" style=3D3D"position:absolute; top:0px; height:30px=
; le=3D
ft:0px; right:0px; border: solid white 1px; border-right: solid black 1px; =
=3D
border-bottom: solid black 1px;">
+<div id=3D3D"navbarDIV">
         {navbar}
 </div>
-<div id=3D3D"subjectDIV" style=3D3D"position:absolute; background-color:#f=
ffff=3D
f; top:32px; height:20px; width:100%; font-weight:bold; text-align:left; li=
=3D
ne-height:20px;">
+<div id=3D3D"subjectDIV">
 	<span style=3D3D"padding-left:2px;">{subject_data}</span>
 </div>
-<div id=3D3D"headerDIV" style=3D3D"position:absolute; background-color:#ef=
efdf=3D
; top:52px; height:80px; left:0px; right:0px; border-top: 1px solid silver;=
=3D
 border-bottom: 1px solid silver; overflow:hidden;">
+<div id=3D3D"headerDIV">
 	{header}
 </div>
-<div id=3D3D"bodyDIV" style=3D3D"position:absolute; background-color:white=
; to=3D
p:134px; bottom:0px; width:100%; border-top: 1px solid #efefdf;">
-	<iframe frameborder=3D3D"no" scrolling=3D3D"auto" style=3D3D"width:100%; =
border=3D
:0px solid black; height:100%;" src=3D3D"{url_displayBody}">
+<div class=3D3D"bodyDIV" id=3D3D"bodyDIV">
+	<iframe id=3D3D"messageIFRAME" frameborder=3D3D"no" scrolling=3D3D"auto" =
src=3D3D=3D
"{url_displayBody}">
 	</iframe>
 </div>
 <!-- END message_main -->
@@ -23,20 +23,20 @@
 self.focus();
 </script>
 <!-- {print_navbar} -->
-<div id=3D3D"navbarDIV" style=3D3D"position:absolute; top:0px; height:30px=
; le=3D
ft:0px; right:0px; border: solid white 1px; border-right: solid black 1px; =
=3D
border-bottom: solid black 1px;">
+<div id=3D3D"navbarDIV">
         {navbar}
 </div>
-<div id=3D3D"subjectDIV" style=3D3D"position:absolute; background-color:#f=
ffff=3D
f; top:32px; height:20px; width:100%; font-weight:bold; text-align:left; li=
=3D
ne-height:20px;">
+<div id=3D3D"subjectDIV">
 	<span style=3D3D"padding-left:2px;">{subject_data}</span>
 </div>
-<div id=3D3D"headerDIV" style=3D3D"position:absolute; background-color:#ef=
efdf=3D
; top:52px; height:80px; left:0px; right:0px; border-top: 1px solid silver;=
=3D
 border-bottom: 1px solid silver; overflow:hidden;">
+<div id=3D3D"headerDIV">
 	{header}
 </div>
-<div id=3D3D"bodyDIV" style=3D3D"position:absolute; background-color:white=
; to=3D
p:134px; bottom:80px; width:100%; border-top: 1px solid #efefdf;">
+<div class=3D3D"bodyDIV bodyDIVAttachment" id=3D3D"bodyDIV">
 	<iframe frameborder=3D3D"no" scrolling=3D3D"auto" style=3D3D"border:0px s=
olid b=3D
lack; width:100%; height:100%;" src=3D3D"{url_displayBody}">
 	</iframe>
 </div>
-<div id=3D3D"attachmentDIV" style=3D3D"position:absolute; background-color=
:#ef=3D
efdf; bottom:0px; height:80px; width:100%; border-top: 1px solid silver; ov=
=3D
erflow:auto;">
+<div id=3D3D"attachmentDIV">
 <table border=3D3D"0" width=3D3D"100%" cellspacing=3D3D"0">
 {attachment_rows}
 </table>

Author: lkneschke
Date: Thu Sep 28 20:46:27 2006
New Revision: 22547

URL: http://www.egroupware.org/viewvc?rev=3D3D22547&view=3D3Drev
Log:
added functionality to add multiple html / text parts to the message

Modified:
    trunk/phpgwapi/inc/class.phpmailer.inc.php

Modified: trunk/phpgwapi/inc/class.phpmailer.inc.php
URL: http://www.egroupware.org/viewvc/trunk/phpgwapi/inc/class.phpmailer.in=
=3D
c=2Ephp?rev=3D3D22547&r1=3D3D22546&r2=3D3D22547&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/phpgwapi/inc/class.phpmailer.inc.php (original)
+++ trunk/phpgwapi/inc/class.phpmailer.inc.php Thu Sep 28 20:46:27 2006
@@ -1079,14 +1079,22 @@
             $cid         =3D3D $this->attachment[$i][7];
             =3D

             $mime[] =3D3D sprintf("--%s%s", $this->boundary[1], $this->LE);
-            $mime[] =3D3D sprintf("Content-Type: %s; name=3D3D\"%s\"%s", $=
type=3D
, $name, $this->LE);
+            if($disposition =3D3D=3D3D 'part') {
+                $mime[] =3D3D sprintf("Content-Type: %s; charset =3D3D\"%s=
\"%s=3D
", $type, $this->CharSet, $this->LE);
+            } else {
+                $mime[] =3D3D sprintf("Content-Type: %s; name=3D3D\"%s\"%s=
", $=3D
type, $name, $this->LE);
+            }
             $mime[] =3D3D sprintf("Content-Transfer-Encoding: %s%s", $enco=
di=3D
ng, $this->LE);
 =3D

             if($disposition =3D3D=3D3D "inline")
                 $mime[] =3D3D sprintf("Content-ID: <%s>%s", $cid, $this->L=
E);
 =3D

-            $mime[] =3D3D sprintf("Content-Disposition: %s; filename=3D3D\=
"%s\=3D
"%s", =3D

+            if($disposition !=3D3D "part") {
+                $mime[] =3D3D sprintf("Content-Disposition: %s; filename=
=3D3D\=3D
"%s\"%s", =3D

                               $disposition, $name, $this->LE.$this->LE);
+            } else {
+                $mime[] =3D3D sprintf("%s", $this->LE);
+            }
 =3D

             // Encode as string attachment
             if($bString)
@@ -1289,6 +1297,30 @@
     }
     =3D

     /**
+     * Adds a string or binary attachment (non-filesystem) to the list.
+     * This method can be used to attach ascii or binary data,
+     * such as a BLOB record from a database.
+     * @param string $string String attachment data.
+     * @param string $filename Name of the attachment.
+     * @param string $encoding File encoding (see $Encoding).
+     * @param string $type File extension (MIME) type.
+     * @return void
+     */
+    function AddStringPart($string, $filename, $encoding =3D3D "base64", =
=3D

+                                 $type =3D3D "application/octet-stream") {
+        // Append to $attachment array
+        $cur =3D3D count($this->attachment);
+        $this->attachment[$cur][0] =3D3D $string;
+        $this->attachment[$cur][1] =3D3D $filename;
+        $this->attachment[$cur][2] =3D3D $filename;
+        $this->attachment[$cur][3] =3D3D $encoding;
+        $this->attachment[$cur][4] =3D3D $type;
+        $this->attachment[$cur][5] =3D3D true; // isString
+        $this->attachment[$cur][6] =3D3D "part";
+        $this->attachment[$cur][7] =3D3D 0;
+    }
+    =3D

+    /**
      * Adds an embedded attachment.  This can include images, sounds, and =
=3D

      * just about any other document.  Make sure to set the $type to an =
=3D

      * image type.  For JPEG images use "image/jpeg" and for GIF images =
=3D

Author: lkneschke
Date: Thu Sep 28 20:44:36 2006
New Revision: 22546

URL: http://www.egroupware.org/viewvc?rev=3D3D22546&view=3D3Drev
Log:
finished signature handling rewrite mostly. There are still some layout cor=
=3D
rection needed.
You can now define multiple signatures and select them while writing a emai=
=3D
l=2E

Added:
    trunk/felamimail/js/jscode/listSignatures.js
    trunk/felamimail/templates/default/preferences_edit_signature.tpl
    trunk/felamimail/templates/default/preferences_list_signatures.tpl
Removed:
    trunk/felamimail/templates/default/images/mail_new.png
    trunk/felamimail/templates/default/images/new.png
Modified:
    trunk/felamimail/Changelog
    trunk/felamimail/inc/class.ajaxfelamimail.inc.php
    trunk/felamimail/inc/class.bocompose.inc.php
    trunk/felamimail/inc/class.bofelamimail.inc.php
    trunk/felamimail/inc/class.bopreferences.inc.php
    trunk/felamimail/inc/class.sopreferences.inc.php
    trunk/felamimail/inc/class.uicompose.inc.php
    trunk/felamimail/inc/class.uidisplay.inc.php
    trunk/felamimail/inc/class.uifelamimail.inc.php
    trunk/felamimail/inc/class.uipreferences.inc.php
    trunk/felamimail/inc/class.uiwidgets.inc.php
    trunk/felamimail/inc/hook_sidebox_menu.inc.php
    trunk/felamimail/setup/setup.inc.php
    trunk/felamimail/setup/tables_current.inc.php
    trunk/felamimail/setup/tables_update.inc.php
    trunk/felamimail/templates/default/composeForm.tpl

Modified: trunk/felamimail/Changelog
URL: http://www.egroupware.org/viewvc/trunk/felamimail/Changelog?rev=3D3D22=
54=3D
6&r1=3D3D22545&r2=3D3D22546&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/felamimail/Changelog (original)
+++ trunk/felamimail/Changelog Thu Sep 28 20:44:36 2006
@@ -1,3 +1,7 @@
+20060928
+- finished signature handling rewrite mostly. You can now define multiple =
=3D
signatures
+  and select them while writing a email.
+
 20060914
 - removed (temporarly) the dbcache. FeLaMiMail now works completly against=
=3D
 the imapserver.
   This requires a server with search and sort functionality. Big folders

Modified: trunk/felamimail/inc/class.ajaxfelamimail.inc.php
URL: http://www.egroupware.org/viewvc/trunk/felamimail/inc/class.ajaxfelami=
=3D
mail.inc.php?rev=3D3D22546&r1=3D3D22545&r2=3D3D22546&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/felamimail/inc/class.ajaxfelamimail.inc.php (original)
+++ trunk/felamimail/inc/class.ajaxfelamimail.inc.php Thu Sep 28 20:44:36 2=
=3D
006
@@ -189,6 +189,18 @@
 			return $this->generateMessageList($this->sessionData['mailbox']);
 		}
 		=3D

+		function deleteSignatures($_signatures) {
+				$boPreferences =3D3D CreateObject('felamimail.bopreferences');
+				=3D

+				$boPreferences->deleteSignatures($_signatures);
+				=3D

+				$signatures =3D3D $boPreferences->getListOfSignatures();
+
+				$response =3D3D& new xajaxResponse();
+				$response->addAssign('signatureTable', 'innerHTML', $this->uiwidgets->=
=3D
createSignatureTable($signatures));
+				return $response->getXML();
+		}
+		=3D

 		function emptyTrash() {
 			if(!empty($GLOBALS['egw_info']['user']['preferences']['felamimail']['tr=
=3D
ashFolder'])) {
 				$this->bofelamimail->compressFolder($GLOBALS['egw_info']['user']['pref=
=3D
erences']['felamimail']['trashFolder']);
@@ -219,7 +231,6 @@
 		}
 		=3D

 		function generateMessageList($_folderName) {
-			error_log('generateMessageList for folder '.$_folderName);
 			$listMode =3D3D 0;
 		=3D

 			$this->bofelamimail->restoreSessionData();
@@ -423,6 +434,16 @@
 			=3D

 		}
 		=3D

+		function refreshSignatureTable() {
+				$boPreferences =3D3D CreateObject('felamimail.bopreferences');
+				=3D

+				$signatures =3D3D $boPreferences->getListOfSignatures();
+
+				$response =3D3D& new xajaxResponse();
+				$response->addAssign('signatureTable', 'innerHTML', $this->uiwidgets->=
=3D
createSignatureTable($signatures));
+				return $response->getXML();
+		}
+		=3D

 		function reloadAttachments($_composeID) {
 			$bocompose	=3D3D& CreateObject('felamimail.bocompose', $_composeID);
 			$tableRows	=3D3D  array();
@@ -478,6 +499,24 @@
 		function saveSessionData() {
 			$GLOBALS['egw']->session->appsession('ajax_session_data','',$this->sess=
=3D
ionDataAjax);
 			$GLOBALS['egw']->session->appsession('session_data','',$this->sessionDa=
=3D
ta);
+		}
+		=3D

+		function saveSignature($_mode, $_id, $_description, $_signature) {
+				$boPreferences =3D3D CreateObject('felamimail.bopreferences');
+				=3D

+				$signatureID =3D3D $boPreferences->saveSignature($_id, $_description, =
$_=3D
signature);
+
+				$response =3D3D& new xajaxResponse();
+
+				if($_mode =3D3D=3D3D 'save') {
+					#$response->addAssign('signatureID', 'value', $signatureID);
+					#$response->addScript('window.close()');
+				} else {
+					$response->addScript("opener.fm_refreshSignatureTable()");
+					$response->addAssign('signatureID', 'value', $signatureID);
+				}
+				=3D

+				return $response->getXML();
 		}
 		=3D

 		function searchAddress($_searchString) {

Modified: trunk/felamimail/inc/class.bocompose.inc.php
URL: http://www.egroupware.org/viewvc/trunk/felamimail/inc/class.bocompose.=
=3D
inc.php?rev=3D3D22546&r1=3D3D22545&r2=3D3D22546&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/felamimail/inc/class.bocompose.inc.php (original)
+++ trunk/felamimail/inc/class.bocompose.inc.php Thu Sep 28 20:44:36 2006
@@ -451,7 +451,7 @@
 			$GLOBALS['egw']->session->appsession('compose_session_data_'.$this->com=
=3D
poseID,'',$this->sessionData);
 		}
 =3D

-		function createMessage(&$_mailObject, $_formData, $_identity) {
+		function createMessage(&$_mailObject, $_formData, $_identity, $_signatur=
=3D
e =3D3D false) {
 			$bofelamimail	=3D3D& CreateObject('felamimail.bofelamimail',$this->disp=
la=3D
yCharset);
 =3D

 			$userLang =3D3D $GLOBALS['egw_info']['user']['preferences']['common']['=
la=3D
ng'];
@@ -518,9 +518,16 @@
 				$_mailObject->IsHTML(true);
 				$_mailObject->Body    =3D3D $_formData['body'];
 				$_mailObject->AltBody =3D3D $this->convertHTMLToText($_formData['body'=
]);
+				if(!empty($_signature['signature'])) {
+					$_mailObject->AddStringPart($_signature['signature'], lang('signature=
=3D
'), 'quoted-printable', 'text/html');
+					$_mailObject->AltBody .=3D3D "\r\n--\r\n". $this->convertHTMLToText($=
_s=3D
ignature['signature']);
+				}
 			} else {
 				$_mailObject->IsHTML(false);
 				$_mailObject->Body =3D3D $this->convertHTMLToText($_formData['body']);
+				if(!empty($_signature['signature'])) {
+					$_mailObject->Body .=3D3D "\r\n--\r\n". $this->convertHTMLToText($_si=
gn=3D
ature['signature']);
+				}
 			}
 			if (!empty($_formData['signature'])) {
 				$_mailObject->Body	.=3D3D "\r\n-- \r\n";
@@ -594,15 +601,20 @@
 			$this->sessionData['subject']	=3D3D trim($_formData['subject']);
 			$this->sessionData['body']	=3D3D $_formData['body'];
 			$this->sessionData['priority']	=3D3D $_formData['priority'];
-			$this->sessionData['signature']	=3D3D $_formData['signature'];
+			$this->sessionData['signatureID'] =3D3D $_formData['signatureID'];
 			$this->sessionData['disposition'] =3D3D $_formData['disposition'];
 			$this->sessionData['mimeType']	=3D3D $_formData['mimeType'];
 			$this->sessionData['to_infolog'] =3D3D $_formData['to_infolog'];
 =3D

 			$identity =3D3D $this->preferences->getIdentity((int)$this->sessionData=
['=3D
identity']);
+			$signature =3D3D $this->bopreferences->getSignature((int)$this->session=
Da=3D
ta['signatureID']);
 			=3D

 			// create the messages
-			$this->createMessage($mail, $_formData, $identity);
+			$this->createMessage($mail, $_formData, $identity, $signature);
+			#print "<pre>". $mail->getMessageHeader() ."</pre><hr><br>";
+			#print "<pre>". $mail->getMessageBody() ."</pre><hr><br>";
+			#exit;
+			                                                                =3D

 =3D

 			$ogServer =3D3D $this->preferences->getOutgoingServer(0);
 =3D

@@ -615,7 +627,7 @@
 				$mail->Username	=3D3D $ogServer->username;
 				$mail->Password	=3D3D $ogServer->password;
 			}
-			=3D

+
 			// set a higher timeout for big messages
 			@set_time_limit(120);
 			#$mail->SMTPDebug =3D3D 10;

Modified: trunk/felamimail/inc/class.bofelamimail.inc.php
URL: http://www.egroupware.org/viewvc/trunk/felamimail/inc/class.bofelamima=
=3D
il.inc.php?rev=3D3D22546&r1=3D3D22545&r2=3D3D22546&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/felamimail/inc/class.bofelamimail.inc.php (original)
+++ trunk/felamimail/inc/class.bofelamimail.inc.php Thu Sep 28 20:44:36 2006
@@ -179,10 +179,10 @@
 		function appendMessage($_folderName, $_header, $_body, $_flags)
 		{
 			$imapServer =3D3D& $this->mailPreferences->getIncomingServer(0);
-			#print "<pre>$_header.$_body</pre>";
 			$mailboxString =3D3D $imapServer->getMailboxString($_folderName);
 			$header =3D3D str_replace("\n","\r\n",$_header);
 			$body   =3D3D str_replace("\n","\r\n",$_body);
+			#print "<pre>". htmlentities($header.$body) ."</pre>";
 			$result =3D3D @imap_append($this->mbox, $mailboxString, "$header"."$bod=
y"=3D
, $_flags);
 			#print imap_last_error();exit;
 			return $result;

Modified: trunk/felamimail/inc/class.bopreferences.inc.php
URL: http://www.egroupware.org/viewvc/trunk/felamimail/inc/class.bopreferen=
=3D
ces.inc.php?rev=3D3D22546&r1=3D3D22545&r2=3D3D22546&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/felamimail/inc/class.bopreferences.inc.php (original)
+++ trunk/felamimail/inc/class.bopreferences.inc.php Thu Sep 28 20:44:36 20=
=3D
06
@@ -95,6 +95,10 @@
 			return array('icServer' =3D3D> $icServer, 'ogServer' =3D3D> $ogServer, =
'ide=3D
ntity' =3D3D> $identity, 'active' =3D3D> $isActive);
 		}
 		=3D

+		function getListOfSignatures() {
+			return parent::getListOfSignatures($GLOBALS['egw_info']['user']['accoun=
=3D
t_id']);
+		}
+		=3D

 		function getPreferences()
 		{
 			if(!is_a($this->profileData,'ea_preferences ')) {
@@ -152,13 +156,26 @@
 			return $this->profileData;
 		}
 		=3D

-		function saveAccountData($_icServer, $_ogServer, $_identity)
-		{
+		function getSignature($_signatureID) {
+			return parent::getSignature($GLOBALS['egw_info']['user']['account_id'],=
=3D
 $_signatureID);
+		}
+		=3D

+		function deleteSignatures($_signatureID) {
+			if(!is_array($_signatureID)) {
+				return false;
+			}
+			return parent::deleteSignatures($GLOBALS['egw_info']['user']['account_i=
=3D
d'], $_signatureID);
+		}
+		=3D

+		function saveAccountData($_icServer, $_ogServer, $_identity) {
 			parent::saveAccountData($GLOBALS['egw_info']['user']['account_id'], $_i=
=3D
cServer, $_ogServer, $_identity);
 		}
+		=3D

+		function saveSignature($_signatureID, $_description, $_signature) {
+			return parent::saveSignature($GLOBALS['egw_info']['user']['account_id']=
=3D
, $_signatureID, $_description, $_signature);
+		}
 =3D

-		function setProfileActive($_status)
-		{
+		function setProfileActive($_status) {
 			parent::setProfileActive($GLOBALS['egw_info']['user']['account_id'], $_=
=3D
status);
 		}
 	}

Modified: trunk/felamimail/inc/class.sopreferences.inc.php
URL: http://www.egroupware.org/viewvc/trunk/felamimail/inc/class.sopreferen=
=3D
ces.inc.php?rev=3D3D22546&r1=3D3D22545&r2=3D3D22546&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/felamimail/inc/class.sopreferences.inc.php (original)
+++ trunk/felamimail/inc/class.sopreferences.inc.php Thu Sep 28 20:44:36 20=
=3D
06
@@ -15,6 +15,7 @@
 	class sopreferences
 	{
 		var $accounts_table =3D3D 'egw_felamimail_accounts';
+		var $signatures_table =3D3D 'egw_felamimail_signatures';
 		/**
 		 * Instance of the db-class
 		 *
@@ -47,6 +48,66 @@
 			return $retValue;
 		}
 =3D

+		function getListOfSignatures($_accountID)
+		{
+			// no valid accountID
+			if(($accountID =3D3D (int)$_accountID) < 1)
+				return false;
+				=3D

+			$retValue	=3D3D array();
+			=3D

+			$where		=3D3D array('fm_accountid' =3D3D> $accountID);
+			=3D

+			$this->db->select($this->signatures_table,'fm_signatureid,fm_descriptio=
=3D
n',
+				$where, __LINE__, __FILE__);
+				=3D

+			while(($row =3D3D $this->db->row(true,'fm_'))) {
+				$retValue[$row['signatureid']] =3D3D $row;
+			}
+			=3D

+			return $retValue;
+		}
+
+		function getSignature($_accountID, $_signatureID) {
+			// no valid accountID
+			if(($accountID =3D3D (int)$_accountID) < 1)
+				return false;
+				=3D

+			$retValue	=3D3D array();
+			=3D

+			$where		=3D3D array(
+				'fm_accountid'		=3D3D> $accountID,
+				'fm_signatureid'	=3D3D> $_signatureID
+			);
+			=3D

+			$this->db->select($this->signatures_table,'fm_signatureid,fm_descriptio=
=3D
n,fm_signature',
+				$where, __LINE__, __FILE__);
+				=3D

+			if(($row =3D3D $this->db->row(true,'fm_'))) {
+				return $row;
+			}
+
+			return $retValue;
+		}
+
+		function deleteSignatures($_accountID, $_signatureIDs) {
+			// no valid accountID
+			if(($accountID =3D3D (int)$_accountID) < 1)
+				return false;
+				=3D

+			foreach($_signatureIDs as $signatureID) {
+			=3D

+				$where		=3D3D array(
+					'fm_accountid'		=3D3D> $accountID,
+					'fm_signatureid'	=3D3D> $signatureID
+				);
+			=3D

+				$this->db->delete($this->signatures_table, $where, __LINE__, __FILE__);
+				}
+
+			return true;
+		}
+
 		function saveAccountData($_accountID, $_icServer, $_ogServer, $_identity)
 		{
 			$this->db->insert($this->accounts_table,array(
@@ -69,6 +130,29 @@
 				'fm_owner'			=3D3D> $_accountID,
 			),__LINE__,__FILE__);	=3D

 		}
+		=3D

+		function saveSignature($_accountID, $_signatureID, $_description, $_sign=
=3D
ature) {
+			$data =3D3D array(
+				'fm_accountid'			=3D3D> $_accountID,
+				'fm_signature'			=3D3D> $_signature,
+				'fm_description'		=3D3D> $_description,
+			);
+			=3D

+			if($_signatureID =3D3D=3D3D -1) {
+				$this->db->insert($this->signatures_table, $data, '', __LINE__, __FILE=
=3D
__);
+				=3D

+				return $this->db->get_last_insert_id($this->signatures_table,'fm_signa=
=3D
tureid');
+			} else {
+				$where =3D3D array(
+					'fm_accountid'			=3D3D> $_accountID,
+					'fm_signatureid'			=3D3D> $_signatureID,
+				);
+
+				$this->db->update($this->signatures_table, $data, $where, __LINE__, __=
=3D
FILE__);
+				=3D

+				return $_signatureID;
+			}
+		}
 =3D

 		function setProfileActive($_accountID, $_status)
 		{

Modified: trunk/felamimail/inc/class.uicompose.inc.php
URL: http://www.egroupware.org/viewvc/trunk/felamimail/inc/class.uicompose.=
=3D
inc.php?rev=3D3D22546&r1=3D3D22545&r2=3D3D22546&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/felamimail/inc/class.uicompose.inc.php (original)
+++ trunk/felamimail/inc/class.uicompose.inc.php Thu Sep 28 20:44:36 2006
@@ -85,7 +85,7 @@
 			$formData['subject'] 	=3D3D $this->bocompose->stripSlashes($_POST['subj=
ec=3D
t']);
 			$formData['body'] 	=3D3D $this->bocompose->stripSlashes($_POST['body']);
 			$formData['priority'] 	=3D3D $this->bocompose->stripSlashes($_POST['pri=
or=3D
ity']);
-			$formData['signature'] 	=3D3D $this->bocompose->stripSlashes($_POST['si=
gn=3D
ature']);
+			$formData['signatureID'] =3D3D (int)$_POST['signatureID'];
 			$formData['mimeType']	=3D3D $this->bocompose->stripSlashes($_POST['mime=
Ty=3D
pe']);
 			$formData['disposition'] =3D3D (bool)$_POST['disposition'];
 			$formData['to_infolog'] =3D3D $_POST['to_infolog'];
@@ -236,7 +236,15 @@
 				$this->t->set_var('tinymce', $GLOBALS['egw']->html->tinymceQuick('body=
=3D
', 'ascii', $sessionData['body'], $style));
 				$this->t->set_var('mimeType', 'text');
 			}
-			$this->t->set_var("signature",$sessionData['signature']);
+			=3D

+			$signatures =3D3D ExecMethod('felamimail.bopreferences.getListOfSignatu=
re=3D
s');
+
+			$selectSignatures =3D3D array();
+			foreach($signatures as $signature) {
+				$selectSignatures[$signature['signatureid']] =3D3D $signature['descrip=
ti=3D
on'];
+			}
+			$selectBox =3D3D $GLOBALS['egw']->html->select('signatureID', $sessionD=
at=3D
a['signatureID'], $selectSignatures, true, "style=3D3D'width: 100%;' onchan=
ge=3D
=3D3D'fm_compose_changeInputType(this)'");
+			$this->t->set_var("select_signature", $selectBox);
 			$this->t->pparse("out","body_input");
 =3D

 			// attachments

Modified: trunk/felamimail/inc/class.uidisplay.inc.php
URL: http://www.egroupware.org/viewvc/trunk/felamimail/inc/class.uidisplay.=
=3D
inc.php?rev=3D3D22546&r1=3D3D22545&r2=3D3D22546&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/felamimail/inc/class.uidisplay.inc.php (original)
+++ trunk/felamimail/inc/class.uidisplay.inc.php Thu Sep 28 20:44:36 2006
@@ -997,11 +997,17 @@
 				)
 			);
 =3D

+			$body =3D3D '';
+
 			for($i=3D3D0; $i<count($bodyParts); $i++)
 			{
-				$bodyParts[$i]['body']=3D3D =3D

-					$this->botranslation->convert($bodyParts[$i]['body'],
-											strtolower($bodyParts[$i]['charSet']));
+				if(!empty($body)) {
+					$body .=3D3D '<hr style=3D3D"border:dotted 1px silver;">';
+				}
+				$bodyParts[$i]['body'] =3D3D $this->botranslation->convert(
+					$bodyParts[$i]['body'],
+					strtolower($bodyParts[$i]['charSet'])
+				);
 =3D

 				if($bodyParts[$i]['mimeType'] =3D3D=3D3D 'text/plain')
 				{

Modified: trunk/felamimail/inc/class.uifelamimail.inc.php
URL: http://www.egroupware.org/viewvc/trunk/felamimail/inc/class.uifelamima=
=3D
il.inc.php?rev=3D3D22546&r1=3D3D22545&r2=3D3D22546&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/felamimail/inc/class.uifelamimail.inc.php (original)
+++ trunk/felamimail/inc/class.uifelamimail.inc.php Thu Sep 28 20:44:36 2006
@@ -395,7 +395,7 @@
 			$urlCompose =3D3D "egw_openWindowCentered('".$GLOBALS['egw']->link('/in=
de=3D
x=2Ephp',$linkData)."','compose', 700, egw_getWindowOuterHeight());";
 =3D

 			$navbarImages =3D3D array(
-				'mail_new'	=3D3D> array(
+				'new'			=3D3D> array(
 					'action'	=3D3D> $urlCompose,
 					'tooltip'	=3D3D> lang('compose'),
 				),

Modified: trunk/felamimail/inc/class.uipreferences.inc.php
URL: http://www.egroupware.org/viewvc/trunk/felamimail/inc/class.uipreferen=
=3D
ces.inc.php?rev=3D3D22546&r1=3D3D22545&r2=3D3D22546&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/felamimail/inc/class.uipreferences.inc.php (original)
+++ trunk/felamimail/inc/class.uipreferences.inc.php Thu Sep 28 20:44:36 20=
=3D
06
@@ -32,8 +32,10 @@
 		function uipreferences()
 		{
 			$this->t =3D3D $GLOBALS['egw']->template;
-			#$this->t->egroupware_hack =3D3D False;
+			$this->charset =3D3D $GLOBALS['egw']->translation->charset();
+
 			$this->bofelamimail	=3D3D& CreateObject('felamimail.bofelamimail',$GLOB=
AL=3D
S['egw']->translation->charset());
+			$this->bopreferences	=3D3D& CreateObject('felamimail.bopreferences');
 			$this->uiwidgets	=3D3D& CreateObject('felamimail.uiwidgets');
 			$this->bofelamimail->openConnection('',OP_HALFOPEN);
 			=3D

@@ -66,9 +68,18 @@
 			=3D

 			switch($_GET['menuaction'])
 			{
+				case 'felamimail.uipreferences.editSignature':
+					$GLOBALS['egw']->js->validate_file('jscode','listSignatures','felamim=
=3D
ail');
+					#$GLOBALS['egw']->js->set_onload('fm_initEditLayout();');
+					break;
 				case 'felamimail.uipreferences.editAccountData':
 					$GLOBALS['egw']->js->validate_file('jscode','editAccountData','felami=
=3D
mail');
 					$GLOBALS['egw']->js->set_onload('javascript:initEditAccountData();');
+					break;
+
+				case 'felamimail.uipreferences.listSignatures':
+					$GLOBALS['egw']->js->validate_file('jscode','listSignatures','felamim=
=3D
ail');
+					#$GLOBALS['egw']->js->set_onload('javascript:initEditAccountData();');
 					break;
 =3D

 				case 'felamimail.uipreferences.listFolder':
@@ -134,6 +145,10 @@
 		=3D

 		function editSignature() {
 			$signatureID =3D3D (int)$_GET['signatureID'];
+			=3D

+			if($signatureID >=3D3D 0) {
+				$signatureData =3D3D $this->bopreferences->getSignature($signatureID);
+			}
 =3D

 			$this->display_app_header(false);
 			=3D

@@ -144,12 +159,20 @@
 =3D

 			$linkData =3D3D array
 			(
-				'menuaction'    =3D3D> 'felamimail.uipreferences.editAccountData'
+				'menuaction'    =3D3D> 'felamimail.uipreferences.editSignature'
 			);
 			$this->t->set_var('form_action',$GLOBALS['egw']->link('/index.php',$lin=
=3D
kData));
 =3D

+			$this->t->set_var('description', ($signatureID >=3D3D 0 ? @htmlspecialc=
ha=3D
rs($signatureData['description'], ENT_QUOTES, $this->charset) : ''));
+			=3D

+			$this->t->set_var('signatureID', $signatureID);
+
 			$style=3D3D"width:100%; border:0px; height:150px;";
-			$this->t->set_var('tinymce',$GLOBALS['egw']->html->tinymceQuick('body',=
=3D
 'simple', $sessionData['body'], $style));
+			$this->t->set_var('tinymce',$GLOBALS['egw']->html->tinymceQuick(
+				'signature', 'simple', =3D

+				($signatureID >=3D3D 0 ? $signatureData['signature'] : ''), =3D

+				$style)
+			);
 =3D

 			$this->t->parse("out","main");
 			print $this->t->get('out','main');
@@ -450,16 +473,6 @@
 		=3D

 		function listSignatures()
 		{
-			// create a new Mailbox
-			if(isset($_POST['newSubFolder']))
-			{
-				$oldMailboxName =3D3D $this->bofelamimail->sessionData['preferences'][=
'm=3D
ailbox'].'.';
-				$oldMailboxName	=3D3D ($oldMailboxName =3D3D=3D3D '--topfolderselected=
--.') =3D
? '' : $oldMailboxName;
-				$newMailboxName =3D3D $oldMailboxName.$_POST['newSubFolder'];
-
-				$this->bofelamimail->imap_createmailbox($newMailboxName,True);
-			}
-			=3D

 			$this->display_app_header(TRUE);
 =3D

 			$this->t->set_file(array("body" =3D3D> "preferences_list_signatures.tpl=
")=3D
);
@@ -473,23 +486,27 @@
 			(
 				'menuaction'    =3D3D> 'felamimail.uipreferences.listFolder'
 			);
-			$this->t->set_var('form_action',$GLOBALS['egw']->link('/index.php',$lin=
=3D
kData));
-
+			$this->t->set_var('form_action', $GLOBALS['egw']->link('/index.php',$li=
=3D
nkData));
+
+			$linkData =3D3D array
+			(
+				'menuaction'    =3D3D> 'felamimail.uipreferences.editSignature',
+				'signatureID'	=3D3D> '-1'
+			);
+			$this->t->set_var('url_addSignature', $GLOBALS['egw']->link('/index.php=
=3D
',$linkData));
+			=3D

 			$linkData =3D3D array
 			(
 				'menuaction'    =3D3D> 'felamimail.uipreferences.editSignature'
 			);
 			$urlEditSignature =3D3D $GLOBALS['egw']->link('/index.php',$linkData);
 			=3D

-			$tableRows =3D3D array(
-				'1' =3D3D> array(
-					'1'	=3D3D> $GLOBALS['egw']->html->checkbox('name', false),
-					'.1'	=3D3D> 'style=3D3D"width:30px"',
-					'2'	=3D3D> '<a href=3D3D"#" onclick=3D3D"egw_openWindowCentered(\''. =
$urlEd=3D
itSignature .'\',\'felamiMailACL\',\'600\',\'200\');">Beschreibung</a>',
-				),
-			);
-			=3D

-			$this->t->set_var('table', $GLOBALS['egw']->html->table($tableRows, 'st=
=3D
yle=3D3D"width:100%; border: 1px solid black;"'));
+			$this->t->set_var('url_image_add',$GLOBALS['egw']->common->image('phpgw=
=3D
api','new'));
+			$this->t->set_var('url_image_delete',$GLOBALS['egw']->common->image('ph=
=3D
pgwapi','delete'));
+			=3D

+			$signatures =3D3D $this->bopreferences->getListOfSignatures();
+			=3D

+			$this->t->set_var('table', $this->uiwidgets->createSignatureTable($sign=
=3D
atures));
 			=3D

 			$this->t->pparse("out","main");			=3D

 			$this->bofelamimail->closeConnection();
@@ -549,6 +566,8 @@
 			$this->t->set_var("lang_outgoing_server",lang('outgoing mail server(SMT=
=3D
P)'));
 			$this->t->set_var("auth_required",lang('authentication required'));
 			$this->t->set_var('lang_add_acl',lang('add acl'));
+			$this->t->set_var('lang_description',lang('description'));
+			$this->t->set_var('lang_really_delete_signatures',lang('Do you really w=
=3D
ant to delete the selected signatures?'));
 			=3D

 			$this->t->set_var("th_bg",$GLOBALS['egw_info']["theme"]["th_bg"]);
 			$this->t->set_var("bg01",$GLOBALS['egw_info']["theme"]["bg01"]);

Modified: trunk/felamimail/inc/class.uiwidgets.inc.php
URL: http://www.egroupware.org/viewvc/trunk/felamimail/inc/class.uiwidgets.=
=3D
inc.php?rev=3D3D22546&r1=3D3D22545&r2=3D3D22546&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/felamimail/inc/class.uiwidgets.inc.php (original)
+++ trunk/felamimail/inc/class.uiwidgets.inc.php Thu Sep 28 20:44:36 2006
@@ -56,6 +56,10 @@
 			$this->template =3D3D $template;
 			$this->template->set_file(array("body" =3D3D> 'uiwidgets.tpl'));
 			$this->charset =3D3D $GLOBALS['egw']->translation->charset();
+			=3D

+			if (!is_object($GLOBALS['egw']->html)) {
+				$GLOBALS['egw']->html =3D3D CreateObject('phpgwapi.html');
+			}
 		}
 =3D

 		/**
@@ -160,6 +164,22 @@
 			=3D

 			return $folder_tree_new;
 		}
+		=3D

+		function createSignatureTable($_signatureList) {
+			if(is_array($_signatureList)) {
+				foreach($_signatureList as $signature) {
+					$tableRows[] =3D3D array(
+						'1'	=3D3D> $GLOBALS['egw']->html->checkbox('signatureID', false, $si=
gn=3D
ature['signatureid']),
+						'.1'	=3D3D> 'style=3D3D"width:30px"',
+						'2'	=3D3D> '<a href=3D3D"" onclick=3D3D"egw_openWindowCentered(\''. =
$urlEd=3D
itSignature ."&signatureID=3D3D".$signature['signatureid']. '\',\'felamiMai=
lA=3D
CL\',\'600\',\'230\'); return false;">'. @htmlspecialchars($signature['desc=
=3D
ription'], ENT_QUOTES, $this->charset) .'</a>',
+					);
+				}
+				=3D

+				return $GLOBALS['egw']->html->table($tableRows, 'style=3D3D"width:100%=
;"=3D
');
+			}
+			=3D

+			return '';
+		}
 =3D

 		// $_folderType 0: normal imap folder 1: sent folder 2: draft folder
 		// $_rowStyle felamimail or outlook

Modified: trunk/felamimail/inc/hook_sidebox_menu.inc.php
URL: http://www.egroupware.org/viewvc/trunk/felamimail/inc/hook_sidebox_men=
=3D
u=2Einc.php?rev=3D3D22546&r1=3D3D22545&r2=3D3D22546&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/felamimail/inc/hook_sidebox_menu.inc.php (original)
+++ trunk/felamimail/inc/hook_sidebox_menu.inc.php Thu Sep 28 20:44:36 2006
@@ -70,11 +70,11 @@
 		}
 =3D

 =3D

-		#	$linkData =3D3D array
-		#	(
-		#		'menuaction' =3D3D> 'felamimail.uipreferences.listSignatures',
-		#	);
-		#	$file['Manage Signatures'] =3D3D $GLOBALS['egw']->link('/index.php',$l=
in=3D
kData);
+			$linkData =3D3D array
+			(
+				'menuaction' =3D3D> 'felamimail.uipreferences.listSignatures',
+			);
+			$file['Manage Signatures'] =3D3D $GLOBALS['egw']->link('/index.php',$li=
nk=3D
Data);
 		=3D

 		$file['Manage Folders']	=3D3D $GLOBALS['egw']->link('/index.php','menuac=
ti=3D
on=3D3Dfelamimail.uipreferences.listFolder');
 		=3D


Added: trunk/felamimail/js/jscode/listSignatures.js
URL: http://www.egroupware.org/viewvc/trunk/felamimail/js/jscode/listSignat=
=3D
ures.js?rev=3D3D22546&view=3D3Dauto
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/felamimail/js/jscode/listSignatures.js (added)
+++ trunk/felamimail/js/jscode/listSignatures.js Thu Sep 28 20:44:36 2006
@@ -1,0 +1,62 @@
+var ruleSignatureWindowTimeout=3D3D500;
+var signatureEditWindow;
+var signatureEditWindowTimer;
+
+function fm_addSignature(_url)
+{
+	signatureEditWindow =3D3D egw_openWindowCentered(_url,'editSignature','60=
0'=3D
,'230',window.outerWidth/2,window.outerHeight/2);
+	if(signatureEditWindowTimer) {
+		window.clearTimeout(signatureEditWindowTimer);
+	}
+	signatureEditWindowTimer =3D3D window.setInterval('fm_checkSignatureEditW=
in=3D
dow()', ruleSignatureWindowTimeout);
+}
+
+function fm_saveSignature() {
+	xajax_doXMLHTTP("felamimail.ajaxfelamimail.saveSignature", "save", =3D

+		document.getElementById('signatureID').value, =3D

+		document.getElementById('description').value, =3D

+		tinyMCE.getContent()
+	);
+	window.setTimeout("window.close()", 1000);
+}
+
+function fm_applySignature() {
+	xajax_doXMLHTTP("felamimail.ajaxfelamimail.saveSignature", "apply", =3D

+		document.getElementById('signatureID').value, =3D

+		document.getElementById('description').value, =3D

+		tinyMCE.getContent()
+	);
+}
+
+function fm_initEditLayout() {
+	alert(document.body.offsetHeight);
+}
+
+function fm_deleteSignatures() {
+	if(document.forms["signatureList"].elements.length > 0) {
+		var signatures =3D3D new Array();
+
+		for(i=3D3D0; i<document.forms["signatureList"].elements.length; i++) {
+			if(document.forms["signatureList"].elements[i].checked) {
+				signatures.push(document.forms["signatureList"].elements[i].value);
+			}
+		}
+
+		if(signatures.length > 0) {
+			if(confirm(lang_reallyDeleteSignatures)) {
+				xajax_doXMLHTTP("felamimail.ajaxfelamimail.deleteSignatures", signatur=
=3D
es);
+			}
+		}
+	}
+}
+
+function fm_refreshSignatureTable() {
+	xajax_doXMLHTTP("felamimail.ajaxfelamimail.refreshSignatureTable");
+}
+
+function fm_checkSignatureEditWindow() {
+	if(signatureEditWindow.closed =3D3D=3D3D true) {
+		window.clearTimeout(signatureEditWindowTimer);
+		fm_refreshSignatureTable();
+	}
+}

Modified: trunk/felamimail/setup/setup.inc.php
URL: http://www.egroupware.org/viewvc/trunk/felamimail/setup/setup.inc.php?=
=3D
rev=3D3D22546&r1=3D3D22545&r2=3D3D22546&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/felamimail/setup/setup.inc.php (original)
+++ trunk/felamimail/setup/setup.inc.php Thu Sep 28 20:44:36 2006
@@ -13,7 +13,7 @@
 =3D

 	$setup_info['felamimail']['name']      		=3D3D 'felamimail';
 	$setup_info['felamimail']['title']     		=3D3D 'FeLaMiMail';
-	$setup_info['felamimail']['version']     	=3D3D '1.3.002';
+	$setup_info['felamimail']['version']     	=3D3D '1.3.003';
 	$setup_info['felamimail']['app_order'] 		=3D3D 2;
 	$setup_info['felamimail']['enable']    		=3D3D 1;
 =3D

@@ -24,7 +24,7 @@
 	$setup_info['felamimail']['maintainer'] 	=3D3D 'Lars Kneschke';
 	$setup_info['felamimail']['maintainer_email'] 	=3D3D 'l.kneschke@...=
.d=3D
e';
 =3D

-	$setup_info['felamimail']['tables']    =3D3D array('egw_felamimail_cache'=
,'=3D
egw_felamimail_folderstatus','egw_felamimail_displayfilter','egw_felamimail=
=3D
_accounts');
+	$setup_info['felamimail']['tables']    =3D3D array('egw_felamimail_cache'=
,'=3D
egw_felamimail_folderstatus','egw_felamimail_displayfilter','egw_felamimail=
=3D
_accounts','egw_felamimail_signatures');
 =3D

 	/* The hooks this app includes, needed for hooks registration */
 	$setup_info['felamimail']['hooks'][] =3D3D 'preferences';

Modified: trunk/felamimail/setup/tables_current.inc.php
URL: http://www.egroupware.org/viewvc/trunk/felamimail/setup/tables_current=
=3D
.inc.php?rev=3D3D22546&r1=3D3D22545&r2=3D3D22546&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/felamimail/setup/tables_current.inc.php (original)
+++ trunk/felamimail/setup/tables_current.inc.php Thu Sep 28 20:44:36 2006
@@ -85,6 +85,18 @@
 			'fk' =3D3D> array(),
 			'ix' =3D3D> array('fm_owner'),
 			'uc' =3D3D> array()
+		),
+		'egw_felamimail_signatures' =3D3D> array(
+			'fd' =3D3D> array(
+				'fm_signatureid' =3D3D> array('type' =3D3D> 'auto'),
+				'fm_accountid' =3D3D> array('type' =3D3D> 'int','precision' =3D3D> '11=
'),
+				'fm_signature' =3D3D> array('type' =3D3D> 'text'),
+				'fm_description' =3D3D> array('type' =3D3D> 'varchar','precision' =3D3=
D> '25=3D
5')
+			),
+			'pk' =3D3D> array('fm_signatureid'),
+			'fk' =3D3D> array(),
+			'ix' =3D3D> array(),
+			'uc' =3D3D> array(array('fm_signatureid','fm_accountid'))
 		)
 	);
 ?>

Modified: trunk/felamimail/setup/tables_update.inc.php
URL: http://www.egroupware.org/viewvc/trunk/felamimail/setup/tables_update.=
=3D
inc.php?rev=3D3D22546&r1=3D3D22545&r2=3D3D22546&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/felamimail/setup/tables_update.inc.php (original)
+++ trunk/felamimail/setup/tables_update.inc.php Thu Sep 28 20:44:36 2006
@@ -354,4 +354,24 @@
 =3D

 		return $GLOBALS['setup_info']['felamimail']['currentver'] =3D3D '1.3.002=
';
 	}
+
+
+	$test[] =3D3D '1.3.002';
+	function felamimail_upgrade1_3_002()
+	{
+		$GLOBALS['egw_setup']->oProc->CreateTable('egw_felamimail_signatures',ar=
=3D
ray(
+			'fd' =3D3D> array(
+				'fm_signatureid' =3D3D> array('type' =3D3D> 'auto'),
+				'fm_accountid' =3D3D> array('type' =3D3D> 'int','precision' =3D3D> '11=
'),
+				'fm_signature' =3D3D> array('type' =3D3D> 'text'),
+				'fm_description' =3D3D> array('type' =3D3D> 'varchar','precision' =3D3=
D> '25=3D
5')
+			),
+			'pk' =3D3D> array('fm_signatureid'),
+			'fk' =3D3D> array(),
+			'ix' =3D3D> array(),
+			'uc' =3D3D> array(array('fm_signatureid','fm_accountid'))
+		));
+
+		return $GLOBALS['setup_info']['felamimail']['currentver'] =3D3D '1.3.003=
';
+	}
 ?>

Modified: trunk/felamimail/templates/default/composeForm.tpl
URL: http://www.egroupware.org/viewvc/trunk/felamimail/templates/default/co=
=3D
mposeForm.tpl?rev=3D3D22546&r1=3D3D22545&r2=3D3D22546&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/felamimail/templates/default/composeForm.tpl (original)
+++ trunk/felamimail/templates/default/composeForm.tpl Thu Sep 28 20:44:36 =
=3D
2006
@@ -123,7 +123,8 @@
 </div>
 =3D

 <fieldset class=3D3D"bordertop"><legend>{lang_signature}</legend>
-		<TEXTAREA class=3D3D"input_text" NAME=3D3Dsignature ROWS=3D3D"5" COLS=3D=
3D"76" W=3D
RAP=3D3DHARD>{signature}</TEXTAREA>
+	{select_signature}
+<!--		<TEXTAREA class=3D3D"input_text" NAME=3D3Dsignature ROWS=3D3D"5" COL=
S=3D3D"7=3D
6" WRAP=3D3DHARD>{signature}</TEXTAREA> -->
 </fieldset>
 <!-- END body_input -->
 =3D


Added: trunk/felamimail/templates/default/preferences_edit_signature.tpl
URL: http://www.egroupware.org/viewvc/trunk/felamimail/templates/default/pr=
=3D
eferences_edit_signature.tpl?rev=3D3D22546&view=3D3Dauto
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/felamimail/templates/default/preferences_edit_signature.tpl (adde=
=3D
d)
+++ trunk/felamimail/templates/default/preferences_edit_signature.tpl Thu S=
=3D
ep 28 20:44:36 2006
@@ -1,0 +1,20 @@
+<!-- BEGIN main -->
+<table style=3D3D"width:100%; background-color:white;">
+<tr>
+<td style=3D3D"width:80px;">
+{lang_description}
+</td>
+<td>
+<input id=3D3D"description" type=3D3D"text" style=3D3D"width:100%;" value=
=3D3D"{de=3D
scription}">
+</td>
+</tr>
+</table>
+{tinymce}
+<button type=3D3D"button" onclick=3D3D"fm_saveSignature()">{lang_save}</bu=
tton>
+<button type=3D3D"button" onclick=3D3D"fm_applySignature()">{lang_apply}</=
butt=3D
on>
+<button type=3D3D"button" onclick=3D3D"window.close()">{lang_cancel}</butt=
on>
+<input type=3D3D"hidden" id=3D3D"signatureID" value=3D3D"{signatureID}">
+<script language=3D3D"JavaScript1.2">
+	document.getElementById('description').focus();
+</script>
+<!-- END main -->

Added: trunk/felamimail/templates/default/preferences_list_signatures.tpl
URL: http://www.egroupware.org/viewvc/trunk/felamimail/templates/default/pr=
=3D
eferences_list_signatures.tpl?rev=3D3D22546&view=3D3Dauto
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/felamimail/templates/default/preferences_list_signatures.tpl (add=
=3D
ed)
+++ trunk/felamimail/templates/default/preferences_list_signatures.tpl Thu =
=3D
Sep 28 20:44:36 2006
@@ -1,0 +1,14 @@
+<!-- BEGIN main -->
+<script language=3D3D"JavaScript1.2">
+// some translations needed for javascript functions
+var lang_reallyDeleteSignatures	=3D3D '{lang_really_delete_signatures}';
+</script>
+
+<button type=3D3D"button" onclick=3D3D"fm_addSignature('{url_addSignature}=
')">=3D
<image src=3D3D"{url_image_add}" alt=3D3D"{lang_add}" title=3D3D"{lang_add}=
"></bu=3D
tton>
+<button type=3D3D"button" onclick=3D3D"fm_deleteSignatures()"><image src=
=3D3D"{u=3D
rl_image_delete}" alt=3D3D"{lang_delete}" title=3D3D"{lang_delete}"></butto=
n>
+<form name=3D3D"signatureList">
+<div id=3D3D"signatureTable" style=3D3D"border:1px solid silver;">
+{table}
+</div>
+</form>
+<!-- END main -->

Author: nelius_weiss
Date: Thu Sep 28 14:26:29 2006
New Revision: 22545

URL: http://www.egroupware.org/viewvc?rev=3D3D22545&view=3D3Drev
Log:
some xajax helpers

Modified:
    trunk/etemplate/js/etemplate.js

Modified: trunk/etemplate/js/etemplate.js
URL: http://www.egroupware.org/viewvc/trunk/etemplate/js/etemplate.js?rev=
=3D
=3D3D22545&r1=3D3D22544&r2=3D3D22545&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/etemplate/js/etemplate.js (original)
+++ trunk/etemplate/js/etemplate.js Thu Sep 28 14:26:29 2006
@@ -199,3 +199,28 @@
 		}
 	}
 }
+
+function xajax_eT_wrapper(obj) {
+	if (typeof(obj) =3D3D=3D3D 'object') {
+		set_style_by_class('div','popupManual','display','none');
+		document.getElementById('ajax-loader').style.display =3D3D 'inline';
+		var etemplate_exec_id =3D3D obj.form.etemplate_exec_id.defaultValue;
+		var submit_button =3D3D obj.name;
+		xajax_doXMLHTTP('etemplate.etemplate.process_exec', etemplate_exec_id, s=
=3D
ubmit_button, xajax.getFormValues(obj.form));
+	}
+	else {
+		document.getElementById('ajax-loader').style.display =3D3D 'none';
+		set_style_by_class('div','popupManual','display','inline');
+	}
+}
+		=3D

+function disable_button(id) {
+	document.getElementById(id).disabled =3D3D 'true';
+	document.getElementById(id).style.color =3D3D 'gray';
+}
+
+function enable_button(id) {
+	document.getElementById(id).disabled =3D3D 'false';
+	document.getElementById(id).style.color =3D3D '';
+}
+

Author: nelius_weiss
Date: Thu Sep 28 07:05:11 2006
New Revision: 22544

URL: http://www.egroupware.org/viewvc?rev=3D3D22544&view=3D3Drev
Log:
remove not longer needed tables_baseline

Removed:
    trunk/wiki/setup/tables_baseline.inc.php

Author: nelius_weiss
Date: Thu Sep 28 07:05:06 2006
New Revision: 22543

URL: http://www.egroupware.org/viewvc?rev=3D3D22543&view=3D3Drev
Log:
remove not longer needed tables_baseline

Removed:
    trunk/timesheet/setup/tables_baseline.inc.php

Author: nelius_weiss
Date: Thu Sep 28 07:05:02 2006
New Revision: 22542

URL: http://www.egroupware.org/viewvc?rev=3D3D22542&view=3D3Drev
Log:
remove not longer needed tables_baseline

Removed:
    trunk/syncml/setup/tables_baseline.inc.php

Author: nelius_weiss
Date: Thu Sep 28 07:04:56 2006
New Revision: 22541

URL: http://www.egroupware.org/viewvc?rev=3D3D22541&view=3D3Drev
Log:
remove not longer needed tables_baseline

Removed:
    trunk/sitemgr/setup/tables_baseline.inc.php

Author: nelius_weiss
Date: Thu Sep 28 07:04:46 2006
New Revision: 22540

URL: http://www.egroupware.org/viewvc?rev=3D3D22540&view=3D3Drev
Log:
remove not longer needed tables_baseline

Removed:
    trunk/resources/setup/tables_baseline.inc.php

Author: nelius_weiss
Date: Thu Sep 28 07:04:42 2006
New Revision: 22539

URL: http://www.egroupware.org/viewvc?rev=3D3D22539&view=3D3Drev
Log:
remove not longer needed tables_baseline

Removed:
    trunk/registration/setup/tables_baseline.inc.php

Author: nelius_weiss
Date: Thu Sep 28 07:04:37 2006
New Revision: 22538

URL: http://www.egroupware.org/viewvc?rev=3D3D22538&view=3D3Drev
Log:
remove not longer needed tables_baseline

Removed:
    trunk/projectmanager/setup/tables_baseline.inc.php

Author: nelius_weiss
Date: Thu Sep 28 07:04:30 2006
New Revision: 22537

URL: http://www.egroupware.org/viewvc?rev=3D3D22537&view=3D3Drev
Log:
remove not longer needed tables_baseline

Removed:
    trunk/polls/setup/tables_baseline.inc.php

Author: nelius_weiss
Date: Thu Sep 28 07:04:19 2006
New Revision: 22536

URL: http://www.egroupware.org/viewvc?rev=3D3D22536&view=3D3Drev
Log:
remove not longer needed tables_baseline

Removed:
    trunk/phpgwapi/setup/tables_baseline.inc.php

Author: nelius_weiss
Date: Thu Sep 28 07:03:59 2006
New Revision: 22535

URL: http://www.egroupware.org/viewvc?rev=3D3D22535&view=3D3Drev
Log:
remove not longer needed tables_baseline

Removed:
    trunk/phpbrain/setup/tables_baseline.inc.php

Author: nelius_weiss
Date: Thu Sep 28 07:03:53 2006
New Revision: 22534

URL: http://www.egroupware.org/viewvc?rev=3D3D22534&view=3D3Drev
Log:
remove not longer needed tables_baseline

Removed:
    trunk/news_admin/setup/tables_baseline.inc.php

Author: nelius_weiss
Date: Thu Sep 28 07:03:42 2006
New Revision: 22533

URL: http://www.egroupware.org/viewvc?rev=3D3D22533&view=3D3Drev
Log:
remove not longer needed tables_baseline

Removed:
    trunk/jinn/setup/tables_baseline.inc.php