diff --git a/admin/inc/class.html.inc.php b/admin/inc/class.html.inc.php index 103d6a5aa2..a828e44caa 100755 --- a/admin/inc/class.html.inc.php +++ b/admin/inc/class.html.inc.php @@ -29,9 +29,9 @@ } else { - $html .= '
' . "\n"; + #$html .= '' . "\n"; $bo = CreateObject('admin.bolog',True); if (!isset($start)) { @@ -50,10 +50,10 @@ $hits = $nextmatchs->show_hits($total_records,$start); $html .= ''; - $html .= ''; + $html .= $left; $html .= ''; $html .= ''; - $html .= ''; + $html .= $right; $html .= '
' . $left . ' ' . $hits . ' link('/index.php','menuaction=admin.uilog.list_log&editable=true') .'> ' . lang('Edit Table format') . '' . $right . '
'; } } @@ -120,7 +120,7 @@ while(list($pc,$pcol)=each($printlist)) { $cname = $pcol['#name']; - $cparms = $this->arr_merge($head[$cname],$pcol,array('bgcolor'=>'FFFFFF'),$rows[$rno][$cname]); + $cparms = $this->arr_merge($head[$cname],$pcol,array('bgcolor'=>'#FFFFFF'),$rows[$rno][$cname]); $rows[$rno][$cname] = $cparms; } } @@ -201,7 +201,7 @@ } } $html .= "\n"; - $html .= "
"; + #$html .= ""; return $html; } @@ -225,14 +225,16 @@ if ($pvalue != 1) { $html .= $comma . $pname . '="' . $pvalue . '"'; - $comma = ', '; + #$comma = ', '; + $comma = ' '; }; break; default: if (substr($pname,0,1) != '#') { $html .= $comma . $pname . '="' . $pvalue . '"'; - $comma = ', '; + #$comma = ', '; + $comma = ' '; } } } @@ -310,28 +312,28 @@ // Column Defintions... $html .= "

Column Definition

"; - $html .= "\n"; + $html .= "
\n"; $f = array(); for ($fno=0;$fno<$noflds;$fno++) { $f[]=$fno; } // Column Headings - $html .= "\t\n"; + $html .= "\t\n"; for ($cno=0;$cno<$nocols;$cno++) { - $html .= "\t\t\n"; + $html .= "\t\t\n"; } $html .= "\t\n"; for ($rno=0;$rno<$norows;$rno++) { - $html .= "\t\n"; + $html .= "\t\n"; for ($cno=0;$cno<$nocols;$cno++) { $c = $layout[$rno][$cno]; $tname = "layout[$rno][]"; $t = $this->DropDown($f,$tname,$c); - $html .= "\t\t\n"; + $html .= "\t\t\n"; } $html .= "\t\n"; } @@ -347,9 +349,9 @@ $html .= ""; //Field Definitions $html .= "

Field Definitions

"; - $html .= "
$cno$cno
$t$t
\n"; - $html .= "\t\t\n"; - $html .= "\t\t\n"; + $html .= "
NoDel
\n"; + $html .= "\t\t\n"; + $html .= "\t\t\n"; $html .= "\t\t\n"; $html .= "\t\t\n"; $html .= "\t\n"; @@ -367,11 +369,11 @@ $title = $name; } $html .= "\t\n"; - $html .= "\t\t\n"; - $html .= "\t\t\n"; - $html .= "\t\t\n"; + $html .= "\t\t\n"; + $html .= "\t\t\n"; + $html .= "\t\t\n"; $value = $rows[0][$name]['value']; - $html .= "\t\t\n"; + $html .= "\t\t\n"; $html .= "\t\n"; } $html .= "
NoDelFieldValue
$fno".$this->dropdown($cnam,'_cols[]',$name)."$fno".$this->dropdown($cnam,'_cols[]',$name)."$value$value
\n"; diff --git a/admin/inc/class.solog.inc.php b/admin/inc/class.solog.inc.php index a5936b2483..b0f33d4e49 100755 --- a/admin/inc/class.solog.inc.php +++ b/admin/inc/class.solog.inc.php @@ -77,6 +77,7 @@ function get_error_e($parms) { +if ( false ) { /* Fixed From */ if (!isset($parms['from'])) { @@ -87,6 +88,7 @@ $parms['from'][] = 'phpgw_accounts'; } +} /* Fix Where */ if (!isset($parms['where'])) { @@ -94,9 +96,8 @@ } else { - $parms['where'][] = 'phpgw_log.log_id = phpgw_accounts.account_id'; + $parms['where'][] = 'phpgw_log.log_user = phpgw_accounts.account_id'; } - /* Fix Default Fields */ if (!isset($parms['fields'])) { diff --git a/admin/inc/class.uilog.inc.php b/admin/inc/class.uilog.inc.php index ab718ffba3..6d6890c28e 100644 --- a/admin/inc/class.uilog.inc.php +++ b/admin/inc/class.uilog.inc.php @@ -210,10 +210,10 @@ $header['_cols']= $this->fields_inc; // Set Table formating parameters - $header['#table_parms']=array('width'=>"98%", 'bgcolor'=>"000000", 'border'=>"0"); + $header['#table_parms']=array('width'=>"98%", 'bgcolor'=>"#000000", 'border'=>"0"); // Set Header formating parameters - $header['#head_parms']=array('bgcolor'=>"D3DCFF"); + $header['#head_parms']=array('bgcolor'=>"#D3DCFF"); // Column Log_ID $header['log_id']['#parms_hdr'] = array('align'=>"center"); @@ -271,20 +271,20 @@ { switch($row['log_severity']['value']) { - case 'D': $row['log_severity']['bgcolor'] = 'D3DCFF'; break; - case 'I': $row['log_severity']['bgcolor'] = 'C0FFC0'; break; - case 'W': $row['log_severity']['bgcolor'] = 'FFFFC0'; break; - case 'E': $row['log_severity']['bgcolor'] = 'FFC0C0'; break; - case 'F': $row['log_severity']['bgcolor'] = 'FF0909'; break; + case 'D': $row['log_severity']['bgcolor'] = '#D3DCFF'; break; + case 'I': $row['log_severity']['bgcolor'] = '#C0FFC0'; break; + case 'W': $row['log_severity']['bgcolor'] = '#FFFFC0'; break; + case 'E': $row['log_severity']['bgcolor'] = '#FFC0C0'; break; + case 'F': $row['log_severity']['bgcolor'] = '#FF0909'; break; } switch($row['log_msg_severity']['value']) { - case 'D': $color = 'D3DCFF'; break; - case 'I': $color = 'C0FFC0'; break; - case 'W': $color = 'FFFFC0'; break; - case 'E': $color = 'FFC0C0'; break; - case 'F': $color = 'FF0909'; break; + case 'D': $color = '#D3DCFF'; break; + case 'I': $color = '#C0FFC0'; break; + case 'W': $color = '#FFFFC0'; break; + case 'E': $color = '#FFC0C0'; break; + case 'F': $color = '#FF0909'; break; } reset($this->fields_inc); while(list($cno,$fld) = each($this->fields_inc)) diff --git a/admin/templates/default/accesslog.tpl b/admin/templates/default/accesslog.tpl index 16fa29cb3f..2a831200fa 100644 --- a/admin/templates/default/accesslog.tpl +++ b/admin/templates/default/accesslog.tpl @@ -18,7 +18,9 @@ - {nextmatchs_left} {nextmatchs_right} + {nextmatchs_left} + + {nextmatchs_right}
 
diff --git a/admin/templates/default/accounts.tpl b/admin/templates/default/accounts.tpl index 13a013388e..cb7e7a0384 100644 --- a/admin/templates/default/accounts.tpl +++ b/admin/templates/default/accounts.tpl @@ -13,9 +13,9 @@
- + {left_next_matchs} - + {right_next_matchs}
{left_next_matchs}{lang_user_accounts}{right_next_matchs}
diff --git a/admin/templates/default/applications.tpl b/admin/templates/default/applications.tpl index 2b44c8f692..d49dcf825e 100644 --- a/admin/templates/default/applications.tpl +++ b/admin/templates/default/applications.tpl @@ -2,7 +2,7 @@
- + {left} {right} diff --git a/admin/templates/default/currentusers.tpl b/admin/templates/default/currentusers.tpl index 0379944735..44f8ff4b77 100644 --- a/admin/templates/default/currentusers.tpl +++ b/admin/templates/default/currentusers.tpl @@ -1,13 +1,15 @@
{lang_showing}
- + {left_next_matchs} {right_next_matchs} + +
   
diff --git a/admin/templates/default/groups.tpl b/admin/templates/default/groups.tpl index 55a6d44ae9..27ab1faafb 100644 --- a/admin/templates/default/groups.tpl +++ b/admin/templates/default/groups.tpl @@ -2,9 +2,9 @@

{sort_loginid} {sort_ip}
- + {left_next_matchs} - + {right_next_matchs}
{left_next_matchs}{lang_groups}{right_next_matchs}