From 1a5243c9c4be12ae4b76e338f2d0795711293da5 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 15 Mar 2005 15:36:44 +0000 Subject: [PATCH 01/11] _check_script_tags function: 1) fixed problems pointed out by gulftech, iframes get now unset too 2) unset variables from _check_script_tags are now found in $GLOBALS['egw_unset_vars'], eg. a posted input-field called content would be found in $GLOBALS['egw_unset_vars']['_POST[content]'] (please not the array is only 1-dimensional!), if it has been unset by check_script_tags 3) speed up the function a bit, by not checking all possible names of the superglobals arrays, if nothing found in $_GET and $_POST --- phpgwapi/inc/common_functions.inc.php | 49 +++++++++++++++------------ 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/phpgwapi/inc/common_functions.inc.php b/phpgwapi/inc/common_functions.inc.php index 8657a9f56a..3ef5bda819 100755 --- a/phpgwapi/inc/common_functions.inc.php +++ b/phpgwapi/inc/common_functions.inc.php @@ -681,29 +681,32 @@ { list($appname,$classname) = explode('.',$class); - include_once(EGW_INCLUDE_ROOT.'/'.$appname.'/inc/class.'.$classname.'.inc.php'); + include_once($file=EGW_INCLUDE_ROOT.'/'.$appname.'/inc/class.'.$classname.'.inc.php'); - $args = func_get_args(); - if(count($args) == 1) + if (class_exists($classname)) { - $obj =& new $classname; - } - else - { - $code = '$obj =& new ' . $classname . '('; - foreach($args as $n => $arg) + $args = func_get_args(); + if(count($args) == 1) { - if ($n) - { - $code .= ($n > 1 ? ',' : '') . '$args[' . $n . ']'; - } + $obj =& new $classname; + } + else + { + $code = '$obj =& new ' . $classname . '('; + foreach($args as $n => $arg) + { + if ($n) + { + $code .= ($n > 1 ? ',' : '') . '$args[' . $n . ']'; + } + } + $code .= ');'; + eval($code); } - $code .= ');'; - eval($code); } if (!is_object($obj)) { - echo function_backtrace(1); + echo "

CreateObject('$class'): Cant instanciate class!!!
\n".function_backtrace(1)."

\n"; } return $obj; } @@ -1151,9 +1154,10 @@ } else { - if (preg_match('/<\/?[^>]*(script|onabort|onblur|onchange|onclick|ondblclick|onerror|onfocus|onkeydown|onkeypress|onkeyup|onload|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|onreset|onselect|onsubmit|onunload|javascript)+[^>]*>/i',$val)) + if (preg_match('/<\/?[^>]*(iframe|script|onabort|onblur|onchange|onclick|ondblclick|onerror|onfocus|onkeydown|onkeypress|onkeyup|onload|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|onreset|onselect|onsubmit|onunload|javascript)+[^>]*>/i',$val)) { - //echo "

*** _check_script_tag($name): unset($name [$key]) ***

\n"; + //echo "

*** _check_script_tag($name): unset(${name}[$key]) ***

\n"; + $GLOBALS['egw_unset_vars'][$name.'['.$key.']'] =& $var[$key]; unset($var[$key]); } } @@ -1163,7 +1167,7 @@ } } - foreach(array('_GET','_POST','_REQUEST','HTTP_GET_VARS','HTTP_POST_VARS','HTTP_REQUEST_VARS') as $where) + foreach(array('_GET','_POST','_REQUEST','HTTP_GET_VARS','HTTP_POST_VARS') as $n => $where) { $pregs = array( 'order' => '/^[a-zA-Z0-9_]*$/', @@ -1176,12 +1180,15 @@ $GLOBALS[$where][$name] = ''; } } - if (is_array($GLOBALS[$where])) + // do the check for script-tags only for _GET and _POST or if we found something in _GET and _POST + // speeds up the execusion a bit + if (is_array($GLOBALS[$where]) && ($n < 2 || is_array($GLOBALS['egw_unset_vars']))) { _check_script_tag($GLOBALS[$where],$where); } } - + //if (is_array($GLOBALS['egw_unset_vars'])) { echo "egw_unset_vars=
".htmlspecialchars(print_r($GLOBALS['egw_unset_vars'],true))."
"; exit; } + if(floor(phpversion()) <= 4) { /** From 4610377a6670a332ef36c328722943652768eae8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Leroy?= Date: Thu, 17 Mar 2005 14:36:06 +0000 Subject: [PATCH 02/11] fixing ->setOwner which were always setting empty owner --- phpgwapi/inc/galaxia_workflow/src/API/Instance.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpgwapi/inc/galaxia_workflow/src/API/Instance.php b/phpgwapi/inc/galaxia_workflow/src/API/Instance.php index 24925b1049..52ce9ab820 100644 --- a/phpgwapi/inc/galaxia_workflow/src/API/Instance.php +++ b/phpgwapi/inc/galaxia_workflow/src/API/Instance.php @@ -196,7 +196,7 @@ class Instance extends Base { $this->owner = $user; // save database $query = "update `".GALAXIA_TABLE_PREFIX."instances` set `wf_owner`=? where `wf_instance_id`=?"; - $this->query($query,array($owner,(int)$this->instanceId)); + $this->query($query,array($this->owner,(int)$this->instanceId)); } /*! From 78cd9ae4b63863c9f9e74b35f778003c2953c7b0 Mon Sep 17 00:00:00 2001 From: ak703 Date: Sun, 20 Mar 2005 09:11:21 +0000 Subject: [PATCH 03/11] fix for displaying powerpoint in IE as requested many times --- filemanager/inc/class.uifilemanager.inc.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/filemanager/inc/class.uifilemanager.inc.php b/filemanager/inc/class.uifilemanager.inc.php index 6d0d763f8c..9f40e3ef48 100755 --- a/filemanager/inc/class.uifilemanager.inc.php +++ b/filemanager/inc/class.uifilemanager.inc.php @@ -1719,6 +1719,16 @@ } $viewable = array('','text/plain','text/csv','text/html','text/text'); + //hack for powerpoint (NDEE 070804) + //manage some special mimetypes here + $extension = strstr($this->file,'.'); + if($extension="ppt") + { + $mime_type="x-application/powerpoint"; + } + // END + + if(in_array($mime_type,$viewable) && !$_GET['download']) { From 81db0242bb16b6807f5614d72c7df2ac21d5aa9b Mon Sep 17 00:00:00 2001 From: wnz_gh05t Date: Mon, 21 Mar 2005 09:52:53 +0000 Subject: [PATCH 04/11] *** empty log message *** --- resources/inc/class.bo_acl.inc.php | 16 +++++++- resources/inc/class.bo_resources.inc.php | 1 + resources/inc/class.ui_resources.inc.php | 47 +++++++++++++++++++++++- resources/setup/etemplates.inc.php | 14 ++++++- resources/setup/etemplates.old.inc.php | 8 ++-- 5 files changed, 78 insertions(+), 8 deletions(-) diff --git a/resources/inc/class.bo_acl.inc.php b/resources/inc/class.bo_acl.inc.php index 9290a8d48b..2e5a4a16e0 100755 --- a/resources/inc/class.bo_acl.inc.php +++ b/resources/inc/class.bo_acl.inc.php @@ -66,7 +66,7 @@ @abstract get list of cats where current user has given rights @author Cornelius WeiЯ @param int $perm_type one of PHPGW_ACL_READ, PHPGW_ACL_ADD, PHPGW_ACL_EDIT, PHPGW_ACL_DELETE, PHPGW_ACL_DIRECT_BOOKING - @return array cat_name => cat_id + @return array cat_id => cat_name TODO mark subcats and so on! */ function get_cats($perm_type) @@ -95,6 +95,20 @@ return $perm_cats; } + + /*! + @function get_cat_name + @abstract gets name of category + @author Lukas WeiЯ + @param int $cat_id + @return mixed name of category + */ + function get_cat_name($cat_id) + { + $cat = $this->egw_cats->return_single($cat_id); + return $cat[0]['name']; + } + /*! @function get_cat_admin @abstract gets userid of admin for given category diff --git a/resources/inc/class.bo_resources.inc.php b/resources/inc/class.bo_resources.inc.php index 82cdc15a28..efac8e2dd2 100755 --- a/resources/inc/class.bo_resources.inc.php +++ b/resources/inc/class.bo_resources.inc.php @@ -99,6 +99,7 @@ class bo_resources } } } + print_r($content); $rows[$num]['picture_thumb'] = $this->get_picture($resource['id']); $rows[$num]['admin'] = $this->acl->get_cat_admin($resource['cat_id']); } diff --git a/resources/inc/class.ui_resources.inc.php b/resources/inc/class.ui_resources.inc.php index dcd1f6316c..44e348dad0 100755 --- a/resources/inc/class.ui_resources.inc.php +++ b/resources/inc/class.ui_resources.inc.php @@ -76,6 +76,8 @@ class ui_resources $GLOBALS['phpgw']->session->appsession('session_data','resources_index_nm',$sessiondata); return $this->index(); case 'view': + list($id) = each($content['nm']['rows']['view']); + return $this->show($id); case 'bookable': case 'buyable': } @@ -251,12 +253,55 @@ class ui_resources @function show @abstract showes a single resource @param int $id resource id + @author Lukas Weiss */ - function show($id) + function show($id=0) { + if (isset($_GET['id'])) $id = $_GET['id']; + + $content = array('id' => $id); + $content = $this->bo->read($id); + $content['gen_src_list'] = strstr($content['picture_src'],'.') ? $content['picture_src'] : false; + $content['picture_src'] = strstr($content['picture_src'],'.') ? 'gen_src' : $content['picture_src']; + $content['link_to'] = array( + 'to_id' => $id, + 'to_app' => 'resources' + ); + $content['resource_picture'] = $this->bo->get_picture($content['id'],$content['picture_src'],$size=true); + $content['quantity'] = $content['quantity'] ? $content['quantity'] : 1; + $content['useable'] = $content['useable'] ? $content['useable'] : 1; + + $content['quantity'] = ($content['useable'] == $content['quantity']) ? $content['quantity'] : $content['quantity'].' ('.lang('useable ').$content['useable'].')'; + + //$sel_options['gen_src_list'] = $this->bo->get_genpicturelist(); + + $content['cat_name'] = $this->bo->acl->get_cat_name($content['cat_id']); + $content['cat_admin'] = $this->bo->acl->get_cat_admin($content['cat_id']); + + /* if($content['accessory_of'] > 0) + { + $catofmaster = $this->bo->so->get_value('cat_id',$content['accessory_of']); + $sel_options['cat_id'] = array($catofmaster => $sel_options['cat_id'][$catofmaster]); + } + */ + $content['description'] = $content['long_description'] ? $content['long_description'] : $content['short_description']; + $content['description'] = $content['description'] ? $content['description'] : lang('no description available'); + $sel_options = array(); + $no_button = array(); + $preserv = $content; + //print_r($content); + $this->tmpl->read('resources.showdetails'); + $this->tmpl->exec('resources.ui_resources.show',$content,$sel_options,$no_button,$preserv,2); + } + /*! + @function delete + @abstract deletes a resource + @param int $id resource id + @author Lukas Weiss + */ function delete($id) { $this->bo->delete($id); diff --git a/resources/setup/etemplates.inc.php b/resources/setup/etemplates.inc.php index 425e4d0b61..963ed9984c 100644 --- a/resources/setup/etemplates.inc.php +++ b/resources/setup/etemplates.inc.php @@ -1,10 +1,14 @@ 'resources.add','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:19:"resources.edit_tabs";}}i:2;a:1:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:21:"resources.add_buttons";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:4:"100%";}}','size' => '100%','style' => '','modified' => '1094579218',); + +$templ_data[] = array('name' => 'resources.add_buttons','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:1:"C";s:4:"100%";}i:1;a:3:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:4:"save";s:4:"help";s:21:"Saves entry and exits";}s:1:"B";a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"align";s:5:"right";}}}s:4:"rows";i:1;s:4:"cols";i:3;s:4:"size";s:4:"100%";}}','size' => '100%','style' => '','modified' => '1094579498',); + $templ_data[] = array('name' => 'resources.admin','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:8:"checkbox";s:5:"label";s:55:"Don\'t use vfs (this will need a symlink --> see README)";s:4:"name";s:12:"dont_use_vfs";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:4:"save";}i:2;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";}}}}s:4:"rows";i:2;s:4:"cols";i:1;}}','size' => '','style' => '','modified' => '1109673054',); $templ_data[] = array('name' => 'resources.edit','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";}}i:2;a:1:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:19:"resources.edit_tabs";}}i:3;a:1:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:22:"resources.edit_buttons";}}}s:4:"rows";i:3;s:4:"cols";i:1;}}','size' => '','style' => '','modified' => '1109000980',); @@ -27,5 +31,11 @@ $templ_data[] = array('name' => 'resources.edit_tabs.pictures','template' => '', $templ_data[] = array('name' => 'resources.show','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:1:{s:1:"A";s:4:"100%";}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:19:"resources.show.rows";s:7:"no_lang";s:1:"1";s:4:"name";s:2:"nm";}}i:2;a:1:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:7:"onclick";s:206:"window.open(egw::link(\'/index.php\',\'menuaction=resources.ui_resources.edit\'),\'\',\'dependent=yes,width=800,height=600,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes\'); return false; return false;";s:4:"name";s:3:"add";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:13:"Add accessory";s:4:"name";s:7:"add_sub";s:7:"onclick";s:235:"window.open(egw::link(\'/index.php\',\'menuaction=resources.ui_resources.edit&content=0&accessory_of=$cont[view_accs_of]\'),\'\',\'dependent=yes,width=800,height=600,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes\'); return false;";}i:3;a:3:{s:4:"type";s:6:"button";s:5:"label";s:4:"Back";s:4:"name";s:4:"back";}}}}s:4:"rows";i:2;s:4:"cols";i:1;}}','size' => '','style' => '','modified' => '1108479422',); -$templ_data[] = array('name' => 'resources.show.rows','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:4:{s:1:"C";s:2:"3%";s:2:"c1";s:3:"nmh";s:2:"c2";s:7:"nmr,top";s:1:"F";s:2:"5%";}i:1;a:6:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:4:"name";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:17:"Short description";s:4:"name";s:17:"short_description";}}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Useable";s:4:"name";s:7:"useable";s:4:"help";s:36:"How many of this resource are usable";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Quantity";s:4:"name";s:8:"quantity";s:4:"help";s:32:"How many of this resource exists";}}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Administrator";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Location";s:4:"name";s:8:"location";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:18:"Storage Inforation";}}s:1:"F";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}i:2;a:1:{s:4:"type";s:5:"label";}i:3;a:2:{s:4:"type";s:5:"label";s:6:"needed";s:1:"1";}s:5:"align";s:5:"right";i:4;a:9:{s:4:"type";s:6:"button";s:4:"size";s:9:"check.png";s:5:"label";s:9:"Check all";s:5:"align";s:5:"right";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";i:1;a:1:{s:4:"type";s:5:"label";}i:2;a:1:{s:4:"type";s:5:"label";}i:3;a:1:{s:4:"type";s:5:"label";}}}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"image";s:5:"align";s:6:"center";s:4:"name";s:21:"${row}[picture_thumb]";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:12:"${row}[name]";}i:2;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"${row}[short_description]";}}s:1:"C";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";s:5:"align";s:5:"right";i:1;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:15:"${row}[useable]";}i:2;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:16:"${row}[quantity]";}}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:10:"select-cat";s:7:"no_lang";s:1:"1";s:4:"name";s:14:"${row}[cat_id]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"${row}[admin]";s:8:"readonly";s:1:"1";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[location]";}i:2;a:2:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";}}s:1:"F";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:12:"bookable.gif";s:5:"label";s:18:"Book this resource";s:5:"align";s:6:"center";s:4:"name";s:23:"bookable[$row_cont[id]]";s:4:"help";s:18:"Book this resource";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:11:"buyable.gif";s:5:"label";s:17:"Buy this resource";s:5:"align";s:6:"center";s:4:"name";s:22:"buyable[$row_cont[id]]";s:4:"help";s:17:"Buy this resource";}s:4:"span";s:10:",buttonbox";}i:2;a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:8:"edit.gif";s:5:"label";s:4:"Edit";s:5:"align";s:6:"center";s:4:"name";s:19:"edit[$row_cont[id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:209:"window.open(egw::link(\'/index.php\',\'menuaction=resources.ui_resources.edit&id=$row_cont[id]\'),\'\',\'dependent=yes,width=800,height=600,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes\'); return false;";}i:2;a:7:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:6:"center";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:61:"return confirm(\'Do you really want do delte this resource?\');";s:4:"size";s:10:"delete.gif";}s:6:"needed";s:1:"1";s:5:"align";s:5:"right";s:4:"span";s:10:",buttonbox";}i:3;a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:7:"new.gif";s:5:"label";s:38:"Create new accessory for this resource";s:5:"align";s:6:"center";s:4:"name";s:22:"new_acc[$row_cont[id]]";s:4:"help";s:38:"Create new accessory for this resource";s:7:"onclick";s:224:"window.open(egw::link(\'/index.php\',\'menuaction=resources.ui_resources.edit&id=0&accessory_of=$row_cont[id]\'),\'\',\'dependent=yes,width=800,height=600,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:12:"view_acc.gif";s:5:"label";s:34:"View accessories for this resource";s:5:"align";s:6:"center";s:4:"name";s:23:"view_acc[$row_cont[id]]";s:4:"help";s:34:"View accessories for this resource";}s:4:"span";s:10:",buttonbox";}i:4;a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:4:"View";s:5:"align";s:5:"right";s:4:"name";s:19:"view[$row_cont[id]]";s:4:"help";s:15:"View this entry";}i:2;a:3:{s:4:"type";s:8:"checkbox";s:5:"align";s:5:"right";s:4:"name";s:8:"checkbox";}s:5:"align";s:5:"right";s:4:"span";s:10:",buttonbox";}s:5:"align";s:5:"right";}}}s:4:"rows";i:2;s:4:"cols";i:6;}}','size' => '','style' => '','modified' => '1108922292',); +$templ_data[] = array('name' => 'resources.show.actions','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:1:"F";s:2:"3%";s:2:"c1";s:3:"nmh";s:2:"c2";s:3:"nmr";}i:1;a:6:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:4:"name";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:17:"Short description";s:4:"name";s:17:"short_description";}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Useable";s:4:"name";s:7:"useable";}s:1:"D";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Location";s:4:"name";s:8:"location";}s:1:"F";a:3:{s:4:"type";s:8:"template";s:5:"align";s:5:"right";s:4:"name";s:29:"resources.show.actions_header";}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:12:"${row}[name]";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"${row}[short_description]";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:14:"${row}[usable]";}s:1:"D";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[category]";}s:1:"E";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[location]";}s:1:"F";a:3:{s:4:"type";s:6:"button";s:5:"align";s:5:"right";s:4:"name";s:20:"lukas[$row_cont[id]]";}}}s:4:"rows";i:2;s:4:"cols";i:6;s:4:"size";s:4:"100%";}}','size' => '100%','style' => '','modified' => '1098891355',); + +$templ_data[] = array('name' => 'resources.show.actions_header','template' => '','lang' => '','group' => '0','version' => '','data' => '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:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";}s:1:"B";a:3:{s:4:"type";s:6:"button";s:4:"size";s:9:"check.png";s:4:"name";s:30:"javascript:check_all(\'select\')";}}}s:4:"rows";i:1;s:4:"cols";i:2;}}','size' => '','style' => '','modified' => '1094025049',); + +$templ_data[] = array('name' => 'resources.show.rows','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:4:{s:1:"C";s:2:"3%";s:2:"c1";s:3:"nmh";s:2:"c2";s:7:"nmr,top";s:1:"F";s:2:"5%";}i:1;a:6:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:4:"name";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:17:"Short description";s:4:"name";s:17:"short_description";}}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Useable";s:4:"name";s:7:"useable";s:4:"help";s:36:"How many of this resource are usable";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Quantity";s:4:"name";s:8:"quantity";s:4:"help";s:32:"How many of this resource exists";}}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Administrator";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Location";s:4:"name";s:8:"location";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:18:"Storage Inforation";}}s:1:"F";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}i:2;a:1:{s:4:"type";s:5:"label";}i:3;a:2:{s:4:"type";s:5:"label";s:6:"needed";s:1:"1";}s:5:"align";s:5:"right";i:4;a:9:{s:4:"type";s:6:"button";s:4:"size";s:9:"check.png";s:5:"label";s:9:"Check all";s:5:"align";s:5:"right";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";i:1;a:1:{s:4:"type";s:5:"label";}i:2;a:1:{s:4:"type";s:5:"label";}i:3;a:1:{s:4:"type";s:5:"label";}}}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"image";s:5:"align";s:6:"center";s:4:"name";s:21:"${row}[picture_thumb]";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:12:"${row}[name]";}i:2;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"${row}[short_description]";}}s:1:"C";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";s:5:"align";s:5:"right";i:1;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:15:"${row}[useable]";}i:2;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:16:"${row}[quantity]";}}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:10:"select-cat";s:7:"no_lang";s:1:"1";s:4:"name";s:14:"${row}[cat_id]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"${row}[admin]";s:8:"readonly";s:1:"1";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[location]";}i:2;a:2:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";}}s:1:"F";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:12:"bookable.gif";s:5:"label";s:18:"Book this resource";s:5:"align";s:6:"center";s:4:"name";s:23:"bookable[$row_cont[id]]";s:4:"help";s:18:"Book this resource";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:11:"buyable.gif";s:5:"label";s:17:"Buy this resource";s:5:"align";s:6:"center";s:4:"name";s:22:"buyable[$row_cont[id]]";s:4:"help";s:17:"Buy this resource";}s:4:"span";s:10:",buttonbox";}i:2;a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:8:"edit.gif";s:5:"label";s:4:"Edit";s:5:"align";s:6:"center";s:4:"name";s:19:"edit[$row_cont[id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:209:"window.open(egw::link(\'/index.php\',\'menuaction=resources.ui_resources.edit&id=$row_cont[id]\'),\'\',\'dependent=yes,width=800,height=600,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes\'); return false;";}i:2;a:7:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:6:"center";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:61:"return confirm(\'Do you really want do delte this resource?\');";s:4:"size";s:10:"delete.gif";}s:6:"needed";s:1:"1";s:5:"align";s:5:"right";s:4:"span";s:10:",buttonbox";}i:3;a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:7:"new.gif";s:5:"label";s:38:"Create new accessory for this resource";s:5:"align";s:6:"center";s:4:"name";s:22:"new_acc[$row_cont[id]]";s:4:"help";s:38:"Create new accessory for this resource";s:7:"onclick";s:224:"window.open(egw::link(\'/index.php\',\'menuaction=resources.ui_resources.edit&id=0&accessory_of=$row_cont[id]\'),\'\',\'dependent=yes,width=800,height=600,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:12:"view_acc.gif";s:5:"label";s:34:"View accessories for this resource";s:5:"align";s:6:"center";s:4:"name";s:23:"view_acc[$row_cont[id]]";s:4:"help";s:34:"View accessories for this resource";}s:4:"span";s:10:",buttonbox";}i:4;a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:4:"View";s:5:"align";s:5:"right";s:4:"name";s:19:"view[$row_cont[id]]";s:4:"help";s:15:"View this entry";s:7:"onclick";s:209:"window.open(egw::link(\'/index.php\',\'menuaction=resources.ui_resources.show&id=$row_cont[id]\'),\'\',\'dependent=yes,width=800,height=600,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes\'); return false;";}i:2;a:3:{s:4:"type";s:8:"checkbox";s:5:"align";s:5:"right";s:4:"name";s:8:"checkbox";}s:5:"align";s:5:"right";s:4:"span";s:10:",buttonbox";}s:5:"align";s:5:"right";}}}s:4:"rows";i:2;s:4:"cols";i:6;}}','size' => '','style' => '','modified' => '1108922292',); + +$templ_data[] = array('name' => 'resources.showdetails','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:2:{s:2:"c1";s:7:"nmh,top";s:1:"B";s:4:"100%";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"vbox";s:4:"name";s:16:"resource_picture";s:4:"size";s:1:"1";i:1;a:2:{s:4:"type";s:5:"image";s:4:"name";s:16:"resource_picture";}}s:1:"B";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"4";i:1;a:3:{s:4:"type";s:5:"label";s:4:"size";s:1:"b";s:4:"name";s:4:"name";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"size";s:1:"i";s:4:"name";s:8:"cat_name";}i:3;a:5:{s:4:"type";s:14:"select-account";s:5:"label";s:13:"Responsible: ";s:4:"name";s:9:"cat_admin";s:7:"no_lang";s:1:"1";s:8:"readonly";s:1:"1";}i:4;a:3:{s:4:"type";s:5:"label";s:5:"label";s:10:"Quantity: ";s:4:"name";s:8:"quantity";}}}i:2;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"html";s:4:"span";s:1:"2";s:4:"name";s:11:"description";s:8:"readonly";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:3;s:4:"cols";i:2;}}','size' => '','style' => '','modified' => '1111327616',); diff --git a/resources/setup/etemplates.old.inc.php b/resources/setup/etemplates.old.inc.php index f3db15ea07..425e4d0b61 100755 --- a/resources/setup/etemplates.old.inc.php +++ b/resources/setup/etemplates.old.inc.php @@ -1,5 +1,5 @@ 'resources.admin','template' => '','lang' => '', $templ_data[] = array('name' => 'resources.edit','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";}}i:2;a:1:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:19:"resources.edit_tabs";}}i:3;a:1:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:22:"resources.edit_buttons";}}}s:4:"rows";i:3;s:4:"cols";i:1;}}','size' => '','style' => '','modified' => '1109000980',); -$templ_data[] = array('name' => 'resources.edit_buttons','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:1:"C";s:4:"100%";}i:1;a:3:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:4:"save";s:4:"help";s:21:"Saves entry and exits";}s:1:"B";a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:6:"delete";}}}s:4:"rows";i:1;s:4:"cols";i:3;s:4:"size";s:4:"100%";}}','size' => '100%','style' => '','modified' => '1093597552',); +$templ_data[] = array('name' => 'resources.edit_buttons','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:1:"C";s:4:"100%";}i:1;a:3:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:4:"save";s:4:"help";s:21:"Saves entry and exits";}s:1:"B";a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";}s:1:"C";a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:6:"delete";s:7:"onclick";s:61:"return confirm(\'Do you really want do delte this resource?\');";}}}s:4:"rows";i:1;s:4:"cols";i:3;s:4:"size";s:4:"100%";}}','size' => '100%','style' => '','modified' => '1093597552',); $templ_data[] = array('name' => 'resources.edit_pictures','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:3:{s:2:"c1";s:3:"nmr";s:2:"c2";s:3:"nmr";s:2:"c3";s:3:"nmr";}i:1;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:26:"Use general resources icon";s:5:"align";s:5:"right";}s:1:"B";a:3:{s:4:"type";s:5:"radio";s:4:"size";s:7:"gen_src";s:4:"name";s:11:"picture_src";}s:1:"C";a:3:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:12:"gen_src_list";}}i:2;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:23:"Use the category\'s icon";s:5:"align";s:5:"right";}s:1:"B";a:3:{s:4:"type";s:5:"radio";s:4:"size";s:7:"cat_src";s:4:"name";s:11:"picture_src";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:3;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:15:"Use own picture";s:5:"align";s:5:"right";}s:1:"B";a:3:{s:4:"type";s:5:"radio";s:4:"size";s:7:"own_src";s:4:"name";s:11:"picture_src";}s:1:"C";a:2:{s:4:"type";s:4:"file";s:4:"name";s:8:"own_file";}}}s:4:"rows";i:3;s:4:"cols";i:3;}}','size' => '','style' => '','modified' => '1108638846',); @@ -25,7 +25,7 @@ $templ_data[] = array('name' => 'resources.edit_tabs.page','template' => '','lan $templ_data[] = array('name' => 'resources.edit_tabs.pictures','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:4:",top";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"image";s:5:"align";s:6:"center";s:4:"name";s:16:"resource_picture";}s:1:"B";a:5:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"2";s:5:"label";s:14:"picture source";i:1;a:1:{s:4:"type";s:5:"label";}i:2;a:2:{s:4:"type";s:8:"template";s:4:"name";s:23:"resources.edit_pictures";}}}}s:4:"rows";i:1;s:4:"cols";i:2;}}','size' => '','style' => '','modified' => '1108543308',); -$templ_data[] = array('name' => 'resources.show','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:1:{s:1:"A";s:4:"100%";}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:19:"resources.show.rows";s:7:"no_lang";s:1:"1";s:4:"name";s:2:"nm";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";}i:2;a:3:{s:4:"type";s:6:"button";s:5:"label";s:4:"Back";s:4:"name";s:4:"back";}}}}s:4:"rows";i:2;s:4:"cols";i:1;}}','size' => '','style' => '','modified' => '1108479422',); +$templ_data[] = array('name' => 'resources.show','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:1:{s:1:"A";s:4:"100%";}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:19:"resources.show.rows";s:7:"no_lang";s:1:"1";s:4:"name";s:2:"nm";}}i:2;a:1:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:7:"onclick";s:206:"window.open(egw::link(\'/index.php\',\'menuaction=resources.ui_resources.edit\'),\'\',\'dependent=yes,width=800,height=600,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes\'); return false; return false;";s:4:"name";s:3:"add";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:13:"Add accessory";s:4:"name";s:7:"add_sub";s:7:"onclick";s:235:"window.open(egw::link(\'/index.php\',\'menuaction=resources.ui_resources.edit&content=0&accessory_of=$cont[view_accs_of]\'),\'\',\'dependent=yes,width=800,height=600,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes\'); return false;";}i:3;a:3:{s:4:"type";s:6:"button";s:5:"label";s:4:"Back";s:4:"name";s:4:"back";}}}}s:4:"rows";i:2;s:4:"cols";i:1;}}','size' => '','style' => '','modified' => '1108479422',); -$templ_data[] = array('name' => 'resources.show.rows','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:4:{s:1:"C";s:2:"3%";s:2:"c1";s:3:"nmh";s:2:"c2";s:7:"nmr,top";s:1:"F";s:2:"5%";}i:1;a:6:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:4:"name";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:17:"Short description";s:4:"name";s:17:"short_description";}}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Useable";s:4:"name";s:7:"useable";s:4:"help";s:36:"How many of this resource are usable";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Quantity";s:4:"name";s:8:"quantity";s:4:"help";s:32:"How many of this resource exists";}}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Administrator";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Location";s:4:"name";s:8:"location";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:18:"Storage Inforation";}}s:1:"F";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}i:2;a:1:{s:4:"type";s:5:"label";}i:3;a:2:{s:4:"type";s:5:"label";s:6:"needed";s:1:"1";}s:5:"align";s:5:"right";i:4;a:9:{s:4:"type";s:6:"button";s:4:"size";s:9:"check.png";s:5:"label";s:9:"Check all";s:5:"align";s:5:"right";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";i:1;a:1:{s:4:"type";s:5:"label";}i:2;a:1:{s:4:"type";s:5:"label";}i:3;a:1:{s:4:"type";s:5:"label";}}}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"image";s:5:"align";s:6:"center";s:4:"name";s:21:"${row}[picture_thumb]";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:12:"${row}[name]";}i:2;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"${row}[short_description]";}}s:1:"C";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";s:5:"align";s:5:"right";i:1;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:15:"${row}[useable]";}i:2;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:16:"${row}[quantity]";}}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:10:"select-cat";s:7:"no_lang";s:1:"1";s:4:"name";s:14:"${row}[cat_id]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"${row}[admin]";s:8:"readonly";s:1:"1";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[location]";}i:2;a:2:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";}}s:1:"F";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:12:"bookable.gif";s:5:"label";s:18:"Book this resource";s:5:"align";s:6:"center";s:4:"name";s:23:"bookable[$row_cont[id]]";s:4:"help";s:18:"Book this resource";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:11:"buyable.gif";s:5:"label";s:17:"Buy this resource";s:5:"align";s:6:"center";s:4:"name";s:22:"buyable[$row_cont[id]]";s:4:"help";s:17:"Buy this resource";}s:4:"span";s:10:",buttonbox";}i:2;a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"edit.gif";s:5:"label";s:4:"Edit";s:5:"align";s:6:"center";s:4:"name";s:19:"edit[$row_cont[id]]";s:4:"help";s:15:"Edit this entry";}i:2;a:7:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:6:"center";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:61:"return confirm(\'Do you really want do delte this resource?\');";s:4:"size";s:10:"delete.gif";}s:6:"needed";s:1:"1";s:5:"align";s:5:"right";s:4:"span";s:10:",buttonbox";}i:3;a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:7:"new.gif";s:5:"label";s:38:"Create new accessory for this resource";s:5:"align";s:6:"center";s:4:"name";s:22:"new_acc[$row_cont[id]]";s:4:"help";s:38:"Create new accessory for this resource";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:12:"view_acc.gif";s:5:"label";s:34:"View accessories for this resource";s:5:"align";s:6:"center";s:4:"name";s:23:"view_acc[$row_cont[id]]";s:4:"help";s:34:"View accessories for this resource";}s:4:"span";s:10:",buttonbox";}i:4;a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:4:"View";s:5:"align";s:5:"right";s:4:"name";s:19:"view[$row_cont[id]]";s:4:"help";s:15:"View this entry";}i:2;a:3:{s:4:"type";s:8:"checkbox";s:5:"align";s:5:"right";s:4:"name";s:8:"checkbox";}s:5:"align";s:5:"right";s:4:"span";s:10:",buttonbox";}s:5:"align";s:5:"right";}}}s:4:"rows";i:2;s:4:"cols";i:6;}}','size' => '','style' => '','modified' => '1108922292',); +$templ_data[] = array('name' => 'resources.show.rows','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:4:{s:1:"C";s:2:"3%";s:2:"c1";s:3:"nmh";s:2:"c2";s:7:"nmr,top";s:1:"F";s:2:"5%";}i:1;a:6:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:4:"name";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:17:"Short description";s:4:"name";s:17:"short_description";}}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Useable";s:4:"name";s:7:"useable";s:4:"help";s:36:"How many of this resource are usable";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Quantity";s:4:"name";s:8:"quantity";s:4:"help";s:32:"How many of this resource exists";}}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Administrator";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Location";s:4:"name";s:8:"location";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:18:"Storage Inforation";}}s:1:"F";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}i:2;a:1:{s:4:"type";s:5:"label";}i:3;a:2:{s:4:"type";s:5:"label";s:6:"needed";s:1:"1";}s:5:"align";s:5:"right";i:4;a:9:{s:4:"type";s:6:"button";s:4:"size";s:9:"check.png";s:5:"label";s:9:"Check all";s:5:"align";s:5:"right";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";i:1;a:1:{s:4:"type";s:5:"label";}i:2;a:1:{s:4:"type";s:5:"label";}i:3;a:1:{s:4:"type";s:5:"label";}}}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"image";s:5:"align";s:6:"center";s:4:"name";s:21:"${row}[picture_thumb]";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:12:"${row}[name]";}i:2;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"${row}[short_description]";}}s:1:"C";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";s:5:"align";s:5:"right";i:1;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:15:"${row}[useable]";}i:2;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:16:"${row}[quantity]";}}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:10:"select-cat";s:7:"no_lang";s:1:"1";s:4:"name";s:14:"${row}[cat_id]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"${row}[admin]";s:8:"readonly";s:1:"1";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[location]";}i:2;a:2:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";}}s:1:"F";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:12:"bookable.gif";s:5:"label";s:18:"Book this resource";s:5:"align";s:6:"center";s:4:"name";s:23:"bookable[$row_cont[id]]";s:4:"help";s:18:"Book this resource";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:11:"buyable.gif";s:5:"label";s:17:"Buy this resource";s:5:"align";s:6:"center";s:4:"name";s:22:"buyable[$row_cont[id]]";s:4:"help";s:17:"Buy this resource";}s:4:"span";s:10:",buttonbox";}i:2;a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:8:"edit.gif";s:5:"label";s:4:"Edit";s:5:"align";s:6:"center";s:4:"name";s:19:"edit[$row_cont[id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:209:"window.open(egw::link(\'/index.php\',\'menuaction=resources.ui_resources.edit&id=$row_cont[id]\'),\'\',\'dependent=yes,width=800,height=600,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes\'); return false;";}i:2;a:7:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:6:"center";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:61:"return confirm(\'Do you really want do delte this resource?\');";s:4:"size";s:10:"delete.gif";}s:6:"needed";s:1:"1";s:5:"align";s:5:"right";s:4:"span";s:10:",buttonbox";}i:3;a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:7:"new.gif";s:5:"label";s:38:"Create new accessory for this resource";s:5:"align";s:6:"center";s:4:"name";s:22:"new_acc[$row_cont[id]]";s:4:"help";s:38:"Create new accessory for this resource";s:7:"onclick";s:224:"window.open(egw::link(\'/index.php\',\'menuaction=resources.ui_resources.edit&id=0&accessory_of=$row_cont[id]\'),\'\',\'dependent=yes,width=800,height=600,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:12:"view_acc.gif";s:5:"label";s:34:"View accessories for this resource";s:5:"align";s:6:"center";s:4:"name";s:23:"view_acc[$row_cont[id]]";s:4:"help";s:34:"View accessories for this resource";}s:4:"span";s:10:",buttonbox";}i:4;a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:4:"View";s:5:"align";s:5:"right";s:4:"name";s:19:"view[$row_cont[id]]";s:4:"help";s:15:"View this entry";}i:2;a:3:{s:4:"type";s:8:"checkbox";s:5:"align";s:5:"right";s:4:"name";s:8:"checkbox";}s:5:"align";s:5:"right";s:4:"span";s:10:",buttonbox";}s:5:"align";s:5:"right";}}}s:4:"rows";i:2;s:4:"cols";i:6;}}','size' => '','style' => '','modified' => '1108922292',); From ca6e8858ec21fa84fe0f468078c145501ef2275f Mon Sep 17 00:00:00 2001 From: wnz_gh05t Date: Mon, 21 Mar 2005 10:18:30 +0000 Subject: [PATCH 05/11] *** empty log message *** --- resources/setup/etemplates.inc.php | 4 ++-- resources/setup/etemplates.old.inc.php | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/resources/setup/etemplates.inc.php b/resources/setup/etemplates.inc.php index 963ed9984c..848de0d53f 100644 --- a/resources/setup/etemplates.inc.php +++ b/resources/setup/etemplates.inc.php @@ -1,5 +1,5 @@ 'resources.show.actions_header','template' => '' $templ_data[] = array('name' => 'resources.show.rows','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:4:{s:1:"C";s:2:"3%";s:2:"c1";s:3:"nmh";s:2:"c2";s:7:"nmr,top";s:1:"F";s:2:"5%";}i:1;a:6:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:4:"name";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:17:"Short description";s:4:"name";s:17:"short_description";}}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Useable";s:4:"name";s:7:"useable";s:4:"help";s:36:"How many of this resource are usable";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Quantity";s:4:"name";s:8:"quantity";s:4:"help";s:32:"How many of this resource exists";}}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Administrator";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Location";s:4:"name";s:8:"location";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:18:"Storage Inforation";}}s:1:"F";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}i:2;a:1:{s:4:"type";s:5:"label";}i:3;a:2:{s:4:"type";s:5:"label";s:6:"needed";s:1:"1";}s:5:"align";s:5:"right";i:4;a:9:{s:4:"type";s:6:"button";s:4:"size";s:9:"check.png";s:5:"label";s:9:"Check all";s:5:"align";s:5:"right";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";i:1;a:1:{s:4:"type";s:5:"label";}i:2;a:1:{s:4:"type";s:5:"label";}i:3;a:1:{s:4:"type";s:5:"label";}}}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"image";s:5:"align";s:6:"center";s:4:"name";s:21:"${row}[picture_thumb]";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:12:"${row}[name]";}i:2;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"${row}[short_description]";}}s:1:"C";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";s:5:"align";s:5:"right";i:1;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:15:"${row}[useable]";}i:2;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:16:"${row}[quantity]";}}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:10:"select-cat";s:7:"no_lang";s:1:"1";s:4:"name";s:14:"${row}[cat_id]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"${row}[admin]";s:8:"readonly";s:1:"1";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[location]";}i:2;a:2:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";}}s:1:"F";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:12:"bookable.gif";s:5:"label";s:18:"Book this resource";s:5:"align";s:6:"center";s:4:"name";s:23:"bookable[$row_cont[id]]";s:4:"help";s:18:"Book this resource";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:11:"buyable.gif";s:5:"label";s:17:"Buy this resource";s:5:"align";s:6:"center";s:4:"name";s:22:"buyable[$row_cont[id]]";s:4:"help";s:17:"Buy this resource";}s:4:"span";s:10:",buttonbox";}i:2;a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:8:"edit.gif";s:5:"label";s:4:"Edit";s:5:"align";s:6:"center";s:4:"name";s:19:"edit[$row_cont[id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:209:"window.open(egw::link(\'/index.php\',\'menuaction=resources.ui_resources.edit&id=$row_cont[id]\'),\'\',\'dependent=yes,width=800,height=600,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes\'); return false;";}i:2;a:7:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:6:"center";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:61:"return confirm(\'Do you really want do delte this resource?\');";s:4:"size";s:10:"delete.gif";}s:6:"needed";s:1:"1";s:5:"align";s:5:"right";s:4:"span";s:10:",buttonbox";}i:3;a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:7:"new.gif";s:5:"label";s:38:"Create new accessory for this resource";s:5:"align";s:6:"center";s:4:"name";s:22:"new_acc[$row_cont[id]]";s:4:"help";s:38:"Create new accessory for this resource";s:7:"onclick";s:224:"window.open(egw::link(\'/index.php\',\'menuaction=resources.ui_resources.edit&id=0&accessory_of=$row_cont[id]\'),\'\',\'dependent=yes,width=800,height=600,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:12:"view_acc.gif";s:5:"label";s:34:"View accessories for this resource";s:5:"align";s:6:"center";s:4:"name";s:23:"view_acc[$row_cont[id]]";s:4:"help";s:34:"View accessories for this resource";}s:4:"span";s:10:",buttonbox";}i:4;a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:4:"View";s:5:"align";s:5:"right";s:4:"name";s:19:"view[$row_cont[id]]";s:4:"help";s:15:"View this entry";s:7:"onclick";s:209:"window.open(egw::link(\'/index.php\',\'menuaction=resources.ui_resources.show&id=$row_cont[id]\'),\'\',\'dependent=yes,width=800,height=600,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes\'); return false;";}i:2;a:3:{s:4:"type";s:8:"checkbox";s:5:"align";s:5:"right";s:4:"name";s:8:"checkbox";}s:5:"align";s:5:"right";s:4:"span";s:10:",buttonbox";}s:5:"align";s:5:"right";}}}s:4:"rows";i:2;s:4:"cols";i:6;}}','size' => '','style' => '','modified' => '1108922292',); -$templ_data[] = array('name' => 'resources.showdetails','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:2:{s:2:"c1";s:7:"nmh,top";s:1:"B";s:4:"100%";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"vbox";s:4:"name";s:16:"resource_picture";s:4:"size";s:1:"1";i:1;a:2:{s:4:"type";s:5:"image";s:4:"name";s:16:"resource_picture";}}s:1:"B";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"4";i:1;a:3:{s:4:"type";s:5:"label";s:4:"size";s:1:"b";s:4:"name";s:4:"name";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"size";s:1:"i";s:4:"name";s:8:"cat_name";}i:3;a:5:{s:4:"type";s:14:"select-account";s:5:"label";s:13:"Responsible: ";s:4:"name";s:9:"cat_admin";s:7:"no_lang";s:1:"1";s:8:"readonly";s:1:"1";}i:4;a:3:{s:4:"type";s:5:"label";s:5:"label";s:10:"Quantity: ";s:4:"name";s:8:"quantity";}}}i:2;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"html";s:4:"span";s:1:"2";s:4:"name";s:11:"description";s:8:"readonly";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:3;s:4:"cols";i:2;}}','size' => '','style' => '','modified' => '1111327616',); +$templ_data[] = array('name' => 'resources.showdetails','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:2:"c1";s:7:"nmh,top";s:1:"B";s:4:"100%";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"vbox";s:4:"name";s:16:"resource_picture";s:4:"size";s:1:"1";i:1;a:2:{s:4:"type";s:5:"image";s:4:"name";s:16:"resource_picture";}}s:1:"B";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"4";i:1;a:3:{s:4:"type";s:5:"label";s:4:"size";s:1:"b";s:4:"name";s:4:"name";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"size";s:1:"i";s:4:"name";s:8:"cat_name";}i:3;a:5:{s:4:"type";s:14:"select-account";s:5:"label";s:13:"Responsible: ";s:4:"name";s:9:"cat_admin";s:7:"no_lang";s:1:"1";s:8:"readonly";s:1:"1";}i:4;a:3:{s:4:"type";s:5:"label";s:5:"label";s:10:"Quantity: ";s:4:"name";s:8:"quantity";}}}i:2;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"html";s:4:"span";s:1:"2";s:4:"name";s:11:"description";s:8:"readonly";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Close";s:4:"span";s:1:"2";s:7:"onclick";s:14:"window.close()";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:4;s:4:"cols";i:2;}}','size' => '','style' => '','modified' => '1111396498',); diff --git a/resources/setup/etemplates.old.inc.php b/resources/setup/etemplates.old.inc.php index 425e4d0b61..963ed9984c 100755 --- a/resources/setup/etemplates.old.inc.php +++ b/resources/setup/etemplates.old.inc.php @@ -1,10 +1,14 @@ 'resources.add','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:19:"resources.edit_tabs";}}i:2;a:1:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:21:"resources.add_buttons";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:4:"100%";}}','size' => '100%','style' => '','modified' => '1094579218',); + +$templ_data[] = array('name' => 'resources.add_buttons','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:1:"C";s:4:"100%";}i:1;a:3:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:4:"save";s:4:"help";s:21:"Saves entry and exits";}s:1:"B";a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"align";s:5:"right";}}}s:4:"rows";i:1;s:4:"cols";i:3;s:4:"size";s:4:"100%";}}','size' => '100%','style' => '','modified' => '1094579498',); + $templ_data[] = array('name' => 'resources.admin','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:8:"checkbox";s:5:"label";s:55:"Don\'t use vfs (this will need a symlink --> see README)";s:4:"name";s:12:"dont_use_vfs";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:4:"save";}i:2;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";}}}}s:4:"rows";i:2;s:4:"cols";i:1;}}','size' => '','style' => '','modified' => '1109673054',); $templ_data[] = array('name' => 'resources.edit','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";}}i:2;a:1:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:19:"resources.edit_tabs";}}i:3;a:1:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:22:"resources.edit_buttons";}}}s:4:"rows";i:3;s:4:"cols";i:1;}}','size' => '','style' => '','modified' => '1109000980',); @@ -27,5 +31,11 @@ $templ_data[] = array('name' => 'resources.edit_tabs.pictures','template' => '', $templ_data[] = array('name' => 'resources.show','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:1:{s:1:"A";s:4:"100%";}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:19:"resources.show.rows";s:7:"no_lang";s:1:"1";s:4:"name";s:2:"nm";}}i:2;a:1:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:7:"onclick";s:206:"window.open(egw::link(\'/index.php\',\'menuaction=resources.ui_resources.edit\'),\'\',\'dependent=yes,width=800,height=600,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes\'); return false; return false;";s:4:"name";s:3:"add";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:13:"Add accessory";s:4:"name";s:7:"add_sub";s:7:"onclick";s:235:"window.open(egw::link(\'/index.php\',\'menuaction=resources.ui_resources.edit&content=0&accessory_of=$cont[view_accs_of]\'),\'\',\'dependent=yes,width=800,height=600,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes\'); return false;";}i:3;a:3:{s:4:"type";s:6:"button";s:5:"label";s:4:"Back";s:4:"name";s:4:"back";}}}}s:4:"rows";i:2;s:4:"cols";i:1;}}','size' => '','style' => '','modified' => '1108479422',); -$templ_data[] = array('name' => 'resources.show.rows','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:4:{s:1:"C";s:2:"3%";s:2:"c1";s:3:"nmh";s:2:"c2";s:7:"nmr,top";s:1:"F";s:2:"5%";}i:1;a:6:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:4:"name";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:17:"Short description";s:4:"name";s:17:"short_description";}}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Useable";s:4:"name";s:7:"useable";s:4:"help";s:36:"How many of this resource are usable";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Quantity";s:4:"name";s:8:"quantity";s:4:"help";s:32:"How many of this resource exists";}}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Administrator";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Location";s:4:"name";s:8:"location";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:18:"Storage Inforation";}}s:1:"F";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}i:2;a:1:{s:4:"type";s:5:"label";}i:3;a:2:{s:4:"type";s:5:"label";s:6:"needed";s:1:"1";}s:5:"align";s:5:"right";i:4;a:9:{s:4:"type";s:6:"button";s:4:"size";s:9:"check.png";s:5:"label";s:9:"Check all";s:5:"align";s:5:"right";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";i:1;a:1:{s:4:"type";s:5:"label";}i:2;a:1:{s:4:"type";s:5:"label";}i:3;a:1:{s:4:"type";s:5:"label";}}}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"image";s:5:"align";s:6:"center";s:4:"name";s:21:"${row}[picture_thumb]";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:12:"${row}[name]";}i:2;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"${row}[short_description]";}}s:1:"C";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";s:5:"align";s:5:"right";i:1;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:15:"${row}[useable]";}i:2;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:16:"${row}[quantity]";}}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:10:"select-cat";s:7:"no_lang";s:1:"1";s:4:"name";s:14:"${row}[cat_id]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"${row}[admin]";s:8:"readonly";s:1:"1";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[location]";}i:2;a:2:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";}}s:1:"F";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:12:"bookable.gif";s:5:"label";s:18:"Book this resource";s:5:"align";s:6:"center";s:4:"name";s:23:"bookable[$row_cont[id]]";s:4:"help";s:18:"Book this resource";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:11:"buyable.gif";s:5:"label";s:17:"Buy this resource";s:5:"align";s:6:"center";s:4:"name";s:22:"buyable[$row_cont[id]]";s:4:"help";s:17:"Buy this resource";}s:4:"span";s:10:",buttonbox";}i:2;a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:8:"edit.gif";s:5:"label";s:4:"Edit";s:5:"align";s:6:"center";s:4:"name";s:19:"edit[$row_cont[id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:209:"window.open(egw::link(\'/index.php\',\'menuaction=resources.ui_resources.edit&id=$row_cont[id]\'),\'\',\'dependent=yes,width=800,height=600,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes\'); return false;";}i:2;a:7:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:6:"center";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:61:"return confirm(\'Do you really want do delte this resource?\');";s:4:"size";s:10:"delete.gif";}s:6:"needed";s:1:"1";s:5:"align";s:5:"right";s:4:"span";s:10:",buttonbox";}i:3;a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:7:"new.gif";s:5:"label";s:38:"Create new accessory for this resource";s:5:"align";s:6:"center";s:4:"name";s:22:"new_acc[$row_cont[id]]";s:4:"help";s:38:"Create new accessory for this resource";s:7:"onclick";s:224:"window.open(egw::link(\'/index.php\',\'menuaction=resources.ui_resources.edit&id=0&accessory_of=$row_cont[id]\'),\'\',\'dependent=yes,width=800,height=600,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:12:"view_acc.gif";s:5:"label";s:34:"View accessories for this resource";s:5:"align";s:6:"center";s:4:"name";s:23:"view_acc[$row_cont[id]]";s:4:"help";s:34:"View accessories for this resource";}s:4:"span";s:10:",buttonbox";}i:4;a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:4:"View";s:5:"align";s:5:"right";s:4:"name";s:19:"view[$row_cont[id]]";s:4:"help";s:15:"View this entry";}i:2;a:3:{s:4:"type";s:8:"checkbox";s:5:"align";s:5:"right";s:4:"name";s:8:"checkbox";}s:5:"align";s:5:"right";s:4:"span";s:10:",buttonbox";}s:5:"align";s:5:"right";}}}s:4:"rows";i:2;s:4:"cols";i:6;}}','size' => '','style' => '','modified' => '1108922292',); +$templ_data[] = array('name' => 'resources.show.actions','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:1:"F";s:2:"3%";s:2:"c1";s:3:"nmh";s:2:"c2";s:3:"nmr";}i:1;a:6:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:4:"name";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:17:"Short description";s:4:"name";s:17:"short_description";}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Useable";s:4:"name";s:7:"useable";}s:1:"D";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Location";s:4:"name";s:8:"location";}s:1:"F";a:3:{s:4:"type";s:8:"template";s:5:"align";s:5:"right";s:4:"name";s:29:"resources.show.actions_header";}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:12:"${row}[name]";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"${row}[short_description]";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:14:"${row}[usable]";}s:1:"D";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[category]";}s:1:"E";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[location]";}s:1:"F";a:3:{s:4:"type";s:6:"button";s:5:"align";s:5:"right";s:4:"name";s:20:"lukas[$row_cont[id]]";}}}s:4:"rows";i:2;s:4:"cols";i:6;s:4:"size";s:4:"100%";}}','size' => '100%','style' => '','modified' => '1098891355',); + +$templ_data[] = array('name' => 'resources.show.actions_header','template' => '','lang' => '','group' => '0','version' => '','data' => '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:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";}s:1:"B";a:3:{s:4:"type";s:6:"button";s:4:"size";s:9:"check.png";s:4:"name";s:30:"javascript:check_all(\'select\')";}}}s:4:"rows";i:1;s:4:"cols";i:2;}}','size' => '','style' => '','modified' => '1094025049',); + +$templ_data[] = array('name' => 'resources.show.rows','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:4:{s:1:"C";s:2:"3%";s:2:"c1";s:3:"nmh";s:2:"c2";s:7:"nmr,top";s:1:"F";s:2:"5%";}i:1;a:6:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:4:"name";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:17:"Short description";s:4:"name";s:17:"short_description";}}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Useable";s:4:"name";s:7:"useable";s:4:"help";s:36:"How many of this resource are usable";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Quantity";s:4:"name";s:8:"quantity";s:4:"help";s:32:"How many of this resource exists";}}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Administrator";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Location";s:4:"name";s:8:"location";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:18:"Storage Inforation";}}s:1:"F";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}i:2;a:1:{s:4:"type";s:5:"label";}i:3;a:2:{s:4:"type";s:5:"label";s:6:"needed";s:1:"1";}s:5:"align";s:5:"right";i:4;a:9:{s:4:"type";s:6:"button";s:4:"size";s:9:"check.png";s:5:"label";s:9:"Check all";s:5:"align";s:5:"right";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";i:1;a:1:{s:4:"type";s:5:"label";}i:2;a:1:{s:4:"type";s:5:"label";}i:3;a:1:{s:4:"type";s:5:"label";}}}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"image";s:5:"align";s:6:"center";s:4:"name";s:21:"${row}[picture_thumb]";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:12:"${row}[name]";}i:2;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"${row}[short_description]";}}s:1:"C";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";s:5:"align";s:5:"right";i:1;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:15:"${row}[useable]";}i:2;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:16:"${row}[quantity]";}}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:10:"select-cat";s:7:"no_lang";s:1:"1";s:4:"name";s:14:"${row}[cat_id]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"${row}[admin]";s:8:"readonly";s:1:"1";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[location]";}i:2;a:2:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";}}s:1:"F";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:12:"bookable.gif";s:5:"label";s:18:"Book this resource";s:5:"align";s:6:"center";s:4:"name";s:23:"bookable[$row_cont[id]]";s:4:"help";s:18:"Book this resource";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:11:"buyable.gif";s:5:"label";s:17:"Buy this resource";s:5:"align";s:6:"center";s:4:"name";s:22:"buyable[$row_cont[id]]";s:4:"help";s:17:"Buy this resource";}s:4:"span";s:10:",buttonbox";}i:2;a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:8:"edit.gif";s:5:"label";s:4:"Edit";s:5:"align";s:6:"center";s:4:"name";s:19:"edit[$row_cont[id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:209:"window.open(egw::link(\'/index.php\',\'menuaction=resources.ui_resources.edit&id=$row_cont[id]\'),\'\',\'dependent=yes,width=800,height=600,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes\'); return false;";}i:2;a:7:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:6:"center";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:61:"return confirm(\'Do you really want do delte this resource?\');";s:4:"size";s:10:"delete.gif";}s:6:"needed";s:1:"1";s:5:"align";s:5:"right";s:4:"span";s:10:",buttonbox";}i:3;a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:7:"new.gif";s:5:"label";s:38:"Create new accessory for this resource";s:5:"align";s:6:"center";s:4:"name";s:22:"new_acc[$row_cont[id]]";s:4:"help";s:38:"Create new accessory for this resource";s:7:"onclick";s:224:"window.open(egw::link(\'/index.php\',\'menuaction=resources.ui_resources.edit&id=0&accessory_of=$row_cont[id]\'),\'\',\'dependent=yes,width=800,height=600,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:12:"view_acc.gif";s:5:"label";s:34:"View accessories for this resource";s:5:"align";s:6:"center";s:4:"name";s:23:"view_acc[$row_cont[id]]";s:4:"help";s:34:"View accessories for this resource";}s:4:"span";s:10:",buttonbox";}i:4;a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:4:"View";s:5:"align";s:5:"right";s:4:"name";s:19:"view[$row_cont[id]]";s:4:"help";s:15:"View this entry";s:7:"onclick";s:209:"window.open(egw::link(\'/index.php\',\'menuaction=resources.ui_resources.show&id=$row_cont[id]\'),\'\',\'dependent=yes,width=800,height=600,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes\'); return false;";}i:2;a:3:{s:4:"type";s:8:"checkbox";s:5:"align";s:5:"right";s:4:"name";s:8:"checkbox";}s:5:"align";s:5:"right";s:4:"span";s:10:",buttonbox";}s:5:"align";s:5:"right";}}}s:4:"rows";i:2;s:4:"cols";i:6;}}','size' => '','style' => '','modified' => '1108922292',); + +$templ_data[] = array('name' => 'resources.showdetails','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:2:{s:2:"c1";s:7:"nmh,top";s:1:"B";s:4:"100%";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"vbox";s:4:"name";s:16:"resource_picture";s:4:"size";s:1:"1";i:1;a:2:{s:4:"type";s:5:"image";s:4:"name";s:16:"resource_picture";}}s:1:"B";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"4";i:1;a:3:{s:4:"type";s:5:"label";s:4:"size";s:1:"b";s:4:"name";s:4:"name";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"size";s:1:"i";s:4:"name";s:8:"cat_name";}i:3;a:5:{s:4:"type";s:14:"select-account";s:5:"label";s:13:"Responsible: ";s:4:"name";s:9:"cat_admin";s:7:"no_lang";s:1:"1";s:8:"readonly";s:1:"1";}i:4;a:3:{s:4:"type";s:5:"label";s:5:"label";s:10:"Quantity: ";s:4:"name";s:8:"quantity";}}}i:2;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"html";s:4:"span";s:1:"2";s:4:"name";s:11:"description";s:8:"readonly";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:3;s:4:"cols";i:2;}}','size' => '','style' => '','modified' => '1111327616',); From ad291e1fa56f23ffcad3743c97e9e14b5ac6df03 Mon Sep 17 00:00:00 2001 From: ak703 Date: Mon, 21 Mar 2005 15:30:13 +0000 Subject: [PATCH 06/11] revert changes as Ralph required maybe we find a different approach --- filemanager/inc/class.uifilemanager.inc.php | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/filemanager/inc/class.uifilemanager.inc.php b/filemanager/inc/class.uifilemanager.inc.php index 9f40e3ef48..6d0d763f8c 100755 --- a/filemanager/inc/class.uifilemanager.inc.php +++ b/filemanager/inc/class.uifilemanager.inc.php @@ -1719,16 +1719,6 @@ } $viewable = array('','text/plain','text/csv','text/html','text/text'); - //hack for powerpoint (NDEE 070804) - //manage some special mimetypes here - $extension = strstr($this->file,'.'); - if($extension="ppt") - { - $mime_type="x-application/powerpoint"; - } - // END - - if(in_array($mime_type,$viewable) && !$_GET['download']) { From 4e2bce12e67ab424c0c1156cd11c13819497ca94 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 24 Mar 2005 13:15:12 +0000 Subject: [PATCH 07/11] modernized code and fixed problem reported on the list: new installs cant create admin-account due to not longer existing phpgw class in the api --- phpgwapi/inc/class.accounts.inc.php | 89 ++++---- phpgwapi/inc/class.accounts_contacts.inc.php | 12 +- phpgwapi/inc/class.accounts_ldap.inc.php | 138 ++++++------ phpgwapi/inc/class.accounts_sql.inc.php | 73 +++--- setup/inc/class.Template.inc.php | 2 +- setup/inc/class.setup.inc.php | 224 +++++++++---------- setup/inc/class.setup_html.inc.php | 8 +- setup/inc/class.setup_process.inc.php | 132 +++++------ setup/inc/class.setup_translation.inc.php | 26 +-- setup/inc/functions.inc.php | 20 +- setup/inc/hook_config_validate.inc.php | 4 +- setup/setup_demo.php | 16 +- 12 files changed, 376 insertions(+), 368 deletions(-) diff --git a/phpgwapi/inc/class.accounts.inc.php b/phpgwapi/inc/class.accounts.inc.php index 0b9c8aa027..7b39968da6 100644 --- a/phpgwapi/inc/class.accounts.inc.php +++ b/phpgwapi/inc/class.accounts.inc.php @@ -24,18 +24,18 @@ \**************************************************************************/ /* $Id$ */ - if (empty($GLOBALS['phpgw_info']['server']['account_repository'])) + if (empty($GLOBALS['egw_info']['server']['account_repository'])) { - if (!empty($GLOBALS['phpgw_info']['server']['auth_type'])) + if (!empty($GLOBALS['egw_info']['server']['auth_type'])) { - $GLOBALS['phpgw_info']['server']['account_repository'] = $GLOBALS['phpgw_info']['server']['auth_type']; + $GLOBALS['egw_info']['server']['account_repository'] = $GLOBALS['egw_info']['server']['auth_type']; } else { - $GLOBALS['phpgw_info']['server']['account_repository'] = 'sql'; + $GLOBALS['egw_info']['server']['account_repository'] = 'sql'; } } - include_once(PHPGW_API_INC . '/class.accounts_' . $GLOBALS['phpgw_info']['server']['account_repository'] . '.inc.php'); + include_once(EGW_API_INC . '/class.accounts_' . $GLOBALS['egw_info']['server']['account_repository'] . '.inc.php'); /* Dont know where to put this (seek3r) @@ -43,7 +43,7 @@ This is where it ended up (milosch) Moved again at least temporarily since sql and ldap use it. */ - $GLOBALS['phpgw_info']['server']['global_denied_users'] = array( + $GLOBALS['egw_info']['server']['global_denied_users'] = array( 'root' => True, 'bin' => True, 'daemon' => True, 'adm' => True, 'lp' => True, 'sync' => True, 'shutdown' => True, 'halt' => True, 'ldap' => True, @@ -62,7 +62,7 @@ 'backup' => True ); - $GLOBALS['phpgw_info']['server']['global_denied_groups'] = array( + $GLOBALS['egw_info']['server']['global_denied_groups'] = array( 'root' => True, 'bin' => True, 'daemon' => True, 'sys' => True, 'adm' => True, 'tty' => True, 'disk' => True, 'lp' => True, 'mem' => True, @@ -79,10 +79,11 @@ 'ldap' => True, 'backup' => True ); - /*! - @class_start accounts - @abstract Class for handling user and group accounts - */ + /** + * @class_start accounts + * Class for handling user and group accounts + * + */ class accounts extends accounts_ { @@ -100,9 +101,9 @@ function accounts($account_id = '', $account_type='') { // enable the caching in the session onyl for ldap - $this->use_session_cache = $GLOBALS['phpgw_info']['server']['account_repository'] == 'ldap'; + $this->use_session_cache = $GLOBALS['egw_info']['server']['account_repository'] == 'ldap'; - $this->db = $GLOBALS['phpgw']->db; + $this->db = $GLOBALS['egw']->db; if($account_id != '') { @@ -148,18 +149,18 @@ function setup_cache() { if ($this->use_session_cache && // are we supposed to use a session-cache - !@$GLOBALS['phpgw_info']['accounts']['session_cache_setup'] && // is it already setup + !@$GLOBALS['egw_info']['accounts']['session_cache_setup'] && // is it already setup // is the account-class ready (startup !) - is_object($GLOBALS['phpgw']->session) && $GLOBALS['phpgw']->session->account_id) + is_object($GLOBALS['egw']->session) && $GLOBALS['egw']->session->account_id) { // setting up the session-cache - $GLOBALS['phpgw_info']['accounts']['cache'] = $GLOBALS['phpgw']->session->appsession('accounts_cache','phpgwapi'); - $GLOBALS['phpgw_info']['accounts']['session_cache_setup'] = True; - //echo "accounts::setup_cache() cache=
".print_r($GLOBALS['phpgw_info']['accounts']['cache'],True)."
\n"; + $GLOBALS['egw_info']['accounts']['cache'] = $GLOBALS['egw']->session->appsession('accounts_cache','phpgwapi'); + $GLOBALS['egw_info']['accounts']['session_cache_setup'] = True; + //echo "accounts::setup_cache() cache=
".print_r($GLOBALS['egw_info']['accounts']['cache'],True)."
\n"; } if (!isset($this->cache)) { - $this->cache = &$GLOBALS['phpgw_info']['accounts']['cache']; + $this->cache = &$GLOBALS['egw_info']['accounts']['cache']; } } @@ -171,11 +172,11 @@ function save_session_cache() { if ($this->use_session_cache && // are we supposed to use a session-cache - $GLOBALS['phpgw_info']['accounts']['session_cache_setup'] && // is it already setup + $GLOBALS['egw_info']['accounts']['session_cache_setup'] && // is it already setup // is the account-class ready (startup !) - is_object($GLOBALS['phpgw']->session)) + is_object($GLOBALS['egw']->session)) { - $GLOBALS['phpgw']->session->appsession('accounts_cache','phpgwapi',$GLOBALS['phpgw_info']['accounts']['cache']); + $GLOBALS['egw']->session->appsession('accounts_cache','phpgwapi',$GLOBALS['egw_info']['accounts']['cache']); } } @@ -261,13 +262,13 @@ } if ($group) { - $members = $group > 0 ? $GLOBALS['phpgw']->acl->get_ids_for_location($group, 1, 'phpgw_group') : - $GLOBALS['phpgw']->acl->get_location_list_for_id('phpgw_group', 1,$GLOBALS['phpgw_info']['user']['account_id']); + $members = $group > 0 ? $GLOBALS['egw']->acl->get_ids_for_location($group, 1, 'phpgw_group') : + $GLOBALS['egw']->acl->get_location_list_for_id('phpgw_group', 1,$GLOBALS['egw_info']['user']['account_id']); if (!$members) $members = array(); $valid = !$app ? $members : array_intersect($valid,$members); // use the intersection } //echo "

