Adjust banners and minor formatting

This commit is contained in:
Miles Lott 2004-02-22 14:32:55 +00:00
parent 15011a496e
commit ac7a91b8fa
4 changed files with 31 additions and 18 deletions

View File

@ -14,7 +14,7 @@
function formatted_list($name,$list,$id='',$default=False,$java=False) function formatted_list($name,$list,$id='',$default=False,$java=False)
{ {
if ($java) if($java)
{ {
$jselect = ' onChange="this.form.submit();"'; $jselect = ' onChange="this.form.submit();"';
} }
@ -24,10 +24,10 @@
{ {
$select .= '<option value="">' . lang('Please Select') . '</option>'."\n"; $select .= '<option value="">' . lang('Please Select') . '</option>'."\n";
} }
while (list($key,$val) = each($list)) while(list($key,$val) = each($list))
{ {
$select .= '<option value="' . $key . '"'; $select .= '<option value="' . $key . '"';
if ($key == $id && $id != '') if($key == $id && $id != '')
{ {
$select .= ' selected'; $select .= ' selected';
} }
@ -43,16 +43,16 @@
/* Return a select form element with the categories option dialog in it */ /* Return a select form element with the categories option dialog in it */
function cat_option($cat_id='',$notall=False,$java=True,$multiple=False) function cat_option($cat_id='',$notall=False,$java=True,$multiple=False)
{ {
if ($java) if($java)
{ {
$jselect = ' onChange="this.form.submit();"'; $jselect = ' onChange="this.form.submit();"';
} }
/* Setup all and none first */ /* Setup all and none first */
$cats_link = "\n" .'<select name="cat_id'.($multiple?'[]':'').'"' .$jselect . ($multiple ? 'multiple size="3"' : '') . ">\n"; $cats_link = "\n" .'<select name="cat_id'.($multiple?'[]':'').'"' .$jselect . ($multiple ? 'multiple size="3"' : '') . ">\n";
if (!$notall) if(!$notall)
{ {
$cats_link .= '<option value=""'; $cats_link .= '<option value=""';
if ($cat_id=="all") if($cat_id == 'all')
{ {
$cats_link .= ' selected'; $cats_link .= ' selected';
} }
@ -120,7 +120,7 @@
'note' => 'notes' 'note' => 'notes'
); );
if ($abc[$column]) if($abc[$column])
{ {
return lang($abc[$column]); return lang($abc[$column]);
} }
@ -135,15 +135,15 @@
$i = 0; $j = 0; $i = 0; $j = 0;
$fields = array(); $fields = array();
@reset($GLOBALS['phpgw_info']['user']['preferences']['addressbook']); @reset($GLOBALS['phpgw_info']['user']['preferences']['addressbook']);
while (list($col,$descr) = @each($GLOBALS['phpgw_info']['user']['preferences']['addressbook'])) while(list($col,$descr) = @each($GLOBALS['phpgw_info']['user']['preferences']['addressbook']))
{ {
if ( substr($col,0,6) == 'extra_' ) if( substr($col,0,6) == 'extra_' )
{ {
$fields[$j]['name'] = str_replace('extra_','',$col); $fields[$j]['name'] = str_replace('extra_','',$col);
$fields[$j]['name'] = str_replace(' ','_',$fields[$j]['name']); $fields[$j]['name'] = str_replace(' ','_',$fields[$j]['name']);
$fields[$j]['id'] = $i; $fields[$j]['id'] = $i;
if ($query && ($fields[$j]['name'] != $query)) if($query && ($fields[$j]['name'] != $query))
{ {
unset($fields[$j]['name']); unset($fields[$j]['name']);
unset($fields[$j]['id']); unset($fields[$j]['id']);
@ -163,13 +163,13 @@
function save_custom_field($old='',$new='') function save_custom_field($old='',$new='')
{ {
$GLOBALS['phpgw']->preferences->read_repository($GLOBALS['phpgw_info']['user']['account_id']); $GLOBALS['phpgw']->preferences->read_repository($GLOBALS['phpgw_info']['user']['account_id']);
if ($old) if($old)
{ {
$GLOBALS['phpgw']->preferences->delete("addressbook","extra_".$old); $GLOBALS['phpgw']->preferences->delete('addressbook','extra_'.$old);
} }
if($new) if($new)
{ {
$GLOBALS['phpgw']->preferences->add("addressbook","extra_".$new); $GLOBALS['phpgw']->preferences->add('addressbook','extra_'.$new);
} }
$GLOBALS['phpgw']->preferences->save_repository(1); $GLOBALS['phpgw']->preferences->save_repository(1);
} }

View File

@ -1,4 +1,17 @@
<?php <?php
/**************************************************************************\
* eGroupWare *
* http://www.egroupware.org *
* Written by Joseph Engo <jengo@phpgroupware.org> *
* -------------------------------------------- *
* This program is free software; you can redistribute it and/or modify it *
* under the terms of the GNU General Public License as published by the *
* Free Software Foundation; either version 2 of the License, or (at your *
* option) any later version. *
\**************************************************************************/
// $Id$
$GLOBALS['pref']->change('addressbook','company','addressbook_True'); $GLOBALS['pref']->change('addressbook','company','addressbook_True');
$GLOBALS['pref']->change('addressbook','lastname','addressbook_True'); $GLOBALS['pref']->change('addressbook','lastname','addressbook_True');
$GLOBALS['pref']->change('addressbook','firstname','addressbook_True'); $GLOBALS['pref']->change('addressbook','firstname','addressbook_True');

View File

@ -1,8 +1,8 @@
<?php <?php
/**************************************************************************\ /**************************************************************************\
* eGroupWare * * eGroupWare *
* http://www.egroupware.org * * http://www.egroupware.org *
* Written by Mark Peters <skeeter@phpgroupware.org> * * Written by Miles Lott <milos@groupwhere.org> *
* -------------------------------------------- * * -------------------------------------------- *
* This program is free software; you can redistribute it and/or modify it * * This program is free software; you can redistribute it and/or modify it *
* under the terms of the GNU General Public License as published by the * * under the terms of the GNU General Public License as published by the *

View File

@ -12,7 +12,7 @@
/* $Id$ */ /* $Id$ */
$d1 = strtolower(substr(PHPGW_APP_INC,0,3)); $d1 = strtolower(substr(PHPGW_APP_INC,0,3));
if($d1 == 'htt' || $d1 == 'ftp' ) if($d1 == 'htt' || $d1 == 'ftp')
{ {
echo "Failed attempt to break in via an old Security Hole!<br>\n"; echo "Failed attempt to break in via an old Security Hole!<br>\n";
$GLOBALS['phpgw']->common->phpgw_exit(); $GLOBALS['phpgw']->common->phpgw_exit();
@ -22,7 +22,7 @@
$tmp_app_inc = PHPGW_APP_INC; $tmp_app_inc = PHPGW_APP_INC;
define('PHPGW_APP_INC',$GLOBALS['phpgw']->common->get_inc_dir('addressbook')); define('PHPGW_APP_INC',$GLOBALS['phpgw']->common->get_inc_dir('addressbook'));
if ($GLOBALS['phpgw_info']['user']['apps']['addressbook'] if($GLOBALS['phpgw_info']['user']['apps']['addressbook']
&& $GLOBALS['phpgw_info']['user']['preferences']['addressbook']['mainscreen_showbirthdays']) && $GLOBALS['phpgw_info']['user']['preferences']['addressbook']['mainscreen_showbirthdays'])
{ {
echo "\n<!-- Birthday info -->\n"; echo "\n<!-- Birthday info -->\n";