From 0fcee156a5dd727cd6cbcd75da9691270544626d Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sun, 14 Mar 2004 16:39:09 +0000 Subject: [PATCH] only one error-msg for the freebusy, as it could be used to identify user-names on the system --- calendar/freebusy.php | 10 +++------- calendar/inc/class.bocalendar.inc.php | 6 +++++- calendar/setup/phpgw_de.lang | 4 +--- calendar/setup/phpgw_en.lang | 4 +--- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/calendar/freebusy.php b/calendar/freebusy.php index 8d05ef3ef4..a6ef400b4e 100644 --- a/calendar/freebusy.php +++ b/calendar/freebusy.php @@ -47,7 +47,7 @@ if (!($username = $GLOBALS['phpgw']->accounts->id2name($user))) { - fail_exit(lang("Unknow user '%1' !!!",$_GET['user'])); + fail_exit(lang("freebusy: Unknow user '%1', wrong password or not availible to not loged in users !!!",$_GET['user'])); } if (!$loged_in) { @@ -57,13 +57,9 @@ $GLOBALS['phpgw_info']['user']['account_lid'] = $username; $cal_prefs = &$GLOBALS['phpgw_info']['user']['preferences']['calendar']; - if (!$cal_prefs['freebusy']) + if (!$cal_prefs['freebusy'] || !empty($cal_prefs['freebusy_pw']) && $cal_prefs['freebusy_pw'] != $_GET['password']) { - fail_exit(lang("The freebusy information for user '%1' is not availible to not loged in users !!!",$username)); - } - if (!empty($cal_prefs['freebusy_pw']) && $cal_prefs['freebusy_pw'] != $_GET['password']) - { - fail_exit(lang("Wrong password for user '%1' !!!",$username)); + fail_exit(lang("freebusy: Unknow user '%1', wrong password or not availible to not loged in users !!!",$_GET['user'])); } } ExecMethod('calendar.boicalendar.freebusy'); diff --git a/calendar/inc/class.bocalendar.inc.php b/calendar/inc/class.bocalendar.inc.php index d19f7000aa..efff850531 100755 --- a/calendar/inc/class.bocalendar.inc.php +++ b/calendar/inc/class.bocalendar.inc.php @@ -448,7 +448,7 @@ ), 'categories' => array( 'function' => 'categories', - 'signature' => array(array(xmlrpcStruct,xmlrpcStruct)), + 'signature' => array(array(xmlrpcBoolean,xmlrpcBoolean)), 'docstring' => lang('List all categories.') ), ); @@ -1024,6 +1024,10 @@ { if (!$send_to_ui) { + if ($this->xmlrpc) + { + $GLOBALS['server']->xmlrpc_error($GLOBALS['xmlrpcerr']['incorrect_params'],$GLOBALS['xmlrpcstr']['incorrect_params']); + } return array($datetime_check => 'invalid input data'); } ExecMethod('calendar.uicalendar.edit', diff --git a/calendar/setup/phpgw_de.lang b/calendar/setup/phpgw_de.lang index 14a4a5f2e0..81501f3fc3 100644 --- a/calendar/setup/phpgw_de.lang +++ b/calendar/setup/phpgw_de.lang @@ -114,6 +114,7 @@ firstname of person to notify calendar de Vorname der zu benachrichtigenden Pers format of event updates calendar de Format der Benachrichtigungen fr calendar de Fr free/busy calendar de frei/belegt +freebusy: unknow user '%1', wrong password or not availible to not loged in users !!! calendar de Belegtzeiten: Unbekannter Benutzername '%1', falsches Passwort oder nicht verfügbar für nicht angemeldete Benutzer !!! frequency calendar de Häufigkeit fri calendar de Fr full description calendar de vollständige Beschreibung @@ -282,7 +283,6 @@ test import (show importable records only in browser) calendar de Test Im text calendar de Text th calendar de Do the following conflicts with the suggested time: calendar de Im gewählten Zeitraum gibt es einen Konflikt: -the freebusy information for user '%1' is not availible to not loged in users !!! calendar de Die Belegtzeiten des Benutzers '%1' sind nicht verfügbar, wenn sie nicht angemeldet sind!!! the user %1 is not participating in this event! calendar de Der Benutzer %1 nimmt nicht an diesem Event teil! there was an error trying to connect to your news server.
please contact your admin to check the news servername, username or password. calendar de Fehler beim Kontaktieren Ihres News-Servers.
Bitte benachrichtigen Sie ihren Administrator um Servername, Username und Passwort für News zu überprüfen. this day is shown as first day in the week or month view. calendar de Dieser Tag wird als erster in der Wochen- oder Monatsansicht angezeigt @@ -316,7 +316,6 @@ today calendar de Heute translation calendar de Übersetzung tu calendar de Di tue calendar de Di -unknow user '%1' !!! calendar de Unbekannter Benutzer '%1' !!! update a single entry by passing the fields. calendar de Einen einzelnen Termin über seine Felder updaten. updated calendar de Aktualisiert updates of your appointments via email calendar de @@ -335,7 +334,6 @@ which of the calendar-views do you want to see, when you enter the calendar ? ca work day ends on calendar de Arbeitstag endet um work day starts on calendar de Arbeitstag beginnt um workdayends calendar de Arbeitstag endet -wrong password for user '%1' !!! calendar de Falsches Passwort für Benutzer '%1' !!! year calendar de Jahr yearly calendar de Jährlich yearview calendar de Jährliche Ansicht diff --git a/calendar/setup/phpgw_en.lang b/calendar/setup/phpgw_en.lang index ce3cd781f4..ab0f07ac82 100644 --- a/calendar/setup/phpgw_en.lang +++ b/calendar/setup/phpgw_en.lang @@ -108,6 +108,7 @@ firstname of person to notify calendar en Firstname of person to notify format of event updates calendar en Format of event updates fr calendar en F free/busy calendar en Free/Busy +freebusy: unknow user '%1', wrong password or not availible to not loged in users !!! calendar en freebusy: Unknow user '%1', wrong password or not availible to not loged in users !!! frequency calendar en Frequency fri calendar en Fri full description calendar en Full Description @@ -259,7 +260,6 @@ test import (show importable records only in browser) calendar en Test Im text calendar en Text th calendar en T the following conflicts with the suggested time: calendar en The following conflicts with the suggested time: -the freebusy information for user '%1' is not availible to not loged in users !!! calendar en The freebusy information for user '%1' is not availible to not loged in users !!! the user %1 is not participating in this event! calendar en The user %1 is not participating in this event! there was an error trying to connect to your news server.
please contact your admin to check the news servername, username or password. calendar en There was an error trying to connect to your news server.
Please contact your admin to check the news servername, username or password. this day is shown as first day in the week or month view. calendar en This day is shown as first day in the week or month view. @@ -287,7 +287,6 @@ today calendar en Today translation calendar en Translation tu calendar en T tue calendar en Tue -unknow user '%1' !!! calendar en Unknow user '%1' !!! update a single entry by passing the fields. calendar en Update a single entry by passing the fields. updated calendar en Updated use end date calendar en Use End date @@ -304,7 +303,6 @@ which of calendar view do you want to see, when you start calendar ? calendar en work day ends on calendar en Work day ends on work day starts on calendar en Work day starts on workdayends calendar en workdayends -wrong password for user '%1' !!! calendar en Wrong password for user '%1' !!! yearly calendar en Yearly yearview calendar en Year View you can either set a year or a occurence, not both !!! calendar en You can either set a Year or a Occurence, not both !!!