From 3d4049d8731fca2dc05c2fe16f9104d7be2e08a0 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 14 Oct 2005 14:31:35 +0000 Subject: [PATCH] phpgw --> egw --- preferences/inc/class.bocategories.inc.php | 22 +++++++++++----------- preferences/inc/class.bopassword.inc.php | 6 +++--- preferences/inc/class.bosettings.inc.php | 8 ++++---- preferences/inc/class.uiaclprefs.inc.php | 14 +++++++------- preferences/inc/class.uicategories.inc.php | 12 ++++++------ preferences/inc/class.uipassword.inc.php | 18 +++++++++--------- preferences/inc/hook_deleteaccount.inc.php | 22 +++++++++++----------- preferences/inc/hook_preferences.inc.php | 20 ++++++++++---------- preferences/inc/hook_settings.inc.php | 2 +- preferences/index.php | 17 +++++++++-------- 10 files changed, 71 insertions(+), 70 deletions(-) diff --git a/preferences/inc/class.bocategories.inc.php b/preferences/inc/class.bocategories.inc.php index 1e06c6b7cb..758d9068ad 100644 --- a/preferences/inc/class.bocategories.inc.php +++ b/preferences/inc/class.bocategories.inc.php @@ -1,15 +1,15 @@ appname == 'preferences' && file_exists($tmpl_settings)) @@ -228,9 +228,9 @@ function list_methods($_type='xmlrpc') { /* - This handles introspection or discovery by the logged in client, - in which case the input might be an array. The server always calls - this function to fill the server dispatch map using a string. + This handles introspection or discovery by the logged in client, + in which case the input might be an array. The server always calls + this function to fill the server dispatch map using a string. */ if(is_array($_type)) { diff --git a/preferences/inc/class.uiaclprefs.inc.php b/preferences/inc/class.uiaclprefs.inc.php index 85392a5c7a..cf6c559cc8 100644 --- a/preferences/inc/class.uiaclprefs.inc.php +++ b/preferences/inc/class.uiaclprefs.inc.php @@ -20,11 +20,11 @@ function uiaclprefs() { - $GLOBALS['egw']->nextmatchs = CreateObject('phpgwapi.nextmatchs'); + $GLOBALS['egw']->nextmatchs =& CreateObject('phpgwapi.nextmatchs'); if (!is_object($GLOBALS['egw']->html)) { - $GLOBALS['egw']->html = CreateObject('phpgwapi.html'); + $GLOBALS['egw']->html =& CreateObject('phpgwapi.html'); } } @@ -63,10 +63,10 @@ if (($GLOBALS['egw_info']['server']['deny_user_grants_access'] || $owner != $GLOBALS['egw_info']['user']['account_id']) && !isset($GLOBALS['egw_info']['user']['apps']['admin']) || $acl_app_not_passed) { - $GLOBALS['egw']->common->phpgw_header(); + $GLOBALS['egw']->common->egw_header(); echo parse_navbar(); echo '
' . lang('Access not permitted') . '
'; - $GLOBALS['egw']->common->phpgw_footer(); + $GLOBALS['egw']->common->egw_footer(); return; } @@ -79,7 +79,7 @@ { $no_privat_grants = $owner != $GLOBALS['egw_info']['user']['account_id']; } - $this->acl = CreateObject('phpgwapi.acl',(int)$owner); + $this->acl =& CreateObject('phpgwapi.acl',(int)$owner); $this->acl->read_repository(); if ($_POST['submit']) @@ -140,10 +140,10 @@ $this->acl->save_repository(); } $GLOBALS['egw_info']['flags']['app_header'] = lang('%1 - Preferences',$GLOBALS['egw_info']['apps'][$acl_app]['title']).' - '.lang('acl').': '.$owner_name; - $GLOBALS['egw']->common->phpgw_header(); + $GLOBALS['egw']->common->egw_header(); echo parse_navbar(); - $this->template = CreateObject('phpgwapi.Template',$GLOBALS['egw']->common->get_tpl_dir($acl_app)); + $this->template =& CreateObject('phpgwapi.Template',$GLOBALS['egw']->common->get_tpl_dir($acl_app)); $templates = Array ( 'preferences' => 'preference_acl.tpl', 'row_colspan' => 'preference_colspan.tpl', diff --git a/preferences/inc/class.uicategories.inc.php b/preferences/inc/class.uicategories.inc.php index 116e79125c..661b32d544 100644 --- a/preferences/inc/class.uicategories.inc.php +++ b/preferences/inc/class.uicategories.inc.php @@ -37,8 +37,8 @@ { $cats_app = get_var('cats_app',array('GET','POST')); - $this->bo = CreateObject('preferences.bocategories',$cats_app); - $this->nextmatchs = CreateObject('phpgwapi.nextmatchs'); + $this->bo =& CreateObject('preferences.bocategories',$cats_app); + $this->nextmatchs =& CreateObject('phpgwapi.nextmatchs'); $this->account = $GLOBALS['egw_info']['user']['account_id']; $this->user = $GLOBALS['egw_info']['user']['fullname']; @@ -127,7 +127,7 @@ } $GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps'][$cats_app]['title']. ' '.lang('categories for').': '.$this->user; - $GLOBALS['egw']->common->phpgw_header(); + $GLOBALS['egw']->common->egw_header(); echo parse_navbar(); $GLOBALS['egw']->template->set_file(array( @@ -417,7 +417,7 @@ if (!is_object($GLOBALS['egw']->html)) { - $GLOBALS['egw']->html = CreateObject('phpgwapi.html'); + $GLOBALS['egw']->html =& CreateObject('phpgwapi.html'); } $GLOBALS['egw']->template->set_var('color',$GLOBALS['egw']->html->inputColor('cat_data[color]',$cat['data']['color'],lang('Click to select a color'))); @@ -469,7 +469,7 @@ $GLOBALS['egw_info']['flags']['app_header'] = lang($cat_id ? 'Edit %1 category for' : 'Add %1 category for', $GLOBALS['egw_info']['apps'][$cats_app]['title']).': '.$this->user; - $GLOBALS['egw']->common->phpgw_header(); + $GLOBALS['egw']->common->egw_header(); echo parse_navbar(); $GLOBALS['egw']->template->set_var('edithandle',''); @@ -518,7 +518,7 @@ $GLOBALS['egw']->template->set_file(array('category_delete' => 'delete.tpl')); $GLOBALS['egw_info']['flags']['app_header'] = lang('Delete Categories'); - $GLOBALS['egw']->common->phpgw_header(); + $GLOBALS['egw']->common->egw_header(); echo parse_navbar(); $GLOBALS['egw']->template->set_var('deleteheader',lang('Are you sure you want to delete this category ?')); diff --git a/preferences/inc/class.uipassword.inc.php b/preferences/inc/class.uipassword.inc.php index 98933eb346..4ac24cbcfa 100644 --- a/preferences/inc/class.uipassword.inc.php +++ b/preferences/inc/class.uipassword.inc.php @@ -20,7 +20,7 @@ function uipassword() { - $this->bo = CreateObject('preferences.bopassword'); + $this->bo =& CreateObject('preferences.bopassword'); } @@ -32,8 +32,8 @@ if(!$GLOBALS['egw']->acl->check('changepassword', 1) || $_POST['cancel']) { - $GLOBALS['egw']->redirect_link('/preferences/index.php'); - $GLOBALS['egw']->common->phpgw_exit(); + $GLOBALS['egw']->redirect_link('/preferences/index.php'); + $GLOBALS['egw']->common->egw_exit(); } $GLOBALS['egw']->template->set_file(array( @@ -73,22 +73,22 @@ if(is_array($errors)) { - $GLOBALS['egw']->common->phpgw_header(); + $GLOBALS['egw']->common->egw_header(); echo parse_navbar(); $GLOBALS['egw']->template->set_var('messages',$GLOBALS['egw']->common->error_list($errors)); $GLOBALS['egw']->template->pfp('out','form'); - $GLOBALS['egw']->common->phpgw_exit(True); + $GLOBALS['egw']->common->egw_exit(True); } $passwd_changed = $this->bo->changepass($o_passwd, $n_passwd); if(!$passwd_changed) { $errors[] = lang('Failed to change password. Please contact your administrator.'); - $GLOBALS['egw']->common->phpgw_header(); + $GLOBALS['egw']->common->egw_header(); echo parse_navbar(); $GLOBALS['egw']->template->set_var('messages',$GLOBALS['egw']->common->error_list($errors)); $GLOBALS['egw']->template->pfp('out','form'); - $GLOBALS['egw']->common->phpgw_exit(True); + $GLOBALS['egw']->common->egw_exit(True); } else { @@ -108,11 +108,11 @@ else { $GLOBALS['egw_info']['flags']['app_header'] = lang('Change your password'); - $GLOBALS['egw']->common->phpgw_header(); + $GLOBALS['egw']->common->egw_header(); echo parse_navbar(); $GLOBALS['egw']->template->pfp('out','form'); - $GLOBALS['egw']->common->phpgw_footer(); + $GLOBALS['egw']->common->egw_footer(); } } } diff --git a/preferences/inc/hook_deleteaccount.inc.php b/preferences/inc/hook_deleteaccount.inc.php index c00d413245..feeda2d874 100755 --- a/preferences/inc/hook_deleteaccount.inc.php +++ b/preferences/inc/hook_deleteaccount.inc.php @@ -1,16 +1,16 @@ * - * -------------------------------------------- * - * 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. * - \**************************************************************************/ + /**************************************************************************\ + * eGroupWare * + * http://www.egroupware.org * + * Written by Mark Peters * + * -------------------------------------------- * + * 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$ */ + /* $Id$ */ // Delete all records for a user if((int)$GLOBALS['hook_values']['account_id'] > 0) diff --git a/preferences/inc/hook_preferences.inc.php b/preferences/inc/hook_preferences.inc.php index ba97454299..9af773f5da 100644 --- a/preferences/inc/hook_preferences.inc.php +++ b/preferences/inc/hook_preferences.inc.php @@ -1,14 +1,14 @@ * - * -------------------------------------------- * - * 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. * - \**************************************************************************/ + /**************************************************************************\ + * eGroupWare * + * http://www.egroupware.org * + * Written by Joseph Engo * + * -------------------------------------------- * + * 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$ */ diff --git a/preferences/inc/hook_settings.inc.php b/preferences/inc/hook_settings.inc.php index 7dabf84293..a3e577a9d6 100755 --- a/preferences/inc/hook_settings.inc.php +++ b/preferences/inc/hook_settings.inc.php @@ -67,7 +67,7 @@ '24' => lang('24 hour') ); - $sbox = createobject('phpgwapi.sbox'); + $sbox =& CreateObject('phpgwapi.sbox'); $langs = $GLOBALS['egw']->translation->get_installed_langs(); $user_apps = array(); diff --git a/preferences/index.php b/preferences/index.php index bd702841e6..7549fd5707 100755 --- a/preferences/index.php +++ b/preferences/index.php @@ -12,14 +12,15 @@ /* $Id$ */ - $egw_info = array(); - $GLOBALS['egw_info']['flags'] = array( - 'currentapp' => 'preferences', - 'disable_Template_class' => True + $GLOBALS['egw_info'] = array( + 'flags' => array( + 'currentapp' => 'preferences', + 'disable_Template_class' => True, + ), ); include('../header.inc.php'); - $pref_tpl = CreateObject('phpgwapi.Template',EGW_APP_TPL); + $pref_tpl =& CreateObject('phpgwapi.Template',EGW_APP_TPL); $templates = Array( 'pref' => 'index.tpl' ); @@ -44,13 +45,13 @@ $GLOBALS['egw']->session->appsession('session_data','preferences',$session_data); } - if (! $GLOBALS['HTTP_GET_VARS']['type']) + if (! $_GET['type']) { $type = $session_data['type']; } else { - $type = $GLOBALS['HTTP_GET_VARS']['type']; + $type = $_GET['type']; $session_data = array('type' => $type); $GLOBALS['egw']->session->appsession('session_data','preferences',$session_data); } @@ -137,5 +138,5 @@ $GLOBALS['egw']->hooks->process('preferences',array('preferences')); $pref_tpl->pfp('out','list'); - $GLOBALS['egw']->common->phpgw_footer(); + $GLOBALS['egw']->common->egw_footer(); ?>