icon('$cat','$id','$status')"; global $phpgw,$DOCUMENT_ROOT; $icons = &$this->icons[$cat]; @@ -66,23 +68,23 @@ if ($icon) { $fname = $phpgw->common->get_image_dir() . '/' . $icon; if (!is_readable($fname)) { - $icon = False; // echo "
Can't read '$fname' !!!"; - } else { + $icon = False; // echo "
Can't read '$fname' !!!"; + } else { $icon = $phpgw->common->get_image_path() . '/' . $icon; - } + } } if (!$status || !($alt = $icons[$id.'_'.$status.'_alt'])) - if (!($alt = $icons[$id.'_alt'])) + if (!($alt = $icons[$id.'_alt'])) $alt = $id; return ($icon ? "
'; $addr = $this->addr2name( $addr ); - $subject .= 'html->link('/infolog/index.php', + array( 'filter' => $filter,'action' => 'addr','addr_id' => $addr_id )). "\">$addr"; } if (($from = $info['info_from']) && (!$addr || !strstr($addr,$from))) { @@ -170,8 +174,10 @@ } if ($proj || $addr || $from || $info['info_addr']) { $subject .= '
'; - } - $subject .= ''.$info['info_subject'].''; + } + $subject .= ''; + $subject .= $info['info_subject'] ? $info['info_subject'] : substr($info['info_des'],0,60).' ...'; + $subject .= ''; if (!$info['info_enddate']) { $enddate = ' '; @@ -184,24 +190,24 @@ if (!($responsible = $info['info_responsible']) && $info['info_status'] == 'offer') { $responsible = $this->icon('status','offer'); } else { - $responsible = $this->accountInfo($responsible); - } + $responsible = $this->accountInfo($responsible); + } $owner = $this->accountInfo($info['info_owner']); if ($info['info_access'] == 'private') $owner = "$owner"; return array( 'type' => $this->icon('type',$info['info_type']), - 'status' => $this->icon('status',$info['info_status']), + 'status' => $this->icon('status',$info['info_status']), 'pri' => lang($info['info_pri']), 'subject' => $subject, - 'des' => $info['info_des'], + 'des' => $info['info_des'], 'startdate' => $phpgw->common->show_date($info['info_startdate'],$phpgw_info['user']['preferences']['common']['dateformat']), 'enddate' => $enddate, 'owner' => $owner, 'datecreated' => $phpgw->common->show_date($info['info_datecreated'],$phpgw_info['user']['preferences']['common']['dateformat']), - 'responsible' => $responsible ); - } + 'responsible' => $responsible ); + } function infoHeaders( $do_sort_header=0,$sort=0,$order=0) { global $phpgw,$phpgw_info; @@ -214,22 +220,22 @@ if ($do_sort_header) { $headers['sort_'.$f] = $phpgw->nextmatchs->show_sort_order($sort,'info_'.$f,$order,'/infolog/index.php',$lang); } else { - $headers['lang_'.$f] = $lang; + $headers['lang_'.$f] = $lang; } } - return $headers; + return $headers; } function debug( $str ) { - /* $stdout = fopen('/tmp/log','a'); + /* $stdout = fopen('/tmp/log','a'); fwrite( $stdout,"\r\n".$str ); fclose( $stdout ); */ - } + } function check_access( $info_id,$required_rights ) { global $phpgw_info; - if ($info_id != $this->data['info_id']) { // already loaded? - $private_info = $this; // dont change our own internal data, dont use new as it changes $phpgw->db + if ($info_id != $this->data['info_id']) { // already loaded? + $private_info = $this; // dont change our own internal data, dont use new as it changes $phpgw->db $info = $private_info->read($info_id); } else { $info = $this->data; @@ -239,20 +245,20 @@ $owner = $info['info_owner']; $user = $phpgw_info['user']['account_id']; - $access_ok = $owner == $user || // user has all rights - !!($this->grants[$owner] & $required_rights) && // ACL only on public entrys || $owner granted _PRIVATE - ($info['info_access'] == 'public' || !!($this->grants[$owner] & PHPGW_ACL_PRIVATE)); + $access_ok = $owner == $user || // user has all rights + !!($this->grants[$owner] & $required_rights) && // ACL only on public entrys || $owner granted _PRIVATE + ($info['info_access'] == 'public' || !!($this->grants[$owner] & PHPGW_ACL_PRIVATE)); // $this->debug("check_access(info_id=$info_id (owner=$owner, user=$user),required_rights=$required_rights): access".($access_ok?"Ok":"Denied")); - return $access_ok; + return $access_ok; } - function aclFilter($filter = 'none') { // sql to be AND into a query to ensure ACL is respected (incl. _PRIVATE) - global $phpgw_info; // filter: none - list all entrys user have rights to see - // private - list only his personal entrys (incl. those he is responsible for !!!) + function aclFilter($filter = 'none') { // sql to be AND into a query to ensure ACL is respected (incl. _PRIVATE) + global $phpgw_info; // filter: none - list all entrys user have rights to see + // private - list only his personal entrys (incl. those he is responsible for !!!) if (isset($this->acl_filter[$filter])) - return $this->acl_filter[$filter]; // used cached filter if found + return $this->acl_filter[$filter]; // used cached filter if found if (is_array($this->grants)) { while (list($user,$grant) = each($this->grants)) { @@ -262,21 +268,21 @@ if ($grant & PHPGW_ACL_PRIVATE) $private_user_list[] = $user; } - if (count($private_user_list)) { + if (count($private_user_list)) { $has_private_access = 'info_owner IN ('.implode(',',$private_user_list).')'; - } + } } $user = $phpgw_info['user']['account_id']; - $filtermethod = " (info_owner=$user"; // user has all rights + $filtermethod = " (info_owner=$user"; // user has all rights - if ($filter == 'private') { // private means own entrys plus the one user is responsible for (and has rights to see) - $filtermethod .= " OR info_responsible=$user AND (info_access='public'".($has_private_access?" OR $has_private_access":'').')'; - } else { // none --> all entrys user has rights to see + if ($filter == 'private') { // private means own entrys plus the one user is responsible for (and has rights to see) + $filtermethod .= " OR info_responsible=$user AND (info_access='public'".($has_private_access?" OR $has_private_access":'').')'; + } else { // none --> all entrys user has rights to see if ($has_private_access) { $filtermethod .= " OR $has_private_access"; } - if (count($public_user_list)) { + if (count($public_user_list)) { $filtermethod .= " OR (info_access='public' AND info_owner IN(" . implode(',',$public_user_list) . '))'; } } @@ -284,17 +290,17 @@ // echo "
aclFilter('$filter')(user='$user') = '$filtermethod'
"; - return $this->acl_filter[$filter] = $filtermethod; // cache the filter - } + return $this->acl_filter[$filter] = $filtermethod; // cache the filter + } - function read($info_id) { // did _not_ ensure ACL, has to be done by the calling code + function read($info_id) { // did _not_ ensure ACL, has to be done by the calling code if ($info_id <= 0 || $info_id != $this->data['info_id'] && - (!$this->db->query("select * FROM phpgw_infolog where info_id='$info_id'") || !$this->db->next_record())) + (!$this->db->query("select * FROM phpgw_infolog where info_id='$info_id'") || !$this->db->next_record())) { $this->init( ); return False; } - if ($info_id != $this->data['info_id']) { // data yet read in + if ($info_id != $this->data['info_id']) { // data yet read in $this->data = $this->db->Record; if ($this->data['info_subject'] == (substr($this->data['info_des'],0,60).' ...')) { @@ -302,19 +308,19 @@ } if ($this->data['info_addr_id'] && $this->data['info_from'] == $this->addr2name( $this->readAddr( $this->data['info_addr_id'] ))) { $this->data['info_from'] = ''; - } - } - return $this->data; + } + } + return $this->data; } function init() { global $phpgw_info; $this->data = array( 'info_owner' => $phpgw_info['user']['account_id'], - 'info_pri' => 'normal' ); - } + 'info_pri' => 'normal' ); + } - function delete($info_id) { // did _not_ ensure ACL, has to be done by the calling code + function delete($info_id) { // did _not_ ensure ACL, has to be done by the calling code global $phpgw_info; $this->db->query("delete FROM phpgw_infolog where info_id='$info_id' or info_id_parent='" . "$info_id' AND ((info_access='public' and info_owner != '" @@ -322,20 +328,20 @@ . $phpgw_info['user']['account_id'] . "'))" ,__LINE__,__FILE__); if ($this->data['info_id'] == $info_id) - $this->init( ); + $this->init( ); } - function write($values) { // did _not_ ensure ACL, has to be done by the calling code + function write($values) { // did _not_ ensure ACL, has to be done by the calling code global $phpgw_info; if ($values['responsible'] && $values['status'] == 'offer') { - $values['status'] = 'ongoing'; // have to match if not finished + $values['status'] = 'ongoing'; // have to match if not finished } if (!$values['info_id'] && !$values['owner']) { // $this->debug( "write(value[info_id]==0,values[owner]==0) --> owner set to user" ); $values['owner'] = $phpgw_info['user']['account_id']; // user gets owner } if (!$values['info_id'] && !$values['datecreated']) - $values['datecreated'] = time(); // set creation time + $values['datecreated'] = time(); // set creation time if (!$values['subject']) $values['subject'] = substr($values['des'],0,60).' ...'; @@ -343,10 +349,10 @@ $values['from'] = $this->addr2name( $this->readAddr( $values['addr_id'] )); while (list($key,$val) = each($values)) { - $this->data['info_'.$key] = $val; // update internal data + $this->data['info_'.$key] = $val; // update internal data switch ($key) { case 'info_id': - break; // later in where clause + break; // later in where clause case 'des': case 'subject': case 'from': case 'addr': $val = addslashes($val); default: @@ -361,10 +367,10 @@ /* * need to set $this->data['info_id'] with assigned autoincrement id */ - } + } //echo 'edit(): query: '.$query; - $this->db->query($query,__LINE__,__FILE__); + $this->db->query($query,__LINE__,__FILE__); } } diff --git a/infolog/index.php b/infolog/index.php index 5dda2fecb5..731d9707d9 100644 --- a/infolog/index.php +++ b/infolog/index.php @@ -1,229 +1,234 @@ * - * originaly based on todo written by Joseph Engo
'.lang('Back to Projectlist').''); + } - // ========================================================= - // back2project list href declaration for subproject list - // ========================================================= - - if ($action) { - $t->set_var('lang_back2projects', '
'.lang('Back to Projectlist').''); - } + // get actual date and year for matrixview arguments +/* $year = date('Y'); + $month = date('m'); + $t->set_var('lang_matrixviewhref', '
'.lang('View Matrix of actual Month').''); */ + // ============================================ + // template declaration for Add Form + // ============================================ - // get actual date and year for matrixview arguments -/* $year = date('Y'); - $month = date('m'); - $t->set_var('lang_matrixviewhref', '
'.lang('View Matrix of actual Month').''); */ - // ============================================ - // template declaration for Add Form - // ============================================ + $t->set_var(lang_add,lang('Add')); + $t->pfp('out','info_list_t',true); - $t->set_var(lang_add,lang('Add')); - $t->pfp('out','info_list_t',true); + // -------------- end Add form declaration ------------------------ - // -------------- end Add form declaration ------------------------ - - $phpgw->common->phpgw_footer(); + $phpgw->common->phpgw_footer(); ?> diff --git a/infolog/templates/default/delete.tpl b/infolog/templates/default/delete.tpl index ac5195a0d3..21ba03b482 100644 --- a/infolog/templates/default/delete.tpl +++ b/infolog/templates/default/delete.tpl @@ -2,49 +2,36 @@
{lang_info_action}
| {lang_type} | -{lang_status} | -{lang_subject} | -{lang_startdate} | -{lang_enddate} | -{lang_owner} | -{lang_responsible} | -
| {type} | -{status} | -{subject} | -{startdate} | -{enddate} | -{owner} {datecreated} |
- {responsible} | -
+
| {lang_type} | +{lang_status} | +{lang_subject} | +{lang_startdate} | +{lang_enddate} | +{lang_owner} | +{lang_responsible} | +
| {type} | +{status} | +{subject} {des} |
+ {startdate} | +{enddate} | +{owner} {datecreated} |
+ {responsible} | +
-
| {deleteheader} | |||
| - - - | -- - - - | +{no_button} | +{yes_button} |