limiting result to app='app' and/or group=$group valid-ids=".print_r($valid,true)."

\n"; - $offset = $param['offset'] ? $param['offset'] : $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']; + $offset = $param['offset'] ? $param['offset'] : $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']; $stop = $start + $offset; $n = 0; $account_search[$serial]['data'] = array(); @@ -355,7 +356,7 @@ function cache_invalidate($account_id) { //echo "

accounts::cache_invalidate($account_id)

\n"; - $GLOBALS['phpgw_info']['accounts']['cache'] = array(); + $GLOBALS['egw_info']['accounts']['cache'] = array(); } function save_repository() @@ -370,7 +371,7 @@ accounts_::delete($accountid); // delete all acl_entries belonging to that user or group - $GLOBALS['phpgw']->acl->delete_account($accountid); + $GLOBALS['egw']->acl->delete_account($accountid); } function create($account_info,$default_prefs=True) @@ -427,7 +428,7 @@ } $security_equals = Array(); - $security_equals = $GLOBALS['phpgw']->acl->get_location_list_for_id('phpgw_group', 1, $account_id); + $security_equals = $GLOBALS['egw']->acl->get_location_list_for_id('phpgw_group', 1, $account_id); if ($security_equals == False) { @@ -450,7 +451,7 @@ $account_id = get_account_id($accountid); $security_equals = Array(); - $acl = CreateObject('phpgwapi.acl'); + $acl =& CreateObject('phpgwapi.acl'); $security_equals = $acl->get_ids_for_location($account_id, 1, 'phpgw_group'); unset($acl); @@ -468,16 +469,16 @@ return $this->members; } - /*! - @function get_nextid - @abstract Using the common functions next_id and last_id, find the next available account_id - @param $account_type (optional, default to 'u') - */ + /** + * Using the common functions next_id and last_id, find the next available account_id + * + * @param $account_type (optional, default to 'u') + */ // NOTE: to my knowledge this is not used any more RalfBecker 2004/06/15 function get_nextid($account_type='u') { - $min = $GLOBALS['phpgw_info']['server']['account_min_id'] ? $GLOBALS['phpgw_info']['server']['account_min_id'] : 0; - $max = $GLOBALS['phpgw_info']['server']['account_max_id'] ? $GLOBALS['phpgw_info']['server']['account_max_id'] : 0; + $min = $GLOBALS['egw_info']['server']['account_min_id'] ? $GLOBALS['egw_info']['server']['account_min_id'] : 0; + $max = $GLOBALS['egw_info']['server']['account_max_id'] ? $GLOBALS['egw_info']['server']['account_max_id'] : 0; if ($account_type == 'g') { @@ -487,7 +488,7 @@ { $type = 'accounts'; } - $nextid = (int)$GLOBALS['phpgw']->common->last_id($type,$min,$max); + $nextid = (int)$GLOBALS['egw']->common->last_id($type,$min,$max); /* Loop until we find a free id */ $free = 0; @@ -497,7 +498,7 @@ //echo '
calling search for id: '.$nextid; if ($this->exists($nextid)) { - $nextid = (int)$GLOBALS['phpgw']->common->next_id($type,$min,$max); + $nextid = (int)$GLOBALS['egw']->common->next_id($type,$min,$max); } else { @@ -505,7 +506,7 @@ /* echo '
calling search for lid: '.$account_lid . '(from account_id=' . $nextid . ')'; */ if ($this->exists($account_lid)) { - $nextid = (int)$GLOBALS['phpgw']->common->next_id($type,$min,$max); + $nextid = (int)$GLOBALS['egw']->common->next_id($type,$min,$max); } else { @@ -513,8 +514,8 @@ } } } - if ($GLOBALS['phpgw_info']['server']['account_max_id'] && - ($nextid > $GLOBALS['phpgw_info']['server']['account_max_id'])) + if ($GLOBALS['egw_info']['server']['account_max_id'] && + ($nextid > $GLOBALS['egw_info']['server']['account_max_id'])) { return False; } @@ -543,7 +544,7 @@ { return $cache; } - $app_users = $GLOBALS['phpgw']->acl->get_ids_for_location('run',1,$app_users); + $app_users = $GLOBALS['egw']->acl->get_ids_for_location('run',1,$app_users); } $accounts = array( 'accounts' => array(), @@ -551,11 +552,11 @@ ); foreach($app_users as $id) { - $type = $GLOBALS['phpgw']->accounts->get_type($id); + $type = $GLOBALS['egw']->accounts->get_type($id); if($type == 'g') { $accounts['groups'][$id] = $id; - foreach((array)$GLOBALS['phpgw']->acl->get_ids_for_location($id,1,'phpgw_group') as $id) + foreach((array)$GLOBALS['egw']->acl->get_ids_for_location($id,1,'phpgw_group') as $id) { $accounts['accounts'][$id] = $id; } diff --git a/phpgwapi/inc/class.accounts_contacts.inc.php b/phpgwapi/inc/class.accounts_contacts.inc.php index 24b83c5e4c..3ec4509a60 100644 --- a/phpgwapi/inc/class.accounts_contacts.inc.php +++ b/phpgwapi/inc/class.accounts_contacts.inc.php @@ -28,7 +28,7 @@ THIS NEEDS WORK!!!!!!!!! - Milosch But it is a lot closer now... */ - $GLOBALS['phpgw_info']['server']['global_denied_users'] = array( + $GLOBALS['egw_info']['server']['global_denied_users'] = array( 'root' => True, 'bin' => True, 'daemon' => True, 'adm' => True, 'lp' => True, 'sync' => True, 'shutdown' => True, 'halt' => True, 'ldap' => True, @@ -47,7 +47,7 @@ 'backup' => True ); - $GLOBALS['phpgw_info']['server']['global_denied_groups'] = array( + $GLOBALS['egw_info']['server']['global_denied_groups'] = array( 'root' => True, 'bin' => True, 'daemon' => True, 'sys' => True, 'adm' => True, 'tty' => True, 'disk' => True, 'lp' => True, 'mem' => True, @@ -84,15 +84,15 @@ function accounts_() { - $this->db = $GLOBALS['phpgw']->db; - $this->contacts = CreateObject('phpgwapi.contacts',0); + $this->db = $GLOBALS['egw']->db; + $this->contacts =& CreateObject('phpgwapi.contacts',0); } function makeobj() { if(!$this->contacts) { - $this->contacts = CreateObject('phpgwapi.contacts','0'); + $this->contacts =& CreateObject('phpgwapi.contacts','0'); } } @@ -268,7 +268,7 @@ { $account_info['account_id'] = $this->get_nextid(); } - $owner = $GLOBALS['phpgw_info']['user']['account_id']; + $owner = $GLOBALS['egw_info']['user']['account_id']; $entry['id'] = $account_info['account_id']; $entry['lid'] = $account_info['account_lid']; $entry['n_given'] = $account_info['account_firstname']; diff --git a/phpgwapi/inc/class.accounts_ldap.inc.php b/phpgwapi/inc/class.accounts_ldap.inc.php index 1c1bfb54b1..8119dd3b6e 100644 --- a/phpgwapi/inc/class.accounts_ldap.inc.php +++ b/phpgwapi/inc/class.accounts_ldap.inc.php @@ -38,13 +38,13 @@ function accounts_() { - $this->ds = $GLOBALS['phpgw']->common->ldapConnect(); - if(!@is_object($GLOBALS['phpgw']->translation)) + $this->ds = $GLOBALS['egw']->common->ldapConnect(); + if(!@is_object($GLOBALS['egw']->translation)) { - $GLOBALS['phpgw']->translation = CreateObject('phpgwapi.translation'); + $GLOBALS['egw']->translation =& CreateObject('phpgwapi.translation'); } - $this->user_context = $GLOBALS['phpgw_info']['server']['ldap_context']; - $this->group_context = $GLOBALS['phpgw_info']['server']['ldap_group_context']; + $this->user_context = $GLOBALS['egw_info']['server']['ldap_context']; + $this->group_context = $GLOBALS['egw_info']['server']['ldap_group_context']; } function read_repository() @@ -67,7 +67,7 @@ { $this->data['account_id'] = $allValues[0]['gidnumber'][0]; $this->data['account_lid'] = $allValues[0]['cn'][0]; - $this->data['firstname'] = $GLOBALS['phpgw']->translation->convert($allValues[0]['cn'][0],'utf-8'); + $this->data['firstname'] = $GLOBALS['egw']->translation->convert($allValues[0]['cn'][0],'utf-8'); $this->data['lastname'] = lang('Group'); } else @@ -75,8 +75,8 @@ $this->data['account_id'] = $allValues[0]['uidnumber'][0]; $this->data['account_primary_group'] = $allValues[0]['gidnumber'][0]; $this->data['account_lid'] = $allValues[0]['uid'][0]; - $this->data['firstname'] = $GLOBALS['phpgw']->translation->convert($allValues[0]['givenname'][0],'utf-8'); - $this->data['lastname'] = $GLOBALS['phpgw']->translation->convert($allValues[0]['sn'][0],'utf-8'); + $this->data['firstname'] = $GLOBALS['egw']->translation->convert($allValues[0]['givenname'][0],'utf-8'); + $this->data['lastname'] = $GLOBALS['egw']->translation->convert($allValues[0]['sn'][0],'utf-8'); if(isset($allValues[0]['mail'][0])) { $this->data['email'] = $allValues[0]['mail'][0]; @@ -85,7 +85,7 @@ $this->data['account_dn'] = $allValues[0]['dn']; $this->data['fullname'] = $allValues[0]['cn'][0]; - if ($GLOBALS['phpgw_info']['server']['ldap_extra_attributes']) + if ($GLOBALS['egw_info']['server']['ldap_extra_attributes']) { $this->data['homedirectory'] = $allValues[0]['homedirectory'][0]; $this->data['loginshell'] = $allValues[0]['loginshell'][0]; @@ -122,30 +122,30 @@ if($acct_type == 'u') { // data for posixaccount - $newData['cn'] = $GLOBALS['phpgw']->translation->convert(sprintf("%s %s", + $newData['cn'] = $GLOBALS['egw']->translation->convert(sprintf("%s %s", $this->data['firstname'], - $this->data['lastname']),$GLOBALS['phpgw']->translation->charset(),'utf-8' + $this->data['lastname']),$GLOBALS['egw']->translation->charset(),'utf-8' ); - $newData['uid'] = $GLOBALS['phpgw']->translation->convert( + $newData['uid'] = $GLOBALS['egw']->translation->convert( $this->data['account_lid'], - $GLOBALS['phpgw']->translation->charset(),'utf-8' + $GLOBALS['egw']->translation->charset(),'utf-8' ); if($this->data['lastname']) { - $newData['sn'] = $GLOBALS['phpgw']->translation->convert( + $newData['sn'] = $GLOBALS['egw']->translation->convert( $this->data['lastname'], - $GLOBALS['phpgw']->translation->charset(),'utf-8' + $GLOBALS['egw']->translation->charset(),'utf-8' ); } if($this->data['firstname']) { - $newData['givenname'] = $GLOBALS['phpgw']->translation->convert( + $newData['givenname'] = $GLOBALS['egw']->translation->convert( $this->data['firstname'], - $GLOBALS['phpgw']->translation->charset(),'utf-8' + $GLOBALS['egw']->translation->charset(),'utf-8' ); } - if ($GLOBALS['phpgw_info']['server']['ldap_extra_attributes']) + if ($GLOBALS['egw_info']['server']['ldap_extra_attributes']) { $newData['homedirectory'] = $this->data['homedirectory']; $newData['loginshell'] = $this->data['loginshell']; @@ -195,9 +195,9 @@ else { // data for posixgroup - $newData['cn'] = $GLOBALS['phpgw']->translation->convert( + $newData['cn'] = $GLOBALS['egw']->translation->convert( $this->data['account_lid'], - $GLOBALS['phpgw']->translation->charset(), 'utf-8' + $GLOBALS['egw']->translation->charset(), 'utf-8' ); $newData['gidnumber'] = $this->account_id; $newGroupID = $newData['cn']; @@ -220,7 +220,7 @@ { $test = $allValues[0]['uid'][0]; } - if($GLOBALS['phpgw']->translation->convert($test,'utf-8') != $this->data['account_lid']) + if($GLOBALS['egw']->translation->convert($test,'utf-8') != $this->data['account_lid']) { $oldData = $allValues[0]; $oldDN = $oldData['dn']; @@ -497,14 +497,14 @@ { settype($allVals,'array'); $test = @$allVals['uid'][0]; - if (!$GLOBALS['phpgw_info']['server']['global_denied_users'][$test] && $allVals['uid'][0]) + if (!$GLOBALS['egw_info']['server']['global_denied_users'][$test] && $allVals['uid'][0]) { $accounts[] = Array( 'account_id' => $allVals['uidnumber'][0], 'account_lid' => $allVals['uid'][0], 'account_type' => $allVals['phpgwaccounttype'][0], - 'account_firstname' => $GLOBALS['phpgw']->translation->convert($allVals['givenname'][0],'utf-8'), - 'account_lastname' => $GLOBALS['phpgw']->translation->convert($allVals['sn'][0],'utf-8'), + 'account_firstname' => $GLOBALS['egw']->translation->convert($allVals['givenname'][0],'utf-8'), + 'account_lastname' => $GLOBALS['egw']->translation->convert($allVals['sn'][0],'utf-8'), 'account_status' => $allVals['phpgwaccountstatus'][0], 'account_email' => $allVals['mail'][0], ); @@ -527,14 +527,14 @@ { settype($allVals,'array'); $test = $allVals['cn'][0]; - if (!$GLOBALS['phpgw_info']['server']['global_denied_groups'][$test] && $allVals['cn'][0]) + if (!$GLOBALS['egw_info']['server']['global_denied_groups'][$test] && $allVals['cn'][0]) { $accounts[] = Array( 'account_id' => $allVals['gidnumber'][0], 'account_lid' => $allVals['cn'][0], 'account_type' => $allVals['phpgwaccounttype'][0], - 'account_firstname' => $GLOBALS['phpgw']->translation->convert($allVals['givenname'][0],'utf-8'), - 'account_lastname' => $GLOBALS['phpgw']->translation->convert($allVals['sn'][0],'utf-8'), + 'account_firstname' => $GLOBALS['egw']->translation->convert($allVals['givenname'][0],'utf-8'), + 'account_lastname' => $GLOBALS['egw']->translation->convert($allVals['sn'][0],'utf-8'), 'account_status' => $allVals['phpgwaccountstatus'][0], 'account_email' => $allVals['mail'][0], ); @@ -542,7 +542,7 @@ } } // sort the array - $arrayFunctions = CreateObject('phpgwapi.arrayfunctions'); + $arrayFunctions =& CreateObject('phpgwapi.arrayfunctions'); if(empty($order)) { $order = 'account_lid'; @@ -561,7 +561,7 @@ } elseif(is_int($start)) { - return array_slice($sortedAccounts, $start, $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']); + return array_slice($sortedAccounts, $start, $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']); } else { @@ -749,10 +749,10 @@ } $allValues = ldap_get_entries($this->ds, $sri); - if ($GLOBALS['phpgw_info']['server']['ldap_extra_attributes'] && $account_info['account_type'] != 'g') + if ($GLOBALS['egw_info']['server']['ldap_extra_attributes'] && $account_info['account_type'] != 'g') { - $entry['homedirectory'] = $account_info['homedirectory'] && $account_info['homedirectory'] != $GLOBALS['phpgw_info']['server']['ldap_account_home'] ? $account_info['homedirectory'] : $GLOBALS['phpgw_info']['server']['ldap_account_home'].SEP.$account_info['account_lid']; - $entry['loginshell'] = $account_info['loginshell'] ? $account_info['loginshell'] : $GLOBALS['phpgw_info']['server']['ldap_account_shell']; + $entry['homedirectory'] = $account_info['homedirectory'] && $account_info['homedirectory'] != $GLOBALS['egw_info']['server']['ldap_account_home'] ? $account_info['homedirectory'] : $GLOBALS['egw_info']['server']['ldap_account_home'].SEP.$account_info['account_lid']; + $entry['loginshell'] = $account_info['loginshell'] ? $account_info['loginshell'] : $GLOBALS['egw_info']['server']['ldap_account_shell']; } elseif($account_info['account_type'] != 'g') { @@ -799,7 +799,7 @@ $tmpentry['objectclass'][1] = 'person'; $tmpentry['objectclass'][2] = 'organizationalPerson'; $tmpentry['objectclass'][3] = 'inetOrgPerson'; - $tmpentry['userpassword'] = $GLOBALS['phpgw']->common->encrypt_password($account_info['account_passwd'],False); + $tmpentry['userpassword'] = $GLOBALS['egw']->common->encrypt_password($account_info['account_passwd'],False); /* $tmpentry['objectclass'][4] = 'account'; Causes problems with some LDAP servers */ $tmpentry['objectclass'][4] = 'posixAccount'; $tmpentry['objectclass'][5] = 'shadowAccount'; @@ -821,51 +821,51 @@ $entry['objectclass'][0] = 'top'; $entry['objectclass'][1] = 'posixGroup'; $entry['objectclass'][2] = 'phpgwAccount'; - $entry['cn'] = $GLOBALS['phpgw']->translation->convert($account_info['account_lid'],$GLOBALS['phpgw']->translation->charset(),'utf-8'); + $entry['cn'] = $GLOBALS['egw']->translation->convert($account_info['account_lid'],$GLOBALS['egw']->translation->charset(),'utf-8'); $entry['gidnumber'] = $account_id; - #$entry['userpassword'] = $GLOBALS['phpgw']->common->encrypt_password($account_info['account_passwd']); + #$entry['userpassword'] = $GLOBALS['egw']->common->encrypt_password($account_info['account_passwd']); $entry['description'] = 'phpgw-created group'; } else { $dn = 'uid=' . $account_info['account_lid'] . ',' . $this->user_context; - $entry['cn'] = $GLOBALS['phpgw']->translation->convert( + $entry['cn'] = $GLOBALS['egw']->translation->convert( sprintf( "%s %s", $account_info['account_firstname'], $account_info['account_lastname'] ), - $GLOBALS['phpgw']->translation->charset(), + $GLOBALS['egw']->translation->charset(), 'utf-8' ); - $entry['sn'] = $GLOBALS['phpgw']->translation->convert( + $entry['sn'] = $GLOBALS['egw']->translation->convert( $account_info['account_lastname'], - $GLOBALS['phpgw']->translation->charset(), + $GLOBALS['egw']->translation->charset(), 'utf-8' ); if($account_info['account_firstname']) { - $entry['givenname'] = $GLOBALS['phpgw']->translation->convert( + $entry['givenname'] = $GLOBALS['egw']->translation->convert( $account_info['account_firstname'], - $GLOBALS['phpgw']->translation->charset(), + $GLOBALS['egw']->translation->charset(), 'utf-8' ); } if($account_info['account_email']) { - $entry['mail'] = $GLOBALS['phpgw']->translation->convert( + $entry['mail'] = $GLOBALS['egw']->translation->convert( $account_info['account_email'], - $GLOBALS['phpgw']->translation->charset(), + $GLOBALS['egw']->translation->charset(), 'utf-8' ); } $entry['uid'] = $account_info['account_lid']; $entry['uidnumber'] = $account_id; $entry['gidnumber'] = $account_info['account_primary_group']; - $entry['userpassword'] = $GLOBALS['phpgw']->common->encrypt_password($account_info['account_passwd']); + $entry['userpassword'] = $GLOBALS['egw']->common->encrypt_password($account_info['account_passwd']); $entry['objectclass'][0] = 'top'; $entry['objectclass'][1] = 'person'; $entry['objectclass'][2] = 'organizationalPerson'; @@ -932,9 +932,9 @@ } } - if($account_id && is_object($GLOBALS['phpgw']->preferences) && $default_prefs) + if($account_id && is_object($GLOBALS['egw']->preferences) && $default_prefs) { - $GLOBALS['phpgw']->preferences->create_defaults($account_id); + $GLOBALS['egw']->preferences->create_defaults($account_id); } return $account_id; @@ -944,15 +944,15 @@ { if ($expiredate == 0) { - if(isset($GLOBALS['phpgw_info']['server']['auto_create_expire']) == True) + if(isset($GLOBALS['egw_info']['server']['auto_create_expire']) == True) { - if($GLOBALS['phpgw_info']['server']['auto_create_expire'] == 'never') + if($GLOBALS['egw_info']['server']['auto_create_expire'] == 'never') { $expires = -1; } else { - $expiredate = time() + $GLOBALS['phpgw_info']['server']['auto_create_expire']; + $expiredate = time() + $GLOBALS['egw_info']['server']['auto_create_expire']; } } } @@ -967,7 +967,7 @@ $expires = mktime(2,0,0,date('n',$expiredate), (int)date('d',$expiredate), date('Y',$expiredate)); } - $default_group_id = $this->name2id($GLOBALS['phpgw_info']['server']['default_group_lid']); + $default_group_id = $this->name2id($GLOBALS['egw_info']['server']['default_group_lid']); if (!$default_group_id) { $default_group_id = (int) $this->name2id('Default'); @@ -992,9 +992,9 @@ { $acct_info['account_email'] = $GLOBALS['auto_create_acct']['email']; } - elseif(isset($GLOBALS['phpgw_info']['server']['mail_suffix']) == True && $GLOBALS['phpgw_info']['server']['mail_suffix'] != '') + elseif(isset($GLOBALS['egw_info']['server']['mail_suffix']) == True && $GLOBALS['egw_info']['server']['mail_suffix'] != '') { - $acct_info['account_email'] = $accountname . '@' . $GLOBALS['phpgw_info']['server']['mail_suffix']; + $acct_info['account_email'] = $accountname . '@' . $GLOBALS['egw_info']['server']['mail_suffix']; } $this->db->transaction_begin(); @@ -1018,20 +1018,20 @@ /* if we have an mail address set it in the uesrs' email preference */ if (isset($GLOBALS['auto_create_acct']['email']) && $GLOBALS['auto_create_acct']['email'] != '') { - $GLOBALS['phpgw']->acl->acl($accountid); /* needed als preferences::save_repository calls acl */ - $GLOBALS['phpgw']->preferences->preferences($accountid); - $GLOBALS['phpgw']->preferences->read_repository(); - $GLOBALS['phpgw']->preferences->add('email','address',$GLOBALS['auto_create_acct']['email']); - $GLOBALS['phpgw']->preferences->save_repository(); + $GLOBALS['egw']->acl->acl($accountid); /* needed als preferences::save_repository calls acl */ + $GLOBALS['egw']->preferences->preferences($accountid); + $GLOBALS['egw']->preferences->read_repository(); + $GLOBALS['egw']->preferences->add('email','address',$GLOBALS['auto_create_acct']['email']); + $GLOBALS['egw']->preferences->save_repository(); } /* use the default mail domain to set the uesrs' email preference */ - elseif(isset($GLOBALS['phpgw_info']['server']['mail_suffix']) && $GLOBALS['phpgw_info']['server']['mail_suffix'] != '') + elseif(isset($GLOBALS['egw_info']['server']['mail_suffix']) && $GLOBALS['egw_info']['server']['mail_suffix'] != '') { - $GLOBALS['phpgw']->acl->acl($accountid); /* needed als preferences::save_repository calls acl */ - $GLOBALS['phpgw']->preferences->preferences($accountid); - $GLOBALS['phpgw']->preferences->read_repository(); - $GLOBALS['phpgw']->preferences->add('email','address', $accountname . '@' . $GLOBALS['phpgw_info']['server']['mail_suffix']); - $GLOBALS['phpgw']->preferences->save_repository(); + $GLOBALS['egw']->acl->acl($accountid); /* needed als preferences::save_repository calls acl */ + $GLOBALS['egw']->preferences->preferences($accountid); + $GLOBALS['egw']->preferences->read_repository(); + $GLOBALS['egw']->preferences->add('email','address', $accountname . '@' . $GLOBALS['egw_info']['server']['mail_suffix']); + $GLOBALS['egw']->preferences->save_repository(); } /* commit the new account transaction */ @@ -1044,7 +1044,7 @@ $GLOBALS['hook_values']['account_status'] = $acct_info['account_status']; $GLOBALS['hook_values']['account_firstname'] = $acct_info['account_firstname']; $GLOBALS['hook_values']['account_lastname'] = $acct_info['account_lastname']; - $GLOBALS['phpgw']->hooks->process($GLOBALS['hook_values']+array( + $GLOBALS['egw']->hooks->process($GLOBALS['hook_values']+array( 'location' => 'addaccount' ),False,True); // called for every app now, not only enabled ones @@ -1078,15 +1078,15 @@ if($acct_type =='g') { - $lid = $GLOBALS['phpgw']->translation->convert($allValues[0]['cn'][0],'utf-8'); - $fname = $GLOBALS['phpgw']->translation->convert($allValues[0]['cn'][0],'utf-8'); + $lid = $GLOBALS['egw']->translation->convert($allValues[0]['cn'][0],'utf-8'); + $fname = $GLOBALS['egw']->translation->convert($allValues[0]['cn'][0],'utf-8'); $lname = lang('Group'); } else { - $lid = $GLOBALS['phpgw']->translation->convert($allValues[0]['uid'][0],'utf-8'); - $fname = $GLOBALS['phpgw']->translation->convert($allValues[0]['givenname'][0],'utf-8'); - $lname = $GLOBALS['phpgw']->translation->convert($allValues[0]['sn'][0],'utf-8'); + $lid = $GLOBALS['egw']->translation->convert($allValues[0]['uid'][0],'utf-8'); + $fname = $GLOBALS['egw']->translation->convert($allValues[0]['givenname'][0],'utf-8'); + $lname = $GLOBALS['egw']->translation->convert($allValues[0]['sn'][0],'utf-8'); } return !empty($lid); } diff --git a/phpgwapi/inc/class.accounts_sql.inc.php b/phpgwapi/inc/class.accounts_sql.inc.php index 0eadbda8f3..76ed1dda40 100644 --- a/phpgwapi/inc/class.accounts_sql.inc.php +++ b/phpgwapi/inc/class.accounts_sql.inc.php @@ -25,10 +25,11 @@ \**************************************************************************/ /* $Id$ */ - /*! - @class_start accounts - @abstract Class for handling user and group accounts - */ + /** + * @class_start accounts + * Class for handling user and group accounts + * + */ class accounts_ { var $db; @@ -38,9 +39,7 @@ function accounts_() { - //copyobj($GLOBALS['phpgw']->db,$this->db); - $this->db = is_object($GLOBALS['phpgw']->db) ? $GLOBALS['phpgw']->db : $GLOBALS['phpgw_setup']->db; - + $this->db = clone($GLOBALS['egw']->db); $this->table = 'phpgw_accounts'; $this->db->set_app('phpgwapi'); // to load the right table-definitions for insert, select, update, ... } @@ -78,10 +77,10 @@ } } - /*! - @function read_repository - @abstract grabs the records from the data store - */ + /** + * grabs the records from the data store + * + */ function read_repository() { $this->db->select($this->table,'*',array('account_id'=>$this->account_id),__LINE__,__FILE__); @@ -105,10 +104,10 @@ return $this->data; } - /*! - @function save_repository - @abstract saves the records to the data store - */ + /** + * saves the records to the data store + * + */ function save_repository() { $this->db->update($this->table,array( @@ -304,7 +303,7 @@ { $account_data = array( 'account_lid' => $account_info['account_lid'], - 'account_pwd' => $GLOBALS['phpgw']->common->encrypt_password($account_info['account_passwd'],True), + 'account_pwd' => $GLOBALS['egw']->common->encrypt_password($account_info['account_passwd'],True), 'account_firstname' => $account_info['account_firstname'], 'account_lastname' => $account_info['account_lastname'], 'account_status' => $account_info['account_status'], @@ -328,15 +327,15 @@ { if ($expiredate == 0) { - if(isset($GLOBALS['phpgw_info']['server']['auto_create_expire']) == True) + if(isset($GLOBALS['egw_info']['server']['auto_create_expire']) == True) { - if($GLOBALS['phpgw_info']['server']['auto_create_expire'] == 'never') + if($GLOBALS['egw_info']['server']['auto_create_expire'] == 'never') { $expires = -1; } else { - $expiredate = time() + $GLOBALS['phpgw_info']['server']['auto_create_expire']; + $expiredate = time() + $GLOBALS['egw_info']['server']['auto_create_expire']; } } } @@ -351,7 +350,7 @@ $expires = mktime(2,0,0,date('n',$expiredate), (int)date('d',$expiredate), date('Y',$expiredate)); } - $default_group_id = $this->name2id($GLOBALS['phpgw_info']['server']['default_group_lid']); + $default_group_id = $this->name2id($GLOBALS['egw_info']['server']['default_group_lid']); if (!$default_group_id) { $default_group_id = (int) $this->name2id('Default'); @@ -377,9 +376,9 @@ { $acct_info['account_email'] = $GLOBALS['auto_create_acct']['email']; } - elseif(isset($GLOBALS['phpgw_info']['server']['mail_suffix']) == True && $GLOBALS['phpgw_info']['server']['mail_suffix'] != '') + elseif(isset($GLOBALS['egw_info']['server']['mail_suffix']) == True && $GLOBALS['egw_info']['server']['mail_suffix'] != '') { - $acct_info['account_email'] = $accountname . '@' . $GLOBALS['phpgw_info']['server']['mail_suffix']; + $acct_info['account_email'] = $accountname . '@' . $GLOBALS['egw_info']['server']['mail_suffix']; } $this->db->transaction_begin(); @@ -400,20 +399,20 @@ /* if we have an mail address set it in the uesrs' email preference */ if (isset($GLOBALS['auto_create_acct']['email']) && $GLOBALS['auto_create_acct']['email'] != '') { - $GLOBALS['phpgw']->acl->acl($accountid); /* needed als preferences::save_repository calls acl */ - $GLOBALS['phpgw']->preferences->preferences($accountid); - $GLOBALS['phpgw']->preferences->read_repository(); - $GLOBALS['phpgw']->preferences->add('email','address',$GLOBALS['auto_create_acct']['email']); - $GLOBALS['phpgw']->preferences->save_repository(); + $GLOBALS['egw']->acl->acl($accountid); /* needed als preferences::save_repository calls acl */ + $GLOBALS['egw']->preferences->preferences($accountid); + $GLOBALS['egw']->preferences->read_repository(); + $GLOBALS['egw']->preferences->add('email','address',$GLOBALS['auto_create_acct']['email']); + $GLOBALS['egw']->preferences->save_repository(); } /* use the default mail domain to set the uesrs' email preference */ - elseif(isset($GLOBALS['phpgw_info']['server']['mail_suffix']) && $GLOBALS['phpgw_info']['server']['mail_suffix'] != '') + elseif(isset($GLOBALS['egw_info']['server']['mail_suffix']) && $GLOBALS['egw_info']['server']['mail_suffix'] != '') { - $GLOBALS['phpgw']->acl->acl($accountid); /* needed als preferences::save_repository calls acl */ - $GLOBALS['phpgw']->preferences->preferences($accountid); - $GLOBALS['phpgw']->preferences->read_repository(); - $GLOBALS['phpgw']->preferences->add('email','address', $accountname . '@' . $GLOBALS['phpgw_info']['server']['mail_suffix']); - $GLOBALS['phpgw']->preferences->save_repository(); + $GLOBALS['egw']->acl->acl($accountid); /* needed als preferences::save_repository calls acl */ + $GLOBALS['egw']->preferences->preferences($accountid); + $GLOBALS['egw']->preferences->read_repository(); + $GLOBALS['egw']->preferences->add('email','address', $accountname . '@' . $GLOBALS['egw_info']['server']['mail_suffix']); + $GLOBALS['egw']->preferences->save_repository(); } /* commit the new account transaction */ @@ -426,7 +425,7 @@ $GLOBALS['hook_values']['account_status'] = $acct_info['account_status']; $GLOBALS['hook_values']['account_firstname'] = $acct_info['account_firstname']; $GLOBALS['hook_values']['account_lastname'] = $acct_info['account_lastname']; - $GLOBALS['phpgw']->hooks->process($GLOBALS['hook_values']+array( + $GLOBALS['egw']->hooks->process($GLOBALS['hook_values']+array( 'location' => 'addaccount' ),False,True); /* called for every app now, not only enabled ones */ @@ -458,6 +457,6 @@ return True; } } - /*! - @class_end accounts - */ + /** + * @class_end accounts + */ diff --git a/setup/inc/class.Template.inc.php b/setup/inc/class.Template.inc.php index 424468de43..be04b8cf4c 100644 --- a/setup/inc/class.Template.inc.php +++ b/setup/inc/class.Template.inc.php @@ -376,7 +376,7 @@ } else { - $new_root = str_replace($GLOBALS['phpgw_info']['server']['template_set'],'default',$root); + $new_root = str_replace($GLOBALS['egw_info']['server']['template_set'],'default',$root); $new_filename = $this->filename(str_replace($root.'/','',$new_filename),$new_root,2); } } diff --git a/setup/inc/class.setup.inc.php b/setup/inc/class.setup.inc.php index 044535443c..3aac80752c 100644 --- a/setup/inc/class.setup.inc.php +++ b/setup/inc/class.setup.inc.php @@ -35,8 +35,8 @@ function setup($html=False, $translation=False) { - $this->detection = CreateObject('setup.setup_detection'); - $this->process = CreateObject('setup.setup_process'); + $this->detection =& CreateObject('setup.setup_detection'); + $this->process =& CreateObject('setup.setup_process'); /* The setup application needs these */ $this->html = $html ? CreateObject('setup.setup_html') : ''; @@ -47,10 +47,9 @@ $this->tbl_hooks = $this->get_hooks_table_name(); } - /*! - @function loaddb - @abstract include api db class for the ConfigDomain and connect to the db - */ + /** + * include api db class for the ConfigDomain and connect to the db + */ function loaddb($connect_and_setcharset=true) { if(!isset($this->ConfigDomain) || empty($this->ConfigDomain)) @@ -64,7 +63,7 @@ { $GLOBALS['egw_info']['server']['db_persistent'] = False; } - $this->db = CreateObject('phpgwapi.db'); + $this->db =& CreateObject('phpgwapi.db'); $this->db->Host = $GLOBALS['egw_domain'][$this->ConfigDomain]['db_host']; $this->db->Port = $GLOBALS['egw_domain'][$this->ConfigDomain]['db_port']; $this->db->Type = $GLOBALS['egw_domain'][$this->ConfigDomain]['db_type']; @@ -125,11 +124,11 @@ setcookie($cookiename,$cookievalue,$cookietime,'/',$this->cookie_domain); } - /*! - @function auth - @abstract authenticate the setup user - @param $auth_type ??? - */ + /** + * authenticate the setup user + * + * @param $auth_type ??? + */ function auth($auth_type='Config') { #phpinfo(); @@ -335,11 +334,11 @@ return False; } - /*! - @function get_major - @abstract Return X.X.X major version from X.X.X.X versionstring - @param $ - */ + /** + * Return X.X.X major version from X.X.X.X versionstring + * + * @param $ + */ function get_major($versionstring) { if(!$versionstring) @@ -354,11 +353,9 @@ return $major; } - /*! - @function clear_session_cache - @abstract Clear system/user level cache so as to have it rebuilt with the next access - @param None - */ + /** + * Clear system/user level cache so as to have it rebuilt with the next access + */ function clear_session_cache() { $tables = Array(); @@ -376,12 +373,12 @@ } } - /*! - @function register_app - @abstract Add an application to the phpgw_applications table - @param $appname Application 'name' with a matching $setup_info[$appname] array slice - @param $enable optional, set to True/False to override setup.inc.php setting - */ + /** + * Add an application to the phpgw_applications table + * + * @param $appname Application 'name' with a matching $setup_info[$appname] array slice + * @param $enable * optional, set to True/False to override setup.inc.php setting + */ function register_app($appname,$enable=99) { $setup_info = $GLOBALS['setup_info']; @@ -442,12 +439,12 @@ } } - /*! - @function app_registered - @abstract Check if an application has info in the db - @param $appname Application 'name' with a matching $setup_info[$appname] array slice - @param $enabled optional, set to False to not enable this app - */ + /** + * Check if an application has info in the db + * + * @param $appname Application 'name' with a matching $setup_info[$appname] array slice + * @param $enabled optional, set to False to not enable this app + */ function app_registered($appname) { $setup_info = $GLOBALS['setup_info']; @@ -485,12 +482,12 @@ return False; } - /*! - @function update_app - @abstract Update application info in the db - @param $appname Application 'name' with a matching $setup_info[$appname] array slice - @param $enabled optional, set to False to not enable this app - */ + /** + * Update application info in the db + * + * @param $appname Application 'name' with a matching $setup_info[$appname] array slice + * @param $enabled optional, set to False to not enable this app + */ function update_app($appname) { $setup_info = $GLOBALS['setup_info']; @@ -532,13 +529,13 @@ } } - /*! - @function update_app_version - @abstract Update application version in applications table, post upgrade - @param $setup_info Array of application information (multiple apps or single) - @param $appname Application 'name' with a matching $setup_info[$appname] array slice - @param $tableschanged ??? - */ + /** + * Update application version in applications table, post upgrade + * + * @param $setup_info * Array of application information (multiple apps or single) + * @param $appname * Application 'name' with a matching $setup_info[$appname] array slice + * @param $tableschanged ??? + */ function update_app_version($setup_info, $appname, $tableschanged = True) { if(!$appname) @@ -564,11 +561,11 @@ return $setup_info; } - /*! - @function deregister_app - @abstract de-Register an application - @param $appname Application 'name' with a matching $setup_info[$appname] array slice - */ + /** + * de-Register an application + * + * @param $appname Application 'name' with a matching $setup_info[$appname] array slice + */ function deregister_app($appname) { if(!$appname) @@ -587,11 +584,11 @@ $this->clear_session_cache(); } - /*! - @function register_hooks - @abstract Register an application's hooks - @param $appname Application 'name' with a matching $setup_info[$appname] array slice - */ + /** + * Register an application's hooks + * + * @param $appname Application 'name' with a matching $setup_info[$appname] array slice + */ function register_hooks($appname) { $setup_info = $GLOBALS['setup_info']; @@ -609,26 +606,26 @@ if (!is_object($this->hooks)) { - $this->hooks = CreateObject('phpgwapi.hooks',$this->db); + $this->hooks =& CreateObject('phpgwapi.hooks',$this->db); } $this->hooks->register_hooks($appname,$setup_info[$appname]['hooks']); } - /*! - @function update_hooks - @abstract Update an application's hooks - @param $appname Application 'name' with a matching $setup_info[$appname] array slice - */ + /** + * Update an application's hooks + * + * @param $appname Application 'name' with a matching $setup_info[$appname] array slice + */ function update_hooks($appname) { $this->register_hooks($appname); } - /*! - @function deregister_hooks - @abstract de-Register an application's hooks - @param $appname Application 'name' with a matching $setup_info[$appname] array slice - */ + /** + * de-Register an application's hooks + * + * @param $appname Application 'name' with a matching $setup_info[$appname] array slice + */ function deregister_hooks($appname) { if($this->alessthanb($setup_info['phpgwapi']['currentver'],'0.9.8pre5')) @@ -645,33 +642,32 @@ //echo "DELETING hooks for: " . $setup_info[$appname]['name']; if (!is_object($this->hooks)) { - $this->hooks = CreateObject('phpgwapi.hooks',$this->db); + $this->hooks =& CreateObject('phpgwapi.hooks',$this->db); } $this->hooks->register_hooks($appname); } - /*! - @function hook - @abstract call the hooks for a single application - @param $location hook location - required - @param $appname application name - optional - */ + /** + * call the hooks for a single application + * + * @param $location hook location - required + * @param $appname application name - optional + */ function hook($location, $appname='') { if (!is_object($this->hooks)) { - $this->hooks = CreateObject('phpgwapi.hooks',$this->db); + $this->hooks =& CreateObject('phpgwapi.hooks',$this->db); } return $this->hooks->single($location,$appname,True,True); } - /* - @function alessthanb - @abstract phpgw version checking, is param 1 < param 2 in phpgw versionspeak? - @param $a phpgw version number to check if less than $b - @param $b phpgw version number to check $a against - #return True if $a < $b - */ + /** + * egw version checking, is param 1 < param 2 in phpgw versionspeak? + * @param $a phpgw version number to check if less than $b + * @param $b phpgw version number to check $a against + * @return True if $a < $b + */ function alessthanb($a,$b,$DEBUG=False) { $num = array('1st','2nd','3rd','4th'); @@ -752,13 +748,13 @@ } } - /*! - @function amorethanb - @abstract phpgw version checking, is param 1 > param 2 in phpgw versionspeak? - @param $a phpgw version number to check if more than $b - @param $b phpgw version number to check $a against - #return True if $a < $b - */ + /** + * egw version checking, is param 1 > param 2 in phpgw versionspeak? + * + * @param $a phpgw version number to check if more than $b + * @param $b phpgw version number to check $a against + * @return True if $a < $b + */ function amorethanb($a,$b,$DEBUG=False) { $num = array('1st','2nd','3rd','4th'); @@ -861,11 +857,12 @@ } if (!is_object($GLOBALS['egw'])) { - $GLOBALS['egw'] = CreateObject('phpgwapi.phpgw'); + $GLOBALS['egw'] =& CreateObject('phpgwapi.egw'); + $GLOBALS['phpgw'] =& $GLOBALS['egw']; } - copyobj($this->db,$GLOBALS['egw']->db); - $GLOBALS['egw']->common = CreateObject('phpgwapi.common'); - $GLOBALS['egw']->accounts = CreateObject('phpgwapi.accounts'); + $GLOBALS['egw']->db = clone($this->db); + $GLOBALS['egw']->common =& CreateObject('phpgwapi.common'); + $GLOBALS['egw']->accounts =& CreateObject('phpgwapi.accounts'); if(($GLOBALS['egw_info']['server']['account_repository'] == 'ldap') && !$GLOBALS['egw']->accounts->ds) @@ -876,17 +873,18 @@ } } - /*! - @function add_account - @abstract add an user account or a user group - @param username string alphanumerical username or groupname (account_lid) - @param first, last string first / last name - @param $passwd string cleartext pw - @param $group string/boolean Groupname for users primary group or False for a group, default 'Default' - @param $changepw boolean user has right to change pw, default False - @returns the numerical user-id - @note if the $username already exists, only the id is returned, no new user / group gets created - */ + /** + * add an user account or a user group + * + * if the $username already exists, only the id is returned, no new user / group gets created + * + * @param username string alphanumerical username or groupname (account_lid) + * @param first, last string first / last name + * @param $passwd string cleartext pw + * @param $group string/boolean Groupname for users primary group or False for a group, default 'Default' + * @param $changepw boolean user has right to change pw, default False + * @return the numerical user-id + */ function add_account($username,$first,$last,$passwd,$group='default',$changepw=False) { $this->setup_account_object(); @@ -916,14 +914,14 @@ return $accountid; } - /*! - @function add_acl - @abstract Add ACL rights - @param $app string/array with app-names - @param $locations string eg. run - @param $account int/string accountid or account_lid - @param $rights int rights to set, default 1 - */ + /** + * Add ACL rights + * + * @param $app string/array with app-names + * @param $locations string eg. run + * @param $account int/string accountid or account_lid + * @param $rights int rights to set, default 1 + */ function add_acl($apps,$location,$account,$rights=1) { if (!is_int($account)) diff --git a/setup/inc/class.setup_html.inc.php b/setup/inc/class.setup_html.inc.php index 959c996ffd..60e8f743bf 100644 --- a/setup/inc/class.setup_html.inc.php +++ b/setup/inc/class.setup_html.inc.php @@ -16,10 +16,10 @@ class setup_html { - /*! - @function generate_header - @abstract generate header.inc.php file output - NOT a generic html header function - */ + /** + * generate header.inc.php file output - NOT a generic html header function + * + */ function generate_header() { // PHP will automatically replace any dots in incoming diff --git a/setup/inc/class.setup_process.inc.php b/setup/inc/class.setup_process.inc.php index ea286b1e88..2250409fd2 100755 --- a/setup/inc/class.setup_process.inc.php +++ b/setup/inc/class.setup_process.inc.php @@ -35,27 +35,27 @@ function setup_process() { - $this->translation = CreateObject('setup.setup_translation'); + $this->translation =& CreateObject('setup.setup_translation'); } - /*! - @function init_process - @abstract create schema_proc object - @param none - */ + /** + * create schema_proc object + * + * @param none + */ function init_process() { - $GLOBALS['egw_setup']->oProc = CreateObject('phpgwapi.schema_proc'); + $GLOBALS['egw_setup']->oProc =& CreateObject('phpgwapi.schema_proc'); } - /*! - @function pass - @abstract the mother of all multipass upgrade parental loop functions - @param $setup_info array of application info from setup.inc.php files - @param $type optional, defaults to new(install), could also be 'upgrade' - @param $DEBUG optional, print debugging info - @param $force_en optional, install english language files - */ + /** + * the mother of all multipass upgrade parental loop functions + * + * @param $setup_info array of application info from setup.inc.php files + * @param $type optional, defaults to new(install), could also be 'upgrade' + * @param $DEBUG optional, print debugging info + * @param $force_en optional, install english language files + */ function pass($setup_info,$method='new',$DEBUG=False,$force_en=False,$system_charset=false) { if(!$method) @@ -186,10 +186,10 @@ return $setup_info = array_merge($setup_info,$passed); } - /*! - @function save_minimal_config - @abstract saves a minimal default config, so you get a running install without entering and saveing Step #2 config - */ + /** + * saves a minimal default config, so you get a running install without entering and saveing Step #2 config + * + */ function save_minimal_config($system_charset) { $GLOBALS['current_config']['site_title'] = 'eGroupWare'; @@ -215,7 +215,7 @@ array_pop($parts); // remove setup $GLOBALS['current_config']['webserver_url'] = implode('/',$parts); - $datetime = CreateObject('phpgwapi.datetime'); + $datetime =& CreateObject('phpgwapi.datetime'); $GLOBALS['current_config']['tz_offset'] = $datetime->getbestguess(); unset($datetime); @@ -240,11 +240,11 @@ } } - /*! - @function droptables - @abstract drop tables per application, check that they are in the db first - @param $setup_info array of application info from setup.inc.php files, etc. - */ + /** + * drop tables per application, check that they are in the db first + * + * @param $setup_info array of application info from setup.inc.php files, etc. + */ function droptables($setup_info,$DEBUG=False) { if(!@$GLOBALS['egw_setup']->oProc) @@ -289,12 +289,12 @@ return $setup_info; } - /*! - @function current - @abstract process current table setup in each application/setup dir - @param $appinfo array of application info from setup.inc.php files, etc. - @discussion This duplicates the old newtables behavior, using schema_proc - */ + /** + * process current table setup in each application/setup dir + * + * @param $appinfo array of application info from setup.inc.php files, etc. + * This duplicates the old newtables behavior, using schema_proc + */ function current($setup_info,$DEBUG=False) { if(!@$GLOBALS['egw_setup']->oProc) @@ -310,7 +310,7 @@ if($DEBUG) { echo '
process->current(): Incoming status: ' . $appname . ',status: '. $setup_info[$key]['status']; } - $appdir = PHPGW_SERVER_ROOT . SEP . $appname . SEP . 'setup' . SEP; + $appdir = EGW_SERVER_ROOT . SEP . $appname . SEP . 'setup' . SEP; if($setup_info[$key]['tables'] && file_exists($appdir.'tables_current.inc.php')) { @@ -370,11 +370,11 @@ return ($setup_info); } - /*! - @function default_records - @abstract process default_records.inc.php in each application/setup dir - @param $setup_info array of application info from setup.inc.php files, etc. - */ + /** + * process default_records.inc.php in each application/setup dir + * + * @param $setup_info array of application info from setup.inc.php files, etc. + */ function default_records($setup_info,$DEBUG=False) { if(!@$GLOBALS['egw_setup']->oProc) @@ -385,7 +385,7 @@ while(list($key,$null) = @each($setup_info)) { $appname = $setup_info[$key]['name']; - $appdir = PHPGW_SERVER_ROOT . SEP . $appname . SEP . 'setup' . SEP; + $appdir = EGW_SERVER_ROOT . SEP . $appname . SEP . 'setup' . SEP; if($setup_info[$key]['tables'] && file_exists($appdir.'default_records.inc.php')) { @@ -405,12 +405,12 @@ return ($setup_info); } - /*! - @function test_data - @abstract process test_data.inc.php in each application/setup dir for developer tests - This data should work with the baseline tables - @param $setup_info array of application info from setup.inc.php files, etc. - */ + /** + * process test_data.inc.php in each application/setup dir for developer tests + * + * This data should work with the baseline tables + * @param $setup_info array of application info from setup.inc.php files, etc. + */ function test_data($setup_info,$DEBUG=False) { if(!@$GLOBALS['egw_setup']->oProc) @@ -421,7 +421,7 @@ while(list($key,$null) = @each($setup_info)) { $appname = $setup_info[$key]['name']; - $appdir = PHPGW_SERVER_ROOT . SEP . $appname . SEP . 'setup' . SEP; + $appdir = EGW_SERVER_ROOT . SEP . $appname . SEP . 'setup' . SEP; if(file_exists($appdir.'test_data.inc.php')) { @@ -439,11 +439,11 @@ return ($setup_info); } - /*! - @function baseline - @abstract process baseline table setup in each application/setup dir - @param $appinfo array of application info from setup.inc.php files, etc. - */ + /** + * process baseline table setup in each application/setup dir + * + * @param $appinfo array of application info from setup.inc.php files, etc. + */ function baseline($setup_info,$DEBUG=False) { if(!@$GLOBALS['egw_setup']->oProc) @@ -455,7 +455,7 @@ while(list($key,$null) = @each($setup_info)) { $appname = $setup_info[$key]['name']; - $appdir = PHPGW_SERVER_ROOT . SEP . $appname . SEP . 'setup' . SEP; + $appdir = EGW_SERVER_ROOT . SEP . $appname . SEP . 'setup' . SEP; if(file_exists($appdir.'tables_baseline.inc.php')) { @@ -484,11 +484,11 @@ return ($setup_info); } - /*! - @function upgrade - @abstract process available upgrades in each application/setup dir - @param $appinfo array of application info from setup.inc.php files, etc. - */ + /** + * process available upgrades in each application/setup dir + * + * @param $appinfo array of application info from setup.inc.php files, etc. + */ function upgrade($setup_info,$DEBUG=False) { if(!@$GLOBALS['egw_setup']->oProc) @@ -520,7 +520,7 @@ { $currentver = $appdata['currentver']; $targetver = $appdata['version']; // The version we need to match when done - $appdir = PHPGW_SERVER_ROOT . SEP . $appname . SEP . 'setup' . SEP; + $appdir = EGW_SERVER_ROOT . SEP . $appname . SEP . 'setup' . SEP; if(file_exists($appdir . 'tables_update.inc.php') && !@$this->updateincluded[$appname]) { @@ -613,10 +613,10 @@ return ($setup_info); } - /*! - @function post_process - @abstract commit above processing to the db - */ + /** + * commit above processing to the db + * + */ function post_process($tables,$DEBUG=False) { if(!$tables) @@ -643,11 +643,11 @@ } } - /*! - @function sql_to_array - @abstract send this a table name, returns printable column spec and keys for the table from schema_proc - @param $tablename table whose array you want to see - */ + /** + * send this a table name, returns printable column spec and keys for the table from schema_proc + * + * @param $tablename table whose array you want to see + */ function sql_to_array($tablename='') { if(!$tablename) diff --git a/setup/inc/class.setup_translation.inc.php b/setup/inc/class.setup_translation.inc.php index 7eb35439f1..788c628023 100644 --- a/setup/inc/class.setup_translation.inc.php +++ b/setup/inc/class.setup_translation.inc.php @@ -32,11 +32,11 @@ { var $langarray = array(); - /*! - @function setup_lang - @abstract constructor for the class, loads all phrases into langarray - @param $lang user lang variable (defaults to en) - */ + /** + * constructor for the class, loads all phrases into langarray + * + * @param $lang user lang variable (defaults to en) + */ function setup_translation() { $ConfigLang = get_var('ConfigLang',Array('POST','COOKIE')); @@ -68,12 +68,12 @@ } } - /*! - @function translate - @abstract Translate phrase to user selected lang - @param $key phrase to translate - @param $vars vars sent to lang function, passed to us - */ + /** + * Translate phrase to user selected lang + * + * @param $key phrase to translate + * @param $vars vars sent to lang function, passed to us + */ function translate($key, $vars=False) { $ret = $key.'*'; @@ -99,7 +99,7 @@ if (!is_object($this->sql)) { include_once(EGW_API_INC.'/class.translation_sql.inc.php'); - $this->sql = new translation; + $this->sql =& new translation; } } @@ -173,7 +173,7 @@ { return $charsets; } - $html = CreateObject('phpgwapi.html'); + $html =& CreateObject('phpgwapi.html'); return $html->select($name,trim(strtolower($selected)),$charsets,true); } diff --git a/setup/inc/functions.inc.php b/setup/inc/functions.inc.php index a713d476a7..a17aa8ea8d 100644 --- a/setup/inc/functions.inc.php +++ b/setup/inc/functions.inc.php @@ -19,7 +19,7 @@ error_reporting(error_reporting() & ~E_NOTICE); // for an old header, we need to setup the reference before including it - if (!is_array($GLOBALS['phpgw_info'])) $GLOBALS['phpgw_info'] =& $GLOBALS['egw_info']; + if (!is_array($GLOBALS['egw_info'])) $GLOBALS['egw_info'] =& $GLOBALS['egw_info']; if(file_exists('../header.inc.php')) { @@ -48,10 +48,10 @@ define('SEP',filesystem_separator()); - /*! - @function lang - @abstract function to handle multilanguage support - */ + /** + * function to handle multilanguage support + * + */ function lang($key,$m1='',$m2='',$m3='',$m4='',$m5='',$m6='',$m7='',$m8='',$m9='',$m10='') { if(is_array($m1)) @@ -66,11 +66,9 @@ return $value; } - /*! - @function get_langs - @abstract returns array of languages we support, with enabled set - to True if the lang file exists - */ + /** + * returns array of languages we support, with enabled set to True if the lang file exists + */ function get_langs() { $f = fopen('./lang/languages','rb'); @@ -137,5 +135,5 @@ $GLOBALS['egw_info']['server']['app_images'] = 'templates/default/images'; - $GLOBALS['egw_setup'] = CreateObject('setup.setup',True,True); + $GLOBALS['egw_setup'] =& CreateObject('setup.setup',True,True); $GLOBALS['phpgw_setup'] =& $GLOBALS['egw_setup']; diff --git a/setup/inc/hook_config_validate.inc.php b/setup/inc/hook_config_validate.inc.php index 1c91a9e825..f63cd8f567 100644 --- a/setup/inc/hook_config_validate.inc.php +++ b/setup/inc/hook_config_validate.inc.php @@ -16,11 +16,11 @@ Set a global flag to indicate this file was found by setup/config.php. config.php will unset it after parsing the form values. */ - $GLOBALS['phpgw_info']['server']['found_validation_hook'] = True; + $GLOBALS['egw_info']['server']['found_validation_hook'] = True; function in_docroot($path='') { - $docroots = array(PHPGW_SERVER_ROOT,$_SERVER['DOCUMENT_ROOT']); + $docroots = array(EGW_SERVER_ROOT,$_SERVER['DOCUMENT_ROOT']); foreach($docroots as $docroot) { diff --git a/setup/setup_demo.php b/setup/setup_demo.php index ee8f8e4919..360ad9d9eb 100644 --- a/setup/setup_demo.php +++ b/setup/setup_demo.php @@ -147,8 +147,20 @@ foreach ($defaultprefs as $app => $prefs) { - $prefs = $GLOBALS['egw_setup']->db->db_addslashes(serialize($prefs)); - $GLOBALS['egw_setup']->db->query("INSERT INTO phpgw_preferences(preference_owner,preference_app,preference_value) VALUES($accountid,'$app','$prefs')",__FILE__,__LINE__); + // only insert them, if they not already exist + $GLOBALS['egw_setup']->db->select('phpgw_preferences','*',array( + 'preference_owner' => $accountid, + 'preference_app' => $app, + ),__LINE__,__FILE__); + if (!$GLOBALS['egw_setup']->db->next_record()) + { + $GLOBALS['egw_setup']->db->insert('phpgw_preferences',array( + 'preference_value' => serialize($prefs) + ),array( + 'preference_owner' => $accountid, + 'preference_app' => $app, + ),__LINE__,__FILE__); + } } } insert_default_prefs(-2); // set some default prefs From 81f926b501a6a59e096a541c4f2e678528b46f31 Mon Sep 17 00:00:00 2001 From: Miles Lott Date: Thu, 24 Mar 2005 13:29:51 +0000 Subject: [PATCH 08/11] Add special case for correct filename in Palm_PDB export (Bug #1162859) --- addressbook/inc/class.uiXport.inc.php | 7 ++++++- addressbook/inc/export/Palm_PDB | 7 ++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/addressbook/inc/class.uiXport.inc.php b/addressbook/inc/class.uiXport.inc.php index 96baaa960d..3de1fc9c0a 100644 --- a/addressbook/inc/class.uiXport.inc.php +++ b/addressbook/inc/class.uiXport.inc.php @@ -238,7 +238,12 @@ $buffer = $this->bo->export($conv_type,$fcat_id); - if(($download == 'on') || ($conv_type == 'Palm_PDB')) + if($conv_type == 'Palm_PDB') + { + $pdb = CreateObject('addressbook.pdb'); + $pdb->fetch($buffer, 'phpgw Contacts', $tsvfilename); + } + elseif($download == 'on') { // filename, default application/octet-stream, length of file, default nocache True $this->browser->content_header($tsvfilename,'application/x-octet-stream',strlen($buffer)); diff --git a/addressbook/inc/export/Palm_PDB b/addressbook/inc/export/Palm_PDB index 57101340a6..4570fa987b 100644 --- a/addressbook/inc/export/Palm_PDB +++ b/addressbook/inc/export/Palm_PDB @@ -118,7 +118,7 @@ { reset($this->ids); - for ($i=0;$iids);$i++) + for($i=0;$iids);$i++) { $j = $i + 1; reset($this->export); @@ -130,10 +130,7 @@ $entries .= "\r\n"; } - $buffer = $entries; - $pdb = CreateObject('addressbook.pdb'); - $pdb->fetch($buffer, 'phpgw Contacts', 'phpgw.pdb'); - return $buffer; + return $entries; } } ?> From eb290e7731932f308635f15b12c691b85e17fa21 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 24 Mar 2005 13:30:08 +0000 Subject: [PATCH 09/11] DK holidays from Martin Dalum --- calendar/egroupware.org/holidays.DK.csv | 40 +++++++++++++++++++------ 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/calendar/egroupware.org/holidays.DK.csv b/calendar/egroupware.org/holidays.DK.csv index 3de159fe87..5d8c4fc50f 100644 --- a/calendar/egroupware.org/holidays.DK.csv +++ b/calendar/egroupware.org/holidays.DK.csv @@ -1,12 +1,34 @@ DK Nytеrsdag 1 1 0 0 0 -DK Palmesшndag 4 4 2004 0 0 -DK Skжrtorsdag 8 4 2004 0 0 -DK Langfredag 9 4 2004 0 0 -DK Pеskedag 11 4 2004 0 0 -DK 2. Pеskedag 12 4 2004 0 0 -DK St. Bededag 7 5 2004 0 0 -DK Kristi Himmelfartsdag 20 5 2004 0 0 -DK Pinsedag 30 5 2004 0 0 -DK 2. Pinsedag 31 5 2004 0 0 +DK Palmesшndag 20 3 2005 0 0 +DK Skжrtorsdag 24 3 2005 0 0 +DK Langfredag 25 3 2005 0 0 +DK Pеskedag 27 3 2005 0 0 +DK 2. Pеskedag 28 3 2005 0 0 +DK Palmesшndag 1 4 2007 0 0 +DK Skжrtorsdag 5 4 2007 0 0 +DK Langfredag 6 4 2007 0 0 +DK Pеskedag 8 4 2007 0 0 +DK Palmesшndag 9 4 2006 0 0 +DK 2. Pеskedag 9 4 2007 0 0 +DK Skжrtorsdag 13 4 2006 0 0 +DK Langfredag 14 4 2006 0 0 +DK Pеskedag 16 4 2006 0 0 +DK 2. Pеskedag 17 4 2006 0 0 +DK St. Bededag 22 4 2005 0 0 +DK 1. maj 1 5 0 0 0 +DK St. Bededag 4 5 2007 0 0 +DK Kristi Himmelfartsdag 5 5 2005 0 0 +DK St. Bededag 12 5 2006 0 0 +DK Pinsedag 15 5 2005 0 0 +DK 2. Pinsedag 16 5 2005 0 0 +DK Kristi Himmelfartsdag 17 5 2007 0 0 +DK Kristi Himmelfartsdag 25 5 2006 0 0 +DK Pinsedag 27 5 2007 0 0 +DK 2. Pinsedag 28 5 2007 0 0 +DK Pinsedag 4 6 2006 0 0 +DK Grundlovsdag 5 6 0 0 0 +DK 2. Pinsedag 5 6 2006 0 0 +DK Juleaften 24 12 0 0 0 DK Juledag 25 12 0 0 0 DK 2. Juledag 26 12 0 0 0 +DK Nytеr 31 12 0 0 0 From df288f2e02323c31cd4241075c83c97849f9295c Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 24 Mar 2005 13:35:05 +0000 Subject: [PATCH 10/11] IL holidays from Ilan Tayary --- calendar/egroupware.org/holidays.IL.csv | 678 ++++++++++++++++++++++-- 1 file changed, 632 insertions(+), 46 deletions(-) diff --git a/calendar/egroupware.org/holidays.IL.csv b/calendar/egroupware.org/holidays.IL.csv index 1d636501ff..e0c32c2e79 100644 --- a/calendar/egroupware.org/holidays.IL.csv +++ b/calendar/egroupware.org/holidays.IL.csv @@ -1,4 +1,166 @@ +1998: +IL цен й' бибъ 8 1 1998 0 0 +IL и"е бщби 11 2 1998 0 0 +IL цен ътрйъ асъш 11 3 1998 0 0 +IL фешйн 12 3 1998 0 0 +IL щещп фешйн 13 3 1998 0 0 +IL тшб фсз 10 4 1998 0 0 +IL фсз 11 4 1998 0 0 +IL а' зем доетг фсз 12 4 1998 0 0 +IL б' зем доетг фсз 13 4 1998 0 0 +IL в' зем доетг фсз 14 4 1998 0 0 +IL г' зем доетг фсз 15 4 1998 0 0 +IL д' зем доетг фсз 16 4 1998 0 0 +IL щбйтй щм фсз 17 4 1998 0 0 +IL тшб йен дщеад 22 4 1998 0 0 +IL йен дщеад 23 4 1998 0 0 +IL тшб йен джлшеп 28 4 1998 0 0 +IL йен джлшеп 29 4 1998 0 0 +IL йен дтцоаеъ 30 4 1998 0 0 +IL тшб м"в бтеош 13 5 1998 0 0 +IL м"в бтеош 14 5 1998 0 0 +IL тшб йен йшещмйн 23 5 1998 0 0 +IL йен йшещмйн 24 5 1998 0 0 +IL тшб щбетеъ 30 5 1998 0 0 +IL щбетеъ 31 5 1998 0 0 +IL цен й"ж бъоеж 12 7 1998 0 0 +IL тшб цен и' баб 1 8 1998 0 0 +IL цен и' баб 2 8 1998 0 0 +IL тшб и"е баб 6 8 1998 0 0 +IL и"е баб 7 8 1998 0 0 +IL тшб шащ дщрд 20 9 1998 0 0 +IL а' шащ дщрд 21 9 1998 0 0 +IL б' шащ дщрд 22 9 1998 0 0 +IL цен вгмйд 23 9 1998 0 0 +IL тшб йен лйфеш 29 9 1998 0 0 +IL йен лйфеш 30 9 1998 0 0 +IL тшб селеъ 4 10 1998 0 0 +IL селеъ 5 10 1998 0 0 +IL а' зем доетг селеъ 6 10 1998 0 0 +IL б' зем доетг селеъ 7 10 1998 0 0 +IL в' зем доетг селеъ 8 10 1998 0 0 +IL г' зем доетг селеъ 9 10 1998 0 0 +IL д' зем доетг селеъ 10 10 1998 0 0 +IL дещтра шбд 11 10 1998 0 0 +IL щозъ ъешд 12 10 1998 0 0 +IL тшб зрелд 13 12 1998 0 0 +IL а' зрелд 14 12 1998 0 0 +IL б' зрелд 15 12 1998 0 0 +IL в' зрелд 16 12 1998 0 0 +IL г' зрелд 17 12 1998 0 0 +IL д' зрелд 18 12 1998 0 0 +IL е' зрелд 19 12 1998 0 0 +IL ж' зрелд 20 12 1998 0 0 +IL з' зрелд 21 12 1998 0 0 +IL цен й' бибъ 29 12 1998 0 0 +1999: +IL и"е бщби 1 2 1999 0 0 +IL цен ътрйъ асъш 1 3 1999 0 0 +IL фешйн 2 3 1999 0 0 +IL щещп фешйн 3 3 1999 0 0 +IL тшб фсз 31 3 1999 0 0 +IL фсз 1 4 1999 0 0 +IL а' зем доетг фсз 2 4 1999 0 0 +IL б' зем доетг фсз 3 4 1999 0 0 +IL в' зем доетг фсз 4 4 1999 0 0 +IL г' зем доетг фсз 5 4 1999 0 0 +IL д' зем доетг фсз 6 4 1999 0 0 +IL щбйтй щм фсз 7 4 1999 0 0 +IL тшб йен дщеад 12 4 1999 0 0 +IL йен дщеад 13 4 1999 0 0 +IL тшб йен джлшеп 19 4 1999 0 0 +IL йен джлшеп 20 4 1999 0 0 +IL йен дтцоаеъ 21 4 1999 0 0 +IL тшб м"в бтеош 3 5 1999 0 0 +IL м"в бтеош 4 5 1999 0 0 +IL тшб йен йшещмйн 13 5 1999 0 0 +IL йен йшещмйн 14 5 1999 0 0 +IL тшб щбетеъ 20 5 1999 0 0 +IL щбетеъ 21 5 1999 0 0 +IL цен й"ж бъоеж 1 7 1999 0 0 +IL тшб цен и' баб 21 7 1999 0 0 +IL цен и' баб 22 7 1999 0 0 +IL тшб и"е баб 27 7 1999 0 0 +IL и"е баб 28 7 1999 0 0 +IL тшб шащ дщрд 10 9 1999 0 0 +IL а' шащ дщрд 11 9 1999 0 0 +IL б' шащ дщрд 12 9 1999 0 0 +IL цен вгмйд 13 9 1999 0 0 +IL тшб йен лйфеш 19 9 1999 0 0 +IL йен лйфеш 20 9 1999 0 0 +IL тшб селеъ 24 9 1999 0 0 +IL селеъ 25 9 1999 0 0 +IL а' зем доетг селеъ 26 9 1999 0 0 +IL б' зем доетг селеъ 27 9 1999 0 0 +IL в' зем доетг селеъ 28 9 1999 0 0 +IL г' зем доетг селеъ 29 9 1999 0 0 +IL д' зем доетг селеъ 30 9 1999 0 0 +IL дещтра шбд 1 10 1999 0 0 +IL щозъ ъешд 2 10 1999 0 0 +IL тшб зрелд 3 12 1999 0 0 +IL а' зрелд 4 12 1999 0 0 +IL б' зрелд 5 12 1999 0 0 +IL в' зрелд 6 12 1999 0 0 +IL г' зрелд 7 12 1999 0 0 +IL д' зрелд 8 12 1999 0 0 +IL е' зрелд 9 12 1999 0 0 +IL ж' зрелд 10 12 1999 0 0 +IL з' зрелд 11 12 1999 0 0 +IL цен й' бибъ 19 12 1999 0 0 +2000: +IL и"е бщби 22 1 2000 0 0 +IL цен ътрйъ асъш 20 3 2000 0 0 +IL фешйн 21 3 2000 0 0 +IL щещп фешйн 22 3 2000 0 0 +IL тшб фсз 19 4 2000 0 0 +IL фсз 20 4 2000 0 0 +IL а' зем доетг фсз 21 4 2000 0 0 +IL б' зем доетг фсз 22 4 2000 0 0 +IL в' зем доетг фсз 23 4 2000 0 0 +IL г' зем доетг фсз 24 4 2000 0 0 +IL д' зем доетг фсз 25 4 2000 0 0 +IL щбйтй щм фсз 26 4 2000 0 0 +IL тшб йен дщеад 1 5 2000 0 0 +IL йен дщеад 2 5 2000 0 0 +IL тшб йен джлшеп 8 5 2000 0 0 +IL йен джлшеп 9 5 2000 0 0 +IL йен дтцоаеъ 10 5 2000 0 0 +IL тшб м"в бтеош 22 5 2000 0 0 +IL м"в бтеош 23 5 2000 0 0 +IL тшб йен йшещмйн 1 6 2000 0 0 +IL йен йшещмйн 2 6 2000 0 0 +IL тшб щбетеъ 8 6 2000 0 0 +IL щбетеъ 9 6 2000 0 0 +IL цен й"ж бъоеж 20 7 2000 0 0 +IL тшб цен и' баб 9 8 2000 0 0 +IL цен и' баб 10 8 2000 0 0 +IL тшб и"е баб 15 8 2000 0 0 +IL и"е баб 16 8 2000 0 0 +IL тшб шащ дщрд 29 9 2000 0 0 +IL а' шащ дщрд 30 9 2000 0 0 +IL б' шащ дщрд 1 10 2000 0 0 +IL цен вгмйд 2 10 2000 0 0 +IL тшб йен лйфеш 8 10 2000 0 0 +IL йен лйфеш 9 10 2000 0 0 +IL тшб селеъ 13 10 2000 0 0 +IL селеъ 14 10 2000 0 0 +IL а' зем доетг селеъ 15 10 2000 0 0 +IL б' зем доетг селеъ 16 10 2000 0 0 +IL в' зем доетг селеъ 17 10 2000 0 0 +IL г' зем доетг селеъ 18 10 2000 0 0 +IL д' зем доетг селеъ 19 10 2000 0 0 +IL дещтра шбд 20 10 2000 0 0 +IL щозъ ъешд 21 10 2000 0 0 +IL тшб зрелд 21 12 2000 0 0 +IL а' зрелд 22 12 2000 0 0 +IL б' зрелд 23 12 2000 0 0 +IL в' зрелд 24 12 2000 0 0 +IL г' зрелд 25 12 2000 0 0 +IL д' зрелд 26 12 2000 0 0 +IL е' зрелд 27 12 2000 0 0 +IL ж' зрелд 28 12 2000 0 0 +IL з' зрелд 29 12 2000 0 0 2001: IL цен й' бибъ 5 1 2001 0 0 IL и"е бщби 8 2 2001 0 0 @@ -13,11 +175,11 @@ IL IL г' зем доетг фсз 12 4 2001 0 0 IL д' зем доетг фсз 13 4 2001 0 0 IL щбйтй щм фсз 14 4 2001 0 0 -IL тшб йен дщеад 19 4 2001 0 0 -IL йен дщеад 20 4 2001 0 0 -IL тшб йен джлшеп 26 4 2001 0 0 -IL йен джлшеп 27 4 2001 0 0 -IL йен дтцоаеъ 28 4 2001 0 0 +IL тшб йен дщеад 18 4 2001 0 0 +IL йен дщеад 19 4 2001 0 0 +IL тшб йен джлшеп 24 4 2001 0 0 +IL йен джлшеп 25 4 2001 0 0 +IL йен дтцоаеъ 26 4 2001 0 0 IL тшб м"в бтеош 10 5 2001 0 0 IL м"в бтеош 11 5 2001 0 0 IL тшб йен йшещмйн 20 5 2001 0 0 @@ -54,7 +216,6 @@ IL IL ж' зрелд 16 12 2001 0 0 IL з' зрелд 17 12 2001 0 0 IL цен й' бибъ 25 12 2001 0 0 - 2002: IL и"е бщби 28 1 2002 0 0 IL цен ътрйъ асъш 25 2 2002 0 0 @@ -109,7 +270,6 @@ IL IL ж' зрелд 6 12 2002 0 0 IL з' зрелд 7 12 2002 0 0 IL цен й' бибъ 15 12 2002 0 0 - 2003: IL и"е бщби 18 1 2003 0 0 IL цен ътрйъ асъш 17 3 2003 0 0 @@ -163,7 +323,6 @@ IL IL е' зрелд 25 12 2003 0 0 IL ж' зрелд 26 12 2003 0 0 IL з' зрелд 27 12 2003 0 0 - 2004: IL цен й' бибъ 4 1 2004 0 0 IL и"е бщби 7 2 2004 0 0 @@ -179,11 +338,11 @@ IL IL г' зем доетг фсз 10 4 2004 0 0 IL д' зем доетг фсз 11 4 2004 0 0 IL щбйтй щм фсз 12 4 2004 0 0 -IL тшб йен дщеад 17 4 2004 0 0 -IL йен дщеад 18 4 2004 0 0 -IL тшб йен джлшеп 24 4 2004 0 0 -IL йен джлшеп 25 4 2004 0 0 -IL йен дтцоаеъ 26 4 2004 0 0 +IL тшб йен дщеад 18 4 2004 0 0 +IL йен дщеад 19 4 2004 0 0 +IL тшб йен джлшеп 25 4 2004 0 0 +IL йен джлшеп 26 4 2004 0 0 +IL йен дтцоаеъ 27 4 2004 0 0 IL тшб м"в бтеош 8 5 2004 0 0 IL м"в бтеош 9 5 2004 0 0 IL тшб йен йшещмйн 18 5 2004 0 0 @@ -220,7 +379,6 @@ IL IL ж' зрелд 14 12 2004 0 0 IL з' зрелд 15 12 2004 0 0 IL цен й' бибъ 22 12 2004 0 0 - 2005: IL и"е бщби 25 1 2005 0 0 IL цен ътрйъ асъш 24 3 2005 0 0 @@ -234,11 +392,11 @@ IL IL г' зем доетг фсз 28 4 2005 0 0 IL д' зем доетг фсз 29 4 2005 0 0 IL щбйтй щм фсз 30 4 2005 0 0 -IL тшб йен дщеад 5 5 2005 0 0 -IL йен дщеад 6 5 2005 0 0 -IL тшб йен джлшеп 12 5 2005 0 0 -IL йен джлшеп 13 5 2005 0 0 -IL йен дтцоаеъ 14 5 2005 0 0 +IL тшб йен дщеад 4 5 2005 0 0 +IL йен дщеад 5 5 2005 0 0 +IL тшб йен джлшеп 10 5 2005 0 0 +IL йен джлшеп 11 5 2005 0 0 +IL йен дтцоаеъ 12 5 2005 0 0 IL тшб м"в бтеош 26 5 2005 0 0 IL м"в бтеош 27 5 2005 0 0 IL тшб йен йшещмйн 5 6 2005 0 0 @@ -272,7 +430,6 @@ IL IL г' зрелд 29 12 2005 0 0 IL д' зрелд 30 12 2005 0 0 IL е' зрелд 31 12 2005 0 0 - 2006: IL ж' зрелд 1 1 2006 0 0 IL з' зрелд 2 1 2006 0 0 @@ -330,7 +487,6 @@ IL IL ж' зрелд 22 12 2006 0 0 IL з' зрелд 23 12 2006 0 0 IL цен й' бибъ 31 12 2006 0 0 - 2007: IL и"е бщби 3 2 2007 0 0 IL цен ътрйъ асъш 1 3 2007 0 0 @@ -345,11 +501,11 @@ IL IL г' зем доетг фсз 7 4 2007 0 0 IL д' зем доетг фсз 8 4 2007 0 0 IL щбйтй щм фсз 9 4 2007 0 0 -IL тшб йен дщеад 14 4 2007 0 0 -IL йен дщеад 15 4 2007 0 0 -IL тшб йен джлшеп 21 4 2007 0 0 -IL йен джлшеп 22 4 2007 0 0 -IL йен дтцоаеъ 23 4 2007 0 0 +IL тшб йен дщеад 15 4 2007 0 0 +IL йен дщеад 16 4 2007 0 0 +IL тшб йен джлшеп 22 4 2007 0 0 +IL йен джлшеп 23 4 2007 0 0 +IL йен дтцоаеъ 24 4 2007 0 0 IL тшб м"в бтеош 5 5 2007 0 0 IL м"в бтеош 6 5 2007 0 0 IL тшб йен йшещмйн 15 5 2007 0 0 @@ -386,7 +542,6 @@ IL IL ж' зрелд 11 12 2007 0 0 IL з' зрелд 12 12 2007 0 0 IL цен й' бибъ 19 12 2007 0 0 - 2008: IL и"е бщби 22 1 2008 0 0 IL цен ътрйъ асъш 20 3 2008 0 0 @@ -400,11 +555,11 @@ IL IL г' зем доетг фсз 24 4 2008 0 0 IL д' зем доетг фсз 25 4 2008 0 0 IL щбйтй щм фсз 26 4 2008 0 0 -IL тшб йен дщеад 1 5 2008 0 0 -IL йен дщеад 2 5 2008 0 0 -IL тшб йен джлшеп 8 5 2008 0 0 -IL йен джлшеп 9 5 2008 0 0 -IL йен дтцоаеъ 10 5 2008 0 0 +IL тшб йен дщеад 30 4 2008 0 0 +IL йен дщеад 1 5 2008 0 0 +IL тшб йен джлшеп 6 5 2008 0 0 +IL йен джлшеп 7 5 2008 0 0 +IL йен дтцоаеъ 8 5 2008 0 0 IL тшб м"в бтеош 22 5 2008 0 0 IL м"в бтеош 23 5 2008 0 0 IL тшб йен йшещмйн 1 6 2008 0 0 @@ -440,7 +595,6 @@ IL IL е' зрелд 27 12 2008 0 0 IL ж' зрелд 28 12 2008 0 0 IL з' зрелд 29 12 2008 0 0 - 2009: IL цен й' бибъ 6 1 2009 0 0 IL и"е бщби 9 2 2009 0 0 @@ -496,7 +650,6 @@ IL IL ж' зрелд 18 12 2009 0 0 IL з' зрелд 19 12 2009 0 0 IL цен й' бибъ 27 12 2009 0 0 - 2010: IL и"е бщби 30 1 2010 0 0 IL цен ътрйъ асъш 25 2 2010 0 0 @@ -511,11 +664,11 @@ IL IL г' зем доетг фсз 3 4 2010 0 0 IL д' зем доетг фсз 4 4 2010 0 0 IL щбйтй щм фсз 5 4 2010 0 0 -IL тшб йен дщеад 10 4 2010 0 0 -IL йен дщеад 11 4 2010 0 0 -IL тшб йен джлшеп 17 4 2010 0 0 -IL йен джлшеп 18 4 2010 0 0 -IL йен дтцоаеъ 19 4 2010 0 0 +IL тшб йен дщеад 11 4 2010 0 0 +IL йен дщеад 12 4 2010 0 0 +IL тшб йен джлшеп 18 4 2010 0 0 +IL йен джлшеп 19 4 2010 0 0 +IL йен дтцоаеъ 20 4 2010 0 0 IL тшб м"в бтеош 1 5 2010 0 0 IL м"в бтеош 2 5 2010 0 0 IL тшб йен йшещмйн 11 5 2010 0 0 @@ -552,7 +705,6 @@ IL IL ж' зрелд 8 12 2010 0 0 IL з' зрелд 9 12 2010 0 0 IL цен й' бибъ 17 12 2010 0 0 - 2011: IL и"е бщби 20 1 2011 0 0 IL цен ътрйъ асъш 17 3 2011 0 0 @@ -567,11 +719,11 @@ IL IL г' зем доетг фсз 23 4 2011 0 0 IL д' зем доетг фсз 24 4 2011 0 0 IL щбйтй щм фсз 25 4 2011 0 0 -IL тшб йен дщеад 30 4 2011 0 0 -IL йен дщеад 1 5 2011 0 0 -IL тшб йен джлшеп 7 5 2011 0 0 -IL йен джлшеп 8 5 2011 0 0 -IL йен дтцоаеъ 9 5 2011 0 0 +IL тшб йен дщеад 1 5 2011 0 0 +IL йен дщеад 2 5 2011 0 0 +IL тшб йен джлшеп 8 5 2011 0 0 +IL йен джлшеп 9 5 2011 0 0 +IL йен дтцоаеъ 10 5 2011 0 0 IL тшб м"в бтеош 21 5 2011 0 0 IL м"в бтеош 22 5 2011 0 0 IL тшб йен йшещмйн 31 5 2011 0 0 @@ -607,4 +759,438 @@ IL IL е' зрелд 26 12 2011 0 0 IL ж' зрелд 27 12 2011 0 0 IL з' зрелд 28 12 2011 0 0 - +2012: +IL цен й' бибъ 5 1 2012 0 0 +IL и"е бщби 8 2 2012 0 0 +IL цен ътрйъ асъш 7 3 2012 0 0 +IL фешйн 8 3 2012 0 0 +IL щещп фешйн 9 3 2012 0 0 +IL тшб фсз 6 4 2012 0 0 +IL фсз 7 4 2012 0 0 +IL а' зем доетг фсз 8 4 2012 0 0 +IL б' зем доетг фсз 9 4 2012 0 0 +IL в' зем доетг фсз 10 4 2012 0 0 +IL г' зем доетг фсз 11 4 2012 0 0 +IL д' зем доетг фсз 12 4 2012 0 0 +IL щбйтй щм фсз 13 4 2012 0 0 +IL тшб йен дщеад 18 4 2012 0 0 +IL йен дщеад 19 4 2012 0 0 +IL тшб йен джлшеп 24 4 2012 0 0 +IL йен джлшеп 25 4 2012 0 0 +IL йен дтцоаеъ 26 4 2012 0 0 +IL тшб м"в бтеош 9 5 2012 0 0 +IL м"в бтеош 10 5 2012 0 0 +IL тшб йен йшещмйн 19 5 2012 0 0 +IL йен йшещмйн 20 5 2012 0 0 +IL тшб щбетеъ 26 5 2012 0 0 +IL щбетеъ 27 5 2012 0 0 +IL цен й"ж бъоеж 8 7 2012 0 0 +IL тшб цен и' баб 28 7 2012 0 0 +IL цен и' баб 29 7 2012 0 0 +IL тшб и"е баб 2 8 2012 0 0 +IL и"е баб 3 8 2012 0 0 +IL тшб шащ дщрд 16 9 2012 0 0 +IL а' шащ дщрд 17 9 2012 0 0 +IL б' шащ дщрд 18 9 2012 0 0 +IL цен вгмйд 19 9 2012 0 0 +IL тшб йен лйфеш 25 9 2012 0 0 +IL йен лйфеш 26 9 2012 0 0 +IL тшб селеъ 30 9 2012 0 0 +IL селеъ 1 10 2012 0 0 +IL а' зем доетг селеъ 2 10 2012 0 0 +IL б' зем доетг селеъ 3 10 2012 0 0 +IL в' зем доетг селеъ 4 10 2012 0 0 +IL г' зем доетг селеъ 5 10 2012 0 0 +IL д' зем доетг селеъ 6 10 2012 0 0 +IL дещтра шбд 7 10 2012 0 0 +IL щозъ ъешд 8 10 2012 0 0 +IL тшб зрелд 8 12 2012 0 0 +IL а' зрелд 9 12 2012 0 0 +IL б' зрелд 10 12 2012 0 0 +IL в' зрелд 11 12 2012 0 0 +IL г' зрелд 12 12 2012 0 0 +IL д' зрелд 13 12 2012 0 0 +IL е' зрелд 14 12 2012 0 0 +IL ж' зрелд 15 12 2012 0 0 +IL з' зрелд 16 12 2012 0 0 +IL цен й' бибъ 23 12 2012 0 0 +2013: +IL и"е бщби 26 1 2013 0 0 +IL цен ътрйъ асъш 21 2 2013 0 0 +IL тшб фешйн 23 2 2013 0 0 +IL фешйн 24 2 2013 0 0 +IL щещп фешйн 25 2 2013 0 0 +IL тшб фсз 25 3 2013 0 0 +IL фсз 26 3 2013 0 0 +IL а' зем доетг фсз 27 3 2013 0 0 +IL б' зем доетг фсз 28 3 2013 0 0 +IL в' зем доетг фсз 29 3 2013 0 0 +IL г' зем доетг фсз 30 3 2013 0 0 +IL д' зем доетг фсз 31 3 2013 0 0 +IL щбйтй щм фсз 1 4 2013 0 0 +IL тшб йен дщеад 7 4 2013 0 0 +IL йен дщеад 8 4 2013 0 0 +IL тшб йен джлшеп 14 4 2013 0 0 +IL йен джлшеп 15 4 2013 0 0 +IL йен дтцоаеъ 16 4 2013 0 0 +IL тшб м"в бтеош 27 4 2013 0 0 +IL м"в бтеош 28 4 2013 0 0 +IL тшб йен йшещмйн 7 5 2013 0 0 +IL йен йшещмйн 8 5 2013 0 0 +IL тшб щбетеъ 14 5 2013 0 0 +IL щбетеъ 15 5 2013 0 0 +IL цен й"ж бъоеж 25 6 2013 0 0 +IL тшб цен и' баб 15 7 2013 0 0 +IL цен и' баб 16 7 2013 0 0 +IL тшб и"е баб 21 7 2013 0 0 +IL и"е баб 22 7 2013 0 0 +IL тшб шащ дщрд 4 9 2013 0 0 +IL а' шащ дщрд 5 9 2013 0 0 +IL б' шащ дщрд 6 9 2013 0 0 +IL цен вгмйд 8 9 2013 0 0 +IL тшб йен лйфеш 13 9 2013 0 0 +IL йен лйфеш 14 9 2013 0 0 +IL тшб селеъ 18 9 2013 0 0 +IL селеъ 19 9 2013 0 0 +IL а' зем доетг селеъ 20 9 2013 0 0 +IL б' зем доетг селеъ 21 9 2013 0 0 +IL в' зем доетг селеъ 22 9 2013 0 0 +IL г' зем доетг селеъ 23 9 2013 0 0 +IL д' зем доетг селеъ 24 9 2013 0 0 +IL дещтра шбд 25 9 2013 0 0 +IL щозъ ъешд 26 9 2013 0 0 +IL тшб зрелд 27 11 2013 0 0 +IL а' зрелд 28 11 2013 0 0 +IL б' зрелд 29 11 2013 0 0 +IL в' зрелд 30 11 2013 0 0 +IL г' зрелд 1 12 2013 0 0 +IL д' зрелд 2 12 2013 0 0 +IL е' зрелд 3 12 2013 0 0 +IL ж' зрелд 4 12 2013 0 0 +IL з' зрелд 5 12 2013 0 0 +IL цен й' бибъ 13 12 2013 0 0 +2014: +IL и"е бщби 16 1 2014 0 0 +IL цен ътрйъ асъш 13 3 2014 0 0 +IL тшб фешйн 15 3 2014 0 0 +IL фешйн 16 3 2014 0 0 +IL щещп фешйн 17 3 2014 0 0 +IL тшб фсз 14 4 2014 0 0 +IL фсз 15 4 2014 0 0 +IL а' зем доетг фсз 16 4 2014 0 0 +IL б' зем доетг фсз 17 4 2014 0 0 +IL в' зем доетг фсз 18 4 2014 0 0 +IL г' зем доетг фсз 19 4 2014 0 0 +IL д' зем доетг фсз 20 4 2014 0 0 +IL щбйтй щм фсз 21 4 2014 0 0 +IL тшб йен дщеад 27 4 2014 0 0 +IL йен дщеад 28 4 2014 0 0 +IL тшб йен джлшеп 4 5 2014 0 0 +IL йен джлшеп 5 5 2014 0 0 +IL йен дтцоаеъ 6 5 2014 0 0 +IL тшб м"в бтеош 17 5 2014 0 0 +IL м"в бтеош 18 5 2014 0 0 +IL тшб йен йшещмйн 27 5 2014 0 0 +IL йен йшещмйн 28 5 2014 0 0 +IL тшб щбетеъ 3 6 2014 0 0 +IL щбетеъ 4 6 2014 0 0 +IL цен й"ж бъоеж 15 7 2014 0 0 +IL тшб цен и' баб 4 8 2014 0 0 +IL цен и' баб 5 8 2014 0 0 +IL тшб и"е баб 10 8 2014 0 0 +IL и"е баб 11 8 2014 0 0 +IL тшб шащ дщрд 24 9 2014 0 0 +IL а' шащ дщрд 25 9 2014 0 0 +IL б' шащ дщрд 26 9 2014 0 0 +IL цен вгмйд 28 9 2014 0 0 +IL тшб йен лйфеш 3 10 2014 0 0 +IL йен лйфеш 4 10 2014 0 0 +IL тшб селеъ 8 10 2014 0 0 +IL селеъ 9 10 2014 0 0 +IL а' зем доетг селеъ 10 10 2014 0 0 +IL б' зем доетг селеъ 11 10 2014 0 0 +IL в' зем доетг селеъ 12 10 2014 0 0 +IL г' зем доетг селеъ 13 10 2014 0 0 +IL д' зем доетг селеъ 14 10 2014 0 0 +IL дещтра шбд 15 10 2014 0 0 +IL щозъ ъешд 16 10 2014 0 0 +IL тшб зрелд 16 12 2014 0 0 +IL а' зрелд 17 12 2014 0 0 +IL б' зрелд 18 12 2014 0 0 +IL в' зрелд 19 12 2014 0 0 +IL г' зрелд 20 12 2014 0 0 +IL д' зрелд 21 12 2014 0 0 +IL е' зрелд 22 12 2014 0 0 +IL ж' зрелд 23 12 2014 0 0 +IL з' зрелд 24 12 2014 0 0 +2015: +IL цен й' бибъ 1 1 2015 0 0 +IL и"е бщби 4 2 2015 0 0 +IL цен ътрйъ асъш 4 3 2015 0 0 +IL фешйн 5 3 2015 0 0 +IL щещп фешйн 6 3 2015 0 0 +IL тшб фсз 3 4 2015 0 0 +IL фсз 4 4 2015 0 0 +IL а' зем доетг фсз 5 4 2015 0 0 +IL б' зем доетг фсз 6 4 2015 0 0 +IL в' зем доетг фсз 7 4 2015 0 0 +IL г' зем доетг фсз 8 4 2015 0 0 +IL д' зем доетг фсз 9 4 2015 0 0 +IL щбйтй щм фсз 10 4 2015 0 0 +IL тшб йен дщеад 15 4 2015 0 0 +IL йен дщеад 16 4 2015 0 0 +IL тшб йен джлшеп 21 4 2015 0 0 +IL йен джлшеп 22 4 2015 0 0 +IL йен дтцоаеъ 23 4 2015 0 0 +IL тшб м"в бтеош 6 5 2015 0 0 +IL м"в бтеош 7 5 2015 0 0 +IL тшб йен йшещмйн 16 5 2015 0 0 +IL йен йшещмйн 17 5 2015 0 0 +IL тшб щбетеъ 23 5 2015 0 0 +IL щбетеъ 24 5 2015 0 0 +IL цен й"ж бъоеж 5 7 2015 0 0 +IL тшб цен и' баб 25 7 2015 0 0 +IL цен и' баб 26 7 2015 0 0 +IL тшб и"е баб 30 7 2015 0 0 +IL и"е баб 31 7 2015 0 0 +IL тшб шащ дщрд 13 9 2015 0 0 +IL а' шащ дщрд 14 9 2015 0 0 +IL б' шащ дщрд 15 9 2015 0 0 +IL цен вгмйд 16 9 2015 0 0 +IL тшб йен лйфеш 22 9 2015 0 0 +IL йен лйфеш 23 9 2015 0 0 +IL тшб селеъ 27 9 2015 0 0 +IL селеъ 28 9 2015 0 0 +IL а' зем доетг селеъ 29 9 2015 0 0 +IL б' зем доетг селеъ 30 9 2015 0 0 +IL в' зем доетг селеъ 1 10 2015 0 0 +IL г' зем доетг селеъ 2 10 2015 0 0 +IL д' зем доетг селеъ 3 10 2015 0 0 +IL дещтра шбд 4 10 2015 0 0 +IL щозъ ъешд 5 10 2015 0 0 +IL тшб зрелд 6 12 2015 0 0 +IL а' зрелд 7 12 2015 0 0 +IL б' зрелд 8 12 2015 0 0 +IL в' зрелд 9 12 2015 0 0 +IL г' зрелд 10 12 2015 0 0 +IL д' зрелд 11 12 2015 0 0 +IL е' зрелд 12 12 2015 0 0 +IL ж' зрелд 13 12 2015 0 0 +IL з' зрелд 14 12 2015 0 0 +IL цен й' бибъ 22 12 2015 0 0 +2016: +IL и"е бщби 25 1 2016 0 0 +IL цен ътрйъ асъш 23 3 2016 0 0 +IL фешйн 24 3 2016 0 0 +IL щещп фешйн 25 3 2016 0 0 +IL тшб фсз 22 4 2016 0 0 +IL фсз 23 4 2016 0 0 +IL а' зем доетг фсз 24 4 2016 0 0 +IL б' зем доетг фсз 25 4 2016 0 0 +IL в' зем доетг фсз 26 4 2016 0 0 +IL г' зем доетг фсз 27 4 2016 0 0 +IL д' зем доетг фсз 28 4 2016 0 0 +IL щбйтй щм фсз 29 4 2016 0 0 +IL тшб йен дщеад 4 5 2016 0 0 +IL йен дщеад 5 5 2016 0 0 +IL тшб йен джлшеп 10 5 2016 0 0 +IL йен джлшеп 11 5 2016 0 0 +IL йен дтцоаеъ 12 5 2016 0 0 +IL тшб м"в бтеош 25 5 2016 0 0 +IL м"в бтеош 26 5 2016 0 0 +IL тшб йен йшещмйн 4 6 2016 0 0 +IL йен йшещмйн 5 6 2016 0 0 +IL тшб щбетеъ 11 6 2016 0 0 +IL щбетеъ 12 6 2016 0 0 +IL цен й"ж бъоеж 24 7 2016 0 0 +IL тшб цен и' баб 13 8 2016 0 0 +IL цен и' баб 14 8 2016 0 0 +IL тшб и"е баб 18 8 2016 0 0 +IL и"е баб 19 8 2016 0 0 +IL тшб шащ дщрд 2 10 2016 0 0 +IL а' шащ дщрд 3 10 2016 0 0 +IL б' шащ дщрд 4 10 2016 0 0 +IL цен вгмйд 5 10 2016 0 0 +IL тшб йен лйфеш 11 10 2016 0 0 +IL йен лйфеш 12 10 2016 0 0 +IL тшб селеъ 16 10 2016 0 0 +IL селеъ 17 10 2016 0 0 +IL а' зем доетг селеъ 18 10 2016 0 0 +IL б' зем доетг селеъ 19 10 2016 0 0 +IL в' зем доетг селеъ 20 10 2016 0 0 +IL г' зем доетг селеъ 21 10 2016 0 0 +IL д' зем доетг селеъ 22 10 2016 0 0 +IL дещтра шбд 23 10 2016 0 0 +IL щозъ ъешд 24 10 2016 0 0 +IL тшб зрелд 24 12 2016 0 0 +IL а' зрелд 25 12 2016 0 0 +IL б' зрелд 26 12 2016 0 0 +IL в' зрелд 27 12 2016 0 0 +IL г' зрелд 28 12 2016 0 0 +IL д' зрелд 29 12 2016 0 0 +IL е' зрелд 30 12 2016 0 0 +IL ж' зрелд 31 12 2016 0 0 +2017: +IL з' зрелд 1 1 2017 0 0 +IL цен й' бибъ 8 1 2017 0 0 +IL и"е бщби 11 2 2017 0 0 +IL цен ътрйъ асъш 9 3 2017 0 0 +IL тшб фешйн 11 3 2017 0 0 +IL фешйн 12 3 2017 0 0 +IL щещп фешйн 13 3 2017 0 0 +IL тшб фсз 10 4 2017 0 0 +IL фсз 11 4 2017 0 0 +IL а' зем доетг фсз 12 4 2017 0 0 +IL б' зем доетг фсз 13 4 2017 0 0 +IL в' зем доетг фсз 14 4 2017 0 0 +IL г' зем доетг фсз 15 4 2017 0 0 +IL д' зем доетг фсз 16 4 2017 0 0 +IL щбйтй щм фсз 17 4 2017 0 0 +IL тшб йен дщеад 23 4 2017 0 0 +IL йен дщеад 24 4 2017 0 0 +IL тшб йен джлшеп 30 4 2017 0 0 +IL йен джлшеп 1 5 2017 0 0 +IL йен дтцоаеъ 2 5 2017 0 0 +IL тшб м"в бтеош 13 5 2017 0 0 +IL м"в бтеош 14 5 2017 0 0 +IL тшб йен йшещмйн 23 5 2017 0 0 +IL йен йшещмйн 24 5 2017 0 0 +IL тшб щбетеъ 30 5 2017 0 0 +IL щбетеъ 31 5 2017 0 0 +IL цен й"ж бъоеж 11 7 2017 0 0 +IL тшб цен и' баб 31 7 2017 0 0 +IL цен и' баб 1 8 2017 0 0 +IL тшб и"е баб 6 8 2017 0 0 +IL и"е баб 7 8 2017 0 0 +IL тшб шащ дщрд 20 9 2017 0 0 +IL а' шащ дщрд 21 9 2017 0 0 +IL б' шащ дщрд 22 9 2017 0 0 +IL цен вгмйд 24 9 2017 0 0 +IL тшб йен лйфеш 29 9 2017 0 0 +IL йен лйфеш 30 9 2017 0 0 +IL тшб селеъ 4 10 2017 0 0 +IL селеъ 5 10 2017 0 0 +IL а' зем доетг селеъ 6 10 2017 0 0 +IL б' зем доетг селеъ 7 10 2017 0 0 +IL в' зем доетг селеъ 8 10 2017 0 0 +IL г' зем доетг селеъ 9 10 2017 0 0 +IL д' зем доетг селеъ 10 10 2017 0 0 +IL дещтра шбд 11 10 2017 0 0 +IL щозъ ъешд 12 10 2017 0 0 +IL тшб зрелд 12 12 2017 0 0 +IL а' зрелд 13 12 2017 0 0 +IL б' зрелд 14 12 2017 0 0 +IL в' зрелд 15 12 2017 0 0 +IL г' зрелд 16 12 2017 0 0 +IL д' зрелд 17 12 2017 0 0 +IL е' зрелд 18 12 2017 0 0 +IL ж' зрелд 19 12 2017 0 0 +IL з' зрелд 20 12 2017 0 0 +IL цен й' бибъ 28 12 2017 0 0 +2018: +IL и"е бщби 31 1 2018 0 0 +IL цен ътрйъ асъш 28 2 2018 0 0 +IL фешйн 1 3 2018 0 0 +IL щещп фешйн 2 3 2018 0 0 +IL тшб фсз 30 3 2018 0 0 +IL фсз 31 3 2018 0 0 +IL а' зем доетг фсз 1 4 2018 0 0 +IL б' зем доетг фсз 2 4 2018 0 0 +IL в' зем доетг фсз 3 4 2018 0 0 +IL г' зем доетг фсз 4 4 2018 0 0 +IL д' зем доетг фсз 5 4 2018 0 0 +IL щбйтй щм фсз 6 4 2018 0 0 +IL тшб йен дщеад 11 4 2018 0 0 +IL йен дщеад 12 4 2018 0 0 +IL тшб йен джлшеп 17 4 2018 0 0 +IL йен джлшеп 18 4 2018 0 0 +IL йен дтцоаеъ 19 4 2018 0 0 +IL тшб м"в бтеош 2 5 2018 0 0 +IL м"в бтеош 3 5 2018 0 0 +IL тшб йен йшещмйн 12 5 2018 0 0 +IL йен йшещмйн 13 5 2018 0 0 +IL тшб щбетеъ 19 5 2018 0 0 +IL щбетеъ 20 5 2018 0 0 +IL цен й"ж бъоеж 1 7 2018 0 0 +IL тшб цен и' баб 21 7 2018 0 0 +IL цен и' баб 22 7 2018 0 0 +IL тшб и"е баб 26 7 2018 0 0 +IL и"е баб 27 7 2018 0 0 +IL тшб шащ дщрд 9 9 2018 0 0 +IL а' шащ дщрд 10 9 2018 0 0 +IL б' шащ дщрд 11 9 2018 0 0 +IL цен вгмйд 12 9 2018 0 0 +IL тшб йен лйфеш 18 9 2018 0 0 +IL йен лйфеш 19 9 2018 0 0 +IL тшб селеъ 23 9 2018 0 0 +IL селеъ 24 9 2018 0 0 +IL а' зем доетг селеъ 25 9 2018 0 0 +IL б' зем доетг селеъ 26 9 2018 0 0 +IL в' зем доетг селеъ 27 9 2018 0 0 +IL г' зем доетг селеъ 28 9 2018 0 0 +IL д' зем доетг селеъ 29 9 2018 0 0 +IL дещтра шбд 30 9 2018 0 0 +IL щозъ ъешд 1 10 2018 0 0 +IL тшб зрелд 2 12 2018 0 0 +IL а' зрелд 3 12 2018 0 0 +IL б' зрелд 4 12 2018 0 0 +IL в' зрелд 5 12 2018 0 0 +IL г' зрелд 6 12 2018 0 0 +IL д' зрелд 7 12 2018 0 0 +IL е' зрелд 8 12 2018 0 0 +IL ж' зрелд 9 12 2018 0 0 +IL з' зрелд 10 12 2018 0 0 +IL цен й' бибъ 18 12 2018 0 0 +2019: +IL и"е бщби 21 1 2019 0 0 +IL цен ътрйъ асъш 20 3 2019 0 0 +IL фешйн 21 3 2019 0 0 +IL щещп фешйн 22 3 2019 0 0 +IL тшб фсз 19 4 2019 0 0 +IL фсз 20 4 2019 0 0 +IL а' зем доетг фсз 21 4 2019 0 0 +IL б' зем доетг фсз 22 4 2019 0 0 +IL в' зем доетг фсз 23 4 2019 0 0 +IL г' зем доетг фсз 24 4 2019 0 0 +IL д' зем доетг фсз 25 4 2019 0 0 +IL щбйтй щм фсз 26 4 2019 0 0 +IL тшб йен дщеад 1 5 2019 0 0 +IL йен дщеад 2 5 2019 0 0 +IL тшб йен джлшеп 7 5 2019 0 0 +IL йен джлшеп 8 5 2019 0 0 +IL йен дтцоаеъ 9 5 2019 0 0 +IL тшб м"в бтеош 22 5 2019 0 0 +IL м"в бтеош 23 5 2019 0 0 +IL тшб йен йшещмйн 1 6 2019 0 0 +IL йен йшещмйн 2 6 2019 0 0 +IL тшб щбетеъ 8 6 2019 0 0 +IL щбетеъ 9 6 2019 0 0 +IL цен й"ж бъоеж 21 7 2019 0 0 +IL тшб цен и' баб 10 8 2019 0 0 +IL цен и' баб 11 8 2019 0 0 +IL тшб и"е баб 15 8 2019 0 0 +IL и"е баб 16 8 2019 0 0 +IL тшб шащ дщрд 29 9 2019 0 0 +IL а' шащ дщрд 30 9 2019 0 0 +IL б' шащ дщрд 1 10 2019 0 0 +IL цен вгмйд 2 10 2019 0 0 +IL тшб йен лйфеш 8 10 2019 0 0 +IL йен лйфеш 9 10 2019 0 0 +IL тшб селеъ 13 10 2019 0 0 +IL селеъ 14 10 2019 0 0 +IL а' зем доетг селеъ 15 10 2019 0 0 +IL б' зем доетг селеъ 16 10 2019 0 0 +IL в' зем доетг селеъ 17 10 2019 0 0 +IL г' зем доетг селеъ 18 10 2019 0 0 +IL д' зем доетг селеъ 19 10 2019 0 0 +IL дещтра шбд 20 10 2019 0 0 +IL щозъ ъешд 21 10 2019 0 0 +IL тшб зрелд 22 12 2019 0 0 +IL а' зрелд 23 12 2019 0 0 +IL б' зрелд 24 12 2019 0 0 +IL в' зрелд 25 12 2019 0 0 +IL г' зрелд 26 12 2019 0 0 +IL д' зрелд 27 12 2019 0 0 +IL е' зрелд 28 12 2019 0 0 +IL ж' зрелд 29 12 2019 0 0 +IL з' зрелд 30 12 2019 0 0 From 765eee63646b7b2ff9498bebb2b323e05f8d224c Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 24 Mar 2005 13:44:20 +0000 Subject: [PATCH 11/11] NZ holidays from Mark van Walraven --- calendar/egroupware.org/holidays.NZ.csv | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 calendar/egroupware.org/holidays.NZ.csv diff --git a/calendar/egroupware.org/holidays.NZ.csv b/calendar/egroupware.org/holidays.NZ.csv new file mode 100644 index 0000000000..23eeb87ae4 --- /dev/null +++ b/calendar/egroupware.org/holidays.NZ.csv @@ -0,0 +1,23 @@ +NZ New Year's Day 1 1 0 0 0 +NZ New Year's Holiday 2 1 0 0 0 +NZ New Year's Day (Observed) 3 1 2005 0 0 +NZ New Year's Day (Observed) 3 1 2006 0 0 +NZ New Year's Holiday (Observed) 4 1 2005 0 0 +NZ Waitangi (N.Z.) Day 6 2 0 0 0 +NZ Good Friday 21 3 2008 0 0 +NZ Easter Monday 24 3 2008 0 0 +NZ Good Friday 25 3 2005 0 0 +NZ Easter Monday 28 3 2005 0 0 +NZ Good Friday 6 4 2007 0 0 +NZ Easter Monday 9 4 2007 0 0 +NZ Good Friday 10 4 2009 0 0 +NZ Easter Monday 13 4 2009 0 0 +NZ Good Friday 14 4 2006 0 0 +NZ Easter Monday 17 4 2006 0 0 +NZ ANZAC Day 25 4 0 0 0 +NZ Queen's Birthday Observed 0 6 1 1 0 +NZ Labour Day 0 10 4 1 0 +NZ Christmas Day 25 12 0 0 0 +NZ Boxing Day 26 12 0 0 0 +NZ Christmas Day (Observed) 27 12 2005 0 0 +NZ Boxing Day (Observed) 28 12 2009 0 0 \ No newline at end of file