From ec25319d61a6077ee8f52e0e9b080b0df8e79856 Mon Sep 17 00:00:00 2001 From: dragob Date: Mon, 23 Aug 2004 14:21:33 +0000 Subject: [PATCH 001/177] =?UTF-8?q?New/updated=20Slovenian=20translations?= =?UTF-8?q?=20(by=20Matev=EF=BF=BD=20Bokal).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- phpgwapi/setup/phpgw_sl.lang | 279 +++++++++++++++++------------------ 1 file changed, 139 insertions(+), 140 deletions(-) diff --git a/phpgwapi/setup/phpgw_sl.lang b/phpgwapi/setup/phpgw_sl.lang index 477ecbd402..ac06d04ee0 100644 --- a/phpgwapi/setup/phpgw_sl.lang +++ b/phpgwapi/setup/phpgw_sl.lang @@ -1,9 +1,9 @@ about %1 common sl Vizitka %1 access common sl Dostopnost access not permitted common sl Dostop ni dovoljen. -account has been created common sl Uporabniški račun je bil ustvarjen. -account has been deleted common sl Uporabniški račun je bil izbrisan. -account has been updated common sl Uporabniški račun je bil osvežen. +account has been created common sl Uporabniki račun je bil ustvarjen. +account has been deleted common sl Uporabniki račun je bil izbrisan. +account has been updated common sl Uporabniki račun je bil osveen. acl common sl ACL action common sl Akcija active common sl Aktiven @@ -16,9 +16,9 @@ admin common sl Admin administration common sl Administracija afghanistan common sl AFGANISTAN albania common sl ALBANIJA -algeria common sl ALŽIRIJA +algeria common sl ALIRIJA all common sl Vse -american samoa common sl AMERIŠKA SAMOA +american samoa common sl AMERIKA SAMOA andorra common sl ANDORA angola common sl ANGOLA anguilla common sl ANGVILA @@ -26,7 +26,7 @@ antarctica common sl ANTARKTIKA antigua and barbuda common sl ANTIGVA IN BARBUDA apply common sl Uporabi april common sl April -are you sure you want to delete this entry ? common sl Ste prepričani, da želite izbrisati ta vnos? +are you sure you want to delete this entry ? common sl Ste prepričani, da elite izbrisati ta vnos? argentina common sl ARGENTINA armenia common sl ARMENIJA aruba common sl ARUBA @@ -35,12 +35,12 @@ australia common sl AVSTRALIJA austria common sl AVSTRIJA author common sl Avtor autosave default category common sl Samodejno shrani privzeto kategorijo -azerbaijan common sl AZARBEJDŽAN +azerbaijan common sl AZARBEJDAN back common sl Nazaj -bad login or password common sl Napačno uporabniško ime ali geslo +bad login or password common sl Napačno uporabniko ime ali geslo bahamas common sl BAHAMI bahrain common sl BAHRAIN -bangladesh common sl BANGLADEŠ +bangladesh common sl BANGLADE barbados common sl BARBADOS belarus common sl BELARUS belgium common sl BELGIJA @@ -48,37 +48,37 @@ belize common sl BELIZE benin common sl BENIN bermuda common sl BERMUDA bhutan common sl BUTAN -blocked, too many attempts common sl Zaklenjeno: preveč poskusov. +blocked, too many attempts common sl Zaklenjeno: preveč poskusov. bolivia common sl BOLIVIJA bosnia and herzegovina common sl BOSNA IN HERCEGOVINA botswana common sl BOCVANA -bouvet island common sl OTOČJE BOUVET +bouvet island common sl OTOČJE BOUVET brazil common sl BRAZILIJA -british indian ocean territory common sl BRITANSKO INDIJSKO OTOČJE +british indian ocean territory common sl BRITANSKO INDIJSKO OTOČJE brunei darussalam common sl BRUNEI DARUSSALAM bulgaria common sl BOLGARIJA burkina faso common sl BURKINA FASO burundi common sl BURUNDI -cambodia common sl KAMBODŽA +cambodia common sl KAMBODA cameroon common sl KAMERUN canada common sl KANADA -cancel common sl Prekliči +cancel common sl Prekliči cape verde common sl CAPE VERDE categories common sl Kategorije categories for common sl kategorije za category common sl Kategorija category %1 has been added ! common sl Dodana je bila kategorija %1! -category %1 has been updated ! common sl Osvežena je bila kategorija %1! +category %1 has been updated ! common sl Osveena je bila kategorija %1! cayman islands common sl KAJMANSKI OTOKI -central african republic common sl CENTRALNOAFRIŠKA REPUBLIKA -chad common sl ČAD +central african republic common sl CENTRALNOAFRIKA REPUBLIKA +chad common sl ČAD change common sl Spremeni -charset common sl UTF-8 -chile common sl ČILE +charset common sl ISO-8859-2 +chile common sl ČILE china common sl KITAJSKA choose the category common sl Izberi kategorijo choose the parent category common sl Izberi nadrejeno kategorijo -christmas island common sl BOŽIČNI OTOK +christmas island common sl BOIČNI OTOK clear common sl Izprazni clear form common sl Izprazni formo close common sl Zapri @@ -86,42 +86,42 @@ cocos (keeling) islands common sl KOKOSOVI (KEELINGOVI) OTOKI colombia common sl KOLUMBIJA comoros common sl KOMORI congo common sl KONGO -congo, the democratic republic of the common sl KONGO, DEMOKRATIČNA REPUBLIKA +congo, the democratic republic of the common sl KONGO, DEMOKRATIČNA REPUBLIKA cook islands common sl COOKOVI OTOKI copy common sl Kopiraj costa rica common sl KOSTARIKA cote d ivoire common sl COTE D IVOIRE create common sl Ustvari created by common sl Ustvaril -croatia common sl HRVAŠKA +croatia common sl HRVAKA cuba common sl KUBA currency common sl Valuta current common sl Trenutno current users common sl Trenutni uporabniki cyprus common sl CIPER -czech republic common sl ČEŠKA REPUBLIKA +czech republic common sl ČEKA REPUBLIKA date common sl Datum date due common sl Rok december common sl December default category common sl Privzeta kategorija -delete common sl Briši +delete common sl Brii denmark common sl DANSKA description common sl Opis detail common sl Podrobnost details common sl Pordrobnosti -disabled common sl Onemogočeno +disabled common sl Onemogočeno display monday first common sl Najprej ponedeljek display sunday first common sl Najprej nedelja -djibouti common sl DŽIBUTI -do you also want to delete all subcategories ? common sl Ali želite izbrisati tudi podkategorije? +djibouti common sl DIBUTI +do you also want to delete all subcategories ? common sl Ali elite izbrisati tudi podkategorije? domain common sl Domena domain name for mail-address, eg. "%1" common sl ime domene za elektronski naslov, npr. "%1" -domestic common sl Domač +domestic common sl Domač dominica common sl DOMINIKA dominican republic common sl DOMINIKANSKA REPUBLIKA -done common sl Končano -drag to move jscalendar sl Povleci za premik -e-mail common sl Epošta +done common sl Končano +drag to move common sl Povleci za premik +e-mail common sl Epota east timor common sl VZHODNI TIMOR ecuador common sl EKVADOR edit common sl Popravi @@ -130,13 +130,13 @@ edit categories common sl Popravi kategorije edit category common sl Popravi kategorijo egypt common sl EGIPT el salvador common sl EL SALVADOR -email common sl Epošta +email common sl Epota email-address of the user, eg. "%1" common sl enaslov uporabnika, npr. "%1" -enabled common sl Omogočeno -end date common sl Končni datum -end time common sl Končni čas -entry has been deleted sucessfully common sl Vnos je bil uspešno izbrisan. -entry updated sucessfully common sl Vnos je bil uspešno osvežen. +enabled common sl Omogočeno +end date common sl Končni datum +end time common sl Končni čas +entry has been deleted sucessfully common sl Vnos je bil uspeno izbrisan. +entry updated sucessfully common sl Vnos je bil uspeno osveen. equatorial guinea common sl EKVATORIALNA GVINEJA eritrea common sl ERITREJA error common sl Napaka @@ -145,12 +145,12 @@ error deleting %1 %2 directory common sl Napaka ob brisanju %1 %2 direktorija. error renaming %1 %2 directory common sl Napaka ob preimoenovanju %1 %2 direktorija. estonia common sl ESTONIJA ethiopia common sl ETIOPIJA -falkland islands (malvinas) common sl FALKLANDSKO OTOČJE (MALVINI) -faroe islands common sl OTOČJE FAROE -fax number common sl št. faksa +falkland islands (malvinas) common sl FALKLANDSKO OTOČJE (MALVINI) +faroe islands common sl OTOČJE FAROE +fax number common sl t. faksa february common sl Februar fields common sl Polja -fiji common sl FIDŽI +fiji common sl FIDI files common sl Datoteke filter common sl Sito finland common sl FINSKA @@ -163,29 +163,29 @@ force selectbox common sl Prisili izbiro france common sl FRANCIJA french guiana common sl FRANCOSKA GVAJANA french polynesia common sl FRANCOSKA POLINEZIJA -french southern territories common sl FRANCOSKI JUŽNI TERITORIJ +french southern territories common sl FRANCOSKI JUNI TERITORIJ friday common sl Petek ftp common sl FTP fullname common sl Polno ime gabon common sl GABON gambia common sl GAMBIJA -general menu common sl Splošni meni +general menu common sl Sploni meni georgia common sl GRUZIJA -germany common sl NEMČIJA +germany common sl NEMČIJA ghana common sl GANA gibraltar common sl GIBRALTAR global common sl Globalno -global public common sl Splošna javnost -go today jscalendar sl Danes +global public common sl Splona javnost +go today common sl Danes grant access common sl Dovoli dostop -greece common sl GRČIJA +greece common sl GRČIJA greenland common sl GRENLANDIJA grenada common sl GRENADA group common sl Skupina group access common sl Dostop skupine group has been added common sl Skupina je bila dodana. group has been deleted common sl Skupina je bila izbrisana. -group has been updated common sl Skupina je bila osvežena. +group has been updated common sl Skupina je bila osveena. group name common sl Ime skupine group public common sl Javnost skupine groups common sl Skupine @@ -199,26 +199,26 @@ guinea-bissau common sl GVINEJA-BISSAU guyana common sl GVAJANA haiti common sl HAITI heard island and mcdonald islands common sl OTOK HERAD IN MCDONALDOVI OTOKI -help common sl Pomoč +help common sl Pomoč high common sl Visoko -highest common sl Najvišje -holy see (vatican city state) common sl SVETI SEDEŽ (MESTNA DRŽAVA VATIKAN) +highest common sl Najvije +holy see (vatican city state) common sl SVETI SEDE (MESTNA DRAVA VATIKAN) home common sl Domov honduras common sl HONDURAS hong kong common sl HONG KONG -hungary common sl MADŽARSKA +hungary common sl MADARSKA iceland common sl ISLANDIJA india common sl INDIJA indonesia common sl INDONEZIJA international common sl Mednarodno -invalid ip address common sl Napačna IP številka -invalid password common sl Napačno geslo +invalid ip address common sl Napačna IP tevilka +invalid password common sl Napačno geslo iran, islamic republic of common sl IRAN, ISLAMSKA REPUBLIKA iraq common sl IRAK ireland common sl IRSKA israel common sl IZRAEL -it has been more then %1 days since you changed your password common sl Od zadnje menjave gesla je preteklo že več kot %1 dni. -it is recommended that you run setup to upgrade your tables to the current version common sl Priporočamo, da poženete namestitev (setup) za nadgradnjo tabel na trenutno različico. +it has been more then %1 days since you changed your password common sl Od zadnje menjave gesla je preteklo e več kot %1 dni. +it is recommended that you run setup to upgrade your tables to the current version common sl Priporočamo, da poenete namestitev (setup) za nadgradnjo tabel na trenutno različico. italy common sl ITALIJA jamaica common sl JAMAJKA january common sl Januar @@ -228,14 +228,14 @@ july common sl Julij june common sl Junij kazakstan common sl KAZAHSTAN kenya common sl KENIJA -keywords common sl Ključne besede +keywords common sl Ključne besede kiribati common sl KIRIBATI -korea, democratic peoples republic of common sl KOREJA, DEMOKRATIČNA REPUBLIKA +korea, democratic peoples republic of common sl KOREJA, DEMOKRATIČNA REPUBLIKA korea, republic of common sl KOREJA, REPUBLIKA kuwait common sl KUVAJT kyrgyzstan common sl KIRGISTAN language common sl Jezik -lao peoples democratic republic common sl LAO, LJUDSKA DEMOKRATIČNA REPUBLIKA +lao peoples democratic republic common sl LAO, LJUDSKA DEMOKRATIČNA REPUBLIKA last name common sl Priimek last name of the user, eg. "%1" common sl priimek uporabnika, npr. "%1" last page common sl Zadnja stran @@ -245,7 +245,7 @@ lebanon common sl LIBANON lesotho common sl LESOTO liberia common sl LIBERIJA libyan arab jamahiriya common sl LIBIJSKA ARABSKA JAMAHIRIJA -license common sl Licenca +license about sl Licenca liechtenstein common sl LICHTENSTEIN list common sl Seznam lithuania common sl LITVA @@ -254,23 +254,22 @@ login common sl Prijava loginid common sl ID ob prijavi logout common sl Odjava low common sl Nizko -lowest common sl Najnižje +lowest common sl Najnije luxembourg common sl LUKSEMBURG macau common sl MAKU -macedonia, the former yugoslav republic of common sl MAKEDONIJA, BIVŠA JUGOSLOVANSA REPUBLIKA +macedonia, the former yugoslav republic of common sl MAKEDONIJA, BIVA JUGOSLOVANSA REPUBLIKA madagascar common sl MADAGASKAR -mail domain, eg. "%1" common sl poštna domena, npr. "%1" +mail domain, eg. "%1" common sl potna domena, npr. "%1" main category common sl Osnovna kategorija main screen common sl Osnovni zaslon -maintainer common sl Vzdrževalec +maintainer about sl Vzdrevalec malawi common sl MALAWI malaysia common sl MALEZIJA maldives common sl MALDIVI mali common sl MALI malta common sl MALTA -manual common sl Priročnik march common sl Marec -marshall islands common sl MARSHALLOVO OTOČJE +marshall islands common sl MARSHALLOVO OTOČJE martinique common sl MARTINIQUE mauritania common sl MAVRETANIJA mauritius common sl MAVRITIUS @@ -278,9 +277,9 @@ may common sl Maj mayotte common sl MAYOTTE medium common sl Srednje menu common sl Meni -message common sl Sporočilo +message common sl Sporočilo mexico common sl MEHIKA -micronesia, federated states of common sl MIKRONEZIJA, ZDRUŽENE DRŽAVE +micronesia, federated states of common sl MIKRONEZIJA, ZDRUENE DRAVE moldova, republic of common sl MOLDOVA, REPUBLIKA monaco common sl MONAKO monday common sl Ponedeljek @@ -298,14 +297,14 @@ netherlands common sl NIZOZEMSKA netherlands antilles common sl NIZOZEMSKI ANTILI never common sl Nikoli new caledonia common sl NOVA KALEDONIJA -new entry added sucessfully common sl Nov vnos je uspešno dodan. +new entry added sucessfully common sl Nov vnos je uspeno dodan. new main category common sl Nova osnovna kategorija new value common sl Nova vrednost new zealand common sl NOVA ZELANDIJA next common sl Naslednji -next month (hold for menu) jscalendar sl Naslednji mesec (drži za meni) +next month (hold for menu) common sl Naslednji mesec (dri za meni) next page common sl Naslednja stran -next year (hold for menu) jscalendar sl Naslednje leto +next year (hold for menu) common sl Naslednje leto nicaragua common sl NIKARAGVA niger common sl NIGER nigeria common sl NIGERIJA @@ -318,7 +317,7 @@ none common sl Noben norfolk island common sl OTOK NORFOLK normal common sl Normalno northern mariana islands common sl SEVERNI MARIANSKI OTOKI -norway common sl NORVEŠKA +norway common sl NORVEKA not assigned common sl ni dodeljeno note common sl Opomba notes common sl Opombe @@ -330,7 +329,7 @@ old value common sl Stara vrednost oman common sl OMAN on *nix systems please type: %1 common sl Na UNIXu podobnih sistemih vnesite: %1 only private common sl samo zasebno -only yours common sl samo vaše +only yours common sl samo vae open notify window common sl Odpri okno z opozorilom open popup window common sl Odpri popup okno original common sl Original @@ -346,32 +345,32 @@ paraguay common sl PARAGVAJ parcel common sl Paket parent category common sl Nadrejena kategorija password common sl Geslo -password could not be changed common sl Gesla ni mogoče zamenjati. +password could not be changed common sl Gesla ni mogoče zamenjati. password has been updated common sl Geslo je bilo zamenjano. pattern for search in addressbook common sl Vzorec za iskanje v adresarju pattern for search in calendar common sl Vzorec za iskanje v koledarju pattern for search in projects common sl Vzorec za iskanje med projektih -permissions to the files/users directory common sl dovoljenja za datoteke/uporabniški direktorij +permissions to the files/users directory common sl dovoljenja za datoteke/uporabniki direktorij personal common sl Zasebno peru common sl PERU philippines common sl FILIPINI -phone number common sl telefonska številka +phone number common sl telefonska tevilka pitcairn common sl PITCARIN -please %1 by hand common sl Prosimo, ročno %1 +please %1 by hand common sl Prosimo, ročno %1 please enter a name common sl Prosimo, vnesite ime! -please run setup to become current common sl Prosimo poženite namestitve za osvežitev. +please run setup to become current common sl Prosimo poenite namestitve za osveitev. please select common sl Prosimo izberite -please set your global preferences common sl Prosimo, vnesite splošne nastavitve. +please set your global preferences common sl Prosimo, vnesite splone nastavitve. please set your preferences for this application common sl Prosimo, vnesite nastavitve za to aplikacijo! -please wait... common sl Prosimo, počakajte... +please wait... common sl Prosimo, počakajte... poland common sl POLJSKA portugal common sl PORTUGALSKA -postal common sl Poštno -powered by phpgroupware version %1 common sl Teče na eGroupware različica %1 +postal common sl Potno +powered by phpgroupware version %1 common sl Teče na eGroupware različica %1 preferences common sl Nastavitve -prev. month (hold for menu) jscalendar sl Prejšnji mesesc (držite za meni) -prev. year (hold for menu) jscalendar sl Prejšnje leto (držite za meni) -previous page common sl Prejšnja stran +prev. month (hold for menu) common sl Prejnji mesesc (drite za meni) +prev. year (hold for menu) common sl Prejnje leto (drite za meni) +previous page common sl Prejnja stran print common sl Natisni priority common sl Prioriteta private common sl Zasebno @@ -401,88 +400,88 @@ sao tome and principe common sl SAO TOME IN PRINCIPE saturday common sl Sobota saudi arabia common sl SAVDSKA ARABIJA save common sl Shrani -search common sl Išči +search common sl Iči section common sl Izbor select common sl Izberi select category common sl Izberi kategorijo select date common sl Izberi datum select group common sl Izberi skupino -select one common sl Izberi +select one common sl Izberi select user common sl Izberi uporabnika -send common sl Pošlji +send common sl Polji senegal common sl SENEGAL september common sl September -server %1 has been added common sl Dodan je bil strežnik %1. -server name common sl Ime strežnika +server %1 has been added common sl Dodan je bil strenik %1. +server name common sl Ime strenika session has been killed common sl Seja je bila prisilno prekinjena. setup common sl Namestitev -seychelles common sl SEJEŠELI -show all common sl prikaži vse +seychelles common sl SEJEELI +show all common sl prikai vse showing %1 common sl prikazanih %1 showing %1 - %2 of %3 common sl prikazani %1 - %2 od %3 sierra leone common sl SIERRA LEONE singapore common sl SINGAPUR -slovakia common sl SLOVAŠKA +slovakia common sl SLOVAKA slovenia common sl SLOVENIJA solomon islands common sl SOLOMONOVI OTOKI somalia common sl SOMALIJA -sorry, your login has expired login sl Oprostite, vaša prijava je potekla. -south africa common sl JUŽNA AFRIKA -south georgia and the south sandwich islands common sl JUŽNA GEORGIJA IN JUŽNO OTOČJE SANDWICH -spain common sl ŠPANIJA -sri lanka common sl ŠRI LANKA -start date common sl Začetni datum -start time common sl Začetni čas +sorry, your login has expired login sl Oprostite, vaa prijava je potekla. +south africa common sl JUNA AFRIKA +south georgia and the south sandwich islands common sl JUNA GEORGIJA IN JUNO OTOČJE SANDWICH +spain common sl PANIJA +sri lanka common sl RI LANKA +start date common sl Začetni datum +start time common sl Začetni čas status common sl Status subject common sl Zadeva -submit common sl Pošlji +submit common sl Polji substitutions and their meanings: common sl Nadomestila in njihov pomen sudan common sl SUDAN sunday common sl Nedelja suriname common sl SURINAM svalbard and jan mayen common sl SVALBARD IN JAN MAJEN swaziland common sl SVAZILAND -sweden common sl ŠVEDSKA -switzerland common sl ŠVICA +sweden common sl VEDSKA +switzerland common sl VICA syrian arab republic common sl SIRIJA, ARABSKA REPUBLIKA taiwan common sl TAJVAN -tajikistan common sl TADŽIKISTAN -tanzania, united republic of common sl TANZANIJA, ZDRUŽENA REPUBLIKA +tajikistan common sl TADIKISTAN +tanzania, united republic of common sl TANZANIJA, ZDRUENA REPUBLIKA thailand common sl TAJSKA the api is current common sl API je aktualen the api requires an upgrade common sl API je potrebno obnoviti the following applications require upgrades common sl Naslednje aplikacije je potrebno nadgraditi -the mail server returned common sl Poštni strežnik je vrnil +the mail server returned common sl Potni strenik je vrnil this application is current common sl Aplikacija je aktualna this application requires an upgrade common sl Aplikacijo je potrebno obnoviti -this name has been used already common sl To ime je že uporabljeno! -thursday common sl Četrtek -time common sl Čas -time zone common sl Časovna cona -time zone offset common sl Zamik časovne cone +this name has been used already common sl To ime je e uporabljeno! +thursday common sl Četrtek +time common sl Čas +time zone common sl Časovna cona +time zone offset common sl Zamik časovne cone title common sl Naslov to correct this error for the future you will need to properly set the common sl Za odpravo ponavljanja te napake bo potrebno pravilno nastaviti -to go back to the msg list, click here common sl Da pridete nazaj na seznam sporočil, kliknite tu. +to go back to the msg list, click here common sl Da pridete nazaj na seznam sporočil, kliknite tu. today common sl Danes -todays date, eg. "%1" common sl današnji datum, npr. "%1" -toggle first day of week jscalendar sl Zamenjajte prvi dan v tednu +todays date, eg. "%1" common sl dananji datum, npr. "%1" +toggle first day of week common sl Zamenjajte prvi dan v tednu togo common sl TOGO tokelau common sl TOKELAU tonga common sl TONGO total common sl Skupaj trinidad and tobago common sl TRINIDAD IN TOBAGO -tuesday common sl Četrtek +tuesday common sl Četrtek tunisia common sl TUNIZIJA -turkey common sl TURČIJA +turkey common sl TURČIJA turkmenistan common sl TURKMENISTAN turks and caicos islands common sl TURKS IN CAICOS OTOKI tuvalu common sl TUVALU uganda common sl UGANDA ukraine common sl UKRAJINA -united arab emirates common sl ZDRUŽENI ARABSKI EMIRATI -united kingdom common sl ZDRUŽENO KRALJESTVO -united states common sl ZDRUŽENE DRŽAVE -united states minor outlying islands common sl CELINSKE ZDRUŽENE DRŽAVE +united arab emirates common sl ZDRUENI ARABSKI EMIRATI +united kingdom common sl ZDRUENO KRALJESTVO +united states common sl ZDRUENE DRAVE +united states minor outlying islands common sl CELINSKE ZDRUENE DRAVE unknown common sl Neznano update common sl Obnovi url common sl URL @@ -492,45 +491,45 @@ use button to search for address common sl Uporabi gumb za iskanje naslova use button to search for calendarevent common sl Uporabi gumb za iskanje dogodka v koledarju use button to search for project common sl Uporabi gumb za iskanje projekta user common sl Uporabnik -user accounts common sl uporabniško ime -user groups common sl uporabniška skupina -username common sl Uporabniško ime +user accounts common sl uporabniko ime +user groups common sl uporabnika skupina +username common sl Uporabniko ime users common sl uporabniki -users choice common sl Uporabniški izbor +users choice common sl Uporabniki izbor uzbekistan common sl UZBEKISATAN vanuatu common sl VANUATU venezuela common sl VENEZUELA -version common sl Različica +version common sl Različica viet nam common sl VIETNAM view common sl Pregled -virgin islands, british common sl DEVIŠKI OTOKI (BRITANSKI) -virgin islands, u.s. common sl DEVIŠKI OTOKI (ZDA) +virgin islands, british common sl DEVIKI OTOKI (BRITANSKI) +virgin islands, u.s. common sl DEVIKI OTOKI (ZDA) wallis and futuna common sl WALLIS IN FUTUNA wednesday common sl Sreda -welcome common sl Dobrodošli! +welcome common sl Dobrodoli! western sahara common sl ZAHODNA SAHARA which groups common sl Katere skupine -wk jscalendar sl wk +wk common sl wk written by: common sl Napisal: year common sl Leto yemen common sl JEMEN yes common sl Da you are required to change your password during your first login common sl Ob prvi prijavi morate zamenjati geslo -you are running a newer version of phpgroupware than your database is setup for common sl Uporabljate novejšo različico egroupware, kot je nameščena v bazi podatkov. -you have been successfully logged out login sl Bili ste uspešno odjavljeni. +you are running a newer version of phpgroupware than your database is setup for common sl Uporabljate novejo različico egroupware, kot je namečena v bazi podatkov. +you have been successfully logged out login sl Bili ste uspeno odjavljeni. you have not entered a title common sl Niste vnesli naslova you have not entered a valid date common sl Niste vnesli veljavnega datuma -you have not entered a valid time of day common sl Niste vnesli veljavnega časa v dnevu -you have not entered participants common sl Niste vnesli udeležencev -you have selected an invalid date common sl Izbrali ste napačen datum -you have selected an invalid main category common sl Izbrali ste napačno osnovno kategorijo -you have successfully logged out common sl Bili ste uspešno odjavljeni -your message could not be sent!
common sl Vaše sporočilo ni bilo poslano!
-your message has been sent common sl Vaše sporočilo je bilo poslano. +you have not entered a valid time of day common sl Niste vnesli veljavnega časa v dnevu +you have not entered participants common sl Niste vnesli udeleencev +you have selected an invalid date common sl Izbrali ste napačen datum +you have selected an invalid main category common sl Izbrali ste napačno osnovno kategorijo +you have successfully logged out common sl Bili ste uspeno odjavljeni +your message could not be sent!
common sl Vae sporočilo ni bilo poslano!
+your message has been sent common sl Vae sporočilo je bilo poslano. your search returned %1 matchs common sl najdenih %1 zadetkov your search returned 1 match common sl najden 1 zadetek. -your session could not be verified. login sl Vaša seja ne more biti potrjena. -your settings have been updated common sl Vaše nastavitve so bile osvežene. +your session could not be verified. login sl Vaa seja ne more biti potrjena. +your settings have been updated common sl Vae nastavitve so bile osveene. yugoslavia common sl JUGOSLAVIJA zambia common sl ZAMBIJA zimbabwe common sl ZIMBABWE From d7fc09daefdfb81065b55523b5fc6a84e49c9db7 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 23 Aug 2004 18:18:26 +0000 Subject: [PATCH 002/177] fixed probs pointed out by Joxean Koret --- phpgwapi/inc/common_functions.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpgwapi/inc/common_functions.inc.php b/phpgwapi/inc/common_functions.inc.php index f1d0ba064d..7cf0a7e14d 100755 --- a/phpgwapi/inc/common_functions.inc.php +++ b/phpgwapi/inc/common_functions.inc.php @@ -1213,7 +1213,7 @@ } else { - if (preg_match('/<\/?script>/i',$val)) + if (preg_match('/<\/?[^>]*(script|onabort|onblur|onchange|onclick|ondblclick|onerror|onfocus|onkeydown|onkeypress|onkeyup|onload|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|onreset|onselect|onsubmit|onunload|javascript)+[^>]*>/i',$val)) { unset($var[$key]); } From ed8760d1994f655ed2c889c48fb7ebb4b4bcb111 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 23 Aug 2004 18:44:37 +0000 Subject: [PATCH 003/177] fixing the fix ;-) --- phpgwapi/inc/class.nextmatchs.inc.php | 41 ++++++++++++++------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/phpgwapi/inc/class.nextmatchs.inc.php b/phpgwapi/inc/class.nextmatchs.inc.php index 8d3d9351f6..64896ee676 100644 --- a/phpgwapi/inc/class.nextmatchs.inc.php +++ b/phpgwapi/inc/class.nextmatchs.inc.php @@ -178,11 +178,14 @@ 'lang_select' => lang('Select'), 'cat_field' => $cat_field, 'categories' => $GLOBALS['phpgw']->categories->formated_list('select','all',$cat_id,'True'), - 'filter_value' => $this->_filter, - 'qfield' => $this->_qfield, - 'start_value' => (int)$localstart, - 'order_value' => $this->_order, - 'sort_value' => $this->_sort, + 'hidden' => $GLOBALS['phpgw']->html->input_hidden(array( + 'filter' => $this->_filter, + 'qfield' => $this->_qfield, + 'start' => (int)$localstart, + 'order' => $this->_order, + 'sort' => $this->_sort, + 'query' => $GLOBALS['query'], + )), 'query_value' => $GLOBALS['phpgw']->html->htmlspecialchars($GLOBALS['query']), 'table_width' => $twidth, 'th_bg' => $GLOBALS['phpgw_info']['theme']['th_bg'], @@ -329,12 +332,12 @@ 'form_action' => ($this->_menuaction?$this->page($extra):$GLOBALS['phpgw']->link($sn, $extra)), 'th_bg' => $GLOBALS['phpgw_info']['theme']['th_bg'], 'hidden' => $GLOBALS['phpgw']->html->input_hidden(array( - 'filter_value' => $this->_filter, - 'qfield_value' => $this->_qfield, - 'start_value' => 0, - 'order_value' => $this->_order, - 'sort_value' => $this->_sort, - 'query_value' => $GLOBALS['query'], + 'filter' => $this->_filter, + 'qfield' => $this->_qfield, + 'start' => 0, + 'order' => $this->_order, + 'sort' => $this->_sort, + 'query' => $GLOBALS['query'], )), 'search' => $this->search($search_obj), 'filter' => ($filter_obj?$this->filter($filter_obj,$yours):'') @@ -362,12 +365,12 @@ 'cat_field' => $cat_field, 'categories' => $GLOBALS['phpgw']->categories->formated_list('select','all',(int)$cat_id,'True'), 'hidden' => $GLOBALS['phpgw']->html->input_hidden(array( - 'filter_value' => $this->_filter, - 'qfield_value' => $this->_qfield, - 'start_value' => 0, - 'order_value' => $this->_order, - 'sort_value' => $this->_sort, - 'query_value' => $GLOBALS['query'], + 'filter' => $this->_filter, + 'qfield' => $this->_qfield, + 'start' => 0, + 'order' => $this->_order, + 'sort' => $this->_sort, + 'query' => $GLOBALS['query'], )), 'th_bg' => $GLOBALS['phpgw_info']['theme']['th_bg'], 'search' => $this->search($search_obj), @@ -456,7 +459,7 @@ { $this->_qfield = $search_obj[$index][0]; } - $str .= ''; + $str .= ''; } $str = '' . "\n"; } @@ -661,7 +664,7 @@ $extra = $this->extras_to_string($extra); } - $extravar = 'order='.$var.'&sort='.$sort.'&filter='.$this->_filter.'&this->_qfield='.$qfield.'&start='.$this->_start.'&query='.urlencode(stripslashes(@$GLOBALS['query'])).$extra; + $extravar = 'order='.$var.'&sort='.$sort.'&filter='.$this->_filter.'&qfield='.$this->_qfield.'&start='.$this->_start.'&query='.urlencode(stripslashes(@$GLOBALS['query'])).$extra; $link = ($this->_menuaction?$this->page($extravar):$GLOBALS['phpgw']->link($program,$extravar)); From e027149a05f551693feae46a1a01b497539ac802 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 24 Aug 2004 10:45:07 +0000 Subject: [PATCH 004/177] fixed delete-problem of anglemail after security update --- phpgwapi/inc/common_functions.inc.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/phpgwapi/inc/common_functions.inc.php b/phpgwapi/inc/common_functions.inc.php index 7cf0a7e14d..1036a1dd2c 100755 --- a/phpgwapi/inc/common_functions.inc.php +++ b/phpgwapi/inc/common_functions.inc.php @@ -1201,7 +1201,7 @@ return $_GET['menuaction'] ? $_GET['menuaction'] : str_replace(PHPGW_SERVER_ROOT,'',$_SERVER['SCRIPT_FILENAME']); } - function _check_script_tag(&$var) + function _check_script_tag(&$var,$name='') { if (is_array($var)) { @@ -1209,12 +1209,13 @@ { if (is_array($val)) { - _check_script_tag($var[$key]); + _check_script_tag($var[$key],$name.'['.$key.']'); } else { if (preg_match('/<\/?[^>]*(script|onabort|onblur|onchange|onclick|ondblclick|onerror|onfocus|onkeydown|onkeypress|onkeyup|onload|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|onreset|onselect|onsubmit|onunload|javascript)+[^>]*>/i',$val)) { + //echo "

*** _check_script_tag($name): unset($name [$key]) ***

\n"; unset($var[$key]); } } @@ -1237,7 +1238,8 @@ } if (is_array($GLOBALS[$where])) { - _check_script_tag($GLOBALS[$where]); + _check_script_tag($GLOBALS[$where],$where); + reset($GLOBALS[$where]); // in case some stupid old code expects the array-pointer to be at the start of the array } } ?> From 046609d8510fde9d53879331064d3cbb001fb456 Mon Sep 17 00:00:00 2001 From: alpeb Date: Tue, 24 Aug 2004 19:43:19 +0000 Subject: [PATCH 005/177] =?UTF-8?q?Fixed=20wrong=20time=20when=20exporting?= =?UTF-8?q?=20to=20vcal.=20Also=20changed=20ical=20versi=EF=BF=BD=EF=BF=BD?= =?UTF-8?q?n=20from=202.0=20to=201.0=20because=20outlook=202000=20was=20re?= =?UTF-8?q?jecting=20icals=20with=20this=20version.=20Shouldn't=20I=20have?= =?UTF-8?q?=20changed=20this=20version=20number=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- calendar/inc/class.boicalendar.inc.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/calendar/inc/class.boicalendar.inc.php b/calendar/inc/class.boicalendar.inc.php index 9eae617ccc..98258547ae 100755 --- a/calendar/inc/class.boicalendar.inc.php +++ b/calendar/inc/class.boicalendar.inc.php @@ -3375,7 +3375,7 @@ $ical = $this->new_ical(); $this->set_var($ical['prodid'],'value','-//eGroupWare//eGroupWare '.$setup_info['calendar']['version'].' MIMEDIR//'.strtoupper($GLOBALS['phpgw_info']['user']['preferences']['common']['lang'])); - $this->set_var($ical['version'],'value','2.0'); + $this->set_var($ical['version'],'value','1.0'); $this->set_var($ical['method'],'value',strtoupper($method)); if(!$GLOBALS['phpgw_info']['flags']['included_classes']['uicalendar']) @@ -3419,10 +3419,10 @@ } } - // use system's date info for caluculating local timezone's offset in minutes - // - $gmt_offset = date('O',$GLOBALS['phpgw']->datetime->users_localtime); // offset to GMT - $offset = (int)(substr($gmt_offset, 0, 3)) * 60 + (int)(substr($gmt_offset, 3, 2)); + // $event has times in user's time zone, so have to adjust them to GMT, which is used by ical + // To do that one must substract the users time zone difference with the server and then substract the server's time zone difference with GMT + $gmt_offset = date('O'); // server's offset to GMT + $offset = ((int)(substr($gmt_offset, 0, 3)) + $GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset']) * 60 + (int)(substr($gmt_offset, 3, 2)); $event['start']['min'] -= $offset; $event['end']['min'] -= $offset; $event['modtime']['min'] -= $offset; From fb1f4f9d6bbfc27c52c50fa17482979a5ad11e7e Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 24 Aug 2004 19:57:47 +0000 Subject: [PATCH 006/177] renamed html class in admin to html_tables, as the name clashes with the class html in the api --- ...lass.html.inc.php => class.html_tables.inc.php} | 2 +- admin/inc/class.uilog.inc.php | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) rename admin/inc/{class.html.inc.php => class.html_tables.inc.php} (99%) mode change 100755 => 100644 diff --git a/admin/inc/class.html.inc.php b/admin/inc/class.html_tables.inc.php old mode 100755 new mode 100644 similarity index 99% rename from admin/inc/class.html.inc.php rename to admin/inc/class.html_tables.inc.php index e20f2730c5..771aeb34fd --- a/admin/inc/class.html.inc.php +++ b/admin/inc/class.html_tables.inc.php @@ -12,7 +12,7 @@ /* $Id$ */ - class html + class html_tables { function hash_table($rows,$head='',$obj, $frtn) { diff --git a/admin/inc/class.uilog.inc.php b/admin/inc/class.uilog.inc.php index 7c06bb2423..0dced91fd6 100644 --- a/admin/inc/class.uilog.inc.php +++ b/admin/inc/class.uilog.inc.php @@ -31,15 +31,15 @@ $GLOBALS['phpgw']->redirect_link('/index.php'); } - $_cols = $GLOBALS['HTTP_POST_VARS']['_cols']; - $nocols = $GLOBALS['HTTP_POST_VARS']['nocols']; - $_delcol = $GLOBALS['HTTP_POST_VARS']['_delcol']; - $layout = $GLOBALS['HTTP_POST_VARS']['layout']; - $editable = $GLOBALS['HTTP_GET_VARS']['editable']; - $modifytable = $GLOBALS['HTTP_GET_VARS']['modifytable'] ? $GLOBALS['HTTP_GET_VARS']['modifytable'] : $GLOBALS['HTTP_POST_VARS']['modifytable']; + $_cols = $_POST['_cols']; + $nocols = $_POST['nocols']; + $_delcol = $_POST['_delcol']; + $layout = $_POST['layout']; + $editable = $_GET['editable']; + $modifytable = $_GET['modifytable'] ? $_GET['modifytable'] : $_POST['modifytable']; $this->bolog = CreateObject('admin.bolog',True); - $this->html = createobject('admin.html'); + $this->html = createobject('admin.html_tables'); $this->t = CreateObject('phpgwapi.Template',$GLOBALS['phpgw']->common->get_tpl_dir('admin')); $this->lastid = ''; $this->editmode = False; From acc5c0dfb006b59af7f55063554a3e4f93e3b6f2 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 24 Aug 2004 19:59:31 +0000 Subject: [PATCH 007/177] foreach instead of while-list-each --- admin/inc/class.uiconfig.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/inc/class.uiconfig.inc.php b/admin/inc/class.uiconfig.inc.php index f204cc8f26..f1165dcb28 100644 --- a/admin/inc/class.uiconfig.inc.php +++ b/admin/inc/class.uiconfig.inc.php @@ -78,7 +78,7 @@ /* Load hook file with functions to validate each config (one/none/all) */ $GLOBALS['phpgw']->hooks->single('config_validate',$appname); - while (list($key,$config) = each($_POST['newsettings'])) + foreach($_POST['newsettings'] as $key => $config) { if ($config) { From d5b8419f8dfa471ad81629fa5f88bda6f8f6e663 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 24 Aug 2004 20:01:49 +0000 Subject: [PATCH 008/177] fixing the fix, now even all sub-arrays get reset --- phpgwapi/inc/common_functions.inc.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/phpgwapi/inc/common_functions.inc.php b/phpgwapi/inc/common_functions.inc.php index 1036a1dd2c..d98bad354c 100755 --- a/phpgwapi/inc/common_functions.inc.php +++ b/phpgwapi/inc/common_functions.inc.php @@ -1220,6 +1220,8 @@ } } } + // in case some stupid old code expects the array-pointer to be at the start of the array + reset($var); } } @@ -1239,7 +1241,6 @@ if (is_array($GLOBALS[$where])) { _check_script_tag($GLOBALS[$where],$where); - reset($GLOBALS[$where]); // in case some stupid old code expects the array-pointer to be at the start of the array } } ?> From 45c0f356ef0c792afbf8e867621cbf249f22a1b2 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Wed, 25 Aug 2004 11:21:23 +0000 Subject: [PATCH 009/177] replaced all while-list-each with foreach, as requested in patch [ 1015863 ] Admin does not save ACL rights and Site Configuration --- admin/inc/class.uiaclmanager.inc.php | 75 ++++++++++++++++------------ admin/inc/class.uiconfig.inc.php | 12 ++--- 2 files changed, 45 insertions(+), 42 deletions(-) diff --git a/admin/inc/class.uiaclmanager.inc.php b/admin/inc/class.uiaclmanager.inc.php index f6cdc51832..73a3711d3e 100644 --- a/admin/inc/class.uiaclmanager.inc.php +++ b/admin/inc/class.uiaclmanager.inc.php @@ -54,39 +54,45 @@ $this->template->set_block('app_list','link_row'); $this->template->set_block('app_list','spacer_row'); - while (is_array($GLOBALS['acl_manager']) && list($app,$locations) = each($GLOBALS['acl_manager'])) + if (is_array($GLOBALS['acl_manager'])) { - $icon = $GLOBALS['phpgw']->common->image($app,array('navbar.gif',$app.'.gif')); - $this->template->set_var('icon_backcolor',$GLOBALS['phpgw_info']['theme']['row_off']); - $this->template->set_var('link_backcolor',$GLOBALS['phpgw_info']['theme']['row_off']); - $this->template->set_var('app_name',$GLOBALS['phpgw_info']['apps'][$app]['title']); - $this->template->set_var('a_name',$appname); - $this->template->set_var('app_icon',$icon); - - if ($icon) + foreach($GLOBALS['acl_manager'] as $app => $locations) { - $this->template->fp('rows','app_row',True); + $icon = $GLOBALS['phpgw']->common->image($app,array('navbar.gif',$app.'.gif')); + $this->template->set_var('icon_backcolor',$GLOBALS['phpgw_info']['theme']['row_off']); + $this->template->set_var('link_backcolor',$GLOBALS['phpgw_info']['theme']['row_off']); + $this->template->set_var('app_name',$GLOBALS['phpgw_info']['apps'][$app]['title']); + $this->template->set_var('a_name',$appname); + $this->template->set_var('app_icon',$icon); + + if ($icon) + { + $this->template->fp('rows','app_row',True); + } + else + { + $this->template->fp('rows','app_row_noicon',True); + } + + if (is_array($locations)) + { + foreach($locations as $loc => $value) + { + $link_values = array( + 'menuaction' => 'admin.uiaclmanager.access_form', + 'location' => $loc, + 'acl_app' => $app, + 'account_id' => $this->account_id + ); + + $this->template->set_var('link_location',$GLOBALS['phpgw']->link('/index.php',$link_values)); + $this->template->set_var('lang_location',lang($value['name'])); + $this->template->fp('rows','link_row',True); + } + } + + $this->template->parse('rows','spacer_row',True); } - else - { - $this->template->fp('rows','app_row_noicon',True); - } - - while (is_array($locations) && list($loc,$value) = each($locations)) - { - $link_values = array( - 'menuaction' => 'admin.uiaclmanager.access_form', - 'location' => urlencode($loc), - 'acl_app' => $app, - 'account_id' => $this->account_id - ); - - $this->template->set_var('link_location',$GLOBALS['phpgw']->link('/index.php',$link_values)); - $this->template->set_var('lang_location',lang($value['name'])); - $this->template->fp('rows','link_row',True); - } - - $this->template->parse('rows','spacer_row',True); } $this->template->set_var(array( 'cancel_action' => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_users'), @@ -104,9 +110,12 @@ if ($_POST['submit']) { $total_rights = 0; - while (is_array($_POST['acl_rights']) && list(,$rights) = each($_POST['acl_rights'])) + if (is_array($_POST['acl_rights'])) { - $total_rights += $rights; + foreach($_POST['acl_rights'] as $rights) + { + $total_rights += $rights; + } } if ($total_rights) { @@ -145,7 +154,7 @@ $this->template->set_var('form_action',$GLOBALS['phpgw']->link('/index.php',$link_values)); $total = 0; - while (list($name,$value) = each($acl_manager['rights'])) + foreach($acl_manager['rights'] as $name => $value) { $cb .= ' '.lang($name)."
\n"; } diff --git a/admin/inc/class.uiconfig.inc.php b/admin/inc/class.uiconfig.inc.php index f1165dcb28..e983af549a 100644 --- a/admin/inc/class.uiconfig.inc.php +++ b/admin/inc/class.uiconfig.inc.php @@ -162,17 +162,11 @@ $GLOBALS['phpgw']->hooks->single('config',$appname); - while (list($null,$value) = each($vars)) + foreach($vars as $value) { $valarray = explode('_',$value); - $type = $valarray[0]; - $new = $newval = ''; - - while($chunk = next($valarray)) - { - $new[] = $chunk; - } - $newval = implode(' ',$new); + $type = array_shift($valarray); + $newval = implode(' ',$valarray); switch ($type) { From d03d7e011494a33fe1371a71bbc1f40aa8dec5b4 Mon Sep 17 00:00:00 2001 From: reinerj Date: Wed, 25 Aug 2004 14:28:16 +0000 Subject: [PATCH 010/177] replace the bad word grrr --- admin/setup/phpgw_sl.lang | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/admin/setup/phpgw_sl.lang b/admin/setup/phpgw_sl.lang index 33a426c23a..57d97704ae 100644 --- a/admin/setup/phpgw_sl.lang +++ b/admin/setup/phpgw_sl.lang @@ -149,7 +149,7 @@ enter the full path for temporary files.
examples: /tmp, c:temp admin sl Vnes enter the full path for users and group files.
examples: /files, e:\files admin sl Vnesite polno pot do datotek uporabnikov in skupin.
Primera: /files, E:\FILES enter the full path for users and group files.
examples: /files, e:files admin sl Vnesite polno pot do datotek uporabnikov in skupin.
Primera: /files, E:\FILES enter the hostname of the machine on which this server is running admin sl Vnesite ime strežnika skupine, na kateri teče strežnik. -enter the location of phpgroupware's url.
example: http://www.domain.com/phpgroupware   or   /phpgroupware
no trailing slash admin sl Vnesite URP vašega eGroupware strežnika.
Primer: http://www.domena.si/egw   ali   /egw
Brez končne poševnice. +enter the location of egroupware's url.
example: http://www.domain.com/egroupware   or   /egroupware
no trailing slash admin sl Vnesite URP vašega eGroupware strežnika.
Primer: http://www.domena.si/egw   ali   /egw
Brez končne poševnice. enter the search string. to show all entries, empty this field and press the submit button again admin sl Vnesite niz za iskanje. Za prikaz vseh vnosov izpraznite to polje in kliknite gumb Pošlji. enter the site password for peer servers admin sl Vnesite geslo vzporednega strežnika enter the site username for peer servers admin sl Vnesite uporabniško ime vzporednega strežnika @@ -352,9 +352,9 @@ view user account admin sl Preglej uporabnikov račun who would you like to transfer all records owned by the deleted user to? admin sl Komu se dodelijo vsi zapisi v lasti izbrisanega uporabnika? would you like egroupware to check for a new version
when admins login ? admin sl Želite, da eGroupWare preveri za novo verzijo,
ko se prijavi administrator? would you like egroupware to check for new application versions when admins login ? admin sl Želite, da eGroupWare preveri za novo verzijo programov,
ko se prijavi administrator? -would you like phpgroupware to cache the phpgw info array ? admin sl Ali želite, da eGroupware shrani spremenljivko phpgw_info v predpomnilnik? -would you like phpgroupware to check for a new version
when admins login ? admin sl Ali želite, da eGroupware preveri veljavnost različice ob administratorjevi prijavi? -would you like phpgroupware to check for new application versions when admins login ? admin sl Ali želite, da eGroupware preveri veljavnost različice aplikacij ob administratorjevi prijavi? +would you like egroupware to cache the phpgw info array ? admin sl Ali želite, da eGroupware shrani spremenljivko phpgw_info v predpomnilnik? +would you like egroupware to check for a new version
when admins login ? admin sl Ali želite, da eGroupware preveri veljavnost različice ob administratorjevi prijavi? +would you like egroupware to check for new application versions when admins login ? admin sl Ali želite, da eGroupware preveri veljavnost različice aplikacij ob administratorjevi prijavi? would you like to automaticaly load new langfiles (at login-time) ? admin sl Ali želite avtomatično naložiti popravke jezika (ob prijavi)? would you like to show each application's upgrade status ? admin sl Ali želite prikazati status različice vsake aplikacije? xml-rpc admin sl XML_RPC From a806550d644347ea0879cfad9a10ffe7d9a5f32f Mon Sep 17 00:00:00 2001 From: reinerj Date: Wed, 25 Aug 2004 15:14:09 +0000 Subject: [PATCH 011/177] replace the bad word grrr --- phpgwapi/setup/phpgw_sl.lang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpgwapi/setup/phpgw_sl.lang b/phpgwapi/setup/phpgw_sl.lang index ac06d04ee0..33c4a26b2b 100644 --- a/phpgwapi/setup/phpgw_sl.lang +++ b/phpgwapi/setup/phpgw_sl.lang @@ -366,7 +366,7 @@ please wait... common sl Prosimo, počakajte... poland common sl POLJSKA portugal common sl PORTUGALSKA postal common sl Potno -powered by phpgroupware version %1 common sl Teče na eGroupware različica %1 +powered by egroupware version %1 common sl Teče na eGroupware različica %1 preferences common sl Nastavitve prev. month (hold for menu) common sl Prejnji mesesc (drite za meni) prev. year (hold for menu) common sl Prejnje leto (drite za meni) @@ -515,7 +515,7 @@ year common sl Leto yemen common sl JEMEN yes common sl Da you are required to change your password during your first login common sl Ob prvi prijavi morate zamenjati geslo -you are running a newer version of phpgroupware than your database is setup for common sl Uporabljate novejo različico egroupware, kot je namečena v bazi podatkov. +you are running a newer version of egroupware than your database is setup for common sl Uporabljate novejo različico egroupware, kot je namečena v bazi podatkov. you have been successfully logged out login sl Bili ste uspeno odjavljeni. you have not entered a title common sl Niste vnesli naslova you have not entered a valid date common sl Niste vnesli veljavnega datuma From db7cd1697e126e267e91714606ca3de7dc639253 Mon Sep 17 00:00:00 2001 From: mgalgoci Date: Wed, 25 Aug 2004 15:33:59 +0000 Subject: [PATCH 012/177] fix long standing issue in is_owner() - mailto is a subarray of organizer. --- calendar/inc/class.boicalendar.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calendar/inc/class.boicalendar.inc.php b/calendar/inc/class.boicalendar.inc.php index 98258547ae..b557e414b2 100755 --- a/calendar/inc/class.boicalendar.inc.php +++ b/calendar/inc/class.boicalendar.inc.php @@ -2907,7 +2907,7 @@ function is_owner($part_record) { - if(($part_record['user'].'@'.$part_record['host'] == $GLOBALS['phpgw_info']['user']['preferences']['email']['address']) || + if(($part_record['mailto']['user'].'@'.$part_record['mailto']['host'] == $GLOBALS['phpgw_info']['user']['preferences']['email']['address']) || ($part_record['cn'] == $GLOBALS['phpgw_info']['user']['account_lid'])) { return True; From 6a8455291803eece1d64d3a07c0c55e7c87c4079 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oscar=20Manuel=20G=C3=B3mez=20Senovilla?= Date: Wed, 25 Aug 2004 17:50:48 +0000 Subject: [PATCH 013/177] *** empty log message *** --- phpgwapi/setup/phpgw_es-ca.lang | 107 ++++++++++++++++++-------------- 1 file changed, 61 insertions(+), 46 deletions(-) diff --git a/phpgwapi/setup/phpgw_es-ca.lang b/phpgwapi/setup/phpgw_es-ca.lang index 54a722139b..190ba399e5 100644 --- a/phpgwapi/setup/phpgw_es-ca.lang +++ b/phpgwapi/setup/phpgw_es-ca.lang @@ -1,21 +1,24 @@ %1 email addresses inserted common es-ca %1 adreces de correu afegides +%1 is not executable by the webserver !!! common es-ca %1 no es pot executar en el servidor web !!! %1egroupware%2 is a multi-user, web-based groupware suite written in %3php%4. common es-ca %1eGroupWare%2 s una eina de treball en grup, multiusuari i basada en web escrita en %3PHP%4 (shift-)click or drag to change value jscalendar es-ca (Maj-)+clic o arrosegar per a canviar el valor - click on any of the time parts to increase it jscalendar es-ca - Premeu en qualsevol part de l'hora per a incrementar-la -- hold mouse button on any of the above buttons for faster selection. jscalendar es-ca - Mantingueu premut el bot del ratol en qualsevol dels botons anteriors per a una sel.lecci ms rpida. -- or click and drag for faster selection. jscalendar es-ca - o premeu i arrosegueu per a una sel.lecci ms rpida. +- hold mouse button on any of the above buttons for faster selection. jscalendar es-ca - Mantingueu premut el bot del ratol en qualsevol dels botons anteriors per a una selecci ms rpida. +- or click and drag for faster selection. jscalendar es-ca - o premeu i arrosegueu per a una selecci ms rpida. - or shift-click to decrease it jscalendar es-ca - o Maj+clic per disminuir -- use the %1, %2 buttons to select month jscalendar es-ca - Useu els botons %1, %2 per a sel.leccionar el mes -- use the %1, %2 buttons to select year jscalendar es-ca - Useu els botons %1, %2 per a sel.leccionar l'any -00 (disable) admin es-ca 00 (desactivar) +- use the %1, %2 buttons to select month jscalendar es-ca - Useu els botons %1, %2 per a seleccionar el mes +- use the %1, %2 buttons to select year jscalendar es-ca - Useu els botons %1, %2 per a seleccionar l'any +00 (disable) admin es-ca 00 (desactiva) 13 (ntp) admin es-ca 13 (ntp) +3 number of chars for day-shortcut common es-ca 3 carcters per a l'abreviatura del dia +3 number of chars for month-shortcut common es-ca 3 carcters per a l'abreviatura del mes 80 (http) admin es-ca 80 (http) about common es-ca Quant a about %1 common es-ca Quant a %1 about the calendar jscalendar es-ca Quant al calendari about this editor htmlarea es-ca Quant a aquest editor access common es-ca Accs -access not permitted common es-ca Accs no perms +access not permitted common es-ca Accs no perms access type common es-ca Tipo Acceso account has been created common es-ca Compte creat account has been deleted common es-ca Compte esborrat @@ -37,7 +40,7 @@ afghanistan common es-ca AFGANISTAN albania common es-ca ALBNIA algeria common es-ca ALGRIA all common es-ca Tot -alphabet common es-ca a,b,c,,d,e,f,g,h,i,j,k,l,m,n,,o,p,q,r,s,t,u,v,w,x,y,z +alphabet common es-ca a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z american samoa common es-ca SAMOA AMERICANA andorra common es-ca ANDORRA angola common es-ca ANGOLA @@ -75,7 +78,7 @@ belize common es-ca BELIZE benin common es-ca BENIN bermuda common es-ca BERMUDA bhutan common es-ca BHUTAN -blocked, too many attempts common es-ca Bloquejat, masses intents +blocked, too many attempts common es-ca Bloquejat, massa intents bold htmlarea es-ca Negreta bolivia common es-ca BOLIVIA bookkeeping common es-ca Contabilidad @@ -93,7 +96,7 @@ calendar common es-ca Calendari cambodia common es-ca CAMBODJA cameroon common es-ca CAMERUN canada common es-ca CANADA -cancel common es-ca Cancel.lar +cancel common es-ca Cancellar cape verde common es-ca CAP VERD categories common es-ca Categories categories for common es-ca categories per @@ -106,7 +109,7 @@ central african republic common es-ca REP chad common es-ca TXAD change common es-ca Canvi charset common es-ca iso-8859-1 -check installation common es-ca Comprovar instal.laci +check installation common es-ca Comprovar installaci chile common es-ca XILE china common es-ca XINA choose the category common es-ca Trieu la categoria @@ -123,6 +126,8 @@ colombia common es-ca COL comoros common es-ca COMORES company common es-ca Empresa company directory common es-ca Directorio de la Organizacion +config password common es-ca Configura Contrasenya +config username common es-ca Configura Nom d'Usuari congo common es-ca CONGO congo, the democratic republic of the common es-ca CONGO, REPBLICA DEMOCRTICA DEL cook islands common es-ca ILLES COOK @@ -138,26 +143,27 @@ currency common es-ca Moneda current common es-ca Actual current style htmlarea es-ca Estil actual current users common es-ca Usuaris actuals -cut selection htmlarea es-ca Tallar sel.lecci +cut selection htmlarea es-ca Retallar selecci cyprus common es-ca XIPRE czech republic common es-ca REPBLICA TXECA date common es-ca Data date due common es-ca Data lmit -date selection: jscalendar es-ca Sel.lecci de data: +date selection: jscalendar es-ca Selecci de data: datetime port.
if using port 13, please set firewall rules appropriately before submitting this page.
(port: 13 / host: 129.6.15.28) admin es-ca Port de data.
Si useu el port 13, si us plau, configureu acuradament les regles del tallafocs abans d'enviar aquesta plana.
december common es-ca Desembre -decrease indent htmlarea es-ca Redur sangria +decrease indent htmlarea es-ca Reduir sangria default category common es-ca Categoria predeterminada delete common es-ca Esborrar denmark common es-ca DINAMARCA description common es-ca Descripci -detail common es-ca Detalle +detail common es-ca Detall details common es-ca Detalls -diable the execution a bugfixscript for internet explorer 5.5 and higher to show transparency in png-images? common es-ca Desactivar la execuci del pegat d'IE 5.5 i superiors per mostrar transparncies en imatges PNG? +diable the execution a bugfixscript for internet explorer 5.5 and higher to show transparency in png-images? common es-ca Desactivar l'execuci del pegat d'IE 5.5 i superiors per mostrar transparncies en imatges PNG? disable internet explorer png-image-bugfix common es-ca Desactivar el pegat d'IE per veure imatges PNG disable slider effects common es-ca Desactivar efectes lliscants disable the animated slider effects when showing or hiding menus in the page? opera and konqueror users will probably must want this. common es-ca Desactivar efectes lliscants animats en mostrar o amagar mens a la plana? Opera i Konqueror probablement ho necessiten. disabled common es-ca Desactivat +display %s first common es-ca Mostra %s primer display monday first jscalendar es-ca Mostrar Dilluns primer display sunday first jscalendar es-ca Mostar Diumenge primer djibouti common es-ca DJIBOUTI @@ -216,7 +222,7 @@ first page common es-ca Primera plana firstname common es-ca Nom de pila fixme! common es-ca ARREGLEU-ME! font color htmlarea es-ca Color de la lletra -force selectbox common es-ca Forar quadre de sel.lecci +force selectbox common es-ca Forar quadre de selecci france common es-ca FRANA french guiana common es-ca GUAIANA FRANCESA french polynesia common es-ca POLINSIA FRANCESA @@ -244,7 +250,7 @@ group has been added common es-ca Grup afegit group has been deleted common es-ca Grup esborrat group has been updated common es-ca Grup actualitzat group name common es-ca nom del grup -group public common es-ca Grup Public +group public common es-ca Grup Pblic groups common es-ca Grups groups with permission for %1 common es-ca Grups amb perms per %1 groups without permission for %1 common es-ca Grups sense perms per %1 @@ -255,6 +261,9 @@ guinea common es-ca GUINEA guinea-bissau common es-ca GUINEA-BISSAU guyana common es-ca GUYANA haiti common es-ca HAITI +header admin login common es-ca Entrada per Administrar la Capalera +header password common es-ca Contrasenya de la Capalera +header username common es-ca Nom d'usuari de la Capalera heard island and mcdonald islands common es-ca ILLA HEARD I ILLES MCDONALD help common es-ca Ajuda help using editor htmlarea es-ca Ajuda usant editor @@ -284,7 +293,7 @@ iran, islamic republic of common es-ca IRAN, REP iraq common es-ca IRAQ ireland common es-ca IRLANDA israel common es-ca ISRAEL -it has been more then %1 days since you changed your password common es-ca Fa ms de %1 des des de que vreu canviar la contrasenya +it has been more then %1 days since you changed your password common es-ca Fa ms de %1 dies des de que vreu canviar la contrasenya it is recommended that you run setup to upgrade your tables to the current version common es-ca Es recomana que executeu setup per actualitzar les taules a la versi actual. italic common es-ca Cursiva italy common es-ca ITLIA @@ -320,6 +329,7 @@ libyan arab jamahiriya common es-ca LIBIA (LYBIAN ARAB JAMAHIRIYA) license common es-ca Llicncia liechtenstein common es-ca LIECHTENSTEIN list common es-ca Llista +list members common es-ca Llista de membres lithuania common es-ca LITUNIA local common es-ca Local login common es-ca Entrar @@ -351,7 +361,7 @@ mayotte common es-ca MAYOTTE medium common es-ca Mig menu common es-ca Men message common es-ca Missatge -mexico common es-ca MXIC +mexico common es-ca MXIC micronesia, federated states of common es-ca MICRONESIA, ESTATS FEDERATS DE moldova, republic of common es-ca MOLDViA, REPBLICA DE monaco common es-ca MONACO @@ -402,7 +412,7 @@ ok common es-ca Acceptar old value common es-ca Valor anterior oman common es-ca OMAN on *nix systems please type: %1 common es-ca En sistemes *nix escriviu: %1 -on mouse over common es-ca Al moure el ratol per sobre +on mouse over common es-ca En moure el ratol per sobre only private common es-ca noms privat only yours common es-ca noms els vostres open notify window common es-ca Obrir finestra de notificaci @@ -411,7 +421,8 @@ ordered list htmlarea es-ca Llista ordenada original common es-ca Original other common es-ca Altres overview common es-ca Resum -owner common es-ca Amo +owner common es-ca Propietari +page common es-ca Pgina page was generated in %1 seconds common es-ca Plana generada en %1 segons pakistan common es-ca PAKISTAN palau common es-ca PALAU @@ -427,28 +438,29 @@ password has been updated common es-ca Contrasenya actualitzada paste from clipboard htmlarea es-ca Enganxar des del portapapers path htmlarea es-ca Cam path to user and group files has to be outside of the webservers document-root!!! common es-ca El cam als arxius d'usuari i grups HA D'ESTAR FORA del directori arrel de documents dels servidors web!! -pattern for search in addressbook common es-ca Patro de recerca a la Llibreta d'adreces -pattern for search in calendar common es-ca Patro de recerca al Calendari -pattern for search in projects common es-ca Patro de recerca als Projectes +pattern for search in addressbook common es-ca Patr de recerca a la Llibreta d'adreces +pattern for search in calendar common es-ca Patr de recerca al Calendari +pattern for search in projects common es-ca Patr de recerca als Projectes permissions to the files/users directory common es-ca permissos als directoris d'arxius/usuaris personal common es-ca Personal peru common es-ca PERU philippines common es-ca FILIPINES phone number common es-ca Nmero de telfon +phpgroupware login login es-ca Ingreso al Sistema de Groupware phpinfo common es-ca PhpInfo phpwebhostin common es-ca Manejo Avanzado de Archivos pitcairn common es-ca PITCAIRN -please %1 by hand common es-ca Si us plau %1 manualmente -please enter a name common es-ca Si us plau introduiu un nom ! -please run setup to become current common es-ca Si us plau executeu la instal.laci per posar-vos al dia -please select common es-ca Si us plau Trieu -please set your global preferences common es-ca Si us plau establiu les vostres preferncies globals ! -please set your preferences for this application common es-ca Si us plau establiu les vostres preferncies per aquesta aplicaci -please wait... common es-ca Si us plau espereu... +please %1 by hand common es-ca Si us plau, %1 manualment +please enter a name common es-ca Si us plau, introduu un nom ! +please run setup to become current common es-ca Si us plau, executeu la installaci per posar-vos al dia +please select common es-ca Si us plau, Trieu +please set your global preferences common es-ca Si us plau, establiu les vostres preferncies globals ! +please set your preferences for this application common es-ca Si us plau, establiu les vostres preferncies per aquesta aplicaci +please wait... common es-ca Si us plau, espereu... poland common es-ca POLNIA portugal common es-ca PORTUGAL postal common es-ca Postal -powered by egroupware version %1 common es-ca Versi %1 +powered by phpgroupware version %1 common es-ca Versi %1 preferences common es-ca Preferncies preferences for the idots template set common es-ca Preferncies per al joc de plantilles "idot" prev. month (hold for menu) jscalendar es-ca Mes anterior (mantenir clicat per men) @@ -466,10 +478,11 @@ read this list of methods. common es-ca Llegir aquesta llista de m redoes your last action htmlarea es-ca Repeteix la darrera acci registration common es-ca Registracion reject common es-ca Rebutjar -rename common es-ca Reanomenar +remove selected accounts common es-ca esborra els comptes seleccionats +rename common es-ca Reanomena returns a full list of accounts on the system. warning: this is return can be quite large common es-ca Torna una llista completa dels comptes del sistema. Atenci: pot ser molt llarg returns an array of todo items common es-ca Torna una matriu de tasques pendents -returns struct of users application access common es-ca Torna una estructura de l'accs dels usuaria a la aplicaci +returns struct of users application access common es-ca Torna una estructura de l'accs dels usuaris a l'aplicaci reunion common es-ca REUNION romania common es-ca ROMANIA russian federation common es-ca FEDERACI RUSSA @@ -486,6 +499,8 @@ saturday common es-ca Dissabte saudi arabia common es-ca ARBIA SAUD save common es-ca Desar search common es-ca Cercar +search %1 '%2' common es-ca Cercar %1 '%2' +search or select accounts common es-ca Cercar o seleccionar comptes section common es-ca Secci select common es-ca Triar select all %1 %2 for %3 common es-ca Triar tots els %1 %2 per %3 @@ -496,20 +511,22 @@ select home email address common es-ca Triar adre select one common es-ca Triar un select user common es-ca Triar usuari select work email address common es-ca Triar adrea de correu del treball +selection common es-ca Selecci send common es-ca Enviar senegal common es-ca SENEGAL september common es-ca Setembre server %1 has been added common es-ca Servidor %1 afegit server name common es-ca Nom del servidor session has been killed common es-ca Sessi eliminada -setup common es-ca Instal.laci -setup main menu common es-ca Men principal d'instal.laci +setup common es-ca Installaci +setup main menu common es-ca Men principal d'installaci +setup/config admin login common es-ca Entrada per Installar/Configurar Administrador seychelles common es-ca SEYCHELLES show all common es-ca mostrar tot show all categorys common es-ca Mostrar totes les categories show menu common es-ca mostrar menu show page generation time common es-ca Mostrar temps de generaci de la plana -show page generation time on the bottom of the page? common es-ca Mostrar el temps de generaci de la plana a la parte inferior? +show page generation time on the bottom of the page? common es-ca Mostrar el temps de generaci de la plana a la part inferior? show_more_apps common es-ca mostrar ms aplicacions showing %1 common es-ca mostrant %1 showing %1 - %2 of %3 common es-ca mostrant %1 - %2 de %3 @@ -550,30 +567,27 @@ the api is current common es-ca La API esta al dia the api requires an upgrade common es-ca La API necessita actualitzaci the following applications require upgrades common es-ca Les segents aplicacions necessiten actualitzaci the mail server returned common es-ca El servidor de correu ha tornat -this application is current common es-ca Aquesta aplicaci est al dia +this application is current common es-ca Aquesta aplicaci est al dia this application requires an upgrade common es-ca Aquesta aplicaci necessita actualitzar-se this name has been used already common es-ca Aquest nom ja s en s ! thursday common es-ca Dijous time common es-ca Hora time selection: jscalendar es-ca Seleccionar hora: time zone common es-ca Zona horria -time zone offset common es-ca Diferencia de zona horria +time zone offset common es-ca Diferncia de zona horria timetrack preferences es-ca Seguimiento del Tiempo title common es-ca Ttol to common es-ca Per to correct this error for the future you will need to properly set the common es-ca Per a corregir aquest error per al futur necessitareu configurar acuradament el -to go back to the msg list, click here common es-ca Per tornar a la llista de missatges, premeu aqui -to go back to the msg list, click here common es-ca Para volver a la lista de mensajes, pulse aqu -to go back to the msg list, click here common es-ca -to go back to the msg list, click here common es-ca Para volver a la lista de menseajes, pulse aqu +to go back to the msg list, click here common es-ca Per tornar a la llista de missatges, premeu aqu today common es-ca Avui todays date, eg. "%1" common es-ca data d'avui, ex. "%1" -toggle first day of week jscalendar es-ca Canviar el primer da de la setmana +toggle first day of week jscalendar es-ca Canviar el primer dia de la setmana toggle html source htmlarea es-ca Canviar a vista de codi HTML togo common es-ca TOGO tokelau common es-ca TOKELAU tonga common es-ca TONGA -too many unsucessful attempts to login: %1 for the user '%2', %3 for the ip %4 common es-ca Masses intents erronis de inici de sessi: %1 per a l'usuari '%2', %3 per la IP %4 +too many unsucessful attempts to login: %1 for the user '%2', %3 for the ip %4 common es-ca Massa intents erronis d'inici de sessi: %1 per a l'usuari '%2', %3 per la IP %4 total common es-ca Total trinidad and tobago common es-ca TRINIDAD I TOBAGO tuesday common es-ca Dimarts @@ -638,8 +652,9 @@ you have not entered participants common es-ca No heu entrat participants you have selected an invalid date common es-ca Heu triat una data incorrecta ! you have selected an invalid main category common es-ca Heu triat una categoria principal incorrecta ! you have successfully logged out common es-ca Desconnexi correcta +you need to add the webserver user '%1' to the group '%2'. common es-ca Necessiteu afegir l'usuari '%1' del servidor web al grup '%2'. your message as been sent common es-ca Su mensaje fue enviado -your message could not be sent!
common es-ca El missatge no s'ha pogut enviar
+your message could not be sent!
common es-ca El missatge no s'ha pogut enviar!
your message has been sent common es-ca Missatge enviat your search returned %1 matchs common es-ca la recerca ha tornat %1 resultats your search returned 1 match common es-ca la recerca ha tornat 1 resultat From ecf6d380379d4fa287c72f9f211a302d6de63c1f Mon Sep 17 00:00:00 2001 From: reinerj Date: Wed, 25 Aug 2004 18:17:28 +0000 Subject: [PATCH 014/177] replace the bad word grrr --- phpgwapi/setup/phpgw_es-ca.lang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpgwapi/setup/phpgw_es-ca.lang b/phpgwapi/setup/phpgw_es-ca.lang index 190ba399e5..f73037434b 100644 --- a/phpgwapi/setup/phpgw_es-ca.lang +++ b/phpgwapi/setup/phpgw_es-ca.lang @@ -446,7 +446,7 @@ personal common es-ca Personal peru common es-ca PERU philippines common es-ca FILIPINES phone number common es-ca Nmero de telfon -phpgroupware login login es-ca Ingreso al Sistema de Groupware +wgroupware login login es-ca Ingreso al Sistema de Groupware phpinfo common es-ca PhpInfo phpwebhostin common es-ca Manejo Avanzado de Archivos pitcairn common es-ca PITCAIRN @@ -460,7 +460,7 @@ please wait... common es-ca Si us plau, espereu... poland common es-ca POLNIA portugal common es-ca PORTUGAL postal common es-ca Postal -powered by phpgroupware version %1 common es-ca Versi %1 +powered by egroupware version %1 common es-ca Versi %1 preferences common es-ca Preferncies preferences for the idots template set common es-ca Preferncies per al joc de plantilles "idot" prev. month (hold for menu) jscalendar es-ca Mes anterior (mantenir clicat per men) From 23046ac0b55fc2c958d4fd5687b540d612c0bf2f Mon Sep 17 00:00:00 2001 From: Lars Kneschke Date: Wed, 25 Aug 2004 20:04:27 +0000 Subject: [PATCH 015/177] fix for bug [ 1007816 ] error message --- phpgwapi/inc/class.accounts.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpgwapi/inc/class.accounts.inc.php b/phpgwapi/inc/class.accounts.inc.php index 17d48fd0ef..0b9c8aa027 100644 --- a/phpgwapi/inc/class.accounts.inc.php +++ b/phpgwapi/inc/class.accounts.inc.php @@ -555,7 +555,7 @@ if($type == 'g') { $accounts['groups'][$id] = $id; - foreach($GLOBALS['phpgw']->acl->get_ids_for_location($id,1,'phpgw_group') as $id) + foreach((array)$GLOBALS['phpgw']->acl->get_ids_for_location($id,1,'phpgw_group') as $id) { $accounts['accounts'][$id] = $id; } From f3bbad5fffba517541ee6d62653ccc11c74feae4 Mon Sep 17 00:00:00 2001 From: mgalgoci Date: Wed, 25 Aug 2004 20:51:59 +0000 Subject: [PATCH 016/177] More ical import fixes (and cleanups) --- calendar/inc/class.boicalendar.inc.php | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/calendar/inc/class.boicalendar.inc.php b/calendar/inc/class.boicalendar.inc.php index b557e414b2..06efecf525 100755 --- a/calendar/inc/class.boicalendar.inc.php +++ b/calendar/inc/class.boicalendar.inc.php @@ -2973,9 +2973,6 @@ $filename = $uploaddir . $newfilename; move_uploaded_file($_FILES['uploadedfile']['tmp_name'], $filename); -// $ftp = fopen($uploaddir . $newfilename . '.info','wb'); -// fputs($ftp,$uploadedfile_type."\n".$uploadedfile_name."\n"); -// fclose($ftp); return $filename; } @@ -3320,20 +3317,22 @@ $so_event->set_recur_none(); } -// Owner - if(!isset($ical['event'][$i]['organizer']) || (isset($ical['event'][$i]['organizer']) && $this->is_owner($ical['event'][$i]['organizer']))) + /* the organizer must be the current user doing the importing */ + if(!isset($ical['event'][$i]['organizer']) || !$this->is_owner($ical['event'][$i]['organizer'])) { $so_event->add_attribute('owner',$GLOBALS['phpgw_info']['user']['account_id']); - $so_event->add_attribute('participants','A',(int)$GLOBALS['phpgw_info']['user']['account_id']); + $so_event->add_attribute('participants','A',$GLOBALS['phpgw_info']['user']['account_id']); } - else + + /* if the original organizer is an egroupware user, add the original user as an event participant */ + /* NB: ['mailto'] has two parts, ['user'], containing the username, and ['host'], containing the fqdn of the user's email address */ + if (isset($ical['event'][$i]['organizer']['mailto']['user']) && $GLOBALS['phpgw']->accounts->exists($ical['event'][$i]['organizer']['mailto']['user']) == True) { -//owner + $so_event->add_attribute('participants','A',(int)$GLOBALS['phpgw']->accounts->name2id($ical['event'][$i]['organizer']['mailto']['user'])); } $event = $so_event->get_cached_event(); $so_event->add_entry($event); -// $event = $so_event->get_cached_event(); } } Header('Location: '.$GLOBALS['phpgw']->link('/index.php', From 87fd7d1d057fd26be2c6419c2b0217b8c1cffd1c Mon Sep 17 00:00:00 2001 From: Lars Kneschke Date: Wed, 25 Aug 2004 20:57:31 +0000 Subject: [PATCH 017/177] fix for Bug: [ 1009099 ] Unable To Add Project --- phpgwapi/js/tabs/tabs.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/phpgwapi/js/tabs/tabs.js b/phpgwapi/js/tabs/tabs.js index eb36b02c25..1e198e67dc 100644 --- a/phpgwapi/js/tabs/tabs.js +++ b/phpgwapi/js/tabs/tabs.js @@ -223,7 +223,8 @@ function Tabs(nrTabs,activeCSSclass,inactiveCSSclass,HTMLtabID,HTMLtabcontentID, else { // getting the active tab from the selector if set - if(document.getElementById(this.HTMLtabselectorID)) + // the check for != '' is needed for Konqueror + if(document.getElementById(this.HTMLtabselectorID) && this.HTMLtabselectorID != '') tab = document.getElementById(this.HTMLtabselectorID).selectedIndex+1; else tab = 1; From eabf6925b57f33e368a7f1740f958161c5173fb1 Mon Sep 17 00:00:00 2001 From: ak703 Date: Wed, 25 Aug 2004 22:29:28 +0000 Subject: [PATCH 018/177] Added an admin module for ldap based email settings (based on emailadmin) but reduced to those functions, which are needed to manage ldap entries, which rely only on standard schemas (core, qmail) which are not considered "experimental" and without the need to add a separate schema. This modul will be extended whenever possible and approved for more values. Main goal here is: Ability to easily use eGW Admin for account management with LDAP beackend and to comply with those schemas, the distros are delivering. The link for this module will be shown in addition to Lars' EmailAdmin if LDAP is used as account storage. So it will not break existing installation ;-) --- admin/inc/class.boldap_mgr.inc.php | 400 +++++++++++++++++++++++++++++ admin/inc/class.soldap_mgr.inc.php | 173 +++++++++++++ admin/inc/class.uiaccounts.inc.php | 16 ++ admin/inc/class.uildap_mgr.inc.php | 192 ++++++++++++++ admin/setup/phpgw_de.lang | 20 +- admin/setup/phpgw_en.lang | 27 +- phpgwapi/setup/phpgw_de.lang | 1 + phpgwapi/setup/phpgw_en.lang | 1 + 8 files changed, 828 insertions(+), 2 deletions(-) create mode 100644 admin/inc/class.boldap_mgr.inc.php create mode 100644 admin/inc/class.soldap_mgr.inc.php create mode 100644 admin/inc/class.uildap_mgr.inc.php diff --git a/admin/inc/class.boldap_mgr.inc.php b/admin/inc/class.boldap_mgr.inc.php new file mode 100644 index 0000000000..ac127e7076 --- /dev/null +++ b/admin/inc/class.boldap_mgr.inc.php @@ -0,0 +1,400 @@ + True, + 'getLDAPStorageData' => True, + 'getLocals' => True, + 'getProfile' => True, + 'getProfileList' => True, + 'getRcptHosts' => True, + 'getSMTPServerTypes' => True + ); + + function boldap_mgr($_profileID=-1) + { + $this->soldapmgr = CreateObject('admin.soldap_mgr'); + + $this->SMTPServerType = array( + '1' => array( + 'fieldNames' => array( + 'smtpServer', + 'smtpPort', + 'smtpAuth', + 'smtpType' + ), + 'description' => lang('standard SMTP-Server'), + 'classname' => 'defaultsmtp' + ), + '2' => array( + 'fieldNames' => array( + 'smtpServer', + 'smtpPort', + 'smtpAuth', + 'smtpType', + 'smtpLDAPServer', + 'smtpLDAPAdminDN', + 'smtpLDAPAdminPW', + 'smtpLDAPBaseDN', + 'smtpLDAPUseDefault' + ), + 'description' => lang('Postfix with LDAP'), + 'classname' => 'postfixldap' + ) + ); + + $this->IMAPServerType = array( + '1' => array( + 'fieldNames' => array( + 'imapServer', + 'imapPort', + 'imapType', + 'imapLoginType', + 'imapTLSEncryption', + 'imapTLSAuthentication', + 'imapoldcclient' + ), + 'description' => lang('standard POP3 server'), + 'protocol' => 'pop3', + 'classname' => 'defaultpop' + ), + '2' => array( + 'fieldNames' => array( + 'imapServer', + 'imapPort', + 'imapType', + 'imapLoginType', + 'imapTLSEncryption', + 'imapTLSAuthentication', + 'imapoldcclient' + ), + 'description' => lang('standard IMAP server'), + 'protocol' => 'imap', + 'classname' => 'defaultimap' + ), + '3' => array( + 'fieldNames' => array( + 'imapServer', + 'imapPort', + 'imapType', + 'imapLoginType', + 'imapTLSEncryption', + 'imapTLSAuthentication', + 'imapoldcclient', + 'imapEnableCyrusAdmin', + 'imapAdminUsername', + 'imapAdminPW', + 'imapEnableSieve', + 'imapSieveServer', + 'imapSievePort' + ), + 'description' => lang('Cyrus IMAP Server'), + 'protocol' => 'imap', + 'classname' => 'cyrusimap' + ) + ); + + $this->restoreSessionData(); + + if($_profileID >= 0) + { + $this->profileID = $_profileID; + + $this->profileData = $this->getProfile($_profileID); + + $this->imapClass = $this->IMAPServerType[$this->profileData['imapType']]['classname']; + $this->smtpClass = $this->SMTPServerType[$this->profileData['smtpType']]['classname']; + } + } + + function encodeHeader($_string, $_encoding='q') + { + switch($_encoding) + { + case "q": + if(!preg_match("/[\x80-\xFF]/",$_string)) + { + // nothing to quote, only 7 bit ascii + return $_string; + } + + $string = imap_8bit($_string); + $stringParts = explode("=\r\n",$string); + while(list($key,$value) = each($stringParts)) + { + if(!empty($retString)) $retString .= " "; + $value = str_replace(" ","_",$value); + // imap_8bit does not convert "?" + // it does not need, but it should + $value = str_replace("?","=3F",$value); + $retString .= "=?".strtoupper($this->displayCharset)."?Q?".$value."?="; + } + #exit; + return $retString; + break; + default: + return $_string; + } + } + + function getAccountEmailAddress($_accountName, $_profileID) + { + $profileData = $this->getProfile($_profileID); + + $smtpClass = $this->SMTPServerType[$profileData['smtpType']]['classname']; + + return empty($smtpClass) ? False : ExecMethod("emailadmin.$smtpClass.getAccountEmailAddress",$_accountName,3,$profileData); + } + + function getFieldNames($_serverTypeID, $_class) + { + switch($_class) + { + case 'imap': + return $this->IMAPServerType[$_serverTypeID]['fieldNames']; + break; + case 'smtp': + return $this->SMTPServerType[$_serverTypeID]['fieldNames']; + break; + } + } + +# function getIMAPClass($_profileID) +# { +# if(!is_object($this->imapClass)) +# { +# $profileData = $this->getProfile($_profileID); +# $this->imapClass = CreateObject('emailadmin.cyrusimap',$profileData); +# } +# +# return $this->imapClass; +# } + + function getIMAPServerTypes() + { + foreach($this->IMAPServerType as $key => $value) + { + $retData[$key]['description'] = $value['description']; + $retData[$key]['protocol'] = $value['protocol']; + } + + return $retData; + } + + function getLDAPStorageData($_serverid) + { + $storageData = $this->soldapmgr->getLDAPStorageData($_serverid); + return $storageData; + } + + function getMailboxString($_folderName) + { + if (!empty($this->imapClass)) + { + return ExecMethod("emailadmin.".$this->imapClass.".getMailboxString",$_folderName,3,$this->profileData); + } + else + { + return false; + } + } + + function getProfile($_profileID) + { + $profileData = $this->soldapmgr->getProfileList($_profileID); + $fieldNames = $this->SMTPServerType[$profileData[0]['smtpType']]['fieldNames']; + $fieldNames = array_merge($fieldNames, $this->IMAPServerType[$profileData[0]['imapType']]['fieldNames']); + $fieldNames[] = 'description'; + $fieldNames[] = 'defaultDomain'; + $fieldNames[] = 'profileID'; + $fieldNames[] = 'organisationName'; + $fieldNames[] = 'userDefinedAccounts'; + + return $this->soldapmgr->getProfile($_profileID, $fieldNames); + } + + function getProfileList($_profileID='') + { + $profileList = $this->soldapmgr->getProfileList($_profileID); + return $profileList; + } + +# function getSMTPClass($_profileID) +# { +# if(!is_object($this->smtpClass)) +# { +# $profileData = $this->getProfile($_profileID); +# $this->smtpClass = CreateObject('emailadmin.postfixldap',$profileData); +# } +# +# return $this->smtpClass; +# } + + function getSMTPServerTypes() + { + foreach($this->SMTPServerType as $key => $value) + { + $retData[$key] = $value['description']; + } + + return $retData; + } + + function getUserData($_accountID, $_usecache) + { + if ($_usecache) + { + $userData = $this->userSessionData[$_accountID]; + } + else + { + $userData = $this->soldapmgr->getUserData($_accountID); + $this->userSessionData[$_accountID] = $userData; + $this->saveSessionData(); + } + return $userData; + } + + function restoreSessionData() + { + global $phpgw; + + $this->sessionData = $phpgw->session->appsession('session_data'); + $this->userSessionData = $phpgw->session->appsession('user_session_data'); + + #while(list($key, $value) = each($this->userSessionData)) + #{ + # print "++ $key: $value
"; + #} + #print "restored Session
"; + } + + function saveProfile($_globalSettings, $_smtpSettings, $_imapSettings) + { + if(!isset($_globalSettings['profileID'])) + { + $this->soldapmgr->addProfile($_globalSettings, $_smtpSettings, $_imapSettings); + } + else + { + $this->soldapmgr->updateProfile($_globalSettings, $_smtpSettings, $_imapSettings); + } + } + + + + + + function saveSessionData() + { + global $phpgw; + + $phpgw->session->appsession('session_data','',$this->sessionData); + $phpgw->session->appsession('user_session_data','',$this->userSessionData); + } + + + + + + + + function saveUserData($_accountID, $_formData, $_boAction) + { + $this->userSessionData[$_accountID]['mail'] = $_formData["mail"]; + $this->userSessionData[$_accountID]['mailForwardingAddress'] = $_formData["mailForwardingAddress"]; + $this->userSessionData[$_accountID]['accountStatus'] = $_formData["accountStatus"]; + + switch ($_boAction) + { + case 'add_mailAlternateAddress': + + if (is_array($this->userSessionData[$_accountID]['mailAlternateAddress'])) + { + $count = count($this->userSessionData[$_accountID]['mailAlternateAddress']); + } + else + { +//ACHTUNG!! + $count = 0; + } + + $this->userSessionData[$_accountID]['mailAlternateAddress'][$count] = + $_formData['add_mailAlternateAddress']; + + $this->saveSessionData(); + + break; + + case 'remove_mailAlternateAddress': + $i=0; + + while(list($key, $value) = @each($this->userSessionData[$_accountID]['mailAlternateAddress'])) + { + #print ".. $key: $value
"; + if ($key != $_formData['remove_mailAlternateAddress']) + { + $newMailAlternateAddress[$i]=$value; + #print "!! $i: $value
"; + $i++; + } + } + $this->userSessionData[$_accountID]['mailAlternateAddress'] = $newMailAlternateAddress; + + $this->saveSessionData(); + + break; + + case 'save': + $this->soldapmgr->saveUserData( + $_accountID, + $this->userSessionData[$_accountID]); + $bofelamimail = CreateObject('felamimail.bofelamimail'); + $bofelamimail->openConnection('','',true); + $bofelamimail->imapSetQuota($GLOBALS['phpgw']->accounts->id2name($_accountID), + $this->userSessionData[$_accountID]['quotaLimit']); + $bofelamimail->closeConnection(); + $GLOBALS['phpgw']->accounts->cache_invalidate($_accountID); + + + break; + } + } + + function updateAccount($_hookValues) + { + if (!empty($this->imapClass)) + { + ExecMethod("emailadmin.".$this->imapClass.".updateAccount",$_hookValues,3,$this->profileData); + } + + if (!empty($this->smtpClass)) + { + ExecMethod("emailadmin.".$this->smtpClass.".updateAccount",$_hookValues,3,$this->profileData); + } + } + + } +?> diff --git a/admin/inc/class.soldap_mgr.inc.php b/admin/inc/class.soldap_mgr.inc.php new file mode 100644 index 0000000000..a586216191 --- /dev/null +++ b/admin/inc/class.soldap_mgr.inc.php @@ -0,0 +1,173 @@ +db = $GLOBALS['phpgw']->db; + include(PHPGW_INCLUDE_ROOT.'/emailadmin/setup/tables_current.inc.php'); + $this->tables = &$phpgw_baseline; + unset($phpgw_baseline); + $this->table = &$this->tables['phpgw_emailadmin']; + } + + + function getUserData($_accountID) + { + global $phpgw, $phpgw_info; + + $ldap = $phpgw->common->ldapConnect(); + $filter = "(&(uidnumber=$_accountID))"; + + $sri = @ldap_search($ldap,$phpgw_info['server']['ldap_context'],$filter); + if ($sri) + { + $allValues = ldap_get_entries($ldap, $sri); + if ($allValues['count'] > 0) + { + #print "found something
"; + $userData["mail"] = $allValues[0]["mail"][0]; + $userData["mailAlternateAddress"] = $allValues[0]["mailalternateaddress"]; + $userData["accountStatus"] = $allValues[0]["accountstatus"][0]; + $userData["mailForwardingAddress"] = $allValues[0]["mailforwardingaddress"][0]; + $userData["deliveryMode"] = $allValues[0]["deliverymode"][0]; + + unset($userData["mailAlternateAddress"]["count"]); + unset($userData["mailForwardingAddress"]["count"]); + + return $userData; + } + } + + // if we did not return before, return false + return false; + } + + function saveUserData($_accountID, $_accountData) + { + + $ldap = $GLOBALS['phpgw']->common->ldapConnect(); + // need to be fixed + if(is_numeric($_accountID)) + { + $filter = "uidnumber=$_accountID"; + } + else + { + $filter = "uid=$_accountID"; + } + + $sri = @ldap_search($ldap,$GLOBALS['phpgw_info']['server']['ldap_context'],$filter); + if ($sri) + { + $allValues = ldap_get_entries($ldap, $sri); + $accountDN = $allValues[0]['dn']; + $uid = $allValues[0]['uid'][0]; + $homedirectory = $allValues[0]['homedirectory'][0]; + $objectClasses = $allValues[0]['objectclass']; + + unset($objectClasses['count']); + } + else + { + return false; + } + + if(empty($homedirectory)) + { + $homedirectory = "/home/".$uid; + } + + // the old code for qmail ldap + $newData = array + ( + 'mail' => $_accountData["mail"], + 'mailAlternateAddress' => $_accountData["mailAlternateAddress"], + 'mailForwardingAddress' => $_accountData["mailForwardingAddress"], +// 'homedirectory' => $homedirectory, +// 'mailMessageStore' => $homedirectory."/Maildir/", +// 'gidnumber' => '1000', +// 'qmailDotMode' => $_accountData["qmailDotMode"], +// 'deliveryProgramPath' => $_accountData["deliveryProgramPath"] + ); + + if(!in_array('qmailUser',$objectClasses) && + !in_array('qmailuser',$objectClasses)) + { + $objectClasses[] = 'qmailuser'; + } + + // the new code for postfix+cyrus+ldap + $newData = array + ( + 'mail' => $_accountData["mail"], + 'accountStatus' => $_accountData["accountStatus"], + 'objectclass' => $objectClasses + ); + + if(is_array($_accountData["mailAlternateAddress"])) + { + $newData['mailAlternateAddress'] = $_accountData["mailAlternateAddress"]; + } + else + { + $newData['mailAlternateAddress'] = array(); + } + + if($_accountData["accountStatus"] == 'active') + { + $newData['accountStatus'] = 'active'; + } + else + { + $newData['accountStatus'] = 'disabled'; + } +/* + if(!empty($_accountData["deliveryMode"])) + { + $newData['deliveryMode'] = $_accountData["deliveryMode"]; + } + else + { + $newData['deliveryMode'] = array(); + } +*/ + +// if(is_array($_accountData["mailForwardingAddress"])) +// { + $newData['mailForwardingAddress'] = $_accountData["mailForwardingAddress"]; +// } +// else +// { +// $newData['mailForwardingAddress'] = array(); +// } + + #print "
DN: $accountDN
"; + ldap_mod_replace ($ldap, $accountDN, $newData); + + // also update the account_email field in phpgw_accounts + // when using sql account storage + if($GLOBALS['phpgw_info']['server']['account_repository'] == 'sql') + { + $this->db->update('phpgw_accounts',array( + 'account_email' => $_accountData["mail"] + ), + array( + 'account_id' => $_accountID + ),__LINE__,__FILE__ + ); + } + } + } +?> diff --git a/admin/inc/class.uiaccounts.inc.php b/admin/inc/class.uiaccounts.inc.php index ad5215ed3a..d509c1e4ea 100755 --- a/admin/inc/class.uiaccounts.inc.php +++ b/admin/inc/class.uiaccounts.inc.php @@ -632,6 +632,22 @@ 'extradata' => 'menuaction=admin.uiaclmanager.list_apps' ); } + + // NDEE210804 + // added for different way of handling ldap entries inside account manager + // we show this only, if accounts are stored in ldap + + if ($GLOBALS['phpgw_info']['server']['account_repository'] == "ldap") + { + $GLOBALS['menuData'][] = array( + 'description' => 'LDAP-MGR', + 'url' => '/index.php', + 'extradata' => 'menuaction=admin.uildap_mgr.editUserData' + ); + } + //NDEE + + } function edit_user($cd='',$account_id='') diff --git a/admin/inc/class.uildap_mgr.inc.php b/admin/inc/class.uildap_mgr.inc.php new file mode 100644 index 0000000000..17c829d215 --- /dev/null +++ b/admin/inc/class.uildap_mgr.inc.php @@ -0,0 +1,192 @@ + True, + 'saveUserData' => True + ); + + function uildap_mgr() + { + $this->t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL); + $this->boldapmgr = CreateObject('admin.boldap_mgr'); + } + + function display_app_header() + { + $GLOBALS['phpgw']->common->phpgw_header(); + echo parse_navbar(); + + } + + function editUserData($_useCache='0') + { + global $phpgw, $phpgw_info, $HTTP_GET_VARS; + + $accountID = $HTTP_GET_VARS['account_id']; + $GLOBALS['account_id'] = $accountID; + + $this->display_app_header(); + + $this->translate(); + + $this->t->set_file(array("editUserData" => "account_form_ldapdata.tpl")); + $this->t->set_block('editUserData','form','form'); + $this->t->set_block('editUserData','link_row','link_row'); + $this->t->set_var("th_bg",$phpgw_info["theme"]["th_bg"]); + $this->t->set_var("tr_color1",$phpgw_info["theme"]["row_on"]); + $this->t->set_var("tr_color2",$phpgw_info["theme"]["row_off"]); + + $this->t->set_var("lang_email_config",lang("edit email settings")); + $this->t->set_var("lang_emailAddress",lang("email address")); + $this->t->set_var("lang_emailaccount_active",lang("email account active")); + $this->t->set_var("lang_mailAlternateAddress",lang("alternate email address")); + $this->t->set_var("lang_mailForwardingAddress",lang("forward email's to")); + $this->t->set_var("lang_forward_also_to",lang("forward also to")); + $this->t->set_var("lang_button",lang("save")); + $this->t->set_var("lang_deliver_extern",lang("deliver extern")); + $this->t->set_var("lang_edit_email_settings",lang("edit email settings")); + $this->t->set_var("lang_ready",lang("Done")); + $this->t->set_var("link_back",$phpgw->link('/admin/accounts.php')); + + $linkData = array + ( + 'menuaction' => 'admin.uildap_mgr.saveUserData', + 'account_id' => $accountID + ); + $this->t->set_var("form_action", $phpgw->link('/index.php',$linkData)); + + // only when we show a existing user + if($userData = $this->boldapmgr->getUserData($accountID, $_useCache)) + { + echo "


"; + if ($userData['mailAlternateAddress'] != '') + { + $options_mailAlternateAddress = "\n"; + } + else + { + $options_mailAlternateAddress = lang('no alternate email address'); + } + + $this->t->set_var("mail",$userData["mail"]); +// $this->t->set_var("mailAlternateAddress",''); + $this->t->set_var("mailForwardingAddress",$userData["mailForwardingAddress"]); + $this->t->set_var("options_mailAlternateAddress",$options_mailAlternateAddress); + + $this->t->set_var("uid",rawurlencode($_accountData["dn"])); + if ($userData["accountStatus"] == "active") + $this->t->set_var("account_checked","checked"); + if ($userData["deliveryMode"] == "forwardOnly") + $this->t->set_var("forwardOnly_checked","checked"); + if ($_accountData["deliverExtern"] == "active") + $this->t->set_var("deliver_checked","checked"); + } + else + { + $this->t->set_var("mail",''); + $this->t->set_var("mailAlternateAddress",''); + $this->t->set_var("mailForwardingAddress",''); + $this->t->set_var("options_mailAlternateAddress",lang('no alternate email address')); + $this->t->set_var("account_checked",''); + $this->t->set_var("forwardOnly_checked",''); + } + + // create the menu on the left, if needed + $menuClass = CreateObject('admin.uimenuclass'); + $this->t->set_var('rows',$menuClass->createHTMLCode('edit_user')); + + $this->t->pparse("out","form"); + + } + + function saveUserData() + { + global $HTTP_POST_VARS, $HTTP_GET_VARS; + + if($HTTP_POST_VARS["accountStatus"] == "on") + { + $accountStatus = "active"; + } + if($HTTP_POST_VARS["forwardOnly"] == "on") + { + $deliveryMode = "forwardOnly"; + } + + $formData = array + ( + 'mail' => $HTTP_POST_VARS["mail"], + 'mailAlternateAddress' => $HTTP_POST_VARS["mailAlternateAddress"], + 'mailForwardingAddress' => $HTTP_POST_VARS["mailForwardingAddress"], + 'add_mailAlternateAddress' => $HTTP_POST_VARS["mailAlternateAddressInput"], + 'remove_mailAlternateAddress' => $HTTP_POST_VARS["mailAlternateAddress"], + 'accountStatus' => $accountStatus, + 'deliveryMode' => $deliveryMode + ); + + //echo "

DebugArray in uiuserdata"; + // echo _debug_array($formData); + + if($HTTP_POST_VARS["add_mailAlternateAddress"]) $bo_action='add_mailAlternateAddress'; + if($HTTP_POST_VARS["remove_mailAlternateAddress"]) $bo_action='remove_mailAlternateAddress'; + if($HTTP_POST_VARS["save"]) $bo_action='save'; + + $this->boldapmgr->saveUserData($_GET['account_id'], $formData, $bo_action); + + if ($bo_action == 'save') + { + // read date fresh from ldap storage + $this->editUserData(); + } + else + { + // use cached data + $this->editUserData('1'); + } + } + + function translate() + { + global $phpgw_info; + + $this->t->set_var('th_bg',$phpgw_info['theme']['th_bg']); + + $this->t->set_var('lang_add',lang('add')); + $this->t->set_var('lang_done',lang('Done')); + $this->t->set_var('lang_remove',lang('remove')); + $this->t->set_var('lang_remove',lang('remove')); + $this->t->set_var('lang_advanced_options',lang('advanced options')); + $this->t->set_var('lang_qmaildotmode',lang('qmaildotmode')); + $this->t->set_var('lang_default',lang('default')); + $this->t->set_var('lang_quota_settings',lang('quota settings')); + $this->t->set_var('lang_qoutainmbyte',lang('qouta size in MByte')); + $this->t->set_var('lang_inmbyte',lang('in MByte')); + $this->t->set_var('lang_0forunlimited',lang('leave empty for no quota')); + $this->t->set_var('lang_forward_only',lang('forward only')); + $this->t->set_var('lang_mailAliases',lang('Aliases')); + $this->t->set_var('lang_masterEmailAddress',lang('Main Email-Address')); + $this->t->set_var('lang_RouteMailsTo',lang('Route all Mails to')); + } + } +?> diff --git a/admin/setup/phpgw_de.lang b/admin/setup/phpgw_de.lang index 38392ecd2f..52104dea69 100644 --- a/admin/setup/phpgw_de.lang +++ b/admin/setup/phpgw_de.lang @@ -36,11 +36,14 @@ admin email addresses (comma-separated) to be notified about the blocking (empty admin name admin de Admininistratorname administration admin de Administration admins admin de Administatoren +advanced options admin de erweiterte Optionen after how many unsuccessful attempts to login, an account should be blocked (default 3) ? admin de Nach wievielen erfolglosen Versuchen sich anzumelden, soll ein Benutzerkonto gesperrt werden (Vorgabe 3)? after how many unsuccessful attempts to login, an ip should be blocked (default 3) ? admin de Nach wievielen erfolglosen Versuchen sich anzumelden soll eine IP-Adresse gesperrt werden (Vorgabe 3)? +aliases admin de Email-Alias all records and account information will be lost! admin de Alle Datensätze und Kontoinformationen sind dann verloren! all users admin de Alle Benutzer allow anonymous access to this app admin de Anonymen Zugriff auf diese Anwendung zulassen +alternate email address admin de Alternative Emailadresse anonymous user admin de Anonymer Benutzer anonymous user (not shown in list sessions) admin de Anonymer Benutzer (wird bei Sitzungen anzeigen nicht angezeigt) appearance admin de Aussehen @@ -84,6 +87,7 @@ color admin de Farbe country selection admin de Lnderauswahl create group admin de Erstelle Gruppe crontab only (recomended) admin de nur Crontab (empfohlen) +cyrus imap server admin de Cyrus IMAP Server data admin de Daten day admin de Tag day of week
(0-6, 0=sun) admin de Wochentag
(0-6, 0=Sonntag) @@ -127,6 +131,7 @@ do you want to delete all global subcategories ? admin de M do you want to move all global subcategories one level down ? admin de Wollen sie alle globalen Unterkategorien eine Ebene nach unten verschieben? edit account admin de Benutzerkonto bearbeiten edit application admin de Anwendung bearbeiten +edit email settings admin de Email Einstellungen bearbeiten edit global category admin de Globale Kategorie bearbeiten edit global category for %1 admin de Globale Kategorie fr %1 bearbeiten edit group admin de Gruppe bearbeiten @@ -140,6 +145,8 @@ edit this group admin de Diese Gruppe bearbeiten edit this user admin de Diesen Benutzer bearbeiten edit user admin de Benutzer bearbeiten edit user account admin de Benutzerkonto bearbeiten +email account active admin de Emailkonto aktiv +email address admin de Email-Adresse enable debug-messages admin de Debug-Meldungen einschalten enabled - hidden from navbar admin de Verfgbar, aber nicht in der Navigationsleiste enabled - popup window admin de Verfgbar, Popup-Fenster @@ -195,6 +202,7 @@ icon admin de Icon idle admin de im Leerlauf if no acl records for user or any group the user is a member of admin de Wenn es keinen ACL-Eintrag fr einen Benutzer oder oder eine Gruppe der er angehrt gibt if using ldap, do you want to manage homedirectory and loginshell attributes? admin de Wenn Sie LDAP verwenden, wollen Sie Benutzerverzeichnisse und Komandointerpreter verwalten ? +in mbyte admin de in MByte inbound admin de eingehend install crontab admin de Crontab installieren installed applications common de Installierte Anwendungen @@ -230,6 +238,7 @@ login shell admin de Login-Komandointerpreter (Login-Shell) login time admin de Login-Zeit loginid admin de Login-ID mail settings admin de EMail Einstellungen +main email-address admin de Stamm-Emailadresse main screen message admin de Nachricht der Startseite manager admin de Manager maximum account id (e.g. 65535 or 1000000) admin de Maximum fr Benutzer-ID (z.B. 65535 oder 1000000) @@ -245,6 +254,7 @@ new group name admin de Neuer Gruppenname new password [ leave blank for no change ] admin de Neues Passwort [ Feld leerlassen, wenn das Passwort nicht gendert werden soll ] next run admin de nchste Ausfhrung no algorithms available admin de Kein Algorithmus verfgbar +no alternate email address admin de keine Aliases definiert no jobs in the database !!! admin de Keine Jobs in der Datenbank!!! no login history exists for this user admin de Benutzer hat sich noch nie angemeldet no matches found admin de Keine bereinstimmungen gefunden @@ -268,15 +278,20 @@ please enter a name admin de Bitte einen Namen eingeben please enter a name for that server ! admin de Bitte einen Namen fr diesen Server eingeben! please run setup to become current admin de Bitte Setup ausfhren um die Installation zu aktualisieren please select admin de Bitte auswhlen +postfix with ldap admin de Postfix mit LDAP preferences admin de Einstellungen primary group admin de primre Gruppe +qouta size in mbyte admin de Quotagre in MByte +quota settings admin de Quota-Einstellungen re-enter password admin de Passwort wiederholen read this list of methods. admin de Diese Liste der Methoden lesen register application hooks admin de Registrieren der "Hooks" der Anwendungen +remove admin de Entfernen remove all users from this group admin de Entferne alle Benutzer aus dieser Gruppe remove all users from this group ? admin de Entferne alle Benutzer aus dieser Gruppe return to admin mainscreen admin de zum Adminstrationsmen zurckkehren return to view account admin de Zurck zum Anzeigen des Benutzerkontos +route all mails to admin de Alle Mails senden an run asynchronous services admin de Asynchrone Dienste ausfhren save the category admin de Kategorie speichern save the category and return back to the list admin de Kategorie speichern und zur Liste zurckkehren @@ -317,6 +332,9 @@ sorry, the follow users are still a member of the group %1 admin de Sorry, die f sort the entries admin de Eintrge sortieren ssl admin de verschlsselt (SSL) standard admin de Standard +standard imap server admin de Standard IMAP Server +standard pop3 server admin de Standard POP3 Server +standard smtp-server admin de Standard SMTP Server start testjob! admin de Testjob starten! submit changes admin de nderungen speichern submit the search string admin de Geben Sie Ihren Suchbegriff ein @@ -365,9 +383,9 @@ view sessions admin de Sitzungen anzeigen view this user admin de Diesen Benutzer anzeigen view user account admin de Benutzerkonto anzeigen who would you like to transfer all records owned by the deleted user to? admin de Wem sollen alle Datenstze, die dem zu lschenden Benutzer gehren, bertragen werden? +would you like egroupware to cache the egw info array ? admin de Soll eGroupWare das egw info Array cachen ? would you like egroupware to check for a new version
when admins login ? admin de Soll eGroupWare prfen ob eine neue Version vorhanden ist,
wenn sich ein Administrator anmeldet ? would you like egroupware to check for new application versions when admins login ? admin de Soll eGroupWare auf neue Versionen der Anwendungen prfen, wenn sich ein Administrator anmeldet ? -would you like egroupware to cache the egw info array ? admin de Soll eGroupWare das egw info Array cachen ? would you like to automaticaly load new langfiles (at login-time) ? admin de Sollen neue Sprachdateien automatisch gelanden werden (beim Login) ? would you like to show each application's upgrade status ? admin de Soll der Upgrade-Status aller Anwendungen angezeigt werden ? xml-rpc admin de XML-RPC diff --git a/admin/setup/phpgw_en.lang b/admin/setup/phpgw_en.lang index 02bc6a564f..4f3d28c5c7 100644 --- a/admin/setup/phpgw_en.lang +++ b/admin/setup/phpgw_en.lang @@ -35,11 +35,14 @@ admin email addresses (comma-separated) to be notified about the blocking (empty admin name admin en Admin Name administration admin en Administration admins admin en Admins +advanced options admin en advanced options after how many unsuccessful attempts to login, an account should be blocked (default 3) ? admin en After how many unsuccessful attempts to login, an account should be blocked (default 3) ? after how many unsuccessful attempts to login, an ip should be blocked (default 3) ? admin en After how many unsuccessful attempts to login, an IP should be blocked (default 3) ? +aliases admin en Aliases all records and account information will be lost! admin en All records and account information will be lost! all users admin en All Users allow anonymous access to this app admin en Allow anonymous access to this app +alternate email address admin en alternate email address anonymous user admin en Anonymous user anonymous user (not shown in list sessions) admin en Anonymous User (not shown in list sessions) appearance admin en Appearance @@ -83,6 +86,7 @@ color admin en Color country selection admin en Country Selection create group admin en Create Group crontab only (recomended) admin en crontab only (recomended) +cyrus imap server admin en Cyrus IMAP Server data admin en Data day admin en Day day of week
(0-6, 0=sun) admin en Day of week
(0-6, 0=Sun) @@ -101,6 +105,7 @@ delete the group admin en delete the group delete this category admin en delete this category delete this group admin en delete this group delete this user admin en delete this user +deliver extern admin en deliver extern deny access to access log admin en Deny access to access log deny access to application registery admin en Deny access to application registery deny access to applications admin en Deny access to applications @@ -126,6 +131,7 @@ do you want to delete all global subcategories ? admin en Do you want to delete do you want to move all global subcategories one level down ? admin en Do you want to move all global subcategories one level down ? edit account admin en Edit account edit application admin en Edit application +edit email settings admin en edit email settings edit global category admin en Edit global category edit global category for %1 admin en Edit global category for %1 edit group admin en Edit Group @@ -139,6 +145,8 @@ edit this group admin en edit this group edit this user admin en edit this user edit user admin en edit user edit user account admin en Edit user account +email account active admin en email account active +email address admin en email address enable debug-messages admin en Enable debug-messages enabled - hidden from navbar admin en Enabled - Hidden from navbar enabled - popup window admin en Enabled - Popup Window @@ -174,6 +182,9 @@ find and register all application hooks admin en Find and Register all Applicati for the times above admin en for the times above for the times below (empty values count as '*', all empty = every minute) admin en for the times below (empty values count as '*', all empty = every minute) force selectbox admin en Force Selectbox +forward also to admin en forward also to +forward email's to admin en forward email's to +forward only admin en forward only global categories common en Global Categories group ? admin en group ? group has been added common en Group has been added @@ -192,6 +203,7 @@ icon admin en Icon idle admin en idle if no acl records for user or any group the user is a member of admin en If no ACL records for user or any group the user is a member of if using ldap, do you want to manage homedirectory and loginshell attributes? admin en If using LDAP, do you want to manage homedirectory and loginshell attributes? +in mbyte admin en in MByte inbound admin en inbound install crontab admin en Install crontab installed applications common en Installed applications @@ -214,6 +226,7 @@ ldap groups context admin en LDAP groups context ldap host admin en LDAP host ldap root password admin en LDAP root password ldap rootdn admin en LDAP rootdn +leave empty for no quota admin en leave empty for no quota leave the category untouched and return back to the list admin en leave the category untouched and return back to the list leave the group untouched and return back to the list admin en Leave the group untouched and return back to the list list config settings admin en List config settings @@ -226,6 +239,7 @@ login shell admin en Login shell login time admin en Login Time loginid admin en LoginID mail settings admin en Mail settings +main email-address admin en Main Email-Address main screen message admin en Main screen message manager admin en Manager maximum account id (e.g. 65535 or 1000000) admin en Maximum account id (e.g. 65535 or 1000000) @@ -240,6 +254,7 @@ new group name admin en New group name new password [ leave blank for no change ] admin en New password [ Leave blank for no change ] next run admin en Next run no algorithms available admin en no algorithms available +no alternate email address admin en no alternate email address no jobs in the database !!! admin en No jobs in the database !!! no login history exists for this user admin en No login history exists for this user no matches found admin en No matches found @@ -263,15 +278,21 @@ please enter a name admin en Please enter a name please enter a name for that server ! admin en Please enter a name for that server ! please run setup to become current admin en Please run setup to become current please select admin en Please Select +postfix with ldap admin en Postfix with LDAP preferences admin en Preferences primary group admin en primary Group +qmaildotmode admin en qmaildotmode +qouta size in mbyte admin en qouta size in MByte +quota settings admin en quota settings re-enter password admin en Re-enter password read this list of methods. admin en Read this list of methods. register application hooks admin en Register application hooks +remove admin en remove remove all users from this group admin en Remove all users from this group remove all users from this group ? admin en Remove all users from this group ? return to admin mainscreen admin en return to admin mainscreen return to view account admin en Return to view account +route all mails to admin en Route all Mails to run asynchronous services admin en Run Asynchronous services save the category admin en save the category save the category and return back to the list admin en save the category and return back to the list @@ -311,6 +332,9 @@ sorry, the follow users are still a member of the group %1 admin en Sorry, the f sort the entries admin en sort the entries ssl admin en ssl standard admin en standard +standard imap server admin en standard IMAP server +standard pop3 server admin en standard POP3 server +standard smtp-server admin en standard SMTP-Server start testjob! admin en Start TestJob! submit changes admin en Submit Changes submit the search string admin en Submit the search string @@ -359,9 +383,10 @@ view sessions admin en View sessions view this user admin en view this user view user account admin en View user account who would you like to transfer all records owned by the deleted user to? admin en Who would you like to transfer ALL records owned by the deleted user to? +would you like egroupware to cache the egw info array ? admin en Would you like eGroupWare to cache the egw info array ? +would you like egroupware to cache the phpgw info array ? admin en Would you like eGroupWare to cache the phpgw info array ? would you like egroupware to check for a new version
when admins login ? admin en Would you like eGroupWare to check for a new version
when admins login ? would you like egroupware to check for new application versions when admins login ? admin en Would you like eGroupWare to check for new application versions when admins login ? -would you like egroupware to cache the egw info array ? admin en Would you like eGroupWare to cache the egw info array ? would you like to automaticaly load new langfiles (at login-time) ? admin en Would you like to automatically load new langfiles (at login-time) ? would you like to show each application's upgrade status ? admin en Would you like to show each application's upgrade status ? xml-rpc admin en XML-RPC diff --git a/phpgwapi/setup/phpgw_de.lang b/phpgwapi/setup/phpgw_de.lang index 9c0c587743..2bf7183a0d 100644 --- a/phpgwapi/setup/phpgw_de.lang +++ b/phpgwapi/setup/phpgw_de.lang @@ -312,6 +312,7 @@ last name of the user, eg. "%1" common de Familienname des Benutzers, zB. "%1" last page common de Letzte Seite lastname common de Name latvia common de LATVIA +ldap-mgr common de LDAP-Manager lebanon common de LIBANON lesotho common de LESOTHO liberia common de LYBIEN diff --git a/phpgwapi/setup/phpgw_en.lang b/phpgwapi/setup/phpgw_en.lang index d6ba3b2f4d..bf50931673 100644 --- a/phpgwapi/setup/phpgw_en.lang +++ b/phpgwapi/setup/phpgw_en.lang @@ -307,6 +307,7 @@ last name of the user, eg. "%1" common en last name of the user, eg. "%1" last page common en Last page lastname common en Lastname latvia common en LATVIA +ldap-mgr common en LDAP-Manager lebanon common en LEBANON lesotho common en LESOTHO liberia common en LIBERIA From 2c62ea94b9cb18b5560b39eae9c90119cca2e16c Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 26 Aug 2004 11:57:58 +0000 Subject: [PATCH 019/177] fix for bug [ 1011713 ] new user email address gone --- admin/inc/class.boaccounts.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/inc/class.boaccounts.inc.php b/admin/inc/class.boaccounts.inc.php index 9e40db1481..18d26f36d5 100755 --- a/admin/inc/class.boaccounts.inc.php +++ b/admin/inc/class.boaccounts.inc.php @@ -334,7 +334,7 @@ 'homedirectory' => $_POST['homedirectory'], 'loginshell' => $_POST['loginshell'], 'account_expires_never' => $_POST['never_expires'], - 'email' => $_POST['account_email'], + 'account_email' => $_POST['account_email'], /* 'file_space' => $_POST['account_file_space_number'] . "-" . $_POST['account_file_space_type'] */ ); From 9673ed9a05d46110407151471ceadb4a0bca2142 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 26 Aug 2004 14:15:55 +0000 Subject: [PATCH 020/177] fixed update-file, update from stable was running the phpgw_async changes twice, reported by Andy --- phpgwapi/setup/tables_update.inc.php | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/phpgwapi/setup/tables_update.inc.php b/phpgwapi/setup/tables_update.inc.php index b618b2581e..d4b3ec2539 100644 --- a/phpgwapi/setup/tables_update.inc.php +++ b/phpgwapi/setup/tables_update.inc.php @@ -22,14 +22,7 @@ $test[] = '1.0.0.001'; function phpgwapi_upgrade1_0_0_001() { - $GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_async','id','async_id'); - $GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_async','next','async_next'); - $GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_async','times','async_times'); - $GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_async','method','async_method'); - $GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_async','data','async_data'); - $GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_async','account_id','async_account_id'); - - $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.0.1.001'; + $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.0.0.004'; return $GLOBALS['setup_info']['phpgwapi']['currentver']; } @@ -50,10 +43,14 @@ $test[] = '1.0.0.004'; function phpgwapi_upgrade1_0_0_004() { - phpgwapi_upgrade1_0_0_001(); - - // we skip the 1.0.1.001 update as its identitcal to the 1.0.0.003 update, which we already have - $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.0.1.002'; + $GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_async','id','async_id'); + $GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_async','next','async_next'); + $GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_async','times','async_times'); + $GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_async','method','async_method'); + $GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_async','data','async_data'); + $GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_async','account_id','async_account_id'); + + $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.0.1.001'; return $GLOBALS['setup_info']['phpgwapi']['currentver']; } From b3971d810c8b39ede8b446d55b2f8e5d87d30007 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 26 Aug 2004 14:18:09 +0000 Subject: [PATCH 021/177] RenameColumn no checks if column is used in an index and evtl. rename the column in the index-definition (for the baseline delta) --- phpgwapi/inc/class.schema_proc.inc.php | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/phpgwapi/inc/class.schema_proc.inc.php b/phpgwapi/inc/class.schema_proc.inc.php index e4504fbaf2..f48fbfa328 100644 --- a/phpgwapi/inc/class.schema_proc.inc.php +++ b/phpgwapi/inc/class.schema_proc.inc.php @@ -274,6 +274,26 @@ { $this->m_aTables[$sTableName]['fd'][$sNewColumnName] = $this->m_aTables[$sTableName]['fd'][$sOldColumnName]; unset($this->m_aTables[$sTableName]['fd'][$sOldColumnName]); + + // check if column is used in an index and evtl. rename the column in the index-definition + if (($key = array_search($sOldColumnName,$this->m_aTables[$sTableName]['pk'])) !== false) + { + $this->m_aTables[$sTableName]['pk'][$key] = $sNewColumnName; + } + foreach(array('ix','uc') as $kind) + { + foreach($this->m_aTables[$sTableName][$kind] as $key => $index) + { + if (!is_array($index)) + { + if ($index == $sOldColumnName) $this->m_aTables[$sTableName][$kind][$key] = $sNewColumnName; + } + elseif (($sub_key = array_search($sOldColumnName,$index)) !== false) + { + $this->m_aTables[$sTableName][$kind][$key][$sub_key] = $sNewColumnName; + } + } + } if($this->m_bDeltaOnly) return True; // we have to use the new column-name, as m_oDeltaProc has already changed m_aTables @@ -541,7 +561,7 @@ if ($this->debug) $bOutputHTML = True; if ($bOutputHTML && !$this->debug) $this->debug = 2; - $this->m_aTables = $aTables; + $this->m_aTables = array(); foreach($aTables as $sTableName => $aTableDef) { From 18221503b656ba26f6f5a2c250fbc79d2afd79ac Mon Sep 17 00:00:00 2001 From: mgalgoci Date: Thu, 26 Aug 2004 18:47:29 +0000 Subject: [PATCH 022/177] - re-write display_fullname to be more readable and suck much less - add support for Lastname, Firstname username account views --- phpgwapi/inc/class.common.inc.php | 45 ++++++++++++++----------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php index d0d9e9e5eb..410759500a 100644 --- a/phpgwapi/inc/class.common.inc.php +++ b/phpgwapi/inc/class.common.inc.php @@ -464,42 +464,37 @@ $display = $GLOBALS['phpgw_info']['user']['preferences']['common']['account_display']; - if (!$firstname && !$lastname || $display == 'username') + if ($firstname && $lastname) { - return $lid; + $delimiter = ', '; } - if ($lastname) + else { - $a[] = $lastname; + $delimiter = ''; } - - if ($firstname) - { - $a[] = $firstname; - } - + $name = ''; switch($display) { - case 'all': - if ($lid) - { - $name = '['.$lid.'] '; - } - // fall-through + case 'firstname': + $name = $firstname . ' ' . $lastname; + break; case 'lastname': - $name .= implode(', ',$a); + $name = $lastname . $delimiter . $firstname; + break; + case 'username': + $name = $lid; break; case 'firstall': - if ($lid) - { - $name = ' ['.$lid.']'; - } - // fall-through - case 'firstname': - default: - $name = $firstname . ' ' . $lastname . $name; + $name = $firstname . ' ' . $lastname . ' ['.$lid.']'; break; + case 'lastall': + $name = $lastname . $delimiter . $firstname . ' ['.$lid.']'; + break; + case 'all': + /* fall through */ + default: + $name = '['.$lid.'] ' . $firstname . ' ' . $lastname; } return $name; } From 68f68ae0dbd87d03816ecbbd88c289f357291ef1 Mon Sep 17 00:00:00 2001 From: mgalgoci Date: Thu, 26 Aug 2004 18:48:12 +0000 Subject: [PATCH 023/177] add support for Lastname, Firstname username account views --- preferences/inc/hook_settings.inc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/preferences/inc/hook_settings.inc.php b/preferences/inc/hook_settings.inc.php index 65c6473c8e..a45d17618a 100755 --- a/preferences/inc/hook_settings.inc.php +++ b/preferences/inc/hook_settings.inc.php @@ -123,6 +123,7 @@ 'lastname' => lang('Lastname').', '.lang('Firstname'), 'username' => lang('username'), 'firstall' => lang('Firstname').' '.lang('Lastname').' ['.lang('username').']', + 'lastall' => lang('Lastname').', '.lang('Firstname').' ['.lang('username').']', 'all' => '['.lang('username').'] '.lang('Lastname').', '.lang('Firstname') ); create_select_box('How do you like to display accounts','account_display',$account_display, From 703e964f576dd47778180bcebaac160242686791 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 26 Aug 2004 19:00:50 +0000 Subject: [PATCH 024/177] fixed "TranslationTools" italian langfile is written empty, it only happens if system-charset utf-8 is set and is cause by the wrong translation of charset to "set characteri" instead of the used charset iso-8859-1 --- phpgwapi/setup/phpgw_it.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpgwapi/setup/phpgw_it.lang b/phpgwapi/setup/phpgw_it.lang index 9a5de465c2..521ecbcec4 100644 --- a/phpgwapi/setup/phpgw_it.lang +++ b/phpgwapi/setup/phpgw_it.lang @@ -106,7 +106,7 @@ cc common it Cc central african republic common it REPUBBLICA CENTRO AFRICANA chad common it CHAD change common it Cambia -charset common it set caratteri +charset common it iso-8859-1 check installation common it Controlla installazione chile common it CILE china common it CINA From d47313617fd6f25176d83d691d25dff181247435 Mon Sep 17 00:00:00 2001 From: reinerj Date: Thu, 26 Aug 2004 21:02:07 +0000 Subject: [PATCH 025/177] lang file update from Theytaz Antoine --- admin/setup/phpgw_fr.lang | 104 +++++++++++++++++- filemanager/setup/phpgw_fr.lang | 31 +++--- phpgwapi/setup/phpgw_fr.lang | 38 ++++--- setup/lang/phpgw_fr.lang | 182 +++++++++++++++++++++++++------- 4 files changed, 282 insertions(+), 73 deletions(-) diff --git a/admin/setup/phpgw_fr.lang b/admin/setup/phpgw_fr.lang index 523d7cbc21..70ce636441 100644 --- a/admin/setup/phpgw_fr.lang +++ b/admin/setup/phpgw_fr.lang @@ -1,4 +1,6 @@ %1 - %2 of %3 user accounts admin fr %1 - %2 de %3 comptes utilisateurs +%1 - %2 of %3 user groups admin fr %1 - %2 de %3 groupes utilisateurs +%1 not found or not executable !!! admin fr %1 introuvable ou pas excutable !!! (stored password will not be shown here) admin fr (Le mot de passe enregistr ne sera pas montr ici) (to install new applications use
setup [manage applications] !!!) admin fr (Pour installer de nouvelles applications utilisez
Setup [Grer Les Applications] !!!) accesslog and bruteforce defense admin fr Protection contre les attaques accs aux logs et attaque systmatique @@ -6,22 +8,28 @@ account active admin fr Compte actif account has been created common fr Le compte a t cre account has been deleted common fr Le compte a t effac account has been updated common fr Le compte a t mis jour +account list admin fr Liste des comptes account permissions admin fr Permissions de compte account preferences admin fr Prfrences de compte acl manager admin fr Gestionnaire des droits d'accs acl rights common fr Droits d'accs action admin fr Action +activate wysiwyg-editor admin fr activer l'diteur WYSIWYG add a category admin fr Ajouter une catgorie add a group admin fr Ajouter un groupe add a new account. admin fr Ajouter un nouveau compte. add a subcategory admin fr Ajouter une sous-catgorie add a user admin fr Ajouter un utilisateur +add account admin fr Ajouter un compte +add application admin fr Ajouter une application add auto-created users to this group ('default' will be attempted if this is empty.) admin fr Ajouter les utilisateurs cres automatiquement ce groupe ('Dfaut' sera tent si ce champ est laiss vide.) add global category admin fr Ajouter une catgorie globale add global category for %1 admin fr Ajouter une catgorie globale pour %1 +add group admin fr Ajouter un groupe add new account admin fr Ajouter un nouveau compte add new application admin fr Ajouter une nouvelle application add peer server admin fr Ajouter un serveur pair +add sub-category admin fr Ajouter une sous-catgorie admin email admin fr Email de l'administrateur admin email addresses (comma-separated) to be notified about the blocking (empty for no notify) admin fr Adresses EMail (spares par des virgules) des administrateurs prvenir propos du blocage (vide pour aucune notification) admin name admin fr Nom de l'administrateur @@ -33,11 +41,14 @@ all records and account information will be lost! admin fr Tous les enregistreme all users admin fr Tous les utilisateurs allow anonymous access to this app admin fr Autoriser l'accs anonyme cette application anonymous user admin fr Utilisateur anonyme +anonymous user (not shown in list sessions) admin fr Utilisateur anonyme (n'apparat pas dans la liste des sessions) anonymous user
(not shown in list sessions) admin fr Utilisateur anonyme
(non montr dans la liste des sessions) +appearance admin fr Apparence application admin fr Application application name admin fr Nom d'application application title admin fr Titre d'application applications admin fr Applications +applications list admin fr Liste de applications apply admin fr Appliquer are you sure you want to delete the application %1 ? admin fr Etes-vous sr de vouloir effacer l'application %1 ? are you sure you want to delete this account ? admin fr Etes-vous sr de vouloir effacer ce compte ? @@ -47,6 +58,9 @@ are you sure you want to delete this global category ? admin fr Etes-vous s are you sure you want to delete this group ? admin fr Etes-vous sr de vouloir effacer ce groupe ? are you sure you want to delete this server? admin fr Etes-vous sr de vouloir effacer ce serveur ? are you sure you want to kill this session ? admin fr Etes-vous sr de vouloir tuer cette session ? +async services last executed admin fr Dernire excution des services asynchrones +asynchronous timed services admin fr Services asynchrones +asyncservices not yet installed or other error (%1) !!! admin fr services asynchrones pas encore installs ou autre erreur (%1) !!! attempt to use correct mimetype for ftp instead of default 'application/octet-stream' admin fr Tentative d'utiliser la type MIME correct pour ftp la place de celui par dfaut 'application/octet-stream' authentication / accounts admin fr Authentification / Comptes auto create account records for authenticated users admin fr Crer automatiquement les enregistrements de comptes pour les utilisateurs authentifis @@ -54,24 +68,44 @@ back to the list admin fr retour bi-dir passthrough admin fr passage bi-dir bi-directional admin fr bi-directionnel bottom admin fr bas +calculate next run admin fr Calculer la prochaine excution +can change password admin fr Peut modifier son mot de passe +cancel testjob! admin fr Annuler le Travail de test! +categories list admin fr Liste des catgories category %1 has been saved ! admin fr La catgorie %1 a t enregistre ! category list admin fr Liste de catgories +change acl rights admin fr modifier les droits d'accs (ACL) +change config settings admin fr Modifier les paramtres de configuration change main screen message admin fr Changer le message de l'cran principal check ip address of all sessions admin fr Vrifier l'adresse IP de toutes les sessions check items to %1 to %2 for %3 admin fr Vrifier les objets vers %1 %2 pour %3 +click to select a color admin fr Cliquez pour slectionner une couleur +color admin fr Couleur country selection admin fr Slection du pays create group admin fr Crer un groupe +crontab only (recomended) admin fr crontab seulement (recommand) +data admin fr Donnes +day admin fr Jour +day of week
(0-6, 0=sun) admin fr Jour de la semaine
(0-6, 0=Dim) default admin fr Dfaut default file system space per user admin fr Espace disque par utilisateur (par dfaut) default file system space per user/group ? admin fr Espace disque par utilisateur/groupe (par dfaut) ? +deinstall crontab admin fr Dsinstaller le crontab +delete account admin fr Effacer le compte delete all records admin fr Effacer tous les enregistrements +delete application admin fr Effacer l'application +delete category admin fr Effacer catgorie +delete group admin fr Effacer groupe +delete peer server admin fr Effacer serveur (peer server) delete the category admin fr Effacer la catgorie delete the group admin fr Effacer le groupe delete this category admin fr Effacer cette catgorie delete this group admin fr Effacer ce groupe delete this user admin fr Effacer cet utilisateur +deny access to access log admin fr Refuser l'accs au log d'accs deny access to application registery admin fr Refuser l'accs l'enregistrement d'applications deny access to applications admin fr Refuser l'accs aux applications +deny access to asynchronous timed services admin fr Refuser l'accs aux services asynchrones deny access to current sessions admin fr Refuser l'accs aux sessions en cours deny access to error log admin fr Refuser l'accs la log d'erreurs deny access to global categories admin fr Refuser l'accs aux catgories globales @@ -84,15 +118,20 @@ deny access to site configuration admin fr Refuser l'acc deny access to user accounts admin fr Refuser l'accs aux comptes utilisateurs deny all users access to grant other users access to their entries ? admin fr Les utilisateurs ne peuvent permettre aux autres l'accs leurs donnes ? description can not exceed 255 characters in length ! admin fr La description ne peut dpasser 255 caractres de long ! +disable "auto completion" of the login form admin fr Dsactiver "remplissage auto" dans le formulaire de login +disable wysiwyg-editor admin fr dsactiver l'diteur WYSIWYG +disabled (not recomended) admin fr dsactiv (pas recommand) display admin fr Afficher do not delete the category and return back to the list admin fr Ne PAS effacer la catgorie et retourner la liste do you also want to delete all global subcategories ? admin fr Voulez-vous aussi effacer toutes les sous-catgories globales ? do you want to delete all global subcategories ? admin fr Voulez-vous effacer toutes les sous-catgories globales ? do you want to move all global subcategories one level down ? admin fr Voulez-vous dplacer toutes les sous-catgories globales un niveau plus bas ? +edit account admin fr Editer le compte edit application admin fr Modifier l'application edit global category admin fr Modifier la catgorie globale edit global category for %1 admin fr Modifier la catgorie globale pour %1 edit group admin fr Modifier le groupe +edit group acl's admin fr diter les autorisations d'accs du groupe (ACL) edit login screen message admin fr Modifier le message de l'cran de connexion edit main screen message admin fr Modifier le message de l'cran principal edit peer server admin fr Modifier le serveur pair @@ -102,14 +141,18 @@ edit this group admin fr Modifier ce groupe edit this user admin fr Modifier cet utilisateur edit user admin fr Modifier l'utilisateur edit user account admin fr Modifier le compte de l'utilisateur +enable debug-messages admin fr Activer les messages de dboguage enabled - hidden from navbar admin fr Activ - cach de la barre de navigation +enabled - popup window admin fr Activ - Fentre popup enter a description for the category admin fr Entrez une description pour la catgorie enter some random text for app_session
encryption (requires mcrypt) admin fr Entrez un texte au hasard pour le
chiffrement de l'app_session (ncessite mcrypt) enter the background color for the login page admin fr Entrez la couleur de fond pour la page de connexion enter the background color for the site title admin fr Entrez la couleur de fond pour le titre du site enter the file name of your logo admin fr Entrez le nom du fichier de votre logo enter the full path for temporary files.
examples: /tmp, c:\temp admin fr Entrez le chemin complet pour les fichiers temporaires.
Exemples: /tmp, c:\temp +enter the full path for temporary files.
examples: /tmp, c:temp admin fr Entrez le chemin complet pour les fichiers temporaires.
Exemples: /tmp, c:\temp enter the full path for users and group files.
examples: /files, e:\files admin fr Entrez le chemin complet pour les fichiers de utilisateurs et groupes.
Exemples: /files, e:\files +enter the full path for users and group files.
examples: /files, e:files admin fr Entrez le chemin complet pour les fichiers de utilisateurs et groupes.
Exemples: /files, e:\files enter the hostname of the machine on which this server is running admin fr Entrez le nom de la machine sur laquelle ce serveur s'excute enter the location of egroupware's url.
example: http://www.domain.com/egroupware   or   /egroupware
no trailing slash admin fr Entrez l'emplacement de l'URL eGroupWare.
Exemple: http://www.domaine.com/egroupware   ou   /egroupware
Pas de division (/) la fin enter the search string. to show all entries, empty this field and press the submit button again admin fr Entrez la chane de recherche. Pour montrer toutes les entres, videz ce champ et recliquez sur le bouton SOUMETTRE @@ -117,34 +160,49 @@ enter the site password for peer servers admin fr Entrez le mot de passe du site enter the site username for peer servers admin fr Entrez le nom d'utilisateur du site pour les serveurs pairs enter the title for your site admin fr Entrez le titre pour votre site enter the title of your logo admin fr Entrez le titre de votre logo +enter the url or filename (in phpgwapi/templates/default/images) of your logo admin fr Entrez l'URL ou le fichier pour votre logo (dans phpgwapi/templates/default/images) enter the url where your logo should link to admin fr Entrez l'URL vers laquelle votre logo doit rediriger enter your default ftp server admin fr Entrez votre serveur FTP par dfaut +enter your default mail domain ( from: user@domain ) admin fr Entrez votre domaine de messagerie par dfaut (De: utilisateur@domaine) enter your http proxy server admin fr Entrez votre serveur proxy HTTP enter your http proxy server port admin fr Entrez le port de votre serveur proxy HTTP +enter your smtp server hostname or ip address admin fr Entrez votre nom de serveur SMTP ou adresse IP +enter your smtp server port admin fr Entrez le port de votre serveur SMTP +error canceling timer, maybe there's none set !!! admin fr Erreur en annulant le timer, peut-tre qu'il n'y en a aucun de dfini !!! +error setting timer, wrong syntax or maybe there's one already running !!! admin fr Erreur en crant le timer, erreur de syntaxe ou peut-tre il y en a dj un qui tourne !!! +error: %1 not found or other error !!! admin fr Erreur: %1 introuvable ou autre erreur !!! expires admin fr Expire file space admin fr Espace fichiers file space must be an integer admin fr La valeur Espace fichiers doit tre un entier find and register all application hooks admin fr Trouver et enregistrer tous les "application hooks" +for the times above admin fr pour le timing ci-dessus +for the times below (empty values count as '*', all empty = every minute) admin fr pour le timing ci-dessous (valeurs vides comptent comme '*', tout vide = chaque minute) force selectbox admin fr Forcer la boite de slection global categories common fr Catgories globales group ? admin fr Groupe ? group has been added common fr Le groupe a t ajout group has been deleted common fr Le groupe a t effac group has been updated common fr Le groupe a t mis jour +group list admin fr Liste des groupes group manager admin fr Gestionnaire de groupe group name admin fr Nom du groupe hide php information admin fr Cacher les informations sur php home directory admin fr Rpertoire maison host information admin fr Informations sur l'hte +hour
(0-23) admin fr Heure
(0-23) how many days should entries stay in the access log, before they get deleted (default 90) ? admin fr Pendant combien de jours les entres doivent-elles rester dans la log d'accs, avant d'tre effaces (90 par dfaut) ? how many minutes should an account or ip be blocked (default 30) ? admin fr Pendant combien de minutes un compte ou une adresse IP doit-il(elle) tre bloqu(e) (30 par dfaut) ? +icon admin fr Icne idle admin fr Disponible if no acl records for user or any group the user is a member of admin fr Si pas d'enregistrements dans les droits d'accs pour l'utilisateur ou n'importe quel groupe, l'utilisateur est membre de if using ldap, do you want to manage homedirectory and loginshell attributes? admin fr Si vous utilisez LDAP, voulez-vous grer les attributs rpertoire maison et shell de connexion? inbound admin fr Entrant +install crontab admin fr Installer le crontab installed applications common fr Applications installes +installed crontab admin fr Crontab installe interface admin fr Interface ip admin fr IP +jobs admin fr Travaux kill admin fr Tuer kill session admin fr Tuer la session last %1 logins admin fr Dernires %1 connexions @@ -162,23 +220,33 @@ ldap root password admin fr Mot de passe root LDAP ldap rootdn admin fr Rootdn LDAP leave the category untouched and return back to the list admin fr Laisser la catgorie telle quelle et retourner la liste leave the group untouched and return back to the list admin fr Laisser le groupe tel quel et retouner la liste +list config settings admin fr Afficher les paramtres de configuration +list current sessions admin fr Afficher les sessions actuelles list of current users admin fr Liste des utilisateurs actuels login history common fr Historique de connexion +login message admin fr Message d'accueil login screen admin fr Ecran de connexion login shell admin fr Shell de connexion login time admin fr Heure de connexion loginid admin fr Identifiant de l'utilisateur +mail settings admin fr Rglages mail main screen message admin fr Message de l'cran principal manager admin fr Gestionnaire maximum account id (e.g. 65535 or 1000000) admin fr Numro de compte maximum (p.e. 65535 ou 1000000) +maximum entries in click path history admin fr Nombre maximal d'entres dans l'historique des clics sur les liens message has been updated admin fr le message a t mis jour +method admin fr Mthode minimum account id (e.g. 500 or 100, etc.) admin fr Numro de compte minimum (p.e. 500 ou 100, etc.) +minute admin fr Minute mode admin fr Mode +month admin fr Mois new group admin fr Nouveau groupe new group name admin fr Nouveau nom de groupe new password [ leave blank for no change ] admin fr Nouveau mot de passe [ Laisser vide pour aucun changement ] new user admin fr Nouvel utilisateur +next run admin fr Prochain dmarrage no algorithms available admin fr Pas d'algorithme disponible +no jobs in the database !!! admin fr Pas de travaux dans la base de donnes !!! no login history exists for this user admin fr Aucun historique de connexion n'existe pour cet utilisateur no matches found admin fr Aucune occurrence trouve no modes available admin fr Pas de modes disponibles @@ -189,7 +257,9 @@ note: ssl available only if php is compiled with curl support admin fr Note: SSL open popup window admin fr Ouvrir une fentre Popup outbound admin fr sortant passthrough admin fr passage +password for smtp-authentication admin fr Mot de passe pour l'authentification SMTP path information admin fr Information sur le chemin +peer server list admin fr Liste des serveurs (peer servers) peer servers admin fr Serveurs pairs percent of users that logged out admin fr Pourcentage des utilisateurs qui se sont dconnects percent this user has logged out admin fr Pourcentage de dconnexion de cet utilisateur @@ -201,14 +271,21 @@ please enter a name for that server ! admin fr SVP entrez un nom pour ce serveur please run setup to become current admin fr SVP excutez setup pour vous mettre jour please select admin fr SVP choisissez preferences admin fr Prfrences +primary group admin fr groupe initial re-enter password admin fr R-entrez le mot de passe read this list of methods. admin fr Lisez cette liste de mthodes. +register application hooks admin fr Enregistrer les "application hooks" remove all users from this group admin fr Retirer tous les utilisateurs de ce groupe remove all users from this group ? admin fr Retirer tous les utilisateurs de ce groupe ? return to admin mainscreen admin fr Retourner l'cran principal de l'administration return to view account admin fr Retourner la vue du compte +run asynchronous services admin fr Faire tourner les Services asynchrones save the category admin fr Enregistrer la catgorie save the category and return back to the list admin fr Enregistrer la catgorie et retourner la liste +search accounts admin fr Chercher des comptes +search categories admin fr Chercher des catgories +search groups admin fr Chercher des groupes +search peer servers admin fr Chercher des seveurs (peer servers) security admin fr Scurit select group managers admin fr Slectionner les gestionnaires de groupe select permissions this group will have admin fr Choisissez les permissions que ce groupe va avoir @@ -225,12 +302,22 @@ server type(mode) admin fr Type de serveur(mode) server url admin fr URL du serveur server username admin fr Nom d'utilisateur du serveur set preference values. admin fr Rgler les valeurs des prfrences. +should the login page include a language selectbox (useful for demo-sites) ? admin fr Est-ce que la page de login doit inclure une zone de slection linguistique (utile aussi pour les sites de dmonstration) show 'powered by' logo on admin fr Montrer le logo 'excut par' sur +show access log admin fr Montrer les logs d'accs +show current action admin fr Montrer les actions en cours +show error log admin fr Montrer le log d'erreurs +show phpinfo() admin fr Montrer phpinfo() +show session ip address admin fr Montrer les adresses IP des sessions site admin fr Site site configuration common fr Configuration du site -sorry, that group name has already been taken. admin fr Dsol, ce nom de groupe a dj t pris. +sorry, that group name has already been taken. admin fr Dsol, ce nom de groupe existe dj. +sorry, the above users are still a member of the group %1 admin fr Dsol, les utilisateurs ci-dessus sont toujours membre du groupe %1 sorry, the follow users are still a member of the group %1 admin fr Dsol, les utilisateurs suivants sont encore membres de ce groupe %1 sort the entries admin fr Trier les entres +ssl admin fr ssl +standard admin fr standard +start testjob! admin fr Dmarrer le Travail de test! submit changes admin fr Soumettre les changements submit the search string admin fr Soumettre la chane de recherche template selection admin fr Slection du style @@ -242,46 +329,55 @@ that name has been used already admin fr Ce nom a d that server name has been used already ! admin fr Ce nom de serveur a dj t utilis ! the api is current admin fr L'API est jour the api requires an upgrade admin fr L'API ncessite une mise jour +the groups must include the primary group admin fr Les groupes doivent inclure le groupe primaire the login and password can not be the same admin fr Le login et le mot de passe ne peuvent tre identiques the loginid can not be more then 8 characters admin fr Le loginid ne peut pas tre compos de plus de 8 caractres +the testjob sends you a mail everytime it is called. admin fr Le Travail de test vous envoie un mail chaque fois qu'il est appel. the two passwords are not the same admin fr Les deux mots de passe ne sont pas identiques the users bellow are still members of group %1 admin fr Les utilisateurs ci-dessous sont encore membres du groupe %1 +there already is a group with this name. userid's can not have the same name as a groupid admin fr Il y a dj un groupe portant ce nom. Les noms de comptes ne peuvent pas avoir le mme nom qu'un nom de groupe they must be removed before you can continue admin fr Ils doivent tre enlevs avant que vous puissiez continuer this application is current admin fr Cette application est jour this application requires an upgrade admin fr Cette application ncessite une mise jour this category is currently being used by applications as a parent category admin fr Cette catgorie est actuellement utilise par des applications comme une catgorie parente timeout for application session data in seconds (default 86400 = 1 day) admin fr Expiration pour les donnes session de l'application en secondes (par dfaut 86400 = 1 jour) timeout for sessions in seconds (default 14400 = 4 hours) admin fr Expiration pour les sessions en secondes (par dfaut 14400 = 4 heures) +times admin fr Heures top admin fr Haut total records admin fr Enregistrements totaux trust level admin fr Niveau de confiance trust relationship admin fr Relation de confiance +under windows you need to install the asyncservice %1manually%2 or use the fallback mode. fallback means the jobs get only checked after each page-view !!! admin fr Sous windows vous devez installer les services asynchrones %1manuellement%2 ou utiliser le mode "fallback". "Fallback" veut dire que les travaux ne sont vrifis qu'aprs chaque affichage de page !!! use cookies to pass sessionid admin fr Utiliser les cookies pour passer l'ID de session use pure html compliant code (not fully working yet) admin fr Utiliser du code HTML standard (ne fonctionne pas encore compltement) use theme admin fr Utiliser le thme user accounts admin fr Comptes utilisateurs user data admin fr Donnes utilisateurs +user for smtp-authentication (leave it empty if no auth required) admin fr Utilisateur pour l'authentification SMTP (laisser vide si pas requis) user groups admin fr Groupes utilisateurs userdata admin fr Donnes utilisateur users choice admin fr Choix de l'utilisateur view access log admin fr Voir le journal d'accs +view account admin fr Voir le compte +view category admin fr Voir la catgorie view error log admin fr Voir le journal d'erreurs view sessions admin fr Voir les sessions view this user admin fr Voir cet utilisateur view user account admin fr Voir le compte utilisateur who would you like to transfer all records owned by the deleted user to? admin fr A qui voudriez-vous tranfrer tous les enregistrements appartenant l'utilisateur effac? would you like egroupware to cache the egw info array ? admin fr Voudriez-vous que eGroupWare cache le champ egw info ? +would you like egroupware to check for a new version
when admins login ? admin fr Voulez-vous que eGroupWare vrifie les mises jour
quand un administrateur se connecte ? would you like egroupware to check for new application versions when admins login ? admin fr Voudriez-vous que eGroupWare vrifie s'il y a de nouvelles versions d'applications quand les administrateurs se connectent ? +would you like to automaticaly load new langfiles (at login-time) ? admin fr Voulez-vous automatiquement charger les nouveaux fichiers de langues ( la connexion) ? would you like to show each application's upgrade status ? admin fr Voudriez-vous montrer l'tat de mise jour de chaque application ? +xml-rpc admin fr XML-RPC you have entered an invalid expiration date admin fr Vous avez entr une date d'expiration invalide you must add at least 1 permission or group to this account admin fr Vous devez ajouter au moins 1 permission ou groupe ce compte you must enter a group name. admin fr Vous devez entrer un nom de groupe +you must enter a lastname admin fr Vous devez entrer un nom you must enter a loginid admin fr Vous devez entrer un loginid you must enter an application name and title. admin fr Vous devez entrer un nom d'application et un titre. you must enter an application name. admin fr Vous devez entrer un nom d'application. you must enter an application title. admin fr Vous devez entrer un titre d'application. you must select a file type admin fr Vous devez choisir un type de fichier you will need to remove the subcategories before you can delete this category admin fr Vous allez devoir enlever les sous-catgories avant de pouvoir effacer cette catgorie ! -enter your smtp server hostname or ip address admin fr Entrez votre nom de serveur SMTP ou adresse IP -enter your smtp server port admin fr Entrez le port de votre serveur SMTP -mail settings admin fr Rglages mail diff --git a/filemanager/setup/phpgw_fr.lang b/filemanager/setup/phpgw_fr.lang index a6409bf42c..31a9a82490 100644 --- a/filemanager/setup/phpgw_fr.lang +++ b/filemanager/setup/phpgw_fr.lang @@ -3,12 +3,12 @@ application filemanager fr Application back to file manager filemanager fr Retourner au gestionnaire de fichiers cancel editing %1 without saving filemanager fr Annuler les modifications de "%1" cannot create directory because it begins or ends in a space filemanager fr Ne peut crr le rpertoire car il commence ou finit sur un espace -cannot replace %1 because it is a directory filemanager fr Ne peut remplacer %1 parce-que c'est un rpertoire +cannot replace %1 because it is a directory filemanager fr Ne peut remplacer %1 car c'est un rpertoire command sucessfully run filemanager fr Commande excute avec succs comment filemanager fr Commentaire comments cannot contain "%1" filemanager fr Les commentaires ne peuvent pas contenir "%1" copied %1 to %2 filemanager fr Copi %1 vers %2 -copy to filemanager fr Copier vers +copy to filemanager fr Copier Vers copy to: filemanager fr Copier vers: could not copy %1 to %2 filemanager fr N'a pas pu copier %1 vers %2 could not copy file because no destination directory is given filemanager fr Impossible de copier le fichier car aucun rpertoire de destination n'a t donn @@ -19,11 +19,11 @@ could not move %1 to %2 filemanager fr N'a pas pu d could not move file because no destination directory is given filemanager fr Impossible de dplacer le fichier car aucun rpertoire de destination n'a t donn could not rename %1 to %2 filemanager fr N'a pas pu renommer %1 to %2 could not save %1 filemanager fr N'a pas pu enregistrer %1 -create file filemanager fr Crr fichier -create folder filemanager fr Crr dossier +create file filemanager fr Crer fichier +create folder filemanager fr Crer dossier created filemanager fr Cr created %1 filemanager fr %1 cr -created %1,%2 filemanager fr Creation de %1,%2 +created %1,%2 filemanager fr Cration de %1,%2 created by filemanager fr Cr par created directory %1 filemanager fr Rpertoire %1 cr date filemanager fr Date @@ -46,10 +46,11 @@ file filemanager fr Fichier file %1 already exists. please edit it or delete it first. filemanager fr Le fichier %1 existe dj. SVP modifiez-le ou effacez-le d'abord. file %1 could not be created. filemanager fr Le fichier %1 n'a pas pu tre cr. file name filemanager fr Nom du fichier +file names cannot contain or / filemanager fr Les noms de fichier ne peuvent contenir \ ou / file names cannot contain "%1" filemanager fr Les noms de fichier ne peuvent contenir "%1" file names cannot contain \ or / filemanager fr Les noms de fichier ne peuvent contenir \ ou / filemanager common fr Gestionnaire de fichiers -filemanager preferences filemanager fr Prfrences filemanager +filemanager preferences filemanager fr Prfrences gestionnaire de fichiers files filemanager fr Fichiers files in this directory filemanager fr Fichiers dans ce rpertoire folder filemanager fr Dossier @@ -58,7 +59,7 @@ go home filemanager fr R go to filemanager fr Aller dans go to %1 filemanager fr Aller dans %1 go to your home directory filemanager fr Aller dans votre rpertoire "home" (maison) -go to: filemanager fr Aller dans: +go to: filemanager fr Aller : go up filemanager fr Remonter home filemanager fr Maison location filemanager fr Location @@ -66,11 +67,11 @@ locked filemanager fr Verouill mime type filemanager fr Type MIME modified filemanager fr Modifi modified by filemanager fr Modifi par -move to filemanager fr Dplacer dans +move to filemanager fr Dplacer Dans move to: filemanager fr Dplacer dans: moved %1 to %2 filemanager fr Dplac %1 dans %2 -no files in this directory. filemanager fr Pas de fichiers dans ce rpertoire -no version history for this file/directory filemanager fr pas d'historique de versions pour ce fichier/rpertoire +no files in this directory. filemanager fr Pas de fichiers dans ce rpertoire. +no version history for this file/directory filemanager fr Pas d'historique de versions pour ce fichier/rpertoire operation filemanager fr Opration other settings filemanager fr Autres paramtres owner filemanager fr Propritaire @@ -83,7 +84,7 @@ rename filemanager fr Renommer renamed %1 to %2 filemanager fr Renomm %1 en %2 replaced %1 filemanager fr Remplac %1 save %1 filemanager fr Enregistrer %1 -save %1, and go back to file listing filemanager fr Enregistrer %1, et afficher le listing +save %1, and go back to file listing filemanager fr Enregistrer %1, et retour au listing save all filemanager fr Enregistrer tout save changes filemanager fr Enregistrer les changements saved %1 filemanager fr %1 enregistr @@ -93,9 +94,9 @@ show .files filemanager fr Montrer .fichiers show command line (experimental. dangerous.) filemanager fr Montrer la ligne de commande (EXPERIMENTAL. DANGEREUX.) show help filemanager fr Montrer l'aide size filemanager fr Taille -sort by: filemanager fr Tri par: -the future filemanager, now for testing purposes only, please send bugreports filemanager fr -total files filemanager fr Total de fichiers +sort by: filemanager fr Trier par: +the future filemanager, now for testing purposes only, please send bugreports filemanager fr Le futur gestionnaire de fichiers, SEULEMENT POUR DES TESTS, envoyez des rapports de bogues svp +total files filemanager fr Nombre de Fichiers unknown mime-type defaults to text/plain when viewing filemanager fr text/plain utilis par dfaut si type MIME inconnu unused space filemanager fr Espace inutilis up filemanager fr Haut @@ -104,7 +105,7 @@ updated comment for %1 filemanager fr Commentaire pour %1 mis upload filemanager fr Envoyer upload fields filemanager fr Champs d'envoi upload files filemanager fr Fichiers envoyer -use new experimental filemanager? filemanager fr Voir le gestionnaire de fichier exprimental? +use new experimental filemanager? filemanager fr Utiliser le Gestionnaire de fichier exprimental? used space filemanager fr Espace utilis users filemanager fr Utilisateurs version filemanager fr Version diff --git a/phpgwapi/setup/phpgw_fr.lang b/phpgwapi/setup/phpgw_fr.lang index d553b0fea9..1ebc19a366 100644 --- a/phpgwapi/setup/phpgw_fr.lang +++ b/phpgwapi/setup/phpgw_fr.lang @@ -75,6 +75,7 @@ belize common fr BELIZE benin common fr BENIN bermuda common fr BERMUDES bhutan common fr BOUTAN +blocked, too many attempts common fr Accs refus car trop de tentatives infructueuses bold htmlarea fr Gras bolivia common fr BOLIVIE bosnia and herzegovina common fr BOSNIE HERZEGOVINE @@ -134,13 +135,14 @@ cuba common fr CUBA currency common fr Devise current common fr Courant current style htmlarea fr Style courat -current users common fr Utilisateurs courants +current users common fr Utilisateurs connects cut selection htmlarea fr Slection pour couper cyprus common fr CHYPRE czech republic common fr REPUBLIQUE TCHEQUE date common fr Date date due common fr Date butoir date selection: jscalendar fr Slection de la date : +datetime port.
if using port 13, please set firewall rules appropriately before submitting this page.
(port: 13 / host: 129.6.15.28) admin fr Port Datetime.
Si vous utilisez le port 13, adaptze svp les rgles de votre firewall avant de soumettre cette page.
(Port: 13 / Host: 129.6.15.28) december common fr Dcembre decrease indent htmlarea fr Diminuer l'indentation default category common fr Catgorie par dfaut @@ -149,10 +151,11 @@ denmark common fr DANEMARK description common fr Description detail common fr Dtail details common fr Dtails -disable the execution of bugfixscript for internet explorer 5.5 and higher to show transparency in png-images? common fr Dsactiver l'excution du bugfixscript pour Internet Explorer 5.5 et plus afin d'afficher la tranparence dans les images PNG? +diable the execution a bugfixscript for internet explorer 5.5 and higher to show transparency in png-images? common fr Dsactiver l'excution d'un script correcteur pour Internet Explorer 5.5 et plus rcent pour montrer la transparence des images PNG? disable internet explorer png-image-bugfix common fr Dsactiver png-image-bugfix d'Internet Explorer disable slider effects common fr Dsactiver les effets de glisse disable the animated slider effects when showing or hiding menus in the page? opera and konqueror users will probably must want this. common fr Dsactiver les effets de glisse anims lors de laffichage ou le masquage des menus de la page? les utilisateurs d'Opera et Konqueror devraient srement en avoir besoin. +disable the execution of bugfixscript for internet explorer 5.5 and higher to show transparency in png-images? common fr Dsactiver l'excution du bugfixscript pour Internet Explorer 5.5 et plus afin d'afficher la tranparence dans les images PNG? disabled common fr Dsactiv display %s first jscalendar fr Affiche %s en premier display monday first jscalendar fr Affiche Lundi en premier @@ -174,7 +177,7 @@ edit %1 category for common fr Modifier la cat edit categories common fr Modifier les catgories edit category common fr Modifier la catgorie egroupware api version %1 common fr eGroupWare version API %1 -egroupware: login blocked for user '%1', ip %2 common en eGroupWare: login bloqu pour lutilisateur '%1', IP %2 +egroupware: login blocked for user '%1', ip %2 common fr eGroupWare: login bloqu pour lutilisateur '%1', IP %2 egypt common fr EGYPTE el salvador common fr SALVADOR email common fr EMail @@ -402,6 +405,7 @@ only private common fr Seulement priv only yours common fr seulement les vtres open notify window common fr Ouvrir une fentre de notification open popup window common fr Ouvrir une fentre de popup +ordered list htmlarea fr Liste trie original common fr Original other common fr Autre overview common fr Vue d'ensemble @@ -431,13 +435,13 @@ peru common fr PERU philippines common fr PHILIPPINES phone number common fr Numro de tlphone pitcairn common fr PITCAIRN -please %1 by hand common fr SVP %1 la main +please %1 by hand common fr Veuillez %1 la main please enter a name common fr Veuillez saisir un nom ! -please run setup to become current common fr SVP excutez setup pour vous mettre jour -please select common fr SVP choisissez -please set your global preferences common fr SVP rglez vos prfrences globales ! +please run setup to become current common fr Veuillez excutez setup pour vous mettre jour +please select common fr Veuillez Choisir +please set your global preferences common fr Veuillez rglez vos prfrences globales ! please set your preferences for this application common fr Veuillez dfinir vos prfrences pour cette application -please wait... common fr SVP patientez... +please wait... common fr Veuillez patienter... poland common fr POLOGNE portugal common fr PORTUGAL postal common fr Code postal @@ -457,7 +461,7 @@ qatar common fr QATAR read common fr Lire read this list of methods. common fr Lire cette liste de mthodes. redoes your last action htmlarea fr Rpte votre dernire action -reject common fr Rejetter +reject common fr Rejeter remove selected accounts common fr effacer les comptes slectionns rename common fr Renommer returns a full list of accounts on the system. warning: this is return can be quite large common fr Retourne une liste complte des comptes sur le systme. Attention: ceci peut tre trs long @@ -477,8 +481,9 @@ san marino common fr SAN MARIN sao tome and principe common fr SAO TOME AND PRINCIPE saturday common fr Samedi saudi arabia common fr ARABIE SAOUDITE -save common fr Sauver +save common fr Enregistrer search common fr Chercher +search %1 '%2' common fr Chercher %1 '%2' search or select accounts common fr Chercher ou slectionner des comptes section common fr Section select common fr Slectionner @@ -490,7 +495,7 @@ select home email address common fr S select one common fr Slectionner un select user common fr Slectionner l'utilisateur select work email address common fr Slectionner l'email Bureau -selection common en Slection +selection common fr Slection send common fr Envoyer senegal common fr SENEGAL september common fr Septembre @@ -504,6 +509,7 @@ show all common fr Tous les show all categorys common fr Voir toutes les catgories show menu common fr Voir menu show page generation time common fr Voir le temps de gnration de page +show page generation time on the bottom of the page? common fr Montrer le temps de gnration de page au fond de la page? show_more_apps common fr Voir plus d'applications showing %1 common fr Montre %1 showing %1 - %2 of %3 common fr Montre %1 - %2 de %3 @@ -518,9 +524,9 @@ south africa common fr AFRIQUE DU SUD south georgia and the south sandwich islands common fr SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS spain common fr ESPAGNE sri lanka common fr SRI LANKA -start date common fr Date dbut -start time common fr Heure dbut -start with common fr Dbute +start date common fr Date de dbut +start time common fr Heure de dbut +start with common fr commence avec status common fr Etat strikethrough htmlarea fr Ray subject common fr Sujet @@ -557,7 +563,7 @@ to common fr Pour to correct this error for the future you will need to properly set the common fr Pour corriger cette erreur dans le futur vous allez devoir rgler correctement le to go back to the msg list, click here common fr Pour revenir la liste des messages, cliquez ici today common fr Aujourd'hui -todays date, eg. "%1" common fr Date d'aujourd'hui, p.e. "%1" +todays date, eg. "%1" common fr date d'aujourd'hui, p.ex. "%1" toggle first day of week jscalendar fr Voir le premier jour de la semaine toggle html source htmlarea fr Voir source HTML togo common fr TOGO @@ -615,6 +621,7 @@ yemen common fr YEMEN yes common fr Oui you are in text mode. use the [<>] button to switch back to wysiwig. htmlarea fr Vous tes en MODE TEXTE. Utilisez le bouton [<>] pour revenir au mode WYSIWIG. you are required to change your password during your first login common fr Il vous est demand de changer votre mot de passe lors de votre premire connexion +you are running a newer version of egroupware than your database is setup for common fr Vous utilisez une version de eGroupWare plus rcente que celle dfinie pour la base de donnes. you have been successfully logged out login fr Dconnexion russie you have not entered a title common fr Vous n'avez pas entr de titre you have not entered a valid date common fr Vous n'avez pas entr une date valide @@ -623,6 +630,7 @@ you have not entered participants common fr Vous n'avez pas entr you have selected an invalid date common fr Vous avez slectionn une date invalide ! you have selected an invalid main category common fr Vous avez slectionn une catgorie principale invalide ! you have successfully logged out common fr Vous vous tes correctement dconnect +you need to add the webserver user '%1' to the group '%2'. common fr Vous devez ajouter l'utilisateur du serveur web '%1' au groupe '%2'. your message could not be sent!
common fr Votre message n'a pas pu tre envoy!
your message has been sent common fr Votre message a t envoy your search returned %1 matchs common fr Votre recherche a retourn %1 rsultats diff --git a/setup/lang/phpgw_fr.lang b/setup/lang/phpgw_fr.lang index 95f7d59057..60520ce596 100644 --- a/setup/lang/phpgw_fr.lang +++ b/setup/lang/phpgw_fr.lang @@ -1,21 +1,32 @@ -(account deletion in SQL Only) setup fr (Effacement de compte dans SQL seulement) +%1 does not exist !!! setup fr %1 n'existe pas !!! +%1 is %2%3 setup fr %1 est %2%3 +%1 is %2%3 !!! setup fr %1 est %2%3 !!! +(account deletion in sql only) setup fr (Effacement de compte dans SQL seulement) +*** do not update your database via setup, as the update might be interrupted by the max_execution_time, which leaves your db in an unrecoverable state (your data is lost) !!! setup fr *** Ne mettez pas jour votre base de donne via l'installateur, si la mise jour venez a tre pertub par l'option max_execution_time , vous laisserez votre base de donne dans un tat irrcuprable (vos donnes seront perdues) +*** you have to do the changes manualy in your php.ini (usualy in /etc on linux) in order to get egw fully working !!! setup fr *** Vous devez faire ce changement manuellement dans votre configuration PHP (php.ini, gnralement stock dans /etc sous Linux) pour utiliser eGroupWare convenablement. 00 (disable) setup fr 00 (dsactiver) 13 (ntp) setup fr 13 (ntp) 80 (http) setup fr 80 (http) +this will create 1 admin account and 3 demo accounts
the username/passwords are: demo/guest, demo2/guest and demo3/guest. setup fr Ceci va crer un compte administrateur et trois comptes de dmonstration
Les identifiants et mots de passes des comptes de dmonstrations sont: demo/guest, demo2/guest et demo3/guest. +accounts existing setup fr Comptes dj crs actions setup fr Actions add a domain setup fr Ajouter un domaine -add auto-created users to this group ('Default' will be attempted if this is empty.) setup fr Ajouter les utilisateurs auto-cres ce groupe ('Default' sera tent si ceci est vide.) +add auto-created users to this group ('default' will be attempted if this is empty.) setup fr Ajouter les utilisateurs auto-cres ce groupe ('Default' sera tent si ceci est vide.) additional settings setup fr Rglages additionnels -admin first name setup fr Prnom de l'admin -admin last name setup fr Nom de l'admin -admin password setup fr Mot de passe du compte admin -admin password to header manager setup fr Mot de passe admin pour le gestionnaire d'entte -admin username setup fr Login de l'admin +admin setup fr Administration +admin first name setup fr Prnom de l'administrateur +admin last name setup fr Nom de l'adminstrateur +admin password setup fr Mot de passe du compte administrateur +admin password to header manager setup fr Mot de passe administrateur pour le gestionnaire d'entte +admin user for header manager setup fr Identifiant administrateur pour le gestionnaire d'entte +admin username setup fr Identifiant de l'administrateur (login) admins setup fr Admins after retrieving the file, put it into place as the header.inc.php. then, click "continue". setup fr Aprs avoir rcupr le fichier, mettez-le en place comme le fichier header.inc.php. Puis, cliquez sur "continue". +all applications setup fr toutes les applications all core tables and the admin and preferences applications setup fr Toutes les tables de base et les applications admin et preferences all users setup fr Tous les utilisateurs analysis setup fr Analyse +and reload your webserver, so the above changes take effect !!! setup fr ET redmarrez votre serveur Web pour qu'ils soient pris en compte. app details setup fr Dtails de l'app app install/remove/upgrade setup fr App install/enlve/maj app process setup fr Processus d'application @@ -25,6 +36,7 @@ application management setup fr Gestion de l'application application name and status setup fr Nom et statut de l'application application name and status information setup fr Informations sur le nom et le statut de l'application application title setup fr Titre de l'application +application: %1, file: %2, line: "%3" setup fr Application: %1, Fichier: %2, Ligne: "%3" are you sure you want to delete your existing tables and data? setup fr Etes-vous sr de vouloir effacer vos tables et donnes existantes? are you sure? setup fr ETES-VOUS SUR? at your request, this script is going to attempt to create the database and assign the db user rights to it setup fr Sur votre demande, ce script va tenter de crer la base de donnes et de lui assigner les droits d'utilisateur @@ -33,11 +45,13 @@ at your request, this script is going to attempt to upgrade your old application at your request, this script is going to attempt to upgrade your old tables to the new format setup fr Sur votre demande, ce script va tenter de mettre jour vos vieilles tables vers le nouveau format at your request, this script is going to take the evil action of deleting your existing tables and re-creating them in the new format setup fr Sur votre demande, ce script va (sans hsiter !) supprimer vos tables existantes et les recrer dans le nouveau format at your request, this script is going to take the evil action of uninstalling all your apps, which deletes your existing tables and data setup fr Sur votre demande, ce script va (sans hsiter !) dsinstaller toutes vos applications, ce qui supprime vos tables existantes et vos donnes de configuration -attempt to use correct mimetype for FTP instead of default 'application/octet-stream' setup fr Tentative d'utiliser le type MIME correct pour FTP au lieu de celui par dfaut 'application/octet-stream' -authentication / Accounts setup fr Authentification / Comptes +attempt to use correct mimetype for ftp instead of default 'application/octet-stream' setup fr Tentative d'utiliser le type MIME correct pour FTP au lieu de celui par dfaut 'application/octet-stream' +authentication / accounts setup fr Authentification / Comptes auto create account records for authenticated users setup fr Crer automatiquement les enregistrements de comptes pour les utilisateurs authentifis auto-created user accounts expire setup fr Les comptes d'utilisateur auto-cres expirent available version setup fr Version disponible +back to the previous screen setup fr Retour l'cran prcdent +back to user login setup fr Revenir la maison backupwarn setup fr Mais nous vous recommendons fortement de sauvegarder vos tables pour le cas o le script endommagerait vos donnes.
Ces scripts automatiques peuvent facilement endommager vos donnes.
SVP faites une sauvegarde avant de continuer! because an application it depends upon was upgraded setup fr parce-qu'une application de laquelle il dpend a t mise jour because it depends upon setup fr Parce-que a dpend de @@ -48,39 +62,65 @@ because of a failed upgrade or install setup fr A cause d'une mise because of a failed upgrade, or the database is newer than the installed version of this app setup fr A cause d'une mise jour dfectueuse, ou la base de donnes est plus rcente que celle de la version installe de cette app because the enable flag for this app is set to 0, or is undefined setup fr Parce-que le drapeau activer de cette app est sur 0, ou est indfini bottom setup fr Bas +calendar setup fr Calendrier cancel setup fr Abandon cannot create the header.inc.php due to file permission restrictions.
instead you can %1 the file. setup fr Ne peut pas crer le fichier header.inc.php cause de restrictions sur les permissions sur le fichier.
A la place vous pouvez %1 le fichier. +change system-charset setup fr Changement du jeu de caractre charset setup fr ISO-8859-1 +charset to convert to setup fr Conversion vers +check can only be performed, if called via a webserver, as the user-id/-name of the webserver is not known. setup fr La vrification peut seulemnt tre execut, si vous l'appel via le serveur web, comme l'identifiant (id/name) du serveur web est inconnu. +check installation setup fr Vrification de l'installation check ip address of all sessions setup fr Vrifier l'adresse IP de toutes les sessions +checking extension %1 is loaded or loadable setup fr Vrification du support %1 dans PHP +checking file-permissions of %1 for %2: %3 setup fr Vrification des permissions de fichiers de %1 pour %2 : %3 +checking for gd support... setup fr Vrification du support GD ... +checking php.ini setup fr Vrification de la configuration de PHP (php.ini) +checking the egroupware installation setup fr Vrification du l'installation eGroupWare click here to return to setup. setup fr Cliquez ici pour retourner au setup. click here setup fr Cliquez ici +click here to re-run the installation tests setup fr Cliquez ici pour rdemarrer la procdure de vrification completed setup fr Complt +config password setup fr Mot de passe +config username setup fr Identifiant configuration setup fr Configuration configuration completed setup fr Configuration complte configuration password setup fr Mot de passe de configuration +configuration user setup fr Identifiant de configuration configure now setup fr Configurer maintenant +contain setup fr contient continue setup fr Continuer +continue to the header admin setup fr Continuer la configuration eGroupWare +convert setup fr Convertir could not open header.inc.php for writing! setup fr N'a pas pu ouvrir le fichier header.inc.php puor y crire! country selection setup fr Choix de pays create setup fr Crer +create admin account setup fr Cration du compte Administrateur create database setup fr Crer la base de donnes -create demo accounts setup fr Crer les comptes de dmo +create demo accounts setup fr Crer les comptes de dmonstration create one now setup fr Crer un exemplaire maintenant +create the empty database - setup fr Crer une base de donnes vide +create the empty database and grant user permissions - setup fr Crer une base de donnes vide et attribuer des autorisations aux utilisateurs create your header.inc.php setup fr Crer votre fichier header.inc.php created setup fr Cre +created header.inc.php! setup fr Cr header.inc.php! creating tables setup fr Cration de tables en cours +current system-charset setup fr Jeu de caractre courant +current system-charset is %1, click %2here%3 to change it. setup fr Le jeu de caractres est %1, cliquez %2ici%3 pour le changer
(note: attention, certain navigateur ne le supporte pas, notamment Internet Explorer sous MacOS) current version setup fr Version actuelle currently installed languages: %1
setup fr Langues installes actuellement: %1
-datetime port.
If using port 13, please set firewall rules appropriately before submitting this page.
(Port: 13 / Host: 129.6.15.28) setup fr Port Date/heure.
Si vous utilisez le port 13, SVP modifiez les rgles du firewall avant de modifier cette page.
(Port: 13 / Serveur: 129.6.15.28) +database successfully converted from '%1' to '%2' setup fr Base de donnes convertie de '%1' '%2' avec succs +datetime port.
if using port 13, please set firewall rules appropriately before submitting this page.
(port: 13 / host: 129.6.15.28) setup fr Port Date/heure.
Si vous utilisez le port 13, SVP modifiez les rgles du firewall avant de modifier cette page.
(Port: 13 / Serveur: 129.6.15.28) db host setup fr Nom du serveur de base de donnes db name setup fr Nom de la base de donnes db password setup fr Mot de passe d'accs la base de donnes +db port setup fr Port base d'accs la base de donnes db root password setup fr Mot de passe du compte root de la base de donnes db root username setup fr Login du compte root de la base de donnes db type setup fr Type de base de donnes db user setup fr Utilisateur de la base de donnes default file system space per user/group ? setup fr Espace disque par utilisateur/groupe par dfaut ? delete setup fr Effacer +delete all existing sql accounts, groups, acls and preferences (normally not necessary)? setup fr Supprimer tout les comptes, groupes, ACLs et prfrences stocks dans la base SQL dj existants (normalement, ce n'est pas ncessaire) ? delete all my tables and data setup fr Supprimer toutes mes tables et donnes delete all old languages and install new ones setup fr Supprimer toutes les anciennes langues et installer les nouvelles deleting tables setup fr Suppression de tables en cours @@ -101,23 +141,31 @@ download setup fr Downloader edit current configuration setup fr Editer la configuration actuelle edit your existing header.inc.php setup fr Modifier votre fichier header.inc.php existant edit your header.inc.php setup fr Modifier votre fichier header.inc.php +egroupware administration manual setup fr Manuel d'Administration eGroupWare enable for extra debug-messages setup fr Activer pour les messages de dboguage supplmentaires +enable ldap version 3 setup fr Activer le support du protocole version 3 pour LDAP enable mcrypt setup fr Activer MCrypt enter some random text for app session encryption setup fr Entrez du texte au hasard pour le cryptage des sessions applicatives enter some random text for app_session
encryption (requires mcrypt) setup fr Entrez du texte au hasard pour le
cryptage app_session (ncessite mcrypt) -enter the full path for temporary files.
Examples: /tmp, C:\TEMP setup fr Entrez le chemin complet pour les fichiers temporaires.
Exemples: /tmp, C:\TEMP -enter the full path for users and group files.
Examples: /files, E:\FILES setup fr Entrez le chemin complet pour les fichiers d'utilisateurs et de groupes.
Exemples: /files, E:\FILES +enter the full path for temporary files.
examples: /tmp, c:\temp setup fr Entrez le chemin complet pour les fichiers temporaires.
Exemples: /tmp, C:\TEMP +enter the full path for temporary files.
examples: /tmp, c:temp setup fr Entrez le chemin complet pour les fichiers temporaires.
Exemples: /tmp, C:\TEMP +enter the full path for users and group files.
examples: /files, e:\files setup fr Entrez le chemin complet pour les fichiers d'utilisateurs et de groupes.
Exemples: /files, E:\FILES +enter the full path for users and group files.
examples: /files, e:files setup fr Entrez le chemin complet pour les fichiers d'utilisateurs et de groupes.
Exemples: /files, E:\FILES enter the hostname of the machine on which this server is running setup fr Entrez le nom de la machine sur laquelle ce serveur s'excute -enter the location of eGroupWare's URL.
Example: http://www.domain.com/egroupware   or   /egroupware
No trailing slash setup fr Entrez l'emplacement de l'URL de eGroupWare.
Exemple: http://www.domain.com/egroupware   ou   /egroupware
Pas de / (slash ou division) la fin +enter the location of egroupware's url.
example: http://www.domain.com/egroupware   or   /egroupware
no trailing slash setup fr Entrez l'emplacement de l'URL de eGroupWare.
Exemple: http://www.domain.com/egroupware   ou   /egroupware
Pas de / (slash ou division) la fin enter the site password for peer servers setup fr Entrez le mot de passe du site pour les serveurs pairs enter the site username for peer servers setup fr Entrez le nom d'utilisateur du site pour les serveurs pairs enter the title for your site setup fr Entrez le titre pour votre site -enter your default FTP server setup fr Entrez votre serveur FTP par dfaut -enter your HTTP proxy server setup fr Entrez votre serveur proxy HTTP -enter your HTTP proxy server port setup fr Entrez le port de votre serveur proxy HTTP -export has been completed! you will need to set the user passwords manually. setup fr L'export a t complt! Vous allez devoir rgler les mots de passe des utilisateurs manuellement. +enter your default ftp server setup fr Entrez votre serveur FTP par dfaut +enter your http proxy server setup fr Entrez votre serveur proxy HTTP +enter your http proxy server password setup fr Entrez le mot de passe pour le proxy HTTP +enter your http proxy server port setup fr Entrez le port de votre serveur proxy HTTP +enter your http proxy server username setup fr Entrez le nom d'utilisateur pour le proxy HTTP +etemplate setup fr ETemplate export egroupware accounts from sql to ldap setup fr Exporter les comptes eGroupWare de SQL vers LDAP +export has been completed! you will need to set the user passwords manually. setup fr L'export a t complt! Vous allez devoir rgler les mots de passe des utilisateurs manuellement. export sql users to ldap setup fr Exporter les utilisateurs SQL vers LDAP +false setup fr Faux file setup fr Fichier file type, size, version, etc. setup fr Type de fichier, taille, version, etc. for a new install, select import. to convert existing sql accounts to ldap, select export setup fr Pour une nouvelle install, choisir importer. Pour convertir les comptes SQL existants vers LDAP, choisir exporter @@ -127,31 +175,41 @@ go back setup fr Retour arri go to setup fr Aller grant access setup fr Autoriser l'accs has a version mismatch setup fr A une diffrence de version +header admin login setup fr Configuration de l'en-tte EgroupWare +header password setup fr Mot de passe +header username setup fr Identifiant +historylog removed setup fr Historique effac hooks deregistered setup fr Crochets d-enregistrs hooks registered setup fr Crochets enregistrs host information setup fr Informations d'hte hostname/ip of database server setup fr Nom de machine/IP du serveur de base de donnes however, the application is otherwise installed setup fr De toutes faons, l'application est par ailleurs installe however, the application may still work setup fr Malgr tout, l'application peut encore fonctionner -if no ACL records for user or any group the user is a member of setup fr Si aucun enregistrement d'ACL pour un utilisateur ou groupe l'utilisateur est un membre de +if no acl records for user or any group the user is a member of setup fr Si aucun enregistrement d'ACL pour un utilisateur ou groupe l'utilisateur est un membre de +if safe_mode is turned on, egw is not able to change certain settings on runtime, nor can we load any not yet loaded module. setup fr Si Safe Mode est activ, eGroupWare ne sera pas capable de changer certaines options ou d'activer certains modules. if the application has no defined tables, selecting upgrade should remedy the problem setup fr Si l'application n'a pas dfini de tables, choisir mise jour devrait rsoudre le problme if using ldap setup fr Si vous utilisez LDAP -if using LDAP, do you want to manage homedirectory and loginshell attributes? setup fr Si vous utilisez LDAP, voulez-vous grer les attributs rpertoire maison (home) et shell de connexion? +if using ldap, do you want to manage homedirectory and loginshell attributes? setup fr Si vous utilisez LDAP, voulez-vous grer les attributs rpertoire maison (home) et shell de connexion? if you did not receive any errors, your applications have been setup fr Si vous n'avez pas reu de messages d'erreur, vos applications ont t if you did not receive any errors, your tables have been setup fr Si vous n'avez pas reu de messages d'erreur, vos tables ont t if you running this the first time, don't forget to manualy %1 !!! setup fr Si vous excutez ceci pour la premire fois, n'oubliez pas de faire manuellement %1 !!! +if you use only languages of the same charset (eg. western european ones) you dont need to set a system-charset! setup fr Si vous utilisez des langues qui appartiennent aux mmes jeux de caractres (exemple: Europe de l'ouest), vous n'avez pas besoin de dfinir le jeu de caractre au niveau du systme image type selection order setup fr Ordre de slection de type d'image import accounts from ldap to the egroupware accounts table (for a new install using sql accounts) setup fr Importer les comptes de LDAP vers la table des comptes eGroupWare (pour une nouvelle installation utilisant les comptes SQL) import has been completed! setup fr L'import a t complt! import ldap users/groups setup fr Importer les utilisateurs/groupes LDAP importing old settings into the new format.... setup fr J'importe les vieux rglages dans le nouveau format.... +in setup fr dans include root (this should be the same as server root unless you know what you are doing) setup fr Racine d'inclusion (ceci devrait tre la mme chose de racine du serveur moins que vous ne sachiez ce que vous fates) +include_path need to contain "." - the current directory setup fr include_path a besoin de contenir "." - le rpertoire courant +infolog setup fr InfoLog insanity setup fr Grave erreur install setup fr Installer install all setup fr Installer tout install applications setup fr Installer les applications install language setup fr Installer les Langues installed setup fr install +instructions for creating the database in %1: setup fr Instructions pour crer la base de donnes dans %1: invalid ip address setup fr Adresse IP invalide invalid password setup fr Mot de passe invalide is broken setup fr est cass @@ -171,10 +229,13 @@ ldap modify setup fr Modification LDAP ldap root password setup fr Mot de passe root LDAP ldap rootdn setup fr Rootdn LDAP limit access to setup to the following addresses or networks (e.g. 10.1.1,127.0.0.1) setup fr Limiter l'accs setup aux adresses ou plages d'adresses suivants (p.e. 10.1.1,127.0.0.1) +limit access to setup to the following addresses, networks or hostnames (e.g. 127.0.0.1,10.1.1,myhost.dnydns.org) setup fr Limiter l'acces au setup ces adresses, rseaux ou machines (p.ex. 127.0.0.1,10.1.1,myhost.dnydns.org) +line setup fr Ligne logout setup fr Dconnecter makesure setup fr Assurez-vous que votre base de donnes est cr et que les permissions sur les comptes sont positionnes manage applications setup fr Grer les Applications manage languages setup fr Grer les Langues +max_execution_time is set to less than 30 (seconds): egroupware sometimes needs a higher execution_time, expect occasional failures setup fr L'option Max Execution Time est positionne en dessous des 30 secondes;
Parfois, eGroupware aura besoin de plus de temps. maximum account id (e.g. 65535 or 1000000) setup fr ID de compte maximum (p.e. 65535 ou 1000000) may be broken setup fr pourrait tre casse mcrypt algorithm (default tripledes) setup fr ALgorythme Mcrypt (dfaut TRIPLEDES) @@ -182,16 +243,21 @@ mcrypt initialization vector setup fr Vecteur d'initialisation MCrypt mcrypt mode (default cbc) setup fr Mode Mcrypt (dfaut CBC) mcrypt settings (requires mcrypt php extension) setup fr Rglages Mcrypt (Ncessite l'extension PHP mcrypt) mcrypt version setup fr Versio de MCrypt +memory_limit is set to less than 16m: some applications of egroupware need more than the recommend 8m, expect occasional failures setup fr L'option Memory Limit est positionne en dessous des 16M;
Certaines applications ont besoin de plus de 8M, cela peut entrainer des problmes. minimum account id (e.g. 500 or 100, etc.) setup fr ID de compte minimum (p.e. 500 ou 100, etc.) modifications have been completed! setup fr Les modifications ont t compltes! modify setup fr Modifier modify an existing ldap account store for use with egroupware (for a new install using ldap accounts) setup fr Modifier un compte LDAP existant pour stocker et utiliser avec eGroupWare (pour une nouvelle installation utilisant les comptes LDAP) +module setup fr module multi-language support setup setup fr Setup pour le support du multi-langues +mysqlinstr setup fr Instructions pour crer la base de donnes dans MySQL:
Se connecter mysql -
[user@server user]# mysql -u root -p
Crer la base de donnes vide et attribuer les permissions utilisateurs -
mysql> create database egroupware;
mysql> grant all on egroupware.* to egroupware@localhost identified by 'password'; name of database setup fr Nom de la base de donnes -name of db user eGroupWare uses to connect setup fr Nom de l'utilisateur de la base de donnes dont eGroupWare se sert pour se connecter +name of db user egroupware uses to connect setup fr Nom de l'utilisateur de la base de donnes dont eGroupWare se sert pour se connecter never setup fr Jamais new setup fr Nouveau +news_admin setup fr News Admin no setup fr Non +no accounts existing setup fr Aucun compte n'existe no algorithms available setup fr Pas d'algorythme disponible no microsoft sql server support found. disabling setup fr Pas de support pour Microsoft SQL Server trouv. Je le dsactive no modes available setup fr Pas de modes disponibles @@ -199,9 +265,11 @@ no mysql support found. disabling setup fr Pas de support pour MySQL trouv no oracle-db support found. disabling setup fr Pas de support pour Oracle-DB trouv. Je le dsactive no postgres-db support found. disabling setup fr Pas de support pour Postgres-DB trouv. Je le dsactive no xml support found. disabling setup fr Pas de support pour XML trouv. Je le dsactive +not setup fr n'a pas not complete setup fr Pas complet not completed setup fr Pas complt not ready for this stage yet setup fr Pas encore prt pour cette partie +not set setup fr pas dfini note: you will be able to customize this later setup fr Note: vous aurez la possibilit de personnaliser ceci plus tard now guessing better values for defaults... setup fr Maintenant j'essaye de trouver les meilleurs valeurs par dfaut... ok setup fr OK @@ -211,6 +279,7 @@ one week setup fr Une semaine only add languages that are not in the database already setup fr Ajouter seulement les langues qui ne sont pas dj dans la base de donnes only add new phrases setup fr Ajouter seulement les nouvelles phrases or setup fr ou +or %1continue to the header admin%2 setup fr ou %1continuer la configuration eGroupWare%2 or http://webdav.domain.com (webdav) setup fr ou http://webdav.domain.com (WebDAV) or we can attempt to create the database for you: setup fr Ou nous pouvons tenter de crer la base de donnes pour vous: password needed for configuration setup fr Mot de passe ncessaire pour la configuration @@ -219,14 +288,18 @@ passwords did not match, please re-enter setup fr Les mots de passe ne correspon path information setup fr Information de chemin path to user and group files has to be outside of the webservers document-root!!! setup fr Le chemin vers les fichiers utilisateur et groupe DOIT ETRE EN DEHORS du rpertoire racine des serveurs web!!! persistent connections setup fr Connexions persistantes -egroupware administration manual setup fr Manuel d'Administration eGroupWare +pgsqlinstr setup fr Instructions pour crer la base de donnes dans PostgreSQL:
Dmarrer le postmaster
[user@server user]# postmaster -i -D /home/[username]/[dataDir]
Crer la base de donnes vide-
[user@server user]# createdb egroupware +phpldapadmin setup fr PHPLdapAdmin please check for sql scripts within the application's directory setup fr SVP vrifiez la prsence de scripts SQL dans le rpertoire setup de l'application please check read/write permissions on directories, or back up and use another option. setup fr SVP vrifiez les permissions de lecture/criture sur les rpertoires, ou fates une sauvegarde et utilisez une autre option. -please configure eGroupWare for your environment setup fr SVP configurez eGroupWare pour votre environnement +please configure egroupware for your environment setup fr SVP configurez eGroupWare pour votre environnement please consult the %1. setup fr SVP consultez le %1. +please fix the above errors (%1) and warnings(%2) setup fr S'il-vous-plait, Rsolvez les errors (%1) et les messages d'avertissements (%2) please install setup fr SVP installez please login setup fr SVP connectez-vous please login to egroupware and run the admin application for additional site configuration setup fr SVP connectez-vous egroupware et excutez l'application admin pour les possibilits supplmentaires de configuration du site +please make the following change in your php.ini setup fr S'il vous plait, effectuez des changements dans votre configuration PHP. +please select your language S'il-vous-plait fr fr please wait... setup fr Patientez SVP... possible reasons setup fr Raisons possibles possible solutions setup fr Solutions possibles @@ -235,22 +308,30 @@ potential problem setup fr Probl preferences setup fr Prfrences problem resolution setup fr Rsolution du problme process setup fr Procder +projects setup fr Gestionnaire de projets re-check my database setup fr Re-vrifier ma base de donnes re-check my installation setup fr Re-vrifier mon installation re-enter password setup fr R-entrer mon mot de passe read translations from setup fr Lire les traductions depuis +readable by the webserver setup fr lisible par le serveur Web really uninstall all applications setup fr Dsinstaller VRAIMENT toutes les applications recommended: filesystem setup fr Recommand: systme de fichiers +register_globals is turned on, egroupware does not require it and it's generaly more secure to have it turned off setup fr L'option Register Globals est activ, eGroupWare n'a pas besoin de cela et cela est gnralement plus scurisant de le dsactiver. registered setup fr Enregistr +rejected lines setup fr Lignes rejetes remove setup fr Enlever remove all setup fr Enlever tout requires reinstall or manual repair setup fr Ncessite une rinstall ou une rparation manuelle requires upgrade setup fr Ncessite une mise jour resolve setup fr Rsoudre +return to setup setup fr Revenir la page de l'installateur +run installation tests setup fr Dmarrage de la procdure de vrification... +safe_mode is turned on, which is generaly a good thing as it makes your install more secure setup fr Safe Mode est activ, ceci est une bonne chose pour la scurit de votre systme. sample configuration not found. using built in defaults setup fr Configuration exemple non trouve. J'utilise les valeurs par dfaut dfinies en interne save setup fr Enregistrer save this text as contents of your header.inc.php setup fr Enregistrer ce texte comme le contenu de votre fichier header.inc.php -select an app, enter a target version, then submit to process to that version.
If you do not enter a version, only the baseline tables will be installed for the app.
THIS WILL DROP ALL OF THE APPS' TABLES FIRST! setup fr Choisissez une application, entrez une version de destination, puis soumettez pour transformer vers cette version.
Si vous n'entrez pas de version, seules les tables de base pour cette application seront installes.
CETTE MANIPULATION VA D'ABORD EFFACER TOUTES LES TABLES DE DONNEES DES APPLICATIONS! +select an app, enter a target version, then submit to process to that version.
if you do not enter a version, only the baseline tables will be installed for the app.
this will drop all of the apps' tables first! setup fr Choisissez une application, entrez une version de destination, puis soumettez pour transformer vers cette version.
Si vous n'entrez pas de version, seules les tables de base pour cette application seront installes.
CETTE MANIPULATION VA D'ABORD EFFACER TOUTES LES TABLES DE DONNEES DES APPLICATIONS! +select one... setup fr slectionnez un... select the default applications to which your users will have access setup fr Choisissez les applications par dfaut auxquelles vos utilisateurs auront accs select the desired action(s) from the available choices setup fr Choisissez la(les) action(s) dsire(s) dans les choix possibles select to download file setup fr Choisissez pour downloader le fichier @@ -273,42 +354,56 @@ selectbox setup fr Bo server root setup fr Racine serveur sessions type setup fr Type de sessions set this to "old" for versions < 2.4, otherwise the exact mcrypt version you use. setup fr Mettez ceci sur "ancien" pour les versions < 2.4, sinon la version exacte de mcrypt que vous utilisez. +setting the system-charset to utf-8 (unicode) allows the coexistens of data from languages of different charsets. setup fr Dfinir le jeu de caractre en UTF8 permet la co-existence de donnes provenant de jeu de caractres des diffrentes langues settings setup fr Rglages -setup setup fr Setup +setup setup fr Installation setup demo accounts in ldap setup fr Configurer des comptes de dmo dans LDAP +setup main menu setup fr Page principal d'installation setup the database setup fr Configurer la base de donnes +setup/config admin login setup fr Page de connexion pour la configuration et l'installation show 'powered by' logo on setup fr Montrer le logo 'propuls par' sur some or all of its tables are missing setup fr Certaines ou toutes ses tables manquent +sql encryption type setup fr Type de chiffrement SQL status setup fr Etat -step %1 - simple application management setup fr Etape %1 - Gestion simple d'applications +step %1 - admin account setup fr tape %1 - Compte Administrateur +step %1 - advanced application management setup fr Etape %1 - Gestion avance d'applications step %1 - configuration setup fr Etape %1 - Configuration step %1 - language management setup fr Etape %1 - Gestion des langues -step %1 - advanced application management setup fr Etape %1 - Gestion avance d'applications +step %1 - simple application management setup fr Etape %1 - Gestion simple d'applications table change messages setup fr Messages de changement de table tables dropped setup fr Tables supprimes tables installed, unless there are errors printed above setup fr Tables installes, moins qu'il y ait des messages d'erreur imprims ci-dessous tables upgraded setup fr Tables mises jour target version setup fr Version de destination text entry setup fr Entre de texte +the %1 extension is needed, if you plan to use a %2 database. setup fr L'extension %1 est ncessaire si vous dcidez d'utiliser la base de donne %2
the db_type in defaults (%1) is not supported on this server. using first supported type. setup fr Le type de base de donnes dans les valeurs par dfaut (%1) n'est pas support sur ce server. J'utilise le 1er type support. the file setup fr le fichier +the first step in installing egroupware is to ensure your environment has the necessary settings to correctly run the application. setup fr La premire tape pour l'installation d'egroupware est la vrification de votre environnement systme. +the following applications need to be upgraded: setup fr L'application suivante a besoin d'une mise jour: +the imap extension is needed by the two email apps (even if you use email with pop3 as protocoll). setup fr L'extension IMAP est ncessaire pour deux des applications de messagerie (sauf si vous utilisez le protocole pop3) +the mbstring extension is needed to fully support unicode (utf-8) or other multibyte-charsets. setup fr L'extension MBString est ncessaire pour le support complet d'UNICODE (UTF8) ou des autres jeu de caractres multibyte. the table definition was correct, and the tables were installed setup fr La dfinition de table tait correcte, et les tables taient installes the tables setup fr Les tables -there was a problem trying to connect to your ldap server.
please check your LDAP server configuration setup fr Il y a eu un problme en essayant de se connecter votre serveur LDAP.
SVP vrifiez la configuration de votre serveur LDAP +there was a problem trying to connect to your ldap server.
please check your ldap server configuration setup fr Il y a eu un problme en essayant de se connecter votre serveur LDAP.
SVP vrifiez la configuration de votre serveur LDAP this has to be outside the webservers document-root!!! setup fr Ceci doit tre en dehors du rpertoire racine des documents des serveurs Web!!! -this program will help you upgrade or install different languages for eGroupWare setup fr Ce programme va vous aider mettre jour ou installer des langues diffrentes dans eGroupWare +this might take a while, please wait ... setup fr Cela peu prendre un certain moment, veuillez patienter ... +this program will convert your database to a new system-charset. setup fr Ce programme va convertir les informations de votre base de donnes vers le nouveau jeu de caractre. +this program will help you upgrade or install different languages for egroupware setup fr Ce programme va vous aider mettre jour ou installer des langues diffrentes dans eGroupWare this section will help you export users and groups from egroupware's account tables into your ldap tree setup fr Cette section va vous aider exporter les utilisateurs et groupes des tables de comptes de eGroupWare vers votre arbre LDAP -this section will help you import users and groups from your ldap tree into eGroupWare's account tables setup fr Cette section va vous aider importer les utilisateurs et groupes de votre arbre LDAP vers les tables de comptes de eGroupWare -this section will help you setup your LDAP accounts for use with eGroupWare setup fr Cette section va vous aider configurer vos comptes LDAP pour les utiliser dans eGroupWare +this section will help you import users and groups from your ldap tree into egroupware's account tables setup fr Cette section va vous aider importer les utilisateurs et groupes de votre arbre LDAP vers les tables de comptes de eGroupWare +this section will help you setup your ldap accounts for use with egroupware setup fr Cette section va vous aider configurer vos comptes LDAP pour les utiliser dans eGroupWare this should be around 30 bytes in length.
note: the default has been randomly generated. setup fr Ceci devrait faire environ 30 octets de long.
Note: la valeur par dfaut a t gnre au hasard. this stage is completed
setup fr Cette tape est complte
-this will create 1 admin account and 3 demo accounts
the username/passwords are: demo/guest, demo2/guest and demo3/guest.
!!!THIS WILL DELETE ALL EXISTING ACCOUNTS!!!
setup fr Ceci va crer 1 compte admin et 3 comptes demo
Les utilisateurs/mots de passe sont: demo/guest, demo2/guest et demo3/guest.
!!!CECI VA SUPPRIMER TOUS LES COMPTES EXISTANTS!!!
+this will create 1 admin account and 3 demo accounts
the username/passwords are: demo/guest, demo2/guest and demo3/guest.
!!!this will delete all existing accounts!!!
setup fr Ceci va crer 1 compte admin et 3 comptes demo
Les utilisateurs/mots de passe sont: demo/guest, demo2/guest et demo3/guest.
!!!CECI VA SUPPRIMER TOUS LES COMPTES EXISTANTS!!!
to a version it does not know about setup fr vers une version qu'il ne connat pas +to setup 1 admin account and 3 demo accounts. setup fr pour crer 1 compte administrateur et 3 comptes demo. to setup 1 admin account and 3 demo accounts.
this will delete all existing accounts setup fr Pour crer 1 compte admin et 3 comptes demo.
ceci va supprimer tous les comptes existants top setup fr top translations added setup fr Traductions ajoutes translations removed setup fr Traductions enleves translations upgraded setup fr Traductions mises jour +true setup fr Vrai try to configure your php to support one of the above mentioned dbms, or install egroupware by hand. setup fr Essayez de configurer votre php pour qu'il supporte une des bases de donnes mentionnes ci-dessus, ou installez eGroupWare la main. two weeks setup fr Deux semaines uninstall setup fr Dsinstaller @@ -319,7 +414,9 @@ upgrade all setup fr Mettre tout upgraded setup fr Mis jour upgrading tables setup fr Met jour les tables use cookies to pass sessionid setup fr Utiliser les cookies pour passer l'ID de session -use pure HTML compliant code (not fully working yet) setup fr Utiliser du code HTML entirement standard (ne fonctionne pas encore compltement) +use pure html compliant code (not fully working yet) setup fr Utiliser du code HTML entirement standard (ne fonctionne pas encore compltement) +user account prefix setup fr Prfixe pour les comptes utilisateurs +usernames are casesensitive setup fr Les identifiants sont sensibles la casse users choice setup fr Choix utilisateur version setup fr version version mismatch setup fr Diffrence de version @@ -327,16 +424,21 @@ view setup fr Voir warning! setup fr Attention! we can proceed setup fr Nous pouvons continuer we will automatically update your tables/records to %1 setup fr Nous allons automatiquement mettre jour vos tables/enregistrements vers %1 +we will now run a series of tests, which may take a few minutes. click the link below to proceed. setup fr Nous allons dmarrer une srie de vrification, cela peut prendre plusieurs minutes. Cliquez sur le lien en dessous pour dmarrer cette tape. +welcome to the egroupware installation setup fr Bienvenue sur l'installateur EgroupWare what type of sessions management do you want to use (php4 session management may perform better)? setup fr Quel type de gestion de sessions voulez-vous utiliser (gestion de session PHP4 devrait tre le plus performant)? which database type do you want to use with egroupware? setup fr Quel type de base de donnes voulez-vous utiliser avec eGroupWare? -would you like eGroupWare to cache the phpgw info array ? setup fr Voudriez-vous que eGroupWare mette en cache le champ phpgw info ? -would you like eGroupWare to check for a new version
when admins login ? setup fr Voudriez-vous que eGroupWare vrifie la disponibilit d'une nouvelle version
quand les administrateurs se connectent ? +world readable setup fr visible par tous +world writable setup fr accs en criture pour tous +would you like egroupware to cache the phpgw info array ? setup fr Voudriez-vous que eGroupWare mette en cache le champ phpgw info ? +would you like egroupware to check for a new version
when admins login ? setup fr Voudriez-vous que eGroupWare vrifie la disponibilit d'une nouvelle version
quand les administrateurs se connectent ? would you like to show each application's upgrade status ? setup fr Voudriez-vous montrer le statut de mise jour de chaque application ? +writable by the webserver setup fr accs en criture pour le serveur Web write config setup fr Ecrire la configuration yes setup fr Oui -you appear to be running a pre-beta version of eGroupWare.
These versions are no longer supported, and there is no upgrade path for them in setup.
You may wish to first upgrade to 0.9.10 (the last version to support pre-beta upgrades)
and then upgrade from there with the current version. setup fr Vous semblez utiliser une version pre-beta de eGroupWare.
Ces versions ne sont plus supportes, et il n'y a pas de possibilit de mise jour pour elles dans le setup.
Vous devriez d'abord mettre votre version jour vers la version 0.9.10 (la dernire version supporter les mises jour pre-beta)
puis mettre jour depuis cette version jusqu' la version actuelle. -you appear to be running an old version of PHP
It its recommend that you upgrade to a new version.
Older version of PHP might not run eGroupWare correctly, if at all.

Please upgrade to at least version 4.1.0 setup fr Vous semblez utiliser une version ancienne de PHP
Il est recommand que vous mettiez votre systme jour vers une version plus rcente.
Les anciennes version de PHP pourraient ne pas faire fonctionner correctement eGroupWare, voire pas du tout.

SVP, mettez votre systme jour vers au moins la version 4.1.0 -you appear to be running version %1 of eGroupWare setup fr Vous semblez utiliser la version %1 de eGroupWare +you appear to be running a pre-beta version of egroupware.
these versions are no longer supported, and there is no upgrade path for them in setup.
you may wish to first upgrade to 0.9.10 (the last version to support pre-beta upgrades)
and then upgrade from there with the current version. setup fr Vous semblez utiliser une version pre-beta de eGroupWare.
Ces versions ne sont plus supportes, et il n'y a pas de possibilit de mise jour pour elles dans le setup.
Vous devriez d'abord mettre votre version jour vers la version 0.9.10 (la dernire version supporter les mises jour pre-beta)
puis mettre jour depuis cette version jusqu' la version actuelle. +you appear to be running an old version of php
it its recommend that you upgrade to a new version.
older version of php might not run egroupware correctly, if at all.

please upgrade to at least version 4.1.0 setup fr Vous semblez utiliser une version ancienne de PHP
Il est recommand que vous mettiez votre systme jour vers une version plus rcente.
Les anciennes version de PHP pourraient ne pas faire fonctionner correctement eGroupWare, voire pas du tout.

SVP, mettez votre systme jour vers au moins la version 4.1.0 +you appear to be running version %1 of egroupware setup fr Vous semblez utiliser la version %1 de eGroupWare you appear to be using php earlier than 4.1.0. egroupware now requires 4.1.0 or later setup fr Vous semblez utiliser une version de PHP plus ancienne que la 4.1.0. eGroupWare ncessite maintenant 4.1.0 ou plus rcent you appear to be using php3. disabling php4 sessions support setup fr Vous semblez utiliser PHP3. Je dsactive le support des sessions PHP4 you appear to be using php4. enabling php4 sessions support setup fr Vous semblez utiliser PHP4. J'active le support des sessions PHP4 @@ -351,9 +453,10 @@ you didn't enter a config password for domain %1 setup fr Vous n'avez pas entr you didn't enter a header admin password setup fr Vous n'avez pas entr de mot de passe d'administration de l'entte you do not have any languages installed. please install one now
setup fr Vous n'avez pas de langue installe. SVP installez-en une maintenant
you have not created your header.inc.php yet!
you can create it now. setup fr Vous n'avez pas encore cre votre fichier header.inc.php !
Vous pouvez le crer maintenant. -you have successfully logged out setup fr Vous vous tes dconnect avec succs +you have successfully logged out setup fr Vous vous tes parfaitement dconnect you must enter a username for the admin setup fr Vous devez entrer un nom d'utilisateur pour le compte admin you should either uninstall and then reinstall it, or attempt manual repairs setup fr Vous devriez soit le dsinstaller et le r-installer, ou tenter des rparations manuelles +you will need to load the proper schema into your ldap server - see phpgwapi/doc/ldap/readme setup fr Vous devez charger votre propre schma LDAP dans votre serveur LDAP centralis - Regardez la documentation stocke dans phpgwapi/doc/ldap/README you're using an old configuration file format... setup fr Vous utilisez un format de fichier de configuration ancien... you're using an old header.inc.php version... setup fr Vous utilisez une ancienne version du fichier header.inc.php... your applications are current setup fr Vos applications sont jour @@ -363,6 +466,7 @@ your database is working, but you dont have any applications installed setup fr your header admin password is not set. please set it now! setup fr Votre mot de passe d'administration d'entte n'est PAS configur. SVP configurez-le maintenant! your header.inc.php needs upgrading. setup fr Votre fichier header.inc.php a besoin d'tre mis jour. your header.inc.php needs upgrading.
warning!
make backups! setup fr Votre fichier header.inc.php a besoin d'tre mis jour.
ATTENTION!
FAITES DES SAUVEGARDES! +your php installation does not have appropriate gd support. you need gd library version 1.8 or newer to see gantt charts in projects. setup fr Votre installation de PHP n'a pas de support GD appropri.
Vous avez besoin de la bibliothque GD suprieur ou gale la version 1.8 pour voir certaines fonctionnalits dans le module Projets your tables are current setup fr Vos tables sont jour your tables may be altered and you may lose data setup fr Vos tables pourraient tre altres et vous pourriez perdre des donnes your tables will be dropped and you will lose data setup fr Vos tables vont tre supprimes et vous allez perdre des donnes From d2586ba500f7d9d0cbf695644c48b92de880c3e9 Mon Sep 17 00:00:00 2001 From: ak703 Date: Thu, 26 Aug 2004 21:11:25 +0000 Subject: [PATCH 026/177] improvements of the ui and some error checking for emtpy fields, implemented tooltip info images for better explanation of the module. Started the README --- admin/doc/README.ldapman | 16 ++++ admin/inc/class.uildap_mgr.inc.php | 27 +++++- admin/setup/phpgw_de.lang | 5 ++ admin/setup/phpgw_en.lang | 5 ++ .../default/account_form_ldapdata.tpl | 84 ++++++++++++++++++ phpgwapi/templates/idots/images/info.gif | Bin 0 -> 75 bytes phpgwapi/templates/jerryr/images/info.gif | Bin 0 -> 75 bytes 7 files changed, 133 insertions(+), 4 deletions(-) create mode 100644 admin/doc/README.ldapman create mode 100644 admin/templates/default/account_form_ldapdata.tpl create mode 100644 phpgwapi/templates/idots/images/info.gif create mode 100644 phpgwapi/templates/jerryr/images/info.gif diff --git a/admin/doc/README.ldapman b/admin/doc/README.ldapman new file mode 100644 index 0000000000..70f8594cf1 --- /dev/null +++ b/admin/doc/README.ldapman @@ -0,0 +1,16 @@ +The add-on LDAP-Manager for Admin currently manages the following configuration: + +1. Postfix 2.x +2. LDAP v3 +3. Courier-Imap 3.x + +Example for Postfix-configuration: + + + + +Usage of LDAP schemas: + +core.schema +qmail.schema + diff --git a/admin/inc/class.uildap_mgr.inc.php b/admin/inc/class.uildap_mgr.inc.php index 17c829d215..f9143e7e02 100644 --- a/admin/inc/class.uildap_mgr.inc.php +++ b/admin/inc/class.uildap_mgr.inc.php @@ -62,7 +62,9 @@ $this->t->set_var("lang_edit_email_settings",lang("edit email settings")); $this->t->set_var("lang_ready",lang("Done")); $this->t->set_var("link_back",$phpgw->link('/admin/accounts.php')); + $this->t->set_var("info_icon",PHPGW_IMAGES_DIR.'/info.gif'); + $linkData = array ( 'menuaction' => 'admin.uildap_mgr.saveUserData', @@ -91,8 +93,17 @@ } $this->t->set_var("mail",$userData["mail"]); -// $this->t->set_var("mailAlternateAddress",''); - $this->t->set_var("mailForwardingAddress",$userData["mailForwardingAddress"]); + //$this->t->set_var("mailAlternateAddress",''); could be deleted? + + if ($userData["mailForwardingAddress"] == "") + { + $this->t->set_var("mailForwardingAddress",$userData["mail"]); + } + else + { + $this->t->set_var("mailForwardingAddress",$userData["mailForwardingAddress"]); + } + $this->t->set_var("options_mailAlternateAddress",$options_mailAlternateAddress); $this->t->set_var("uid",rawurlencode($_accountData["dn"])); @@ -151,9 +162,12 @@ if($HTTP_POST_VARS["add_mailAlternateAddress"]) $bo_action='add_mailAlternateAddress'; if($HTTP_POST_VARS["remove_mailAlternateAddress"]) $bo_action='remove_mailAlternateAddress'; if($HTTP_POST_VARS["save"]) $bo_action='save'; - - $this->boldapmgr->saveUserData($_GET['account_id'], $formData, $bo_action); + if (!$HTTP_POST_VARS["mail"]== "") //attribute 'mail'is not allowed to be empty + { +// error generator necessary!! + $this->boldapmgr->saveUserData($_GET['account_id'], $formData, $bo_action); + } if ($bo_action == 'save') { // read date fresh from ldap storage @@ -185,8 +199,13 @@ $this->t->set_var('lang_0forunlimited',lang('leave empty for no quota')); $this->t->set_var('lang_forward_only',lang('forward only')); $this->t->set_var('lang_mailAliases',lang('Aliases')); + $this->t->set_var('lang_info_mailAliases',lang('Attribute mailAlternateAddress explained')); $this->t->set_var('lang_masterEmailAddress',lang('Main Email-Address')); + $this->t->set_var('lang_info_masterEmailAddress',lang('Attribute mail explained')); $this->t->set_var('lang_RouteMailsTo',lang('Route all Mails to')); + $this->t->set_var('lang_info_RouteMailsTo',lang('Attribute mailForwardingAddress explained')); + $this->t->set_var('lang_info_AccountActive',lang('Attribute accountstatus explained')); + $this->t->set_var('lang_info_UsageHints',lang('Explanation of LDAPMAN')); } } ?> diff --git a/admin/setup/phpgw_de.lang b/admin/setup/phpgw_de.lang index 52104dea69..9a99d770ad 100644 --- a/admin/setup/phpgw_de.lang +++ b/admin/setup/phpgw_de.lang @@ -65,6 +65,10 @@ async services last executed admin de Asynchroner Dienst zuletzt ausgef asynchronous timed services admin de Asynchroner zeitgesteuerter Dienst asyncservices not yet installed or other error (%1) !!! admin de Asynchroner Dienst is noch nicht installiert oder ein anderer Fehler ist aufgetreten (%1) !!! attempt to use correct mimetype for ftp instead of default 'application/octet-stream' admin de Soll versucht werden den richtigen MINE-typ fr FTP zu verwenden, statt dem Vorgabewert "application/octet-stream" +attribute accountstatus explained admin de Dies betrifft das Attribut -accountStatus- aus dem QMAIL Schema +attribute mail explained admin de Dies betrifft das Attribut -mail- aus dem CORE Schema. Dieses Attribut darf nicht leer sein und wird gleichzeitig als Emailadresse innerhalb eGW verwendet. +attribute mailalternateaddress explained admin de Dies betrifft das Attribut -mailAlternateAddress- aus dem QMAIL Schema. Das experimentelle Schema verwendet dies auch als Alias fr mailLocalAddress. +attribute mailforwardingaddress explained admin de Dies betrifft das Attribut -mailForwardingAddress- aus dem QMAIL Schema. Darf nicht leer sein. Der Begriff mailRoutingAddress wurde hierfr frher als Alias verwendet. authentication / accounts admin de Benutzerauthentifizierung/Benutzerkonten auto create account records for authenticated users admin de Automatisch Benutzerkonten fr authentifizierte Benutzer anlegen back to the list admin de Zurck zur Liste @@ -177,6 +181,7 @@ error canceling timer, maybe there's none set !!! admin de Fehler beim Abbrechen error setting timer, wrong syntax or maybe there's one already running !!! admin de Fehler beim Starten des Testjobs, falsche Syntax oder es luft schon einer!!! error: %1 not found or other error !!! admin de Fehler: %1 nicht gefunden oder anderer Fehler!!! expires admin de abgelaufen +explanation of ldapman admin de Dieses Modul ist derzeit nur fr folgende Konfiguration getestet: Postfix, LDAP, Courier-Imap, Procmail und erfordert die Schemas: core und qmail(OID 7914). Weitere Konfigurationshinweise sind im README.ldapman im DOC Verzeichnis des Moduls ADMIN zu finden. fallback (after each pageview) admin de Ausweichmglichkeit (nach jedem Seitenaufbau) file space admin de Dateiraum file space must be an integer admin de Speicherplatz muss eine Zahl sein diff --git a/admin/setup/phpgw_en.lang b/admin/setup/phpgw_en.lang index 4f3d28c5c7..be1e873955 100644 --- a/admin/setup/phpgw_en.lang +++ b/admin/setup/phpgw_en.lang @@ -64,6 +64,10 @@ async services last executed admin en Async services last executed asynchronous timed services admin en Asynchronous timed services asyncservices not yet installed or other error (%1) !!! admin en asyncservices not yet installed or other error (%1) !!! attempt to use correct mimetype for ftp instead of default 'application/octet-stream' admin en Attempt to use correct mimetype for FTP instead of default 'application/octet-stream' +attribute accountstatus explained admin en This handles the attribute -accountStatus- from the QMAIL schema. +attribute mail explained admin en This handles the attribute -mail- from the QMAIL schema and should never be empty. It is also the eGW internal email field. +attribute mailalternateaddress explained admin en This handles the attribute -mailAlternateAddress- from the QMAIL schema and can be handled as virtual maps or aliases. +attribute mailforwardingaddress explained admin en This handles the attribute -mailForwardingAddress- from QMAIL Schema and must not be empty if assigned. authentication / accounts admin en Authentication / Accounts auto create account records for authenticated users admin en Auto create account records for authenticated users back to the list admin en back to the list @@ -175,6 +179,7 @@ error canceling timer, maybe there's none set !!! admin en Error canceling timer error setting timer, wrong syntax or maybe there's one already running !!! admin en Error setting timer, wrong syntax or maybe there's one already running !!! error: %1 not found or other error !!! admin en Error: %1 not found or other error !!! expires admin en Expires +explanation of ldapman admin en This module has been tested so far for POSTFIX,LDAP,Courier-IMAP and need the schemas CORE and QMAIL (OID7914). More details about using and configuring this systrem can be found in README.ldapman in the doc folder of ADMIN. fallback (after each pageview) admin en fallback (after each pageview) file space admin en File space file space must be an integer admin en File space must be an integer diff --git a/admin/templates/default/account_form_ldapdata.tpl b/admin/templates/default/account_form_ldapdata.tpl new file mode 100644 index 0000000000..a47be48b92 --- /dev/null +++ b/admin/templates/default/account_form_ldapdata.tpl @@ -0,0 +1,84 @@ + +
+
+ + + + + +
+ {rows} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ {lang_email_config} + + + {lang_emailaccount_active} +
{lang_masterEmailAddress}
{lang_mailAliases}{options_mailAlternateAddress} + +
+   +
+ +
+ +
+ {lang_RouteMailsTo} + + +
+   +
+   +
+ + + + +
+ +
+
+
+
+ + + + +   {row_text} + + diff --git a/phpgwapi/templates/idots/images/info.gif b/phpgwapi/templates/idots/images/info.gif new file mode 100644 index 0000000000000000000000000000000000000000..7d580a470808d1b126e98dcbaa2abea6908cb0af GIT binary patch literal 75 zcmZ?wbhEHb Date: Thu, 26 Aug 2004 21:31:38 +0000 Subject: [PATCH 027/177] *** empty log message *** --- phpgwapi/setup/phpgw_sv.lang | 556 +++++++++++++++++++++++++++++++---- 1 file changed, 506 insertions(+), 50 deletions(-) diff --git a/phpgwapi/setup/phpgw_sv.lang b/phpgwapi/setup/phpgw_sv.lang index 3d20e1d440..09fdd4c624 100644 --- a/phpgwapi/setup/phpgw_sv.lang +++ b/phpgwapi/setup/phpgw_sv.lang @@ -1,132 +1,588 @@ +%1 email addresses inserted common sv %1 e-post adresser tillagda +%1 is not executable by the webserver !!! common sv %1 r inte exekverbar av webbservern! +%1egroupware%2 is a multi-user, web-based groupware suite written in %3php%4. common sv %1eGroupWare%2 r en fleranvndar, webbaserad grupp-programvara skriven i %3PHP%4. +(shift-)click or drag to change value jscalendar sv (Shift)-Klicka eller dra fr att ndra vrde +- click on any of the time parts to increase it jscalendar sv - Klicka p ngon av tids intervallerna fr att utka +- hold mouse button on any of the above buttons for faster selection. jscalendar sv - Hll musknappen ver ngon av knapparna verst fr snabbare val. +- or click and drag for faster selection. jscalendar sv - eller klicka och dra fr snabbare val. +- or shift-click to decrease it jscalendar sv - eller Shift-klicka fr att minska +- use the %1, %2 buttons to select month jscalendar sv - Anvnd %1, %2 knapparna fr att vlja mnad +- use the %1, %2 buttons to select year jscalendar sv - Anvnd %1, %2 knapparna fr att vlja r +00 (disable) admin sv 00 (avakrivera) +13 (ntp) admin sv 13 (ntp) +3 number of chars for day-shortcut jscalendar sv 3 tecken fr dag-genvg +3 number of chars for month-shortcut jscalendar sv 3 tecken fr mnad-genvg +80 (http) admin sv 80 (http) +about common sv Om about %1 common sv Om %1 +about the calendar jscalendar sv Om kalendern +about this editor htmlarea sv Om editorn access common sv tkomst +access not permitted common sv tkomst nekas access type common sv tkomst typ -account has been created common sv Kontot har blivit skapat -account has been deleted common sv Kontot har blivit borttaget -account has been updated common sv Kontot har blivit uppdaterat +account has been created common sv Kontot skapat +account has been deleted common sv Kontot r borttaget +account has been updated common sv Kontot r uppdaterad +account is expired common sv Kontot r utgnget account preferences common sv Konto instllningar +acl common sv ACL +action common sv Val +active common sv Aktiv add common sv Lgg till +add %1 category for common sv Lgg till %1 kategori fr +add category common sv Lgg till kategori +add sub common sv Lgg till under +addressbook common sv Adressbok admin common sv Admin administration common sv Administration +afghanistan common sv AFGHANISTAN +albania common sv ALBANIEN +algeria common sv ALGERIET +all common sv Alla +all fields common sv alla flt +alphabet common sv a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,,, +american samoa common sv AMERIKANSKA SAMOA +andorra common sv ANDORRA +angola common sv ANGOLA +antarctica common sv ANTARKTIS +apply common sv Spara april common sv April -are you sure you want to delete this entry ? common sv r du sker att du vill radera denna entry ? +are you sure you want to delete these entries ? common sv r du sker att du vill radera dessa poster? +are you sure you want to delete this entry ? common sv r du sker att du vill radera denna post? +argentina common sv ARGENTINA +armenia common sv ARMENIEN +aruba common sv ARUBA august common sv Augusti +australia common sv AUSTRALIEN +austria common sv STERIKE +author common sv Frfattare +autohide sidebox menus common sv Automatisk dlj sido menyer +automatically hide the sidebox menus? common sv Automatisk dlj sido menyer? +autosave default category common sv Autospara standard kategori +azerbaijan common sv AZERBAJAN +back common sv Tillbaks +back to user login common sv Tillbaks till anvndar inloggningen +background color htmlarea sv Bakgrunds frg +bad login or password common sv Ogiltigt login eller lsenord +bahamas common sv BAHAMAS +bangladesh common sv BANGLADESH +barbados common sv BARBADOS +bcc common sv Bcc +belarus common sv Vitryssland +belgium common sv BELGIEN +benin common sv BENIN +bermuda common sv BERMUDA birthday common sv Fdelsedag +blocked, too many attempts common sv Blockerad, fr mnga frsk +bold htmlarea sv Fet +bolivia common sv BOLIVIEN +bosnia and herzegovina common sv BOSNIEN HERZEGOVINA +botswana common sv BOTSWANA +brazil common sv BRASILIEN +brunei darussalam common sv BRUNEI DARUSSALAM +bulgaria common sv BULGARIEN +bulleted list htmlarea sv Punktad lista +burundi common sv BURUNDI +calendar common sv Kalender +cambodia common sv KAMBODJA +cameroon common sv KAMERUN +canada common sv KANADA cancel common sv Avbryt +cape verde common sv KAP VERDE +categories common sv Kategorier +categories for common sv kategorier fr +category common sv Kategori +category %1 has been added ! common sv Kategori %1 tillagd +category %1 has been updated ! common sv Kategori %1 uppdaterad +cayman islands common sv CAYMAN ARNA +cc common sv Cc +central african republic common sv CENTRAL AFRIKANSKA REPUBLIKEN +chad common sv CHAD change common sv ndra -charset common sv iso-8859-1 +charset common sv teckenuppsttning +check installation common sv Kontrollera installation +chile common sv CHILE +china common sv Kina +choose the category common sv Vlj kategori +choose the parent category common sv Vlj top kategori city common sv Stad clear common sv Rensa clear form common sv Rensa formulr +click common sv Klicka +click or mouse over to show menus common sv Klicka eller hll musen ver fr att se menyer +click or mouse over to show menus? common sv Klicka eller hll musen ver fr att se menyer? +close common sv Stng +colombia common sv COLOMBIA +company common sv Fretag +congo common sv Kongo +cook islands common sv COOK ARNA copy common sv Kopiera +copy selection htmlarea sv Kopiera vald +costa rica common sv COSTA RICA create common sv Skapa -created by common sv Skapat av +created by common sv Skapad av +croatia common sv KROATIEN +cuba common sv Kuba +currency common sv Valuta +current common sv Nuvarande +current style htmlarea sv Nuvarande stil current users common sv Nuvarande anvndare +cut selection htmlarea sv Klipp ut vald +cyprus common sv CYPERN +czech republic common sv TJEKISKA REPUBLIKEN date common sv Datum +date due common sv Sista datum +date selection: jscalendar sv Datum val: +datetime port.
if using port 13, please set firewall rules appropriately before submitting this page.
(port: 13 / host: 129.6.15.28) admin sv Datumtid port.
Om port 13, uppdatera brandvggen rtt innan du skicakr med denna sida.
(Port: 13 / Host: 129.6.15.28) december common sv December +default category common sv Standard kategori delete common sv Ta bort +denmark common sv DANMARK +description common sv Beskrivning +detail common sv Detalj +details common sv Detaljer +disable internet explorer png-image-bugfix common sv Avaktivera Internet Explorer png-bild-bugfix +disable slider effects common sv Avaktivera "slider" effekten +disable the animated slider effects when showing or hiding menus in the page? opera and konqueror users will probably must want this. common sv Avaktivera animerade effekter vid visning eller dljning av menyer p sidan? Anvndare av Opera och Konqueror vljer troligen detta. +disabled common sv Avaktiverad +display %s first jscalendar sv Visa %s frst +do you also want to delete all subcategories ? common sv Vill du ven radera alla underkategorier +domain common sv Domn +domain name for mail-address, eg. "%1" common sv domn namn fr e-post adressen, eg. "%1" +domestic common sv Inrikes +dominican republic common sv DOMINIKANSKA REPUBLIKEN done common sv Frdig -e-mail common sv E-Post +drag to move jscalendar sv Dra fr att flytta +e-mail common sv E-post +east timor common sv STRA TIMOR +ecuador common sv ECUADOR edit common sv Editera -email common sv E-Post -entry has been deleted sucessfully common sv Entry har blivit borttaget -entry updated sucessfully common sv Entry r uppdaterad +edit %1 category for common sv Editera %1 kategorier fr +edit categories common sv Editera kategorier +edit category common sv Editera kategori +egroupware api version %1 common sv eGroupWare API version %1 +egroupware: login blocked for user '%1', ip %2 common sv eGroupWare: inloggning blockerad fr '%1', IP %2 +egypt common sv EGYPTEN +el salvador common sv EL SALVADOR +email common sv E-post +email-address of the user, eg. "%1" common sv e-post adress fr anvndare, eg. "%1" +enabled common sv Aktiverad +end date common sv Slutdatum +end time common sv Slut tid +enlarge editor htmlarea sv Utka editorn +enter the location of egroupware's url.
example: http://www.domain.com/egroupware   or   /egroupware
no trailing slash admin sv Skriv skvgen till eGroupWare's URL.
Example: http://www.domain.com/egroupware   eller   /egroupware
Utan efterfljande snedstreck +entry has been deleted sucessfully common sv Posten raderad +entry updated sucessfully common sv Posten uppdaterad +eritrea common sv ERITREA error common sv Fel +error creating %1 %2 directory common sv Fel vid skapande av %1 %2 mapp +error deleting %1 %2 directory common sv Fel vid radering av %1 %2 mapp +error renaming %1 %2 directory common sv Fel vid byte av namn p %1 %2 mapp +estonia common sv ESTLAND +ethiopia common sv ETIOPIEN +exact common sv exakt exit common sv Avsluta +falkland islands (malvinas) common sv FALKLAND ARNA +fax number common sv faxnummer february common sv Februari +fields common sv Flt +fiji common sv FUJI files common sv Filer -filter common sv Filter +filter common sv Regler +finland common sv FINLAND first name common sv Frnamn +first name of the user, eg. "%1" common sv frnamn p anvndare, eg. "%1" +first page common sv Frsta sidan +firstname common sv Frnamn +fixme! common sv FIXAMIG!!!! +font color htmlarea sv Frgrunds frg +force selectbox common sv Tvinga SelectBox +france common sv FRANKRIKE +french guiana common sv FRANSKA GUIANA +french polynesia common sv FRANSKA POLYNESIEN friday common sv Fredag ftp common sv FTP -global public common sv Global Public -group access common sv Grupp Access -group has been added common sv Grupp har lagts till -group has been deleted common sv Grupp har tagits bort -group has been updated common sv Grupp har uppdaterats -group public common sv Grupp Public +fullname common sv Fullstndigt namn +gambia common sv GAMBIA +general menu common sv Allmn meny +georgia common sv GEORGIEN +germany common sv TYSKLAND +ghana common sv GHANA +gibraltar common sv GIBRALTAR +global common sv Global +global public common sv Globalt publik +go today jscalendar sv G Idag +grant access common sv Tillt tkomst +greece common sv GREKLAND +greenland common sv GRNLAND +grenada common sv GRENADA +group common sv Grupp +group access common sv Grupp tkomst +group has been added common sv Gruppen tillagd +group has been deleted common sv Gruppen bort tagen +group has been updated common sv Gruppen uppdaterad +group name common sv grupp namn +group public common sv Grupp publik groups common sv Grupper +groups with permission for %1 common sv Grupper med tkomst till %1 +groups without permission for %1 common sv Grupper utan tkomst till %1 +guadeloupe common sv GUADELOUPE +guam common sv GUAM +guatemala common sv GUATEMALA +guinea common sv GUINEA +guinea-bissau common sv GUINEA-BISSAU +guyana common sv GUYANA +haiti common sv HAITI help common sv Hjlp +help using editor htmlarea sv Hjlp om editor anvndning high common sv Hg +highest common sv Hgsta home common sv Hem +home email common sv hem e-post home phone common sv Hemma telefon -it has been more then %1 days since you changed your password common sv Det er mer n %1 dagar sedan du ndrade ditt lsenord +honduras common sv HONDURAS +hong kong common sv HONG KONG +horizontal rule htmlarea sv Horisontell linje +hungary common sv UNGERN +iceland common sv ISLAND +india common sv INDIEN +indonesia common sv INDONESIEN +international common sv Internationell +invalid ip address common sv Ogiltig IP adress +invalid password common sv Ogiltigt lsenord +iran, islamic republic of common sv IRAN +iraq common sv IRAK +ireland common sv IRLAND +israel common sv ISRAEL +it has been more then %1 days since you changed your password common sv Det r mer n %1 dagar sedan du ndrade ditt lsenord +it is recommended that you run setup to upgrade your tables to the current version common sv Det r rekomenderat att du kr installationen fr att uppdatera dina tabeller till nuvarande version. +italic common sv Kursiv +italy common sv ITALIEN +jamaica common sv JAMAICA january common sv Januari +japan common sv JAPAN +jordan common sv JORDANIEN july common sv Juli +jun common sv Jun june common sv Juni +justify center htmlarea sv Justera center +justify full htmlarea sv Justera marginaljustera +justify left htmlarea sv Justera vnster +justify right htmlarea sv Justera hger +kazakstan common sv KAZAKSTAN +kenya common sv KENYA +keywords common sv Skord +korea, democratic peoples republic of common sv KOREA, FOLKREPUBLIKEN +korea, republic of common sv KOREA, SYD +kuwait common sv KUWAIT +language common sv Sprk +lao peoples democratic republic common sv LAOS last name common sv Efternamn -last page common sv sista sidan +last name of the user, eg. "%1" common sv efternamn p anvndare, eg. "%1" +last page common sv Sista sidan +lastname common sv Efternamn +latvia common sv LETTLAND +lebanon common sv LIBANON +lesotho common sv LESOTHO +liberia common sv LIBERIA +libyan arab jamahiriya common sv LIBYEN +license common sv Licens +liechtenstein common sv LIECHTENSTEIN line 2 common sv Andra raden -login common sv Login -logout common sv Logout +list common sv Lista +list members common sv Lista medlemmar +lithuania common sv LITAUEN +local common sv Local +login common sv Inloggning +loginid common sv Inloggnings ID +logout common sv Utloggning low common sv Lg +lowest common sv Lgst +luxembourg common sv LUXEMBURG +macau common sv MACAU +macedonia, the former yugoslav republic of common sv MACEDONIEN +madagascar common sv MADAGASCAR +mail domain, eg. "%1" common sv e-post domn, eg. "%1" +main category common sv Huvudkategori +main screen common sv Startsidan +maintainer common sv Underhll +malaysia common sv MALAYSIA +maldives common sv MALDIVERNA +mali common sv MALI +malta common sv MALTA march common sv Mars +marshall islands common sv MARSHALL ARNA +mauritius common sv MAURITIUS +max number of icons in navbar common sv Max antal ikoner i navigeringslistan may common sv Maj medium common sv Medium +menu common sv Meny +message common sv Meddelande +mexico common sv MEXICO mobile phone common sv Mobil nummer +moldova, republic of common sv MOLDAVIEN +monaco common sv MONACO monday common sv Mndag +mongolia common sv MONGOLIEN +morocco common sv MOROCCO +mozambique common sv MOZAMBIQUE name common sv Namn -new entry added sucessfully common sv Ny entry har lagts till +name of the user, eg. "%1" common sv frnamn p anvndare, eg. "%1" +namibia common sv NAMIBIA +nepal common sv NEPAL +netherlands common sv HOLLAND +never common sv Aldrig +new caledonia common sv NYA KALEDONIEN +new entry added sucessfully common sv Ny post tillagd +new main category common sv Ny huvudkategori new phrase has been added common sv Ny fras har lagts till -next page common sv nsta sida +new value common sv Nytt vrde +new zealand common sv NYA ZELAND +next common sv Nsta +next month (hold for menu) jscalendar sv Nsta mnad (hll fr meny) +next page common sv Nsta sida +next year (hold for menu) jscalendar sv Nsta r (hll fr meny) +nicaragua common sv NICARAGUA +niger common sv NIGER +nigeria common sv NIGERIA no common sv Nej +no entries found, try again ... common sv inga poster funna, frsk igen ... +no history for this record common sv Ingen historia fr denna post +no subject common sv Inget mne none common sv Ingen normal common sv Normal +norway common sv NORGE +not assigned common sv inte tilldelad +note common sv Not +notes common sv Noteringar +notify window common sv Meddelande fnster november common sv November october common sv Oktober -ok common sv OK +ok common sv Ok +old value common sv Gammalt vrde +oman common sv OMAN on *nix systems please type: %1 common sv Skriv %1 p *nix system +on mouse over common sv Vid mus verfring +only private common sv endast privata only yours common sv endast dina +open notify window common sv ppna meddelande fnster +open popup window common sv ppna popup fnster +ordered list htmlarea sv Numrerad lista original common sv Orginal +other common sv Annan other phone common sv Annat nummer +overview common sv versikt +owner common sv gare +page common sv Sida +page was generated in %1 seconds common sv Sidan genererades p %1 sekunder pager common sv Personskare +pakistan common sv PAKISTAN +palestinian territory, occupied common sv PALESTINA +panama common sv PANAMA +papua new guinea common sv PAPUA NYA GUINEA +paraguay common sv PARAGUAY +parcel common sv Leverans +parent category common sv ver kategori password common sv Lsenord -password has been updated common sv Lsenord har blivit uppdaterat +password could not be changed common sv Lsenordet kunde inte ndras +password has been updated common sv Lsenord uppdaterad +paste from clipboard htmlarea sv Kopiera frn klippbok +path htmlarea sv Skvg +path to user and group files has to be outside of the webservers document-root!!! common sv Skvgen till anvndar och grupp filer MSTE VARA UTANFR webbserverns dokument-root! +pattern for search in addressbook common sv Skmnster i Adressboken +pattern for search in calendar common sv Skmnster i Kalendern +pattern for search in projects common sv Skmnster i Projekt permissions to the files/users directory common sv rttigheter p files/users bibliotek -please %1 by hand common sv Var vnlig %1 fr hand -powered by egroupware version %1 common sv Powered by eGroupWare version %1 -preferences common sv Instllningar +personal common sv Person +peru common sv PERU +philippines common sv FILIPINERNA +phone number common sv telefon nummer +please %1 by hand common sv Vnligen, %1 fr hand +please enter a name common sv Vnligen, skriv in ett namn! +please run setup to become current common sv Vnligen, kr installationen fr att uppdatera +please select common sv Vlj +please set your global preferences common sv Gr dina globala instllningar +please set your preferences for this application common sv Gr dina instllningar fr denna applikation +please wait... common sv Vnligen vnta ... +poland common sv POLEN +portugal common sv PORTUGAL +postal common sv Post adress +powered by phpgroupware version %1 common sv Powered by phpGroupWare version %1 +preferences common sv Alternativ +preferences for the idots template set common sv Alternativ fr idots template +prev. month (hold for menu) jscalendar sv Freg. mnad (hll fr meny) +prev. year (hold for menu) jscalendar sv Freg. r (hll fr meny) previous page common sv Fregende sida print common sv Skriv ut priority common sv Prioritet private common sv Privat -rename common sv ndra namn +project common sv Projekt +public common sv publik +puerto rico common sv PUERTO RICO +qatar common sv QATAR +read common sv Ls +read this list of methods. common sv Ls lista p metoder +reject common sv Avvisa +remove selected accounts common sv Ta bort valda konton +rename common sv Byt namn +returns a full list of accounts on the system. warning: this is return can be quite large common sv Hmta en full lista p konton. Varning: Den kan vara tmligen stor +returns an array of todo items common sv Returnera en lista p AttGra +romania common sv RUMNIEN +rwanda common sv RWANDA +samoa common sv SAMOA +san marino common sv SAN MARINO saturday common sv Lrdag +saudi arabia common sv SAUDI ARABIEN save common sv Spara search common sv Sk +search %1 '%2' common sv Sk %1 '%2' +search or select accounts common sv Sk eller vlj konto +section common sv Sektion +select common sv Vlj +select all %1 %2 for %3 common sv Vlj alla %1 %2 fr %3 +select category common sv Vlj kategori +select date common sv Vlj datum +select group common sv Vlj grupp +select home email address common sv Vlj hem e-post adress +select one common sv Vlj en +select user common sv Vlj anvndare +select work email address common sv Vlj arbete e-post adress +selection common sv Val +send common sv Skicka +senegal common sv SENEGAL september common sv September -session has been killed common sv Session har blivit avslutad +server %1 has been added common sv Server %1 tillagd +server name common sv Server namn +session has been killed common sv Session avslutad +setup common sv Installation +setup main menu common sv Installations meny +seychelles common sv SEYCHELLERNA show all common sv visa alla +show all categorys common sv Visa alla kategorier +show menu common sv visa meny +show page generation time common sv Visa sido genererings tid +show page generation time on the bottom of the page? common sv Visa sido genererings tid i slutet p sidan? +show_more_apps common sv visa mer applikationer showing %1 common sv visar %1 showing %1 - %2 of %3 common sv visar %1 - %2 av %3 +sierra leone common sv SIERRA LEONE +singapore common sv SINGAPOR +slovakia common sv SLOVAKIEN +slovenia common sv SLOVENIEN +solomon islands common sv SOLOMON ARNA sorry, there was a problem processing your request. common sv Beklagar, det var problem att utfra din nskan. +sorry, your login has expired login sv Beklagar, din inloggning r lst +south africa common sv SYD AFRIKA +spain common sv SPANIEN +sri lanka common sv SRI LANKA +start date common sv Start datum +start time common sv Start tid +start with common sv brja med state common sv Stat +status common sv Status street common sv Gata +strikethrough htmlarea sv Genomstruken +subject common sv mne submit common sv Utfr +subscript htmlarea sv Prenumerera +sudan common sv SUDAN sunday common sv Sndag +superscript htmlarea sv Superskript +svalbard and jan mayen common sv SVALBARD OCH JAN MAYEN +sweden common sv SVERIGE +syrian arab republic common sv SYRIEN +taiwan common sv TAIWAN/TAIPEI +tanzania, united republic of common sv TANZANIA +thailand common sv THAILAND +the api is current common sv API r senast tillgngliga +the api requires an upgrade common sv API behver en uppdatering +the following applications require upgrades common sv Fljande applikationer behver uppdateras +the mail server returned common sv E-post servern returnerade +this application is current common sv Applikationen r senast tillgngliga +this application requires an upgrade common sv Applikationen behver uppdateras +this name has been used already common sv Anvndarnamnet r redan upptaget! thursday common sv Torsdag time common sv Tid +time selection: jscalendar sv Tids intervall: +time zone common sv Tidzon +time zone offset common sv Tidzon skiljnad +title common sv Titel +to common sv Till to correct this error for the future you will need to properly set the common sv Fr att framgent rtta till detta problem mste du riktigt stta -total common sv Total +to go back to the msg list, click here common sv Fr att komma tillbaks till meddelande listan, klicka hr +today common sv Idag +todays date, eg. "%1" common sv dagens datum, eg. "%1" +toggle first day of week jscalendar sv Visa veckans frsta dag +toggle html source htmlarea sv Visa HTML kllkod +togo common sv TOGO +too many unsucessful attempts to login: %1 for the user '%2', %3 for the ip %4 common sv Fr mnga misslyckade inloggnings frsk: %1 fr anvndare '%2', %3 med IP %4 +total common sv Totalt +trinidad and tobago common sv TRINIDAD OCH TOBAGO tuesday common sv Tisdag +tunisia common sv TUNISIEN +turkey common sv TURKIET +turkmenistan common sv TURKMENISTAN +uganda common sv UGANDA +ukraine common sv UKRAINA +underline htmlarea sv Understruken +undoes your last action htmlarea sv terkalla dit senaste val +united arab emirates common sv FRENTA ARAB EMIRATEN +united kingdom common sv ENGLAND +united states common sv U.S.A +unknown common sv Oknd +update common sv Uppdatera updated common sv Uppdaterat -users common sv anvndare -vcard common sv VKort -view common sv Visa -wednesday common sv Onsdag -which groups common sv vilken grupp -work phone common sv Arbets telefon -yes common sv Ja -you are required to change your password during your first login common sv Du mste byta lsenord vid din frsta inloggning -you have 1 new message! common sv Du har 1 nytt meddelande! -you have %1 new messages! common sv Du har %1 nya meddelanden! -your message has been sent common sv Ditt meddelande har blivit snt -your search returned 1 match common sv din skning gav 1 trff -your search returned %1 matchs common sv din skning gav %1 trffar -your settings have been updated common sv Dina innstllningar har blivit uppdaterade -zip code common sv Postnummer -bad login or password common sv Ogiltigt login eller lsenord -sorry, your login has expired login sv Beklagar, din login har utgtt +url common sv URL +uruguay common sv URUGUAY +use button to search for common sv anvnd Knappen fr att ska +use button to search for address common sv anvnd Knappen fr att ska adresser +use button to search for calendarevent common sv anvnd Knappen fr att ska kalender hndelser +use button to search for project common sv anvnd Knappen fr att ska projekt use cookies login sv Anvnd cookies -username login sv Anvndarnamn -you have been successfully logged out login sv Du har nu loggat ut +user common sv Anvndare +user accounts common sv Anvndarkonto +user groups common sv Anvndargrupp +username common sv Anvndarnamn +users common sv anvndare +users choice common sv Anvndarnas val +uzbekistan common sv UZBEKISTAN +vcard common sv VKort +venezuela common sv VENEZUELA +version common sv Version +viet nam common sv VIETNAM +view common sv Visa +virgin islands, british common sv VIRGIN ISLANDS, BRITISKA +wednesday common sv Onsdag +welcome common sv Vlkommen +western sahara common sv VSTRA SAHARA +which groups common sv Vilken grupp +work email common sv arbets e-post +work phone common sv Arbets telefon +written by: common sv Skriven av: +year common sv r +yemen common sv JEMEN +yes common sv Ja +you are in text mode. use the [<>] button to switch back to wysiwig. htmlarea sv Du r i TEXT lge. Anvnd [<>] fr att komma tillbaks till WYSIWIG. +you are required to change your password during your first login common sv Du mste byta lsenord vid din frsta inloggning +you are running a newer version of phpgroupware than your database is setup for common sv Du anvnder en nyare version av phpGroupWare n din databas r konfigurerad fr. +you have %1 new messages! common sv Du har %1 nya meddelanden! +you have 1 new message! common sv Du har 1 nytt meddelande! +you have been successfully logged out login sv Du r utloggad +you have not entered a title common sv Du har inte anget ngon titel +you have not entered a valid date common sv Du har inte anget ett giltigt datum +you have not entered a valid time of day common sv Du har inte anget en giltig tid +you have not entered participants common sv Du har inte anget deltagare +you have selected an invalid date common sv Du har valt ett ogiltigt datum +you have selected an invalid main category common sv Du har valt en ogiltig huvud kategori +you have successfully logged out common sv Du r utloggad +you need to add the webserver user '%1' to the group '%2'. common sv Du behver lgga till webbserver anvndare '%1' till gruppen '%2'. +your message could not be sent!
common sv Ditt meddelande kunde inte skickas!
+your message has been sent common sv Ditt meddelande har skickats +your search returned %1 matchs common sv din skning gav %1 trffar +your search returned 1 match common sv din skning gav 1 trff +your session could not be verified. login sv Din session kunde inte verifieras +your settings have been updated common sv Dina instllningar har uppdaterats +yugoslavia common sv YOGOSLAVIEN +zambia common sv ZAMBIA +zimbabwe common sv ZIMBABWE +zip code common sv Postnummer From b68f289d87bc2e6b58539146393041996a679970 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 27 Aug 2004 10:41:57 +0000 Subject: [PATCH 028/177] made the update strategy of setup_process a bit more flexible: update dont need to be in order in the tables_update file any more: if the next update is not the one we need, we search for the right one and start again from there. This is needed to be able to import phpGW versions from after the fork and it simplyfies the update-scripts a lot now. --- phpgwapi/inc/class.setup_process.inc.php | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/phpgwapi/inc/class.setup_process.inc.php b/phpgwapi/inc/class.setup_process.inc.php index 079c5ecdab..7a12738df4 100644 --- a/phpgwapi/inc/class.setup_process.inc.php +++ b/phpgwapi/inc/class.setup_process.inc.php @@ -643,7 +643,7 @@ @reset($test); while(list($x,$value) = @each($test)) { - $currentver = $setup_info[$key]['currentver']; + $this->currentversion = $currentver = $setup_info[$key]['currentver']; /* build upgrade function name */ $function = $appname . '_upgrade' . str_replace(".", '_', $value); @@ -718,6 +718,16 @@ $GLOBALS['phpgw_setup']->register_app($appname); $GLOBALS['phpgw_setup']->register_hooks($appname); } + // is the next update the one we need? + if ($success && $test[$x+1] != $success && + ($num = array_search($success,$test)) !== False) + { + // do we have the needed update somewhere else in the row? + // if yes, position the array-pointer just before that update and continue + reset($test); + while((list($x,$value) = each($test)) && $x < $num-1); + continue; + } } else { @@ -737,6 +747,17 @@ if($DEBUG) { echo '
process->upgrade(): running baseline delta only: ' . $function . '...'; } $GLOBALS['phpgw_setup']->oProc->m_bDeltaOnly = True; $success = $function(); + + // is the next update the one we need? + if ($success && $test[$x+1] != $success && + ($num = array_search($success,$test)) !== False) + { + // do we have the needed update somewhere else in the row? + // if yes, position the array-pointer just before that update and continue + reset($test); + while((list($x,$value) = each($test)) && $x < $num-1); + continue; + } } else { From 66d2519243f5d263eb420f12122d22df95182dbb Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 27 Aug 2004 11:36:18 +0000 Subject: [PATCH 029/177] Changes to update phpGW versions from after the fork up to 0.9.16.001, thought we dont import their new addressbook, we only create the original addressbook-tables if they are not there, because it's a newer install. The changed phpgw_log and phpgw_log_msg tables are just droped and recreated. --- phpgwapi/setup/tables_update_0_9_14.inc.php | 242 +++++++++++++++++++- 1 file changed, 232 insertions(+), 10 deletions(-) diff --git a/phpgwapi/setup/tables_update_0_9_14.inc.php b/phpgwapi/setup/tables_update_0_9_14.inc.php index da175d5244..48127963f6 100644 --- a/phpgwapi/setup/tables_update_0_9_14.inc.php +++ b/phpgwapi/setup/tables_update_0_9_14.inc.php @@ -1,7 +1,7 @@ oProc->m_bDeltaOnly) + { + $currentver = explode('.',$GLOBALS['phpgw_setup']->process->currentversion); + if ($currentver[0] == 0 && $currentver[1] == 9 && + ($currentver[2] == 14 && $currentver[3] > 508 || + ($currentver[2] > 14 && $currentver[2] < 99))) + { + // this is a phpGW update from a version after the fork + $GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.14.509'; + //echo "currentver=".print_r($currentver,true)." ==> following the phpGW update path ==> ".$GLOBALS['setup_info']['phpgwapi']['currentver']."
\n"; + return $GLOBALS['setup_info']['phpgwapi']['currentver']; + } + } // update to 0.9.10pre3 droped the columns account_permissions and account_groups // unfortunally they are still in the tables_current of 0.9.14.508 // so it depends on having a new or an updated install, if one have them or not @@ -767,14 +781,144 @@ } /* - * Updates from eGroupWare .16 branch + * Updates from phpGroupWare after the fork */ $test[] = '0.9.14.509'; function phpgwapi_upgrade0_9_14_509() { - // this is the eGW .16RC1 with the new contacts tables - // we need to drop them here to not run into problems later on, if we install them + return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.14.510'; + } + + $test[] = '0.9.14.510'; + function phpgwapi_upgrade0_9_14_510() + { + $GLOBALS['phpgw_setup']->oProc->DropTable('phpgw_log_msg'); + $GLOBALS['phpgw_setup']->oProc->DropTable('phpgw_log'); + $GLOBALS['phpgw_setup']->oProc->CreateTable('phpgw_log',array( + 'fd' => array( + 'log_id' => array('type' => 'auto','precision' => '4','nullable' => False), + 'log_date' => array('type' => 'timestamp','nullable' => False), + 'log_account_id' => array('type' => 'int','precision' => '4','nullable' => False), + 'log_account_lid' => array('type' => 'varchar','precision' => '25','nullable' => False), + 'log_app' => array('type' => 'varchar','precision' => '25','nullable' => False), + 'log_severity' => array('type' => 'char','precision' => '1','nullable' => False), + 'log_file' => array('type' => 'varchar','precision' => '255','nullable' => False, 'default' => ''), + 'log_line' => array('type' => 'int','precision' => '4','nullable' => False, 'default' => '0'), + 'log_msg' => array('type' => 'text','nullable' => False) + ), + 'pk' => array('log_id'), + 'fk' => array(), + 'ix' => array(), + 'uc' => array() + )); + return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.14.511'; + } + + $test[] = '0.9.14.511'; + function phpgwapi_upgrade0_9_14_511() + { + return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.14.512'; + } + + $test[] = '0.9.14.512'; + function phpgwapi_upgrade0_9_14_512() + { + return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.14.513'; + } + + $test[] = '0.9.14.513'; + function phpgwapi_upgrade0_9_14_513() + { + $GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_accounts','account_quota',array('type' => 'int','precision' => '4','default' => -1,'nullable' => True)); + return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.14.514'; + } + + $test[] = '0.9.14.514'; + function phpgwapi_upgrade0_9_14_514() + { + return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.16.000'; + } + + $test[] = '0.9.16.000'; + function phpgwapi_upgrade0_9_16_000() + { + return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.16.001'; + } + + $test[] = '0.9.16.001'; + function phpgwapi_upgrade0_9_16_001() + { + foreach($GLOBALS['phpgw_setup']->db->table_names() as $tableinfo) + { + $tablenames[] = $tableinfo['table_name']; + } + // we need to redo the 0.9.14.510 update with the new phpgw_log table + // we just drop and recreate the table, as it contains no important data + $GLOBALS['phpgw_setup']->oProc->DropTable('phpgw_log'); + $GLOBALS['phpgw_setup']->oProc->CreateTable('phpgw_log',array( + 'fd' => array( + 'log_id' => array('type' => 'auto','precision' => '4','nullable' => False), + 'log_date' => array('type' => 'timestamp','nullable' => False), + 'log_user' => array('type' => 'int','precision' => '4','nullable' => False), + 'log_app' => array('type' => 'varchar','precision' => '50','nullable' => False), + 'log_severity' => array('type' => 'char','precision' => '1','nullable' => False) + ), + 'pk' => array('log_id'), + 'fk' => array(), + 'ix' => array(), + 'uc' => array() + )); + if (in_array('phpgw_log_msg',$tablenames)) + { + $GLOBALS['phpgw_setup']->oProc->DropTable('phpgw_log_msg'); + } + $GLOBALS['phpgw_setup']->oProc->CreateTable('phpgw_log_msg',array( + 'fd' => array( + 'log_msg_log_id' => array('type' => 'int','precision' => '4','nullable' => False), + 'log_msg_seq_no' => array('type' => 'int','precision' => '4','nullable' => False), + 'log_msg_date' => array('type' => 'timestamp','nullable' => False), + 'log_msg_tx_fid' => array('type' => 'varchar','precision' => '4','nullable' => True), + 'log_msg_tx_id' => array('type' => 'varchar','precision' => '4','nullable' => True), + 'log_msg_severity' => array('type' => 'char','precision' => '1','nullable' => False), + 'log_msg_code' => array('type' => 'varchar','precision' => '30','nullable' => False), + 'log_msg_msg' => array('type' => 'text','nullable' => False), + 'log_msg_parms' => array('type' => 'text','nullable' => False), + 'log_msg_file' => array('type' => 'varchar','precision' => '255','nullable' => False), + 'log_msg_line' => array('type' => 'int','precision' => '4','nullable' => False) + ), + 'pk' => array('log_msg_log_id','log_msg_seq_no'), + 'fk' => array(), + 'ix' => array(), + 'uc' => array() + )); + + // now we need to drop phpgw_accounts.accounts_quota from the 0.9.14.513 update + $GLOBALS['phpgw_setup']->oProc->m_oTranslator->_GetColumns($GLOBALS['phpgw_setup']->oProc,'phpgw_accounts',$columns); + $columns = explode(',',$columns); + if (in_array('account_quota',$columns)) + { + $GLOBALS['phpgw_setup']->oProc->DropColumn('phpgw_accounts',array( + 'fd' => array( + 'account_id' => array('type' => 'auto','nullable' => False), + 'account_lid' => array('type' => 'varchar','precision' => '25','nullable' => False), + 'account_pwd' => array('type' => 'varchar','precision' => '32','nullable' => False), + 'account_firstname' => array('type' => 'varchar','precision' => '50'), + 'account_lastname' => array('type' => 'varchar','precision' => '50'), + 'account_lastlogin' => array('type' => 'int','precision' => '4'), + 'account_lastloginfrom' => array('type' => 'varchar','precision' => '255'), + 'account_lastpwd_change' => array('type' => 'int','precision' => '4'), + 'account_status' => array('type' => 'char','precision' => '1','nullable' => False,'default' => 'A'), + 'account_expires' => array('type' => 'int','precision' => '4'), + 'account_type' => array('type' => 'char','precision' => '1','nullable' => True) + ), + 'pk' => array('account_id'), + 'fk' => array(), + 'ix' => array(), + 'uc' => array('account_lid') + ),'account_quota'); + } + /* we dont drop phpGW's new contacts tables for now ;-) foreach(array( 'phpgw_contact', 'phpgw_contact_person', @@ -792,13 +936,91 @@ ) as $table) { $GLOBALS['phpgw_setup']->oProc->DropTable($table); + }*/ + + // we need to check if we stil have the original addressbook-tables and create them again if not + if (!in_array('phpgw_addressbook',$tablenames)) + { + $GLOBALS['phpgw_setup']->oProc->CreateTable('phpgw_addressbook',array( + 'fd' => array( + 'id' => array('type' => 'auto','nullable' => False), + 'lid' => array('type' => 'varchar','precision' => '32'), + 'tid' => array('type' => 'char','precision' => '1'), + 'owner' => array('type' => 'int','precision' => '8'), + 'access' => array('type' => 'varchar','precision' => '7'), + 'cat_id' => array('type' => 'varchar','precision' => '32'), + 'fn' => array('type' => 'varchar','precision' => '64'), + 'n_family' => array('type' => 'varchar','precision' => '64'), + 'n_given' => array('type' => 'varchar','precision' => '64'), + 'n_middle' => array('type' => 'varchar','precision' => '64'), + 'n_prefix' => array('type' => 'varchar','precision' => '64'), + 'n_suffix' => array('type' => 'varchar','precision' => '64'), + 'sound' => array('type' => 'varchar','precision' => '64'), + 'bday' => array('type' => 'varchar','precision' => '32'), + 'note' => array('type' => 'text'), + 'tz' => array('type' => 'varchar','precision' => '8'), + 'geo' => array('type' => 'varchar','precision' => '32'), + 'url' => array('type' => 'varchar','precision' => '128'), + 'pubkey' => array('type' => 'text'), + 'org_name' => array('type' => 'varchar','precision' => '64'), + 'org_unit' => array('type' => 'varchar','precision' => '64'), + 'title' => array('type' => 'varchar','precision' => '64'), + 'adr_one_street' => array('type' => 'varchar','precision' => '64'), + 'adr_one_locality' => array('type' => 'varchar','precision' => '64'), + 'adr_one_region' => array('type' => 'varchar','precision' => '64'), + 'adr_one_postalcode' => array('type' => 'varchar','precision' => '64'), + 'adr_one_countryname' => array('type' => 'varchar','precision' => '64'), + 'adr_one_type' => array('type' => 'varchar','precision' => '32'), + 'label' => array('type' => 'text'), + 'adr_two_street' => array('type' => 'varchar','precision' => '64'), + 'adr_two_locality' => array('type' => 'varchar','precision' => '64'), + 'adr_two_region' => array('type' => 'varchar','precision' => '64'), + 'adr_two_postalcode' => array('type' => 'varchar','precision' => '64'), + 'adr_two_countryname' => array('type' => 'varchar','precision' => '64'), + 'adr_two_type' => array('type' => 'varchar','precision' => '32'), + 'tel_work' => array('type' => 'varchar','precision' => '40','nullable' => False,'default' => '+1 (000) 000-0000'), + 'tel_home' => array('type' => 'varchar','precision' => '40','nullable' => False,'default' => '+1 (000) 000-0000'), + 'tel_voice' => array('type' => 'varchar','precision' => '40','nullable' => False,'default' => '+1 (000) 000-0000'), + 'tel_fax' => array('type' => 'varchar','precision' => '40','nullable' => False,'default' => '+1 (000) 000-0000'), + 'tel_msg' => array('type' => 'varchar','precision' => '40','nullable' => False,'default' => '+1 (000) 000-0000'), + 'tel_cell' => array('type' => 'varchar','precision' => '40','nullable' => False,'default' => '+1 (000) 000-0000'), + 'tel_pager' => array('type' => 'varchar','precision' => '40','nullable' => False,'default' => '+1 (000) 000-0000'), + 'tel_bbs' => array('type' => 'varchar','precision' => '40','nullable' => False,'default' => '+1 (000) 000-0000'), + 'tel_modem' => array('type' => 'varchar','precision' => '40','nullable' => False,'default' => '+1 (000) 000-0000'), + 'tel_car' => array('type' => 'varchar','precision' => '40','nullable' => False,'default' => '+1 (000) 000-0000'), + 'tel_isdn' => array('type' => 'varchar','precision' => '40','nullable' => False,'default' => '+1 (000) 000-0000'), + 'tel_video' => array('type' => 'varchar','precision' => '40','nullable' => False,'default' => '+1 (000) 000-0000'), + 'tel_prefer' => array('type' => 'varchar','precision' => '32'), + 'email' => array('type' => 'varchar','precision' => '64'), + 'email_type' => array('type' => 'varchar','precision' => '32','default' => 'INTERNET'), + 'email_home' => array('type' => 'varchar','precision' => '64'), + 'email_home_type' => array('type' => 'varchar','precision' => '32','default' => 'INTERNET'), + 'last_mod' => array('type' => 'int','precision' => '8','nullable' => False) + ), + 'pk' => array('id'), + 'fk' => array(), + 'ix' => array(array('tid','owner','access','n_family','n_given','email'),array('tid','cat_id','owner','access','n_family','n_given','email')), + 'uc' => array() + )); + $GLOBALS['phpgw_setup']->oProc->CreateTable('phpgw_addressbook_extra',array( + 'fd' => array( + 'contact_id' => array('type' => 'int','precision' => '4','nullable' => False), + 'contact_owner' => array('type' => 'int','precision' => '8'), + 'contact_name' => array('type' => 'varchar','precision' => '255','nullable' => False), + 'contact_value' => array('type' => 'text') + ), + 'pk' => array('contact_id','contact_name'), + 'fk' => array(), + 'ix' => array(), + 'uc' => array() + )); } - $GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.14.508'; - return $GLOBALS['setup_info']['phpgwapi']['currentver']; + // now we return to the version of the fork + return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.14.508'; } - + /* - * Updates / downgrades from eGroupWare HEAD branch + * Updates / downgrades from phpGroupWare HEAD branch */ $test[] = '0.9.15.013'; From d868007dac92c35cc2ca3c5bd196470e2da4a0f8 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 27 Aug 2004 13:17:25 +0000 Subject: [PATCH 030/177] fixed some of our sessions problems: - [ 1015846 ] Registering session MySQL query error - handlich of timed out sessions for php4 sessions was wrong ==> I can't reproduce any more sessions probs, either with db nor php4 sessions --- phpgwapi/inc/class.sessions.inc.php | 2 +- phpgwapi/inc/class.sessions_db.inc.php | 2 +- phpgwapi/inc/class.sessions_php4.inc.php | 13 ++++++++----- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/phpgwapi/inc/class.sessions.inc.php b/phpgwapi/inc/class.sessions.inc.php index f190742ea9..7455ec5a93 100644 --- a/phpgwapi/inc/class.sessions.inc.php +++ b/phpgwapi/inc/class.sessions.inc.php @@ -278,7 +278,7 @@ */ if ($session['session_dla'] <= (time() - $GLOBALS['phpgw_info']['server']['sessions_timeout'])) { - $this->clean_sessions(); + $this->destroy($sessionid,$kp3); return False; } diff --git a/phpgwapi/inc/class.sessions_db.inc.php b/phpgwapi/inc/class.sessions_db.inc.php index b06b7347d9..e708cce67c 100644 --- a/phpgwapi/inc/class.sessions_db.inc.php +++ b/phpgwapi/inc/class.sessions_db.inc.php @@ -59,7 +59,7 @@ function register_session($login,$user_ip,$now,$session_flags) { - $GLOBALS['phpgw']->db->query("DELETE FROM phpgw_sessions WHERE session_id='$this->sessionsid'",__LINE__,__FILE__); + $GLOBALS['phpgw']->db->query("DELETE FROM phpgw_sessions WHERE session_id='$this->sessionid'",__LINE__,__FILE__); $GLOBALS['phpgw']->db->query("INSERT INTO phpgw_sessions VALUES ('" . $this->sessionid . "','".$login."','" . $user_ip . "','" diff --git a/phpgwapi/inc/class.sessions_php4.inc.php b/phpgwapi/inc/class.sessions_php4.inc.php index a835a97840..00c14d3b27 100644 --- a/phpgwapi/inc/class.sessions_php4.inc.php +++ b/phpgwapi/inc/class.sessions_php4.inc.php @@ -105,7 +105,7 @@ function destroy($sessionid, $kp3) { - if (! $sessionid && $kp3) + if (!$sessionid && $kp3) { return False; } @@ -115,8 +115,8 @@ // Only do the following, if where working with the current user if ($sessionid == $GLOBALS['phpgw_info']['user']['sessionid']) { - $this->clean_sessions(); session_unset(); + //echo "

sessions_php4::destroy: session_destroy() returned ".(session_destroy() ? 'True' : 'False')."

\n"; session_destroy(); if ($GLOBALS['phpgw_info']['server']['usecookies']) { @@ -235,9 +235,12 @@ { continue; // happens if webserver runs multiple user-ids } - $fd = fopen ($path . '/' . $file,'r'); - $session = fread ($fd, filesize ($path . '/' . $file)); - fclose ($fd); + $session = ''; + if (($fd = fopen ($path . '/' . $file,'r'))) + { + $session = ($size = filesize ($path . '/' . $file)) ? fread ($fd, $size) : 0; + fclose ($fd); + } if (substr($session,0,14) != 'phpgw_session|') { continue; From 75ac5fa3a2940535a92c6e2a09fd2b66a896b83b Mon Sep 17 00:00:00 2001 From: petere78 Date: Fri, 27 Aug 2004 16:53:26 +0000 Subject: [PATCH 031/177] Fix "Land" translation in head as well, so all branches are in sync. --- addressbook/setup/phpgw_de.lang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addressbook/setup/phpgw_de.lang b/addressbook/setup/phpgw_de.lang index 49a26f89dd..75b3fdd7e9 100644 --- a/addressbook/setup/phpgw_de.lang +++ b/addressbook/setup/phpgw_de.lang @@ -82,7 +82,7 @@ home country addressbook de Land privat home email addressbook de E-Mail privat home email type addressbook de Typ der privaten E-Mail home phone addressbook de Tel. privat -home state addressbook de Land privat +home state addressbook de Bundesland privat home street addressbook de Strae privat home zip code addressbook de PLZ privat import addressbook de Import @@ -138,7 +138,7 @@ select the type of conversion: addressbook de select where you want to store admin de Auswhlen wo Sie speichern wollen show birthday reminders on main screen addressbook de Geburtstagserinnerungen auf der Startseite anzeigen startrecord addressbook de Startdatensatz -state common de Land +state common de Bundesland street common de Strae successfully imported %1 records into your addressbook. addressbook de %1 Kontakte wurden erfolgreich in Ihr Adressbuch importiert suffix addressbook de Zusatz From f2d528fd84373f56f0c7f7a295a94071cd79ca89 Mon Sep 17 00:00:00 2001 From: mgalgoci Date: Fri, 27 Aug 2004 17:17:05 +0000 Subject: [PATCH 032/177] Fix issue where some input text would be hidden by the cursor (eg: l, i, and 1) causing some users to misread some fields they were typing. --- phpgwapi/templates/edge-it/css/idots.css | 2 +- phpgwapi/templates/edge-it/css/kneschke.css | 2 +- phpgwapi/templates/idots/css/idots.css | 2 +- phpgwapi/templates/idots/css/kneschke.css | 2 +- phpgwapi/templates/jerryr/css/idots.css | 2 +- phpgwapi/templates/jerryr/css/jerryr.css | 2 +- phpgwapi/templates/jerryr/css/kneschke.css | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/phpgwapi/templates/edge-it/css/idots.css b/phpgwapi/templates/edge-it/css/idots.css index 1f44f1effd..dcbfde0ecd 100755 --- a/phpgwapi/templates/edge-it/css/idots.css +++ b/phpgwapi/templates/edge-it/css/idots.css @@ -67,7 +67,7 @@ a:active */ input,button { - font-size: 11px; + font-size: 12px; color: #006699; font-family: Arial, Helvetica, sans-serif; border: 1px #bbbbbb solid; diff --git a/phpgwapi/templates/edge-it/css/kneschke.css b/phpgwapi/templates/edge-it/css/kneschke.css index db009ccb22..e14c4274c7 100755 --- a/phpgwapi/templates/edge-it/css/kneschke.css +++ b/phpgwapi/templates/edge-it/css/kneschke.css @@ -61,7 +61,7 @@ a:active */ input,button { - font-size: 11px; + font-size: 12px; color: #006699; font-family: Arial, Helvetica, sans-serif; border: 1px #bbbbbb solid; diff --git a/phpgwapi/templates/idots/css/idots.css b/phpgwapi/templates/idots/css/idots.css index 1f44f1effd..dcbfde0ecd 100755 --- a/phpgwapi/templates/idots/css/idots.css +++ b/phpgwapi/templates/idots/css/idots.css @@ -67,7 +67,7 @@ a:active */ input,button { - font-size: 11px; + font-size: 12px; color: #006699; font-family: Arial, Helvetica, sans-serif; border: 1px #bbbbbb solid; diff --git a/phpgwapi/templates/idots/css/kneschke.css b/phpgwapi/templates/idots/css/kneschke.css index db009ccb22..e14c4274c7 100755 --- a/phpgwapi/templates/idots/css/kneschke.css +++ b/phpgwapi/templates/idots/css/kneschke.css @@ -61,7 +61,7 @@ a:active */ input,button { - font-size: 11px; + font-size: 12px; color: #006699; font-family: Arial, Helvetica, sans-serif; border: 1px #bbbbbb solid; diff --git a/phpgwapi/templates/jerryr/css/idots.css b/phpgwapi/templates/jerryr/css/idots.css index db009ccb22..e14c4274c7 100755 --- a/phpgwapi/templates/jerryr/css/idots.css +++ b/phpgwapi/templates/jerryr/css/idots.css @@ -61,7 +61,7 @@ a:active */ input,button { - font-size: 11px; + font-size: 12px; color: #006699; font-family: Arial, Helvetica, sans-serif; border: 1px #bbbbbb solid; diff --git a/phpgwapi/templates/jerryr/css/jerryr.css b/phpgwapi/templates/jerryr/css/jerryr.css index d57b92ddfa..0969607940 100644 --- a/phpgwapi/templates/jerryr/css/jerryr.css +++ b/phpgwapi/templates/jerryr/css/jerryr.css @@ -61,7 +61,7 @@ a:active */ input,button { - font-size: 11px; + font-size: 12px; color: #006699; font-family: Arial, Helvetica, sans-serif; border: 1px #bbbbbb solid; diff --git a/phpgwapi/templates/jerryr/css/kneschke.css b/phpgwapi/templates/jerryr/css/kneschke.css index db009ccb22..e14c4274c7 100755 --- a/phpgwapi/templates/jerryr/css/kneschke.css +++ b/phpgwapi/templates/jerryr/css/kneschke.css @@ -61,7 +61,7 @@ a:active */ input,button { - font-size: 11px; + font-size: 12px; color: #006699; font-family: Arial, Helvetica, sans-serif; border: 1px #bbbbbb solid; From e109e8c320d8b3a71629ef5d04b9d524082b568d Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 27 Aug 2004 18:21:28 +0000 Subject: [PATCH 033/177] removed destroying of the crypto object if the session-verification fails, as it leads to problems in sitemgr creation of anonymous sessions and it get cleaned up anyway by the shutdown function --- phpgwapi/inc/class.sessions.inc.php | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/phpgwapi/inc/class.sessions.inc.php b/phpgwapi/inc/class.sessions.inc.php index 7455ec5a93..24707712fb 100644 --- a/phpgwapi/inc/class.sessions.inc.php +++ b/phpgwapi/inc/class.sessions.inc.php @@ -137,7 +137,6 @@ $this->db = $GLOBALS['phpgw']->db; $this->sessionid = get_var('sessionid',array('GET','COOKIE')); $this->kp3 = get_var('kp3',array('GET','COOKIE')); - /* Create the crypto object */ $GLOBALS['phpgw']->crypto = CreateObject('phpgwapi.crypto'); if ($GLOBALS['phpgw_info']['server']['usecookies']) @@ -316,11 +315,6 @@ )); $GLOBALS['phpgw']->log->commit(); } - if(is_object($GLOBALS['phpgw']->crypto)) - { - $GLOBALS['phpgw']->crypto->cleanup(); - unset($GLOBALS['phpgw']->crypto); - } return False; } @@ -343,11 +337,6 @@ )); $GLOBALS['phpgw']->log->commit(); } - if(is_object($GLOBALS['phpgw']->crypto)) - { - $GLOBALS['phpgw']->crypto->cleanup(); - unset($GLOBALS['phpgw']->crypto); - } return False; } @@ -369,11 +358,6 @@ )); $GLOBALS['phpgw']->log->commit(); } - if(is_object($GLOBALS['phpgw']->crypto)) - { - $GLOBALS['phpgw']->crypto->cleanup(); - unset($GLOBALS['phpgw']->crypto); - } return False; } } @@ -395,18 +379,10 @@ )); $GLOBALS['phpgw']->log->commit(); } - if(is_object($GLOBALS['phpgw']->crypto)) - { - $GLOBALS['phpgw']->crypto->cleanup(); - unset($GLOBALS['phpgw']->crypto); - } //echo 'DEBUG: Sessions: account_id is empty!
'."\n"; return False; } - else - { - return True; - } + return True; } /** From 8564a78d9aaf868ff10171cdfbbe55f9201f7df3 Mon Sep 17 00:00:00 2001 From: reinerj Date: Sat, 28 Aug 2004 13:03:41 +0000 Subject: [PATCH 034/177] update lang file from Theytaz Antoine --- admin/setup/phpgw_fr.lang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/admin/setup/phpgw_fr.lang b/admin/setup/phpgw_fr.lang index 70ce636441..008d91edac 100644 --- a/admin/setup/phpgw_fr.lang +++ b/admin/setup/phpgw_fr.lang @@ -172,6 +172,7 @@ error canceling timer, maybe there's none set !!! admin fr Erreur en annulant le error setting timer, wrong syntax or maybe there's one already running !!! admin fr Erreur en crant le timer, erreur de syntaxe ou peut-tre il y en a dj un qui tourne !!! error: %1 not found or other error !!! admin fr Erreur: %1 introuvable ou autre erreur !!! expires admin fr Expire +fallback (after each pageview) admin fr retour au dfaut (aprs chaque prvisualisation) file space admin fr Espace fichiers file space must be an integer admin fr La valeur Espace fichiers doit tre un entier find and register all application hooks admin fr Trouver et enregistrer tous les "application hooks" @@ -365,7 +366,7 @@ view sessions admin fr Voir les sessions view this user admin fr Voir cet utilisateur view user account admin fr Voir le compte utilisateur who would you like to transfer all records owned by the deleted user to? admin fr A qui voudriez-vous tranfrer tous les enregistrements appartenant l'utilisateur effac? -would you like egroupware to cache the egw info array ? admin fr Voudriez-vous que eGroupWare cache le champ egw info ? +would you like egroupware to cache the egw info array ? admin fr Voulez-vous qu'eGroupWare mette le tableau d'informations egw en cache ? would you like egroupware to check for a new version
when admins login ? admin fr Voulez-vous que eGroupWare vrifie les mises jour
quand un administrateur se connecte ? would you like egroupware to check for new application versions when admins login ? admin fr Voudriez-vous que eGroupWare vrifie s'il y a de nouvelles versions d'applications quand les administrateurs se connectent ? would you like to automaticaly load new langfiles (at login-time) ? admin fr Voulez-vous automatiquement charger les nouveaux fichiers de langues ( la connexion) ? From 9058ebfb4026793ab8d9633310af1021685d164b Mon Sep 17 00:00:00 2001 From: reinerj Date: Sat, 28 Aug 2004 13:08:57 +0000 Subject: [PATCH 035/177] update lang file from Theytaz Antoine --- phpgwapi/setup/phpgw_fr.lang | 6 ++ setup/lang/phpgw_fr.lang | 201 +++++++++++++++++++---------------- 2 files changed, 118 insertions(+), 89 deletions(-) diff --git a/phpgwapi/setup/phpgw_fr.lang b/phpgwapi/setup/phpgw_fr.lang index 1ebc19a366..df09322c49 100644 --- a/phpgwapi/setup/phpgw_fr.lang +++ b/phpgwapi/setup/phpgw_fr.lang @@ -121,6 +121,8 @@ cocos (keeling) islands common fr COCOS (KEELING) ISLANDS colombia common fr COLOMBIE comoros common fr COMORRES company common fr Socit +config password common fr Mot de passe Configuration +config username common fr Utilisateur Configuration congo common fr CONGO congo, the democratic republic of the common fr CONGO, REPUBLIQUE DEMOCRATIQUE DU cook islands common fr ILES COOK @@ -253,6 +255,9 @@ guinea common fr GUINEE guinea-bissau common fr GUINEE-BISSAU guyana common fr GUYANE haiti common fr HAITI +header admin login common fr Connexion Administrateur Entete +header password common fr Mot de passe Entete +header username common fr Utilisateur Entete heard island and mcdonald islands common fr HEARD ISLAND AND MCDONALD ISLANDS help common fr Aide help using editor htmlarea fr Aide en utilisant l'diteur @@ -504,6 +509,7 @@ server name common fr Nom du serveur session has been killed common fr La session a t tue setup common fr Setup setup main menu common fr Menu principal du Seup +setup/config admin login common fr Connexion Administrateur Installation/Configuration seychelles common fr SEYCHELLES show all common fr Tous les lments show all categorys common fr Voir toutes les catgories diff --git a/setup/lang/phpgw_fr.lang b/setup/lang/phpgw_fr.lang index 60520ce596..16ea24c72a 100644 --- a/setup/lang/phpgw_fr.lang +++ b/setup/lang/phpgw_fr.lang @@ -2,6 +2,7 @@ %1 is %2%3 setup fr %1 est %2%3 %1 is %2%3 !!! setup fr %1 est %2%3 !!! (account deletion in sql only) setup fr (Effacement de compte dans SQL seulement) +(searching accounts and changing passwords) setup fr (recherche des comptes et modification des mots de passe) *** do not update your database via setup, as the update might be interrupted by the max_execution_time, which leaves your db in an unrecoverable state (your data is lost) !!! setup fr *** Ne mettez pas jour votre base de donne via l'installateur, si la mise jour venez a tre pertub par l'option max_execution_time , vous laisserez votre base de donne dans un tat irrcuprable (vos donnes seront perdues) *** you have to do the changes manualy in your php.ini (usualy in /etc on linux) in order to get egw fully working !!! setup fr *** Vous devez faire ce changement manuellement dans votre configuration PHP (php.ini, gnralement stock dans /etc sous Linux) pour utiliser eGroupWare convenablement. 00 (disable) setup fr 00 (dsactiver) @@ -161,6 +162,8 @@ enter your http proxy server setup fr Entrez votre serveur proxy HTTP enter your http proxy server password setup fr Entrez le mot de passe pour le proxy HTTP enter your http proxy server port setup fr Entrez le port de votre serveur proxy HTTP enter your http proxy server username setup fr Entrez le nom d'utilisateur pour le proxy HTTP +error in admin-creation !!! setup fr Erreur lors de la cration admin !!! +error in group-creation !!! setup fr Erreur lors de la cration groupe !!! etemplate setup fr ETemplate export egroupware accounts from sql to ldap setup fr Exporter les comptes eGroupWare de SQL vers LDAP export has been completed! you will need to set the user passwords manually. setup fr L'export a t complt! Vous allez devoir rgler les mots de passe des utilisateurs manuellement. @@ -221,70 +224,76 @@ ldap config setup fr Configuration LDAP ldap default homedirectory prefix (e.g. /home for /home/username) setup fr Prfixe par dfaut du rpertoire maison LDAP (p.e. /home pour /home/utilisateur) ldap default shell (e.g. /bin/bash) setup fr Shell LDAP par dfaut (p.e. /bin/bash) ldap encryption type setup fr Type de cryptage LDAP +ldap export setup fr Export LDAP ldap export users setup fr Export utilisateurs LDAP ldap groups context setup fr Contexte des groupes LDAP ldap host setup fr Hte LDAP +ldap import setup fr Import LDAP ldap import users setup fr Import utilisateurs LDAP ldap modify setup fr Modification LDAP ldap root password setup fr Mot de passe root LDAP ldap rootdn setup fr Rootdn LDAP +ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain setup fr Filtre de recherche LDAP pour les comptes, par dfaut: "(uid=%user)", %domain=domaineEGW limit access to setup to the following addresses or networks (e.g. 10.1.1,127.0.0.1) setup fr Limiter l'accs setup aux adresses ou plages d'adresses suivants (p.e. 10.1.1,127.0.0.1) limit access to setup to the following addresses, networks or hostnames (e.g. 127.0.0.1,10.1.1,myhost.dnydns.org) setup fr Limiter l'acces au setup ces adresses, rseaux ou machines (p.ex. 127.0.0.1,10.1.1,myhost.dnydns.org) line setup fr Ligne -logout setup fr Dconnecter +login to mysql - setup fr Connexion mysql - +logout setup fr Se dconnecter makesure setup fr Assurez-vous que votre base de donnes est cr et que les permissions sur les comptes sont positionnes manage applications setup fr Grer les Applications manage languages setup fr Grer les Langues max_execution_time is set to less than 30 (seconds): egroupware sometimes needs a higher execution_time, expect occasional failures setup fr L'option Max Execution Time est positionne en dessous des 30 secondes;
Parfois, eGroupware aura besoin de plus de temps. maximum account id (e.g. 65535 or 1000000) setup fr ID de compte maximum (p.e. 65535 ou 1000000) -may be broken setup fr pourrait tre casse -mcrypt algorithm (default tripledes) setup fr ALgorythme Mcrypt (dfaut TRIPLEDES) +may be broken setup fr pourrait tre inconsistant +mcrypt algorithm (default tripledes) setup fr Algorithme Mcrypt (par dfaut TRIPLEDES) mcrypt initialization vector setup fr Vecteur d'initialisation MCrypt -mcrypt mode (default cbc) setup fr Mode Mcrypt (dfaut CBC) -mcrypt settings (requires mcrypt php extension) setup fr Rglages Mcrypt (Ncessite l'extension PHP mcrypt) -mcrypt version setup fr Versio de MCrypt -memory_limit is set to less than 16m: some applications of egroupware need more than the recommend 8m, expect occasional failures setup fr L'option Memory Limit est positionne en dessous des 16M;
Certaines applications ont besoin de plus de 8M, cela peut entrainer des problmes. +mcrypt mode (default cbc) setup fr Mode Mcrypt (par dfaut CBC) +mcrypt settings (requires mcrypt php extension) setup fr Rglages Mcrypt (ncessite l'extension PHP mcrypt) +mcrypt version setup fr Version de MCrypt +memory_limit is set to less than 16m: some applications of egroupware need more than the recommend 8m, expect occasional failures setup fr L'option Memory Limit est positionne en dessous des 16M;
Certaines applications ont besoin de plus de 8M, cela peut entraner des problmes. minimum account id (e.g. 500 or 100, etc.) setup fr ID de compte minimum (p.e. 500 ou 100, etc.) modifications have been completed! setup fr Les modifications ont t compltes! modify setup fr Modifier modify an existing ldap account store for use with egroupware (for a new install using ldap accounts) setup fr Modifier un compte LDAP existant pour stocker et utiliser avec eGroupWare (pour une nouvelle installation utilisant les comptes LDAP) module setup fr module -multi-language support setup setup fr Setup pour le support du multi-langues +multi-language support setup setup fr Setup pour le support multilingue mysqlinstr setup fr Instructions pour crer la base de donnes dans MySQL:
Se connecter mysql -
[user@server user]# mysql -u root -p
Crer la base de donnes vide et attribuer les permissions utilisateurs -
mysql> create database egroupware;
mysql> grant all on egroupware.* to egroupware@localhost identified by 'password'; name of database setup fr Nom de la base de donnes name of db user egroupware uses to connect setup fr Nom de l'utilisateur de la base de donnes dont eGroupWare se sert pour se connecter -never setup fr Jamais +never setup fr jamais new setup fr Nouveau news_admin setup fr News Admin no setup fr Non no accounts existing setup fr Aucun compte n'existe -no algorithms available setup fr Pas d'algorythme disponible +no algorithms available setup fr pas d'algorithme disponible no microsoft sql server support found. disabling setup fr Pas de support pour Microsoft SQL Server trouv. Je le dsactive -no modes available setup fr Pas de modes disponibles +no modes available setup fr pas de modes disponibles no mysql support found. disabling setup fr Pas de support pour MySQL trouv. Je le dsactive no oracle-db support found. disabling setup fr Pas de support pour Oracle-DB trouv. Je le dsactive no postgres-db support found. disabling setup fr Pas de support pour Postgres-DB trouv. Je le dsactive +no postgresql support found. disabling setup fr Pas de support pour PostgresSQL trouv. Je le dsactive no xml support found. disabling setup fr Pas de support pour XML trouv. Je le dsactive not setup fr n'a pas -not complete setup fr Pas complet -not completed setup fr Pas complt +not all mcrypt algorithms and modes work with egroupware. if you experience problems try switching it off. setup fr Pas tous les algorithmes et modes fonctionnent avec eGroupWare. Si vous rencontrez des problmes, essayez de le dsactiver. +not complete setup fr pas complet +not completed setup fr Pas Termin not ready for this stage yet setup fr Pas encore prt pour cette partie not set setup fr pas dfini note: you will be able to customize this later setup fr Note: vous aurez la possibilit de personnaliser ceci plus tard now guessing better values for defaults... setup fr Maintenant j'essaye de trouver les meilleurs valeurs par dfaut... ok setup fr OK once the database is setup correctly setup fr Une fois que la base de donnes est configure correctement -one month setup fr Un mois -one week setup fr Une semaine +one month setup fr un mois +one week setup fr une semaine only add languages that are not in the database already setup fr Ajouter seulement les langues qui ne sont pas dj dans la base de donnes only add new phrases setup fr Ajouter seulement les nouvelles phrases or setup fr ou -or %1continue to the header admin%2 setup fr ou %1continuer la configuration eGroupWare%2 +or %1continue to the header admin%2 setup fr ou %1continuer vers la configuration d'entte%2 or http://webdav.domain.com (webdav) setup fr ou http://webdav.domain.com (WebDAV) or we can attempt to create the database for you: setup fr Ou nous pouvons tenter de crer la base de donnes pour vous: password needed for configuration setup fr Mot de passe ncessaire pour la configuration password of db user setup fr Mot de passe de l'utilisateur de la base de donnes -passwords did not match, please re-enter setup fr Les mots de passe ne correspondaient pas, SVP r-entrez-les +passwords did not match, please re-enter setup fr Les mots de passe ne correspondaient pas, essayez encore SVP path information setup fr Information de chemin path to user and group files has to be outside of the webservers document-root!!! setup fr Le chemin vers les fichiers utilisateur et groupe DOIT ETRE EN DEHORS du rpertoire racine des serveurs web!!! persistent connections setup fr Connexions persistantes @@ -294,16 +303,16 @@ please check for sql scripts within the application's directory setup fr SVP v please check read/write permissions on directories, or back up and use another option. setup fr SVP vrifiez les permissions de lecture/criture sur les rpertoires, ou fates une sauvegarde et utilisez une autre option. please configure egroupware for your environment setup fr SVP configurez eGroupWare pour votre environnement please consult the %1. setup fr SVP consultez le %1. -please fix the above errors (%1) and warnings(%2) setup fr S'il-vous-plait, Rsolvez les errors (%1) et les messages d'avertissements (%2) +please fix the above errors (%1) and warnings(%2) setup fr Rsolvez SVP les erreurs (%1) et les messages d'avertissement (%2) please install setup fr SVP installez please login setup fr SVP connectez-vous please login to egroupware and run the admin application for additional site configuration setup fr SVP connectez-vous egroupware et excutez l'application admin pour les possibilits supplmentaires de configuration du site -please make the following change in your php.ini setup fr S'il vous plait, effectuez des changements dans votre configuration PHP. +please make the following change in your php.ini setup fr SVP modifiez comme suit votre fichier php.ini please select your language S'il-vous-plait fr fr please wait... setup fr Patientez SVP... possible reasons setup fr Raisons possibles possible solutions setup fr Solutions possibles -post-install dependency failure setup fr Erreur de dpendance post-installation +post-install dependency failure setup fr Erreur des dpendances de la post-installation potential problem setup fr Problme potentiel preferences setup fr Prfrences problem resolution setup fr Rsolution du problme @@ -327,12 +336,13 @@ resolve setup fr R return to setup setup fr Revenir la page de l'installateur run installation tests setup fr Dmarrage de la procdure de vrification... safe_mode is turned on, which is generaly a good thing as it makes your install more secure setup fr Safe Mode est activ, ceci est une bonne chose pour la scurit de votre systme. +safe_mode is turned on, which is generaly a good thing as it makes your install more secure. setup fr l'option 'safe_mode' (mode scuris) est actif, ceci est en gnral une bonne chose et rend votre installation plus scurise. sample configuration not found. using built in defaults setup fr Configuration exemple non trouve. J'utilise les valeurs par dfaut dfinies en interne save setup fr Enregistrer save this text as contents of your header.inc.php setup fr Enregistrer ce texte comme le contenu de votre fichier header.inc.php select an app, enter a target version, then submit to process to that version.
if you do not enter a version, only the baseline tables will be installed for the app.
this will drop all of the apps' tables first! setup fr Choisissez une application, entrez une version de destination, puis soumettez pour transformer vers cette version.
Si vous n'entrez pas de version, seules les tables de base pour cette application seront installes.
CETTE MANIPULATION VA D'ABORD EFFACER TOUTES LES TABLES DE DONNEES DES APPLICATIONS! select one... setup fr slectionnez un... -select the default applications to which your users will have access setup fr Choisissez les applications par dfaut auxquelles vos utilisateurs auront accs +select the default applications to which your users will have access setup fr Choisisseez les applications par dfaut auxquelles vos utilisaturs auront accs select the desired action(s) from the available choices setup fr Choisissez la(les) action(s) dsire(s) dans les choix possibles select to download file setup fr Choisissez pour downloader le fichier select where you want to store/retrieve file contents setup fr Choisissez o vous voulez stocker/rcuprer les contenus de fichiers @@ -349,49 +359,55 @@ select which user(s) will be exported setup fr Choisissez quel(s) utilisateur(s) select which user(s) will be imported setup fr Choisissez quel(s) utilisateur(s) sera(seront) import(s) select which user(s) will be modified setup fr Choisissez quel(s) utilisateur(s) sera(seront) modifi(s) select which user(s) will have admin privileges setup fr Choisissez quel(s) utilisateur(s) aura(auront) les privilges admin -select your old version setup fr Choisissez votre vieille version +select your old version setup fr Choisissez votre ancienne version selectbox setup fr Bote de slection server root setup fr Racine serveur -sessions type setup fr Type de sessions +sessions type setup fr Type de Sessions +set setup fr fixer set this to "old" for versions < 2.4, otherwise the exact mcrypt version you use. setup fr Mettez ceci sur "ancien" pour les versions < 2.4, sinon la version exacte de mcrypt que vous utilisez. -setting the system-charset to utf-8 (unicode) allows the coexistens of data from languages of different charsets. setup fr Dfinir le jeu de caractre en UTF8 permet la co-existence de donnes provenant de jeu de caractres des diffrentes langues +setting the system-charset to utf-8 (unicode) allows the coexistens of data from languages of different charsets. setup fr Dfinir le jeu de caractre en UTF8 permet la co-existence de donnes provenant de jeu de caractres des diffrentes langues. settings setup fr Rglages setup setup fr Installation setup demo accounts in ldap setup fr Configurer des comptes de dmo dans LDAP -setup main menu setup fr Page principal d'installation +setup main menu setup fr Menu principal de configuration setup the database setup fr Configurer la base de donnes setup/config admin login setup fr Page de connexion pour la configuration et l'installation -show 'powered by' logo on setup fr Montrer le logo 'propuls par' sur +show 'powered by' logo on setup fr Montrer le logo 'motoris par' sur some or all of its tables are missing setup fr Certaines ou toutes ses tables manquent -sql encryption type setup fr Type de chiffrement SQL +sql encryption type setup fr Type de chiffrement SQL (par dfaut - md5) +start the postmaster setup fr Dmarrer le postmaster status setup fr Etat -step %1 - admin account setup fr tape %1 - Compte Administrateur -step %1 - advanced application management setup fr Etape %1 - Gestion avance d'applications +step %1 - admin account setup fr Etape %1 - Compte Administrateur +step %1 - advanced application management setup fr Etape %1 - Gestion avance des applications step %1 - configuration setup fr Etape %1 - Configuration -step %1 - language management setup fr Etape %1 - Gestion des langues -step %1 - simple application management setup fr Etape %1 - Gestion simple d'applications -table change messages setup fr Messages de changement de table -tables dropped setup fr Tables supprimes -tables installed, unless there are errors printed above setup fr Tables installes, moins qu'il y ait des messages d'erreur imprims ci-dessous -tables upgraded setup fr Tables mises jour -target version setup fr Version de destination -text entry setup fr Entre de texte +step %1 - language management setup fr Etape %1 - Gestion linguistique +step %1 - simple application management setup fr Etape %1 - Gestion simplifie des applications +table change messages setup fr Messages de modifications de table +tables dropped setup fr tables supprimes +tables installed, unless there are errors printed above setup fr tables installes, sauf s'il y a des messages d'erreur ci-dessus +tables upgraded setup fr tables mises jour +target version setup fr Version de Destination +tcp port number of database server setup fr numro de port du serveur de base de donnes +text entry setup fr Zone de Texte the %1 extension is needed, if you plan to use a %2 database. setup fr L'extension %1 est ncessaire si vous dcidez d'utiliser la base de donne %2
-the db_type in defaults (%1) is not supported on this server. using first supported type. setup fr Le type de base de donnes dans les valeurs par dfaut (%1) n'est pas support sur ce server. J'utilise le 1er type support. +the db_type in defaults (%1) is not supported on this server. using first supported type. setup fr Le type de base de donnes (db_type) figurant dans les valeurs par dfaut (%1) n'est pas support sur ce serveur. J'utilise le premier type support. the file setup fr le fichier -the first step in installing egroupware is to ensure your environment has the necessary settings to correctly run the application. setup fr La premire tape pour l'installation d'egroupware est la vrification de votre environnement systme. +the first step in installing egroupware is to ensure your environment has the necessary settings to correctly run the application. setup fr La premire tape lors de l'installation d'eGroupWare est la vrification de votre environnement systme. the following applications need to be upgraded: setup fr L'application suivante a besoin d'une mise jour: -the imap extension is needed by the two email apps (even if you use email with pop3 as protocoll). setup fr L'extension IMAP est ncessaire pour deux des applications de messagerie (sauf si vous utilisez le protocole pop3) -the mbstring extension is needed to fully support unicode (utf-8) or other multibyte-charsets. setup fr L'extension MBString est ncessaire pour le support complet d'UNICODE (UTF8) ou des autres jeu de caractres multibyte. -the table definition was correct, and the tables were installed setup fr La dfinition de table tait correcte, et les tables taient installes -the tables setup fr Les tables -there was a problem trying to connect to your ldap server.
please check your ldap server configuration setup fr Il y a eu un problme en essayant de se connecter votre serveur LDAP.
SVP vrifiez la configuration de votre serveur LDAP -this has to be outside the webservers document-root!!! setup fr Ceci doit tre en dehors du rpertoire racine des documents des serveurs Web!!! -this might take a while, please wait ... setup fr Cela peu prendre un certain moment, veuillez patienter ... +the imap extension is needed by the two email apps (even if you use email with pop3 as protocoll). setup fr L'extension IMAP est ncessaire pour les deux applications de messagerie (sauf si vous utilisez le protocole pop3) +the mbstring extension is needed to fully support unicode (utf-8) or other multibyte-charsets. setup fr L'extension mbstring est ncessaire pour le support complet d'unicode (utf-8) ou des autres jeux de caractres multibyte. +the mbstring.func_overload = 7 is needed to fully support unicode (utf-8) or other multibyte-charsets. setup fr Le paramtre mbstring.func_overload = 7 est requis pour supporter pleinement unicode (utf-8) ou d'autres jeux de caractres multibyte. +the table definition was correct, and the tables were installed setup fr La dfinition de la table tait correcte, et les tables ont t installes +the tables setup fr les tables +there was a problem trying to connect to your ldap server.
setup fr Il y a eu un problme lors de la tentative de connexion votre serveur LDAP.
+there was a problem trying to connect to your ldap server.
please check your ldap server configuration setup fr l y a eu un problme lors de la tentative de connexion votre serveur LDAP.
SVP vrifiez la configuration de votre serveur LDAP +this has to be outside the webservers document-root!!! setup fr Ceci doit figurer l'extrieur du rpertoire racine des documents du serveur Web!!! +this might take a while, please wait ... setup fr Cela peu prendre un certain temps, veuillez patienter ... this program will convert your database to a new system-charset. setup fr Ce programme va convertir les informations de votre base de donnes vers le nouveau jeu de caractre. this program will help you upgrade or install different languages for egroupware setup fr Ce programme va vous aider mettre jour ou installer des langues diffrentes dans eGroupWare +this section will help you export users and groups from egroupware's account tables into your ldap tree setup fr Cette section va vous aider exporter les utilisateurs et les groupes des tables d'utilisateurs d'eGroupWare vers votre arborescence LDAP this section will help you export users and groups from egroupware's account tables into your ldap tree setup fr Cette section va vous aider exporter les utilisateurs et groupes des tables de comptes de eGroupWare vers votre arbre LDAP -this section will help you import users and groups from your ldap tree into egroupware's account tables setup fr Cette section va vous aider importer les utilisateurs et groupes de votre arbre LDAP vers les tables de comptes de eGroupWare +this section will help you import users and groups from your ldap tree into egroupware's account tables setup fr Cette section va vous aider importer les utilisateurs et groupes de votre arborescence LDAP vers les tables de comptes d'eGroupWare this section will help you setup your ldap accounts for use with egroupware setup fr Cette section va vous aider configurer vos comptes LDAP pour les utiliser dans eGroupWare this should be around 30 bytes in length.
note: the default has been randomly generated. setup fr Ceci devrait faire environ 30 octets de long.
Note: la valeur par dfaut a t gnre au hasard. this stage is completed
setup fr Cette tape est complte
@@ -400,73 +416,80 @@ to a version it does not know about setup fr vers une version qu'il ne conna to setup 1 admin account and 3 demo accounts. setup fr pour crer 1 compte administrateur et 3 comptes demo. to setup 1 admin account and 3 demo accounts.
this will delete all existing accounts setup fr Pour crer 1 compte admin et 3 comptes demo.
ceci va supprimer tous les comptes existants top setup fr top -translations added setup fr Traductions ajoutes -translations removed setup fr Traductions enleves -translations upgraded setup fr Traductions mises jour +translations added setup fr Traductions Ajoutes +translations removed setup fr Traductions Enleves +translations upgraded setup fr Traductions Mises jour true setup fr Vrai -try to configure your php to support one of the above mentioned dbms, or install egroupware by hand. setup fr Essayez de configurer votre php pour qu'il supporte une des bases de donnes mentionnes ci-dessus, ou installez eGroupWare la main. -two weeks setup fr Deux semaines -uninstall setup fr Dsinstaller -uninstall all applications setup fr Dsinstaller toutes les applications -uninstalled setup fr Dsinstall -upgrade setup fr MAJ +try to configure your php to support one of the above mentioned dbms, or install egroupware by hand. setup fr Essayez de configurer php pour qu'il supporte une des bases de donnes mentionnes ci-dessus, ou installez eGroupWare la main. +two weeks setup fr deux semaines +uninstall setup fr dsinstaller +uninstall all applications setup fr dsinstaller toutes les applications +uninstalled setup fr dsinstall +upgrade setup fr Metre jour upgrade all setup fr Mettre tout jour -upgraded setup fr Mis jour -upgrading tables setup fr Met jour les tables +upgraded setup fr mis jour +upgrading tables setup fr Mise jour des Tables use cookies to pass sessionid setup fr Utiliser les cookies pour passer l'ID de session use pure html compliant code (not fully working yet) setup fr Utiliser du code HTML entirement standard (ne fonctionne pas encore compltement) -user account prefix setup fr Prfixe pour les comptes utilisateurs +user account prefix setup fr Prfixe des comptes utilisateurs usernames are casesensitive setup fr Les identifiants sont sensibles la casse -users choice setup fr Choix utilisateur +users choice setup fr Choix des Utilisateurs +utf-8 (unicode) setup fr utf-8 (Unicode) version setup fr version -version mismatch setup fr Diffrence de version +version mismatch setup fr Diffrence de Version view setup fr Voir warning! setup fr Attention! we can proceed setup fr Nous pouvons continuer we will automatically update your tables/records to %1 setup fr Nous allons automatiquement mettre jour vos tables/enregistrements vers %1 -we will now run a series of tests, which may take a few minutes. click the link below to proceed. setup fr Nous allons dmarrer une srie de vrification, cela peut prendre plusieurs minutes. Cliquez sur le lien en dessous pour dmarrer cette tape. -welcome to the egroupware installation setup fr Bienvenue sur l'installateur EgroupWare -what type of sessions management do you want to use (php4 session management may perform better)? setup fr Quel type de gestion de sessions voulez-vous utiliser (gestion de session PHP4 devrait tre le plus performant)? +we will now run a series of tests, which may take a few minutes. click the link below to proceed. setup fr Nous allons dmarrer une srie de tests qui vont prendre quelques minutes. Cliquez sur le lien ci-dessous pour commencer. +welcome to the egroupware installation setup fr Bienvenue sur l'installateur eGroupWare +what type of sessions management do you want to use (php4 session management may perform better)? setup fr Quel type de gestion de sessions voulez-vous utiliser (la gestion de session PHP4 devrait tre plus performante)? which database type do you want to use with egroupware? setup fr Quel type de base de donnes voulez-vous utiliser avec eGroupWare? world readable setup fr visible par tous world writable setup fr accs en criture pour tous -would you like egroupware to cache the phpgw info array ? setup fr Voudriez-vous que eGroupWare mette en cache le champ phpgw info ? +would you like egroupware to cache the phpgw info array ? setup fr Voulez-vous qu'eGroupWare mette en cache le tableau d'informations phpgw ? would you like egroupware to check for a new version
when admins login ? setup fr Voudriez-vous que eGroupWare vrifie la disponibilit d'une nouvelle version
quand les administrateurs se connectent ? -would you like to show each application's upgrade status ? setup fr Voudriez-vous montrer le statut de mise jour de chaque application ? +would you like to show each application's upgrade status ? setup fr Voulez-vous afficher le statut de mise jour de chaque application ? writable by the webserver setup fr accs en criture pour le serveur Web write config setup fr Ecrire la configuration yes setup fr Oui you appear to be running a pre-beta version of egroupware.
these versions are no longer supported, and there is no upgrade path for them in setup.
you may wish to first upgrade to 0.9.10 (the last version to support pre-beta upgrades)
and then upgrade from there with the current version. setup fr Vous semblez utiliser une version pre-beta de eGroupWare.
Ces versions ne sont plus supportes, et il n'y a pas de possibilit de mise jour pour elles dans le setup.
Vous devriez d'abord mettre votre version jour vers la version 0.9.10 (la dernire version supporter les mises jour pre-beta)
puis mettre jour depuis cette version jusqu' la version actuelle. +you appear to be running an old version of php
it its recommend that you upgrade to a new version.
older version of php might not run egroupware correctly, if at all.

please upgrade to at least version %1 setup fr Vous semblez utiliser une ancienne version de PHP
Il est recommand de faire une mise jour.
Les anciennes versions de PHP pourraient ne pas fonctionner correctement, ou pas du tout, avec eGroupWare.

SVP faites une mise jour la dernire version %1 you appear to be running an old version of php
it its recommend that you upgrade to a new version.
older version of php might not run egroupware correctly, if at all.

please upgrade to at least version 4.1.0 setup fr Vous semblez utiliser une version ancienne de PHP
Il est recommand que vous mettiez votre systme jour vers une version plus rcente.
Les anciennes version de PHP pourraient ne pas faire fonctionner correctement eGroupWare, voire pas du tout.

SVP, mettez votre systme jour vers au moins la version 4.1.0 -you appear to be running version %1 of egroupware setup fr Vous semblez utiliser la version %1 de eGroupWare -you appear to be using php earlier than 4.1.0. egroupware now requires 4.1.0 or later setup fr Vous semblez utiliser une version de PHP plus ancienne que la 4.1.0. eGroupWare ncessite maintenant 4.1.0 ou plus rcent -you appear to be using php3. disabling php4 sessions support setup fr Vous semblez utiliser PHP3. Je dsactive le support des sessions PHP4 -you appear to be using php4. enabling php4 sessions support setup fr Vous semblez utiliser PHP4. J'active le support des sessions PHP4 -you appear to have microsoft sql server support enabled setup fr Vous semblez avoir le support de Microsoft SQL Server activ -you appear to have mysql support enabled setup fr VOus semblez avoir le support de MySQL activ -you appear to have oracle support enabled setup fr VOus semblez avoir le support de Oracle activ -you appear to have oracle v8 (oci) support enabled setup fr Vous semblez avoir le support de Oracle V8 (OCI) activ +you appear to be running version %1 of egroupware setup fr Vous semblez utiliser la version %1 d'eGroupWare +you appear to be using php earlier than 4.1.0. egroupware now requires 4.1.0 or later setup fr Vous semblez utiliser une version de PHP plus ancienne que 4.1.0. eGroupWare ncessite maintenant 4.1.0 ou plus rcent +you appear to be using php3. disabling php4 sessions support setup fr Vous semblez utiliser PHP3. Je dsactive le support de sessions PHP4 +you appear to be using php4. enabling php4 sessions support setup fr Vous semblez utiliser PHP4. J'active le support de sessions PHP4 +you appear to have microsoft sql server support enabled setup fr Votre support Microsoft SQL Server semble activ +you appear to have mysql support enabled setup fr Votre support MySQL semble activ +you appear to have oracle support enabled setup fr Votre support Oracle semble activ +you appear to have oracle v8 (oci) support enabled setup fr Votre support Oracle V8 (OCI) semble activ you appear to have postgres-db support enabled setup fr Vous semblez avoir le support de Postgres-DB activ -you appear to have xml support enabled setup fr Vous semblez avoir le support de XML activ -you are ready for this stage, but this stage is not yet written.
setup fr Vous tes prt pour cette tape, mais cette tape n'a pas encore t crite.
+you appear to have postgresql support enabled setup fr Votre support PostgreSQL semble activ +you appear to have xml support enabled setup fr Votre support XML semble activ +you are ready for this stage, but this stage is not yet written.
setup fr Vous tes prt pour cette tape, mais ceci n'est pas encore crit.
you didn't enter a config password for domain %1 setup fr Vous n'avez pas entr de mot de passe de configuration pour le domaine %1 -you didn't enter a header admin password setup fr Vous n'avez pas entr de mot de passe d'administration de l'entte -you do not have any languages installed. please install one now
setup fr Vous n'avez pas de langue installe. SVP installez-en une maintenant
-you have not created your header.inc.php yet!
you can create it now. setup fr Vous n'avez pas encore cre votre fichier header.inc.php !
Vous pouvez le crer maintenant. -you have successfully logged out setup fr Vous vous tes parfaitement dconnect +you didn't enter a config username for domain %1 setup fr Vous n'avez pas entr de nom d'utilisateur pour le domaine %1 +you didn't enter a header admin password setup fr Vous n'avez pas entr de mot de passe pour l'administration d'entte +you didn't enter a header admin username setup fr Vous n'avez pas entr de nom d'utilisateur pour l'administration d'entte +you do not have any languages installed. please install one now
setup fr Vous n'avez aucun langage install. SVP installez-en un maintenant
+you have not created your header.inc.php yet!
you can create it now. setup fr Vous n'avez pas encore cr votre fichier header.inc.php!
Vous pouvez le crer maintenant. +you have successfully logged out setup fr Vous vous tes dconnect avec succs you must enter a username for the admin setup fr Vous devez entrer un nom d'utilisateur pour le compte admin -you should either uninstall and then reinstall it, or attempt manual repairs setup fr Vous devriez soit le dsinstaller et le r-installer, ou tenter des rparations manuelles -you will need to load the proper schema into your ldap server - see phpgwapi/doc/ldap/readme setup fr Vous devez charger votre propre schma LDAP dans votre serveur LDAP centralis - Regardez la documentation stocke dans phpgwapi/doc/ldap/README -you're using an old configuration file format... setup fr Vous utilisez un format de fichier de configuration ancien... +you need to add some domains to your header.inc.php. setup fr Vous devez ajouter quelques domaines dans votre header.inc.php. +you need to select your current charset! setup fr Vous devez slectionner votre jeu de caractres! +you should either uninstall and then reinstall it, or attempt manual repairs setup fr Vous devriez soit le dsinstaller et le r-installer, soit tenter une rparation manuelle +you will need to load the proper schema into your ldap server - see phpgwapi/doc/ldap/readme setup fr Vous devrez charger votre propre schma LDAP dans votre serveur LDAP centralis - lisez phpgwapi/doc/ldap/README +you're using an old configuration file format... setup fr Vous utilisez un ancien format de fichier de configuration... you're using an old header.inc.php version... setup fr Vous utilisez une ancienne version du fichier header.inc.php... your applications are current setup fr Vos applications sont jour your database does not exist setup fr Votre base de donnes n'existe pas your database is not working! setup fr Votre base de donnes ne fonctionne pas! -your database is working, but you dont have any applications installed setup fr Votre base de donnes fonctionne, mais vous n'avez pas d'applications installes +your database is working, but you dont have any applications installed setup fr Votre base de donnes fonctionne, mais vous n'avez pas d'application installe your header admin password is not set. please set it now! setup fr Votre mot de passe d'administration d'entte n'est PAS configur. SVP configurez-le maintenant! -your header.inc.php needs upgrading. setup fr Votre fichier header.inc.php a besoin d'tre mis jour. -your header.inc.php needs upgrading.
warning!
make backups! setup fr Votre fichier header.inc.php a besoin d'tre mis jour.
ATTENTION!
FAITES DES SAUVEGARDES! -your php installation does not have appropriate gd support. you need gd library version 1.8 or newer to see gantt charts in projects. setup fr Votre installation de PHP n'a pas de support GD appropri.
Vous avez besoin de la bibliothque GD suprieur ou gale la version 1.8 pour voir certaines fonctionnalits dans le module Projets +your header.inc.php needs upgrading. setup fr Votre fichier header.inc.php a besoin d'une mise jour. +your header.inc.php needs upgrading.
warning!
make backups! setup fr Votre fichier header.inc.php a besoin d'une mise jour.
ATTENTION!
FAITES DES SAUVEGARDES! +your php installation does not have appropriate gd support. you need gd library version 1.8 or newer to see gantt charts in projects. setup fr Votre installation de PHP n'a pas de support GD appropri.
Vous avez besoin de la bibliothque gd suprieure ou gale la version 1.8 pour voir les diagrammes de Gantt dans les Projets. your tables are current setup fr Vos tables sont jour -your tables may be altered and you may lose data setup fr Vos tables pourraient tre altres et vous pourriez perdre des donnes -your tables will be dropped and you will lose data setup fr Vos tables vont tre supprimes et vous allez perdre des donnes +your tables may be altered and you may lose data setup fr Vos tables pourraient tre altres et vous pourriez perdre des donnes. +your tables will be dropped and you will lose data setup fr Vos tables seront supprimes et vous allez perdre des donnes !! From 4eff10135fad5d14d83e0962379ef5874f21a2b0 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sat, 28 Aug 2004 13:35:02 +0000 Subject: [PATCH 036/177] removed plugins, as they only work in selected languages --- admin/inc/class.uimainscreen.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/inc/class.uimainscreen.inc.php b/admin/inc/class.uimainscreen.inc.php index 457ca64946..0fec84bc9a 100644 --- a/admin/inc/class.uimainscreen.inc.php +++ b/admin/inc/class.uimainscreen.inc.php @@ -143,7 +143,7 @@ if($_POST['htmlarea']) { - $text_or_htmlarea=$html->htmlarea('message',stripslashes($current_message),'','','TableOperations,ContextMenu,SpellChecker'); + $text_or_htmlarea=$html->htmlarea('message',stripslashes($current_message)); $htmlarea_button=''; } else From bae3e479b43cd84334f5d2ef834cefc9be644080 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sat, 28 Aug 2004 13:41:23 +0000 Subject: [PATCH 037/177] fixed problem with pagination and an other important issue --- preferences/inc/class.uiaclprefs.inc.php | 328 ++++++++--------------- 1 file changed, 105 insertions(+), 223 deletions(-) diff --git a/preferences/inc/class.uiaclprefs.inc.php b/preferences/inc/class.uiaclprefs.inc.php index f485944c31..2c71f3b5be 100644 --- a/preferences/inc/class.uiaclprefs.inc.php +++ b/preferences/inc/class.uiaclprefs.inc.php @@ -21,6 +21,11 @@ function uiaclprefs() { $GLOBALS['phpgw']->nextmatchs = CreateObject('phpgwapi.nextmatchs'); + + if (!is_object($GLOBALS['phpgw']->html)) + { + $GLOBALS['phpgw']->html = CreateObject('phpgwapi.html'); + } } function index() @@ -28,11 +33,9 @@ $acl_app = get_var('acl_app',array('POST','GET')); $start = get_var('start',array('POST','GET')); $query = get_var('query',array('POST','GET')); - $s_groups = get_var('s_groups',array('POST','GET')); - $s_users = get_var('s_users',array('POST','GET')); $owner = get_var('owner',array('POST','GET')); - if (! $acl_app) + if (!$acl_app) { $acl_app = 'preferences'; $acl_app_not_passed = True; @@ -57,39 +60,26 @@ } } - if ($GLOBALS['phpgw_info']['server']['deny_user_grants_access'] && !isset($GLOBALS['phpgw_info']['user']['apps']['admin'])) + if (($GLOBALS['phpgw_info']['server']['deny_user_grants_access'] || $owner != $GLOBALS['phpgw_info']['user']['account_id']) + && !isset($GLOBALS['phpgw_info']['user']['apps']['admin'])) { echo '
' . lang('Access not permitted') . '
'; - $GLOBALS['phpgw']->common->phpgw_exit(True); - } - - /* - if(isset($save_my_owner) && $GLOBALS['phpgw_info']['user']['apps']['admin']) - { - $owner = $save_my_owner; - unset($save_my_owner); - } - elseif(@isset($save_my_owner)) - { - echo '
'.lang('You do not have permission to set ACL\'s in this mode!').'
'; $GLOBALS['phpgw']->common->phpgw_footer(); } - */ if((!isset($owner) || empty($owner)) || !$GLOBALS['phpgw_info']['user']['apps']['admin']) { $owner = $GLOBALS['phpgw_info']['user']['account_id']; } - - $acct = CreateObject('phpgwapi.accounts',$owner); - $groups = $acct->get_list('groups'); - $users = $acct->get_list('accounts'); - $owner_name = $acct->id2name($owner); // get owner name for title - if($is_group = $acct->get_type($owner) == 'g') + $owner_name = $GLOBALS['phpgw']->accounts->id2name($owner); // get owner name for title + if($no_privat_grants = $GLOBALS['phpgw']->accounts->get_type($owner) == 'g') { $owner_name = lang('Group').' ('.$owner_name.')'; } - unset($acct); + else // admin setting acl-rights is handled as group-rights => no private grants !! + { + $no_privat_grants = $owner != $GLOBALS['phpgw_info']['user']['account_id']; + } $this->acl = CreateObject('phpgwapi.acl',(int)$owner); $this->acl->read_repository(); @@ -100,107 +90,54 @@ for($i=0;$iacl->delete($GLOBALS['phpgw_info']['flags']['currentapp'],$to_remove[$i]); + $this->acl->delete($acl_app,$to_remove[$i]); } /* Group records */ + $totalacl = array(); $group_variable = $_POST['g_'.$GLOBALS['phpgw_info']['flags']['currentapp']]; - if (!$group_variable) + if (is_array($group_variable)) { - $group_variable = array(); - } - @reset($group_variable); - $totalacl = array(); - while(list($rowinfo,$perm) = each($group_variable)) - { - list($group_id,$rights) = split('_',$rowinfo); - $totalacl[$group_id] += $rights; - } - @reset($totalacl); - while(list($group_id,$rights) = @each($totalacl)) - { - if($is_group) + foreach($group_variable as $rowinfo => $perm) { - /* Don't allow group-grants to grant private */ - $rights &= ~PHPGW_ACL_PRIVATE; + list($group_id,$rights) = explode('_',$rowinfo); + $totalacl[$group_id] += $rights; + } + foreach($totalacl as $group_id => $rights) + { + if($no_privat_grants) + { + /* Don't allow group-grants or admin to grant private */ + $rights &= ~PHPGW_ACL_PRIVATE; + } + $this->acl->add($GLOBALS['phpgw_info']['flags']['currentapp'],$group_id,$rights); } - - $this->acl->add($GLOBALS['phpgw_info']['flags']['currentapp'],$group_id,$rights); } /* User records */ + $totalacl = array(); $user_variable = $_POST['u_'.$GLOBALS['phpgw_info']['flags']['currentapp']]; - if (!$user_variable) + if (is_array($user_variable)) { - $user_variable = array(); - } - @reset($user_variable); - $totalacl = array(); - while(list($rowinfo,$perm) = each($user_variable)) - { - list($user_id,$rights) = split('_',$rowinfo); - $totalacl[$user_id] += $rights; - } - @reset($totalacl); - while(list($user_id,$rights) = @each($totalacl)) - { - if($is_group) + foreach($user_variable as $rowinfo => $perm) { - /* Don't allow group-grants to grant private */ - $rights &= ~ PHPGW_ACL_PRIVATE; + list($user_id,$rights) = split('_',$rowinfo); + $totalacl[$user_id] += $rights; } - - $this->acl->add($GLOBALS['phpgw_info']['flags']['currentapp'],$user_id,$rights); - } - $this->acl->save_repository(); - } - - $processed = Array(); - - $total = 0; - - if(!isset($start)) - { - $start = 0; - } - - if(!$start) - { - $s_groups = 0; - $s_users = 0; - } - - if(!isset($s_groups)) - { - $s_groups = 0; - } - - if(!isset($s_users)) - { - $s_users = 0; - } - - if(!isset($query)) - { - $query = ""; - } - - if(!isset($maxm)) - { - $maxm = $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']; - } - - if(!isset($totalentries)) - { - $totalentries = count($groups) + count($users); - if($totalentries < $maxm) - { - $maxm = $totalentries; + foreach($totalacl as $user_id => $rights) + { + if($no_privat_grants) + { + /* Don't allow group-grants or admin to grant private */ + $rights &= ~ PHPGW_ACL_PRIVATE; + } + $this->acl->add($GLOBALS['phpgw_info']['flags']['currentapp'],$user_id,$rights); + } + $this->acl->save_repository(); } } - $GLOBALS['phpgw_info']['flags']['app_header'] = lang('%1 - Preferences',$GLOBALS['phpgw_info']['apps'][$acl_app]['title']).' - '.lang('acl').': '.$owner_name; $GLOBALS['phpgw']->common->phpgw_header(); echo parse_navbar(); @@ -219,36 +156,24 @@ $this->template->set_var('errors',lang('ACL grants have been updated')); } - $common_hidden_vars = - ' '."\n" - . ' '."\n" - . ' '."\n" - . ' '."\n" - . ' '."\n" - . ' '."\n" - . ' '."\n" - . ' '."\n"; - + $common_hidden_vars = array( + 'start' => $start, + 'query' => $query, + 'owner' => $owner, + 'acl_app' => $acl_app, + ); $var = Array( 'errors' => '', 'title' => '
', 'action_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uiaclprefs.index&acl_app=' . $acl_app), 'bg_color' => $GLOBALS['phpgw_info']['theme']['th_bg'], 'submit_lang' => lang('Save'), - 'common_hidden_vars_form' => $common_hidden_vars + 'common_hidden_vars_form' => $GLOBALS['phpgw']->html->input_hidden($common_hidden_vars) ); - $this->template->set_var($var); - if(isset($query_result) && $query_result) - { - $common_hidden_vars .= ''."\n"; - } - - $this->template->set_var('common_hidden_vars',$common_hidden_vars); - $vars = $this->template->get_undefined('row_colspan'); - while (list(,$var) = each($vars)) + foreach($vars as $var) { if(strstr($var,'lang_')) { @@ -259,95 +184,50 @@ } } - if ((int)$s_groups <> count($groups)) + $accounts = $GLOBALS['phpgw']->accounts->search(array( + 'type' => 'both', + 'start' => $start, + 'query' => $query, + 'order' => 'account_type,account_lid', + 'sort' => 'ASC', + )); + $totalentries = $GLOBALS['phpgw']->accounts->total; + + $header_type = ''; + $processed = Array(); + foreach($accounts as $uid => $data) { - $this->template->set_var('string',lang('Groups')); - $this->template->parse('row','row_colspan',True); + if ($uid == $owner) continue; // no need to grant to self - reset($groups); - for($k=0;$knextmatchs->alternate_row_color($tr_color); - $this->display_row($tr_color,'g_',$group['account_id'],$group['account_lid'],$is_group); - $s_groups++; - $processed[] = $group['account_id']; - $total++; - if($total == $maxm) - { - break; - } - } - } - } - - if($total <> $maxm) - { - if($users) - { - $this->template->set_var('string',ucfirst(lang('Users'))); + $this->template->set_var('string',$data['account_type'] == 'g' ? lang('Groups') : lang('Users')); $this->template->parse('row','row_colspan',True); - $tr_color = $GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color); - for($k=$s_users;$k<$totalentries || $k==count($users);$k++) - { - $user = $users[$k]; - //echo '
acctid: '.$user['account_id']; - if ($user['account_id']) - { - $go = True; - } - else - { - $go = False; - } - if($query) - { - $name = ' '.$user['account_firstname'].' '.$user['account_lastname'].' '.$user['account_lid'].' '; - if(!strpos($name,$query)) - { - $go = False; - } - } - - if($go && $user['account_id'] != $owner) // Need to be $owner not $GLOBALS['phpgw_info']['user']['account_id'] - { - // or the admin can't get special grants from a group - $tr_color = $GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color); - $this->display_row($tr_color,'u_',$user['account_id'],$GLOBALS['phpgw']->common->display_fullname($user['account_lid'],$user['account_firstname'],$user['account_lastname']),$is_group); - $s_users++; - $processed[] = $user['account_id']; - $total++; - if($total == $maxm) - { - break; - } - } - } + $header_type = $data['account_type']; } + $tr_color = $GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color); + + if ($data['account_type'] == 'g') + { + $this->display_row($tr_color,'g_',$data['account_id'],$data['account_lid'],$no_privat_grants); + } + else + { + $this->display_row($tr_color,'u_',$data['account_id'],$GLOBALS['phpgw']->common->display_fullname($data['account_lid'],$data['account_firstname'],$data['account_lastname']),$no_privat_grants); + } + $processed[] = $uid; } - $extra_parms = 'menuaction=preferences.uiaclprefs.index' - . '&acl_app=' . $acl_app - . '&s_users='.$s_users.'&s_groups='.$s_groups - . '&maxm=' . $maxm . '&totalentries=' . $totalentries - . '&total=' . ($start + $total) . '&owner='.$owner; + $extra_parms = array( + 'menuaction' => 'preferences.uiaclprefs.index', + 'acl_app' => $acl_app, + 'owner' => $owner, + ); $var = Array( 'nml' => $GLOBALS['phpgw']->nextmatchs->left('/index.php',$start,$totalentries,$extra_parms), 'nmr' => $GLOBALS['phpgw']->nextmatchs->right('/index.php',$start,$totalentries,$extra_parms), - 'search_value' => (isset($query) && $query?$query:''), + 'search_value' => isset($query) && $query ? $GLOBALS['phpgw']->html->htmlspecialchars($query) : '', 'search' => lang('search'), 'processed' => urlencode(serialize($processed)) ); @@ -357,44 +237,46 @@ $this->template->pfp('out','preferences'); } - function check_acl($label,$id,$acl,$rights,$right,$is_group=False) + function check_acl($label,$id,$acl,$rights,$right,$disabled=False) { $this->template->set_var($acl,$label.$GLOBALS['phpgw_info']['flags']['currentapp'].'['.$id.'_'.$right.']'); - $rights_set = (($rights & $right)?' checked':''); - if ($is_group) + $rights_set = ($rights & $right) ? ' checked="1"' : ''; + if ($disabled) { // This is so you can't select it in the GUI - $rights_set .= ' disabled'; + $rights_set .= ' disabled="1"'; } $this->template->set_var($acl.'_selected',$rights_set); } - function display_row($bg_color,$label,$id,$name,$is_group) + function display_row($bg_color,$label,$id,$name,$no_privat_grants) { $this->template->set_var('row_color',$bg_color); $this->template->set_var('user',$name); $rights = $this->acl->get_rights($id,$GLOBALS['phpgw_info']['flags']['currentapp']); - // vv This is new + $grantors = $this->acl->get_ids_for_location($id,$rights,$GLOBALS['phpgw_info']['flags']['currentapp']); $is_group_set = False; - while(@$grantors && list($key,$grantor) = each($grantors)) + if (is_array($grantors)) { - if($GLOBALS['phpgw']->accounts->get_type($grantor) == 'g') + foreach($grantors as $grantor) { - $is_group_set = True; + if($GLOBALS['phpgw']->accounts->get_type($grantor) == 'g') + { + $is_group_set = True; + } } } - // ^^ This is new - $this->check_acl($label,$id,'read',$rights,PHPGW_ACL_READ,($is_group_set && ($rights & PHPGW_ACL_READ) && !$is_group?$is_group_set:False)); - $this->check_acl($label,$id,'add',$rights,PHPGW_ACL_ADD,($is_group_set && ($rights & PHPGW_ACL_ADD && !$is_group)?$is_group_set:False)); - $this->check_acl($label,$id,'edit',$rights,PHPGW_ACL_EDIT,($is_group_set && ($rights & PHPGW_ACL_EDIT && !$is_group)?$is_group_set:False)); - $this->check_acl($label,$id,'delete',$rights,PHPGW_ACL_DELETE,($is_group_set && ($rights & PHPGW_ACL_DELETE && !$is_group)?$is_group_set:False)); - $this->check_acl($label,$id,'private',$rights,PHPGW_ACL_PRIVATE,$is_group); + $this->check_acl($label,$id,'read',$rights,PHPGW_ACL_READ,$is_group_set && $rights & PHPGW_ACL_READ); + $this->check_acl($label,$id,'add',$rights,PHPGW_ACL_ADD,$is_group_set && $rights & PHPGW_ACL_ADD); + $this->check_acl($label,$id,'edit',$rights,PHPGW_ACL_EDIT,$is_group_set && $rights & PHPGW_ACL_EDIT); + $this->check_acl($label,$id,'delete',$rights,PHPGW_ACL_DELETE,$is_group_set && $rights & PHPGW_ACL_DELETE); + $this->check_acl($label,$id,'private',$rights,PHPGW_ACL_PRIVATE,$no_privat_grants); - $this->check_acl($label,$id,'custom_1',$rights,PHPGW_ACL_CUSTOM_1,($is_group_set && ($rights & PHPGW_ACL_CUSTOM_1) && !$is_group?$is_group_set:False)); - $this->check_acl($label,$id,'custom_2',$rights,PHPGW_ACL_CUSTOM_2,($is_group_set && ($rights & PHPGW_ACL_CUSTOM_2) && !$is_group?$is_group_set:False)); - $this->check_acl($label,$id,'custom_3',$rights,PHPGW_ACL_CUSTOM_3,($is_group_set && ($rights & PHPGW_ACL_CUSTOM_3) && !$is_group?$is_group_set:False)); + $this->check_acl($label,$id,'custom_1',$rights,PHPGW_ACL_CUSTOM_1,$is_group_set && $rights & PHPGW_ACL_CUSTOM_1); + $this->check_acl($label,$id,'custom_2',$rights,PHPGW_ACL_CUSTOM_2,$is_group_set && $rights & PHPGW_ACL_CUSTOM_2); + $this->check_acl($label,$id,'custom_3',$rights,PHPGW_ACL_CUSTOM_3,$is_group_set && $rights & PHPGW_ACL_CUSTOM_3); $this->template->parse('row','acl_row',True); } } From 08089de0a6fd0840fa8678ff6e51615c5e571db0 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sat, 28 Aug 2004 13:48:32 +0000 Subject: [PATCH 038/177] enabled editing of user-ACL settings for admins --- admin/inc/class.uiaccounts.inc.php | 64 ++++++++++--------- admin/templates/default/account_form.tpl | 7 ++ admin/templates/default/account_form_ldap.tpl | 9 ++- 3 files changed, 48 insertions(+), 32 deletions(-) diff --git a/admin/inc/class.uiaccounts.inc.php b/admin/inc/class.uiaccounts.inc.php index d509c1e4ea..8e697abac3 100755 --- a/admin/inc/class.uiaccounts.inc.php +++ b/admin/inc/class.uiaccounts.inc.php @@ -30,6 +30,22 @@ var $bo; var $nextmatchs; + var $apps_with_acl = array( + 'addressbook' => True, + 'todo' => True, + 'calendar' => True, + 'notes' => True, + 'projects' => True, + 'phonelog' => True, + 'infolog' => True, + 'filemanager' => True, + 'tts' => True, + 'bookmarks' => True, + 'img' => True, + 'netsaint' => True, + 'inv' => True, + 'phpbrain' => True, + ); function uiaccounts() { @@ -885,25 +901,6 @@ function create_edit_group($group_info,$_errors='') { - // Maybe we should list this in setup/setup.inc.php and put it into the - // phpgw_applications table ? (jengo) - $apps_with_acl = array( - 'addressbook' => True, - 'todo' => True, - 'calendar' => True, - 'notes' => True, - 'projects' => True, - 'phonelog' => True, - 'infolog' => True, - 'filemanager' => True, - 'tts' => True, - 'bookmarks' => True, - 'img' => True, - 'netsaint' => True, - 'inv' => True, - 'phpbrain' =>True - ); - $sbox = createobject('phpgwapi.sbox'); unset($GLOBALS['phpgw_info']['flags']['noheader']); @@ -971,8 +968,8 @@ } } - $perm_html = ''.lang('Application').' '.lang('ACL').''; - $perm_html = ''. + $perm_html = ''.lang('Application').''.lang('enabled').' / '.lang('ACL').''; + $perm_html = ''. $perm_html.$perm_html."\n"; $tr_color = $GLOBALS['phpgw_info']['theme']['row_off']; @@ -984,10 +981,10 @@ $tr_color = $this->nextmatchs->alternate_row_color(); $perm_html .= ''; } - $perm_html .= '' . $perm_display[$i][1] . '' - . '' - . ($apps_with_acl[$app] && $group_info['account_id']?' ' + . ($this->apps_with_acl[$app] && $group_info['account_id']?'':' ').''.($i & 1?'':'')."\n"; } @@ -1226,7 +1223,7 @@ #print $value['account_id'].''.$value['account_primary_group'] if ($value['account_id'] == $userData['account_primary_group']) { - $primary_group_select .= ' selected'; + $primary_group_select .= ' selected="1"'; } $primary_group_select .= '>' . $value['account_lid'] . ''."\n"; } @@ -1246,9 +1243,12 @@ { continue; } - $checked = (@$userData['account_permissions'][$app] || @$db_perms[$app]) && $_account_id ? ' checked' : ''; - $part[$i&1] = sprintf('%s', - $data['title'],$app,$checked); + $checked = (@$userData['account_permissions'][$app] || @$db_perms[$app]) && $_account_id ? ' checked="1"' : ''; + $part[$i&1] = sprintf('%s', + $data['title'],$app,$checked). + ($this->apps_with_acl[$app]?'':' ').''; if ($i & 1) { @@ -1258,7 +1258,7 @@ } if ($i & 1) { - $part[1] = ' '; + $part[1] = ' '; $appRightsOutput .= sprintf('%s%s',$this->nextmatchs->alternate_row_color(), $part[0], $part[1]); } @@ -1268,7 +1268,9 @@ 'primary_group_select' => ''."\n", 'permissions_list' - => $appRightsOutput + => $appRightsOutput, + 'lang_app' => lang('application'), + 'lang_acl' => lang('enabled').' / '.lang('ACL'), ); $t->set_var($var); diff --git a/admin/templates/default/account_form.tpl b/admin/templates/default/account_form.tpl index 98b2491dcb..b6f762df0d 100644 --- a/admin/templates/default/account_form.tpl +++ b/admin/templates/default/account_form.tpl @@ -52,6 +52,13 @@ {lang_primary_group} {primary_group_select}  + + + {lang_app} + {lang_acl} + {lang_app} + {lang_acl} + {permissions_list} diff --git a/admin/templates/default/account_form_ldap.tpl b/admin/templates/default/account_form_ldap.tpl index d2dc1a87cb..c43bb6f0e0 100644 --- a/admin/templates/default/account_form_ldap.tpl +++ b/admin/templates/default/account_form_ldap.tpl @@ -59,7 +59,14 @@ {lang_primary_group} {primary_group_select}  - + + + {lang_app} + {lang_acl} + {lang_app} + {lang_acl} + + {permissions_list} {form_buttons} From fb6621ae2a2d1b6cde4b85f9774eeb3540961cd8 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sat, 28 Aug 2004 14:39:46 +0000 Subject: [PATCH 039/177] fixed bug [ 1018087 ] custom infolog type name only allow 10 bytes: ==> longer fields for multibyte charsets --- infolog/setup/setup.inc.php | 4 +++- infolog/setup/tables_current.inc.php | 10 ++++----- infolog/setup/tables_update.inc.php | 33 ++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 6 deletions(-) diff --git a/infolog/setup/setup.inc.php b/infolog/setup/setup.inc.php index 2428996964..4d00e3bcad 100755 --- a/infolog/setup/setup.inc.php +++ b/infolog/setup/setup.inc.php @@ -12,7 +12,7 @@ /* $Id$ */ $setup_info['infolog']['name'] = 'infolog'; - $setup_info['infolog']['version'] = '1.0.0'; + $setup_info['infolog']['version'] = '1.0.0.001'; $setup_info['infolog']['app_order'] = 5; $setup_info['infolog']['tables'] = array('phpgw_infolog','phpgw_links','phpgw_infolog_extra'); $setup_info['infolog']['enable'] = 1; @@ -71,3 +71,5 @@ ); + + diff --git a/infolog/setup/tables_current.inc.php b/infolog/setup/tables_current.inc.php index 01b78a9d13..cdcaad53ba 100644 --- a/infolog/setup/tables_current.inc.php +++ b/infolog/setup/tables_current.inc.php @@ -15,10 +15,10 @@ 'phpgw_infolog' => array( 'fd' => array( 'info_id' => array('type' => 'auto','nullable' => False), - 'info_type' => array('type' => 'varchar','precision' => '10','nullable' => False,'default' => 'task'), - 'info_from' => array('type' => 'varchar','precision' => '64'), - 'info_addr' => array('type' => 'varchar','precision' => '64'), - 'info_subject' => array('type' => 'varchar','precision' => '64'), + 'info_type' => array('type' => 'varchar','precision' => '40','nullable' => False,'default' => 'task'), + 'info_from' => array('type' => 'varchar','precision' => '255'), + 'info_addr' => array('type' => 'varchar','precision' => '255'), + 'info_subject' => array('type' => 'varchar','precision' => '255'), 'info_des' => array('type' => 'text'), 'info_owner' => array('type' => 'int','precision' => '4','nullable' => False), 'info_responsible' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'), @@ -31,7 +31,7 @@ 'info_pri' => array('type' => 'varchar','precision' => '10','default' => 'normal'), 'info_time' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'), 'info_bill_cat' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'), - 'info_status' => array('type' => 'varchar','precision' => '10','default' => 'done'), + 'info_status' => array('type' => 'varchar','precision' => '40','default' => 'done'), 'info_confirm' => array('type' => 'varchar','precision' => '10','default' => 'not'), 'info_modifier' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'), 'info_link_id' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0') diff --git a/infolog/setup/tables_update.inc.php b/infolog/setup/tables_update.inc.php index 31b9042228..84f8924520 100644 --- a/infolog/setup/tables_update.inc.php +++ b/infolog/setup/tables_update.inc.php @@ -337,4 +337,37 @@ $GLOBALS['setup_info']['infolog']['currentver'] = '1.0.0'; return $GLOBALS['setup_info']['infolog']['currentver']; } + + + $test[] = '1.0.0'; + function infolog_upgrade1_0_0() + { + // longer columns to cope with multibyte charsets + $GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_infolog','info_type',array( + 'type' => 'varchar', + 'precision' => '40', + 'nullable' => False, + 'default' => 'task' + )); + $GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_infolog','info_from',array( + 'type' => 'varchar', + 'precision' => '255' + )); + $GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_infolog','info_addr',array( + 'type' => 'varchar', + 'precision' => '255' + )); + $GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_infolog','info_subject',array( + 'type' => 'varchar', + 'precision' => '255' + )); + $GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_infolog','info_status',array( + 'type' => 'varchar', + 'precision' => '40', + 'default' => 'done' + )); + + $GLOBALS['setup_info']['infolog']['currentver'] = '1.0.0.001'; + return $GLOBALS['setup_info']['infolog']['currentver']; + } ?> From 3b9af33d80baac2f395f842cce60aa9f3a4c1853 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sat, 28 Aug 2004 14:40:52 +0000 Subject: [PATCH 040/177] not longer needed => common sense in eGW --- infolog/setup/TRANSLATORS | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 infolog/setup/TRANSLATORS diff --git a/infolog/setup/TRANSLATORS b/infolog/setup/TRANSLATORS deleted file mode 100644 index 0747c01262..0000000000 --- a/infolog/setup/TRANSLATORS +++ /dev/null @@ -1,9 +0,0 @@ -Hi translators, - -please feel free to add missing phrase. - -Commit them to the CVS or send them to RalfBecker@outdoor-training.de - -Many thanks - -Ralf From 0e557eb9e527e51dde3d1c671fe1c9b8f701a4da Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sat, 28 Aug 2004 14:42:15 +0000 Subject: [PATCH 041/177] translation update --- infolog/setup/phpgw_de.lang | 8 +++++++- infolog/setup/phpgw_en.lang | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/infolog/setup/phpgw_de.lang b/infolog/setup/phpgw_de.lang index 395e51456d..c0420419ac 100644 --- a/infolog/setup/phpgw_de.lang +++ b/infolog/setup/phpgw_de.lang @@ -75,6 +75,7 @@ default status for a new log entry infolog de Vorgabe f delegation infolog de Delegation delete infolog de Lschen delete all subs (if not subs will be subs of this enties parent or have no parent) infolog de Alle Untereintrge lschen (wenn nicht werden diese Untereintrge des bergeordneten Eintrags oder sind keine Untereintrge mehr) +delete one record by passing its id. infolog de Einen Datensatz spezifiziert durch seine id lschen. delete the entry infolog de Eintrag lschen delete this entry infolog de diesen Eintrag lschen deletes the selected typ infolog de lscht den ausgewhlten Typ @@ -133,6 +134,7 @@ length
rows infolog de L link infolog de Verknpfung links infolog de Verknpfungen links of this entry infolog de Verknpfungen dieses Eintrags +list all categories infolog de Alle Kathegorien anzeigen list no subs/childs infolog de Untereintrge nicht anzeigen longer textual description infolog de lngere textliche Beschreibung low infolog de niedrig @@ -177,12 +179,14 @@ priority infolog de Priorit private infolog de Privat project infolog de Projekt re: infolog de Re: +read one record by passing its id. infolog de Einen Datensatz spezifiziert durch seine id lesen. reg. expr. for local ip's
eg. ^192\.168\.1\. infolog de reg. Ausdr. fr lokale IP's
^192\.168\.1\. reject infolog de Absage remark infolog de Bemerkung remove this link (not the entry itself) infolog de Diese Verknpfung lsen (nicht den Eintrag selbst) responsible infolog de Verantwortlich responsible user, priority, ... infolog de Verantwortlicher, Prioritten, ... +returns a list / search for records. infolog de Liefert eine Liste von / sucht nach Datenstzen. save infolog de Speichern saves the changes made and leaves infolog de speichert die nderungen und beendet saves this entry infolog de diesen Eintrag speichern @@ -215,7 +219,8 @@ sub infolog de Unter-
eintr subject infolog de Titel task infolog de Auftrag test import (show importable records only in browser) infolog de Test Import (zeige importierbare Datenstze nur im Browser) -the name used internaly (<= 32 chars), changeing it makes existing data unavailible infolog de der Name wird intern benutzt (<= 32 Zeichen), wenn er gendert wird, werden existierende Daten unzugnglich +the name used internaly (<= 10 chars), changeing it makes existing data unavailible infolog de der Name wird intern benutzt (<= 10 Zeichen), wenn er gendert wird, werden existierende Daten unzugnglich +the name used internaly (<= 20 chars), changeing it makes existing data unavailible infolog de der Name wird intern benutzt (<= 20 Zeichen), wenn er gendert wird, werden existierende Daten unzugnglich the text displayed to the user infolog de der Text der dem Benutzer angezeigt wird this is the filter infolog uses when you enter the application. filters limit the entries to show in the actual view. there are filters to show only finished, still open or futures entries of yourself or all users. infolog de Das ist der Filter, den InfoLog benutzt wenn es das erste mal aufgerufen wird. Filter beschrnken die aktuelle Anzeige. Es gibt Filter um nur beendete, offene oder zuknftige Eintrge von Ihnen oder allen Benutzern anzuzeigen. til when should the todo or phonecall be finished infolog de bis wann soll der Auftrag oder Anruf erledigt sein @@ -244,6 +249,7 @@ view the parent of this entry and all his subs infolog de view this linked entry in its application infolog de diesen verknpfen Eintrag in seiner Anwendung anzeigen when should the todo or phonecall be started, it shows up from that date in the filter open or own open (startpage) infolog de wann soll mit dem Auftrag oder Anruf begonnen werden, ab diesem Datum wird er beim Filter offen oder eigene offen angezeigt (Startseite) will-call infolog de ruft zurck +write (add or update) a record by passing its fields. infolog de Schreiben (zufgen oder aktualisieren) eines Datensatzes durch Angabe seiner Felder. yes - delete infolog de Ja - Lschen you can't delete one of the stock types !!! infolog de Sie knnen keinen der Standardtypen lschen!!! you have entered an invalid ending date infolog de Sie haben ein ungltiges Enddatum eingegeben diff --git a/infolog/setup/phpgw_en.lang b/infolog/setup/phpgw_en.lang index 69553b8344..b58f1ec559 100644 --- a/infolog/setup/phpgw_en.lang +++ b/infolog/setup/phpgw_en.lang @@ -218,7 +218,8 @@ sub infolog en Sub subject infolog en Subject task infolog en ToDo test import (show importable records only in browser) infolog en Test Import (show importable records only in browser) -the name used internaly (<= 32 chars), changeing it makes existing data unavailible infolog en the name used internaly (<= 32 chars), changeing it makes existing data unavailible +the name used internaly (<= 10 chars), changeing it makes existing data unavailible infolog en the name used internaly (<= 10 chars), changeing it makes existing data unavailible +the name used internaly (<= 20 chars), changeing it makes existing data unavailible infolog en the name used internaly (<= 20 chars), changeing it makes existing data unavailible the text displayed to the user infolog en the text displayed to the user this is the filter infolog uses when you enter the application. filters limit the entries to show in the actual view. there are filters to show only finished, still open or futures entries of yourself or all users. infolog en This is the filter InfoLog uses when you enter the application. Filters limit the entries to show in the actual view. There are filters to show only finished, still open or futures entries of yourself or all users. til when should the todo or phonecall be finished infolog en til when should the ToDo or Phone call be finished From b3b34206748cff25a7ffd65299ff2d4e602d9c00 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sat, 28 Aug 2004 14:44:05 +0000 Subject: [PATCH 042/177] allow sorting after multiple criteria as in sql --- phpgwapi/inc/class.accounts_ldap.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpgwapi/inc/class.accounts_ldap.inc.php b/phpgwapi/inc/class.accounts_ldap.inc.php index 2308d56511..1fae54b169 100644 --- a/phpgwapi/inc/class.accounts_ldap.inc.php +++ b/phpgwapi/inc/class.accounts_ldap.inc.php @@ -547,7 +547,7 @@ { $order = 'account_lid'; } - $sortedAccounts = $arrayFunctions->arfsort($accounts,array($order),$sort); + $sortedAccounts = $arrayFunctions->arfsort($accounts,explode(',',$order),$sort); $this->total = count($accounts); // return only the wanted accounts From b7940f1f531adc13e917026d132667e19ff61f5b Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sat, 28 Aug 2004 14:59:56 +0000 Subject: [PATCH 043/177] not longer needed --- infolog/inc/hook_admin.inc.php | 17 ----------------- infolog/inc/hook_preferences.inc.php | 20 -------------------- 2 files changed, 37 deletions(-) delete mode 100644 infolog/inc/hook_admin.inc.php delete mode 100644 infolog/inc/hook_preferences.inc.php diff --git a/infolog/inc/hook_admin.inc.php b/infolog/inc/hook_admin.inc.php deleted file mode 100644 index 1bbce4020e..0000000000 --- a/infolog/inc/hook_admin.inc.php +++ /dev/null @@ -1,17 +0,0 @@ - diff --git a/infolog/inc/hook_preferences.inc.php b/infolog/inc/hook_preferences.inc.php deleted file mode 100644 index eada5b8a26..0000000000 --- a/infolog/inc/hook_preferences.inc.php +++ /dev/null @@ -1,20 +0,0 @@ - * - * ------------------------------------------------------- * - * 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$ */ - -{ - // for compatibility and convinience, can go soon - ExecMethod('infolog.admin_prefs_sidebox_hooks.all_hooks','preferences'); -} - -?> From 9e1dcb9a7813d75a4f9bb21472f7c368171c8264 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sat, 28 Aug 2004 15:52:32 +0000 Subject: [PATCH 044/177] fixed double translation of extra options in selectboxes --- etemplate/inc/class.uietemplate.inc.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/etemplate/inc/class.uietemplate.inc.php b/etemplate/inc/class.uietemplate.inc.php index 22865181be..c33d67f6d2 100644 --- a/etemplate/inc/class.uietemplate.inc.php +++ b/etemplate/inc/class.uietemplate.inc.php @@ -807,7 +807,8 @@ if (!empty($multiple) && 0+$multiple <= 0) { $sels[''] = $multiple < 0 ? 'all' : $multiple; - if ((int)$cell['no_lang'] < 2) + // extra-option: no_lang=0 gets translated later and no_lang=1 gets translated too (now), only no_lang>1 gets not translated + if ((int)$cell['no_lang'] == 1) { $sels[''] = lang($sels['']); } From 2f7c4cb8fc5da77285b813a1404374355d4ee652 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sat, 28 Aug 2004 17:56:27 +0000 Subject: [PATCH 045/177] removed tz-converstation: - to fix tz-probs in infolog - in my belive tz-conversation should always be done in the bo-layer and not in ui (eTemplate) --- etemplate/inc/class.date_widget.inc.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/etemplate/inc/class.date_widget.inc.php b/etemplate/inc/class.date_widget.inc.php index add82c35a5..55c812ea6b 100644 --- a/etemplate/inc/class.date_widget.inc.php +++ b/etemplate/inc/class.date_widget.inc.php @@ -79,7 +79,6 @@ } else { - $value += $GLOBALS['phpgw']->datetime->tz_offset; $value = array( 'Y' => date('Y',$value), 'm' => date('m',$value), @@ -288,8 +287,7 @@ } if (empty($extension_data)) { - $value = mktime(intval($value['H']),intval($value['i']),0,$value['m'],$value['d'],$value['Y']) - - $GLOBALS['phpgw']->datetime->tz_offset; + $value = mktime(intval($value['H']),intval($value['i']),0,$value['m'],$value['d'],$value['Y']); } else { From ff47845902dbf59942138290f9342e1d79248c58 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sat, 28 Aug 2004 17:57:44 +0000 Subject: [PATCH 046/177] added option to suppress time in the readonly display if it's 0h0 --- etemplate/doc/referenz.html | 14 ++++++++------ etemplate/inc/class.date_widget.inc.php | 12 +++++++++--- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/etemplate/doc/referenz.html b/etemplate/doc/referenz.html index 0b1f9a1674..575fae91e6 100644 --- a/etemplate/doc/referenz.html +++ b/etemplate/doc/referenz.html @@ -360,9 +360,9 @@ implement only a subset of XUL. Here are the main differences:

standard widgets and extensions of the eTemplates

- +
- + @@ -441,7 +441,7 @@ implement only a subset of XUL. Here are the main differences:

- + @@ -607,7 +607,7 @@ implement only a subset of XUL. Here are the main differences:

- + - +
Widget Name in EditorWidget Name
in Editor		 xml tag xul internal name
Formatted Text (HTML)Formatted Text
(HTML)		 <htmlarea /> no htmlarea Date-/Time-input via selectboxes or a field for the year
The order of the input-fields is determined by the prefs of the user.
- Options: [datetime-storage-format][,&1=year-no-selectbox|&2=today-button]
+ Options: [datetime-storage-format] [,&1=year-no-selectbox|&2=today-button|&4=one-min-steps|&8=ro-suppress-0h0]
datetime-storage-format is the format, in which the date is stored in the variable: empty means an unix-timestamp (in GMT), or a string containing the letters Y, m, d, H, i plus separators, eg. 'Y-m-d': 2002-12-31. The storage format @@ -617,6 +617,8 @@ implement only a subset of XUL. Here are the main differences:

select-year widget.
today-button: if set (&2) a [Today] button is displayed which sets the fields to the up-to-date date (via javascript)
+ one-min-steps: if set (&4) the minute-selectbox uses one minutes steps, default 5min steps
+ ro-suppress-0h0: if set (&8) the time is suppressed for readonly and a time of 0h0
Sub-widgets: date-time: a date and a time and date-timeonly: only a time
These widgets allow the input of times too or only, they use 12h am/pm or 24h format as specified in the user prefs.
@@ -783,13 +785,13 @@ function index($content = 0)
Nextmatch-SortHeader

Nextmatch-FilterHeader

Nextmatch-
SortHeader

Nextmatch-
FilterHeader

 <nextmatch type="nextmatch-sortheader" id="col-name" label="ColLabel"/>

<nextmatch type="nextmatch-filterheader" id="col-name"/>

nonextmatch-sortheader

nextmatch-filterheader

nextmatch-
sortheader

nextmatch-
filterheader

 These widget are an optional part of the nextmatch widget.

nextmatch-sortheader
diff --git a/etemplate/inc/class.date_widget.inc.php b/etemplate/inc/class.date_widget.inc.php index 55c812ea6b..91fcc23437 100644 --- a/etemplate/inc/class.date_widget.inc.php +++ b/etemplate/inc/class.date_widget.inc.php @@ -19,7 +19,8 @@ @param Options/$cell['size'] = $format[,$options], @param $format: ''=timestamp or eg. 'Y-m-d H:i' for 2002-12-31 23:59 @param $options: &1 = year is int-input not selectbox, &2 = show a [Today] button, \ - &4 = 1min steps for time (default is 5min, with fallback to 1min if value is not in 5min-steps) + &4 = 1min steps for time (default is 5min, with fallback to 1min if value is not in 5min-steps), + &8 = dont show time for readonly and type date-time if time is 0:00 @discussion This widget is independent of the UI as it only uses etemplate-widgets and has therefor no render-function */ class date_widget @@ -88,6 +89,8 @@ 'i' => date('i',$value) ); } + $time_0h0 = !(int)$value['H'] && !(int)$value['i']; + $timeformat = array(3 => 'H', 4 => 'i'); if ($this->timeformat == '12') { @@ -101,11 +104,14 @@ } $format = split('[/.-]',$sep=$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']); - if ($type != 'date') + $readonly = $cell['readonly'] || $readonlys; + + // no time also if $options&8 and readonly and time=0h0 + if ($type != 'date' && !($readonly && ($options & 8) && $time_0h0)) { $format += $timeformat; } - if ($cell['readonly'] || $readonlys) // is readonly + if ($readonly) // is readonly { $sep = array( 1 => $sep[1], From 9e50e0f07d1060538c821508942a7ed9bff671f3 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sat, 28 Aug 2004 18:02:16 +0000 Subject: [PATCH 047/177] fix for bug [ 1007297 ] Time offsets incorrect ==> all tz-conversation is done now in the bo-class, as I handle it in the new calendar too --- infolog/inc/class.boinfolog.inc.php | 62 +++++++++++++++++++++++------ infolog/inc/class.uiinfolog.inc.php | 13 +++--- 2 files changed, 54 insertions(+), 21 deletions(-) diff --git a/infolog/inc/class.boinfolog.inc.php b/infolog/inc/class.boinfolog.inc.php index 520329cbed..50f12b309b 100644 --- a/infolog/inc/class.boinfolog.inc.php +++ b/infolog/inc/class.boinfolog.inc.php @@ -62,6 +62,14 @@ ); var $xmlrpc = False; // called via xmlrpc + /** + * @var int $tz_offset_s offset in secconds between user and server-time, + * it need to be add to a server-time to get the user-time or substracted from a user-time to get the server-time + */ + var $tz_offset = 0; + var $tz_offset_s = 0; + var $user_time_now; + function boinfolog( $info_id = 0) { $this->enums = $this->stock_enums = array( @@ -130,8 +138,13 @@ $this->customfields = $this->config->config_data['customfields']; } } + /** + * @var int $tz_offset_s offset in secconds between user and server-time, + * it need to be add to a server-time to get the user-time or substracted from a user-time to get the server-time + */ $this->tz_offset = $GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset']; - $this->tz_offset_sec = 60*60*$this->tz_offset; + $this->tz_offset_s = 60*60*$this->tz_offset; + $this->user_time_now = time() + $this->tz_offset_s; // are we called via xmlrpc? $this->xmlrpc = is_object($GLOBALS['server']) && $GLOBALS['server']->last_method; @@ -211,7 +224,7 @@ return substr($des,0,60).' ...'; } - function read($info_id) + function &read($info_id) { if (is_array($info_id)) { @@ -234,14 +247,20 @@ } return False; } - $data = &$this->so->data; + $data = $this->so->data; if ($data['info_subject'] == $this->subject_from_des($data['info_des'])) { $data['info_subject'] = ''; } $this->link_id2from($data); - +echo "

boinfolog::read($info_id) start=$data[info_startdate]=".date('Y-m-d H:i:s',$data['info_startdate']).", modified=$data[info_datemodified]=".date('Y-m-d H:i:s',$data['info_datemodified'])."

\n"; + // convert system- to user-time + foreach(array('info_startdate','info_enddate','info_datemodified') as $time) + { + if ($data[$time]) $data[$time] += $this->tz_offset_s; + } +echo "

boinfolog::read($info_id) start=$data[info_startdate]=".date('Y-m-d H:i:s',$data['info_startdate']).", modified=$data[info_datemodified]=".date('Y-m-d H:i:s',$data['info_datemodified'])."

\n"; if ($this->xmlrpc) { $data = $this->data2xmlrpc($data); @@ -316,7 +335,7 @@ ); if ($set_enddate) { - $values['info_enddate'] = time(); + $values['info_enddate'] = $this->user_time_now; } $check_defaults = False; } @@ -325,7 +344,7 @@ if (!$values['info_enddate'] && ($values['info_status'] == 'done' || $values['info_status'] == 'billed')) { - $values['info_enddate'] = time(); // set enddate to today if status == done + $values['info_enddate'] = $this->user_time_now; // set enddate to today if status == done } if ($values['info_responsible'] && $values['info_status'] == 'offer') { @@ -346,12 +365,17 @@ } if ($touch_modified || !$values['info_datemodified']) { - $values['info_datemodified'] = time(); + $values['info_datemodified'] = $this->user_time_now; } if ($touch_modified || !$values['info_modifier']) { $values['info_modifier'] = $this->so->user; } + // convert user- to system-time + foreach(array('info_startdate','info_enddate','info_datemodified') as $time) + { + if ($values[$time]) $values[$time] -= $this->tz_offset_s; + } return $this->so->write($values); } @@ -374,10 +398,22 @@ @param $query[col_filter] array with column-name - data pairs, data == '' means no filter (!) @returns array with id's as key of the matching log-entries */ - function search(&$query) + function &search(&$query) { //echo "

boinfolog::search(".print_r($query,True).")

\n"; $ret = $this->so->search($query); + + // convert system- to user-time + if (is_array($ret) && $this->tz_offset_s) + { + foreach($ret as $id => $data) + { + foreach(array('info_startdate','info_enddate','info_datemodified') as $time) + { + if ($data[$time]) $ret[$id][$time] += $this->tz_offset_s; + } + } + } if ($this->xmlrpc && is_array($ret)) { $infos = $ret; @@ -472,14 +508,14 @@ { foreach($infos as $info) { - $time = intval(date('Hi',$info['info_startdate']+$this->tz_offset_sec)); - $date = date('Y/m/d',$info['info_startdate']+$this->tz_offset_sec); + $time = intval(date('Hi',$info['info_startdate'])); + $date = date('Y/m/d',$info['info_startdate']); if ($do_events && !$time || !$do_events && $time && $date == $date_wanted) { continue; } - $title = ($do_events?$GLOBALS['phpgw']->common->formattime(date('H',$info['info_startdate']+$this->tz_offset_sec),date('i',$info['info_startdate']+$this->tz_offset_sec)).' ':''). + $title = ($do_events?$GLOBALS['phpgw']->common->formattime(date('H',$info['info_startdate']),date('i',$info['info_startdate'])).' ':''). $info['info_subject']; $view = $this->link->view('infolog',$info['info_id']); $content=array(); @@ -494,8 +530,8 @@ $content = $GLOBALS['phpgw']->html->table(array(1 => $content)); $to_include[] = array( - 'starttime' => $info['info_startdate']+$this->tz_offset_sec, - 'endtime' => ($info['info_enddate'] ? $info['info_enddate'] : $info['info_startdate'])+$this->tz_offset_sec, + 'starttime' => $info['info_startdate'], + 'endtime' => ($info['info_enddate'] ? $info['info_enddate'] : $info['info_startdate']), 'title' => $title, 'view' => $view, 'icons' => $icons, diff --git a/infolog/inc/class.uiinfolog.inc.php b/infolog/inc/class.uiinfolog.inc.php index 47f712debf..429cd7894f 100644 --- a/infolog/inc/class.uiinfolog.inc.php +++ b/infolog/inc/class.uiinfolog.inc.php @@ -78,8 +78,6 @@ $this->tmpl = CreateObject('etemplate.etemplate'); $this->html = &$this->tmpl->html; - $this->tz_offset = $GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset']; - $this->user = $GLOBALS['phpgw_info']['user']['account_id']; } @@ -92,7 +90,7 @@ $id = $info['info_id']; $done = $info['info_status'] == 'done' || $info['info_status'] == 'billed'; $info['sub_class'] = $info['info_pri'] . ($done ? '_done' : ''); - if (!$done && $info['info_enddate'] < time()+60*60*$this->tz_offset) + if (!$done && $info['info_enddate'] < $this->bo->user_time_now) { $info['end_class'] = 'overdue'; } @@ -408,9 +406,8 @@ get_var('HTTP_REFERER',Array('SERVER'))); //echo "

uiinfolog::edit: info_id=$info_id, action='$action', action_id='$action_id', type='$type', referer='$referer'

\n"; - $this->bo->read( $info_id || $action != 'sp' ? $info_id : $action_id ); - $content = $this->bo->so->data; - $today = mktime(-$this->tz_offset,0,0,date('m'),date('d'),date('Y')); // time=00:00 + $content = $this->bo->read( $info_id || $action != 'sp' ? $info_id : $action_id ); + $today = mktime(-$this->bo->tz_offset,0,0,date('m'),date('d'),date('Y')); // time=00:00 if (intval($content['info_link_id']) > 0 && !$this->link->get_link($content['info_link_id'])) { @@ -439,11 +436,11 @@ $content['info_subject']=lang($this->messages['re']).' '.$parent['info_subject']; $content['info_des'] = ''; $content['info_lastmodified'] = ''; - if ($content['info_startdate'] < time()) // parent-startdate is in the past => today + if ($content['info_startdate'] < $this->bo->user_time_now) // parent-startdate is in the past => today { $content['info_startdate'] = $today; } - if ($content['info_enddate'] < time()) // parent-enddate is in the past => empty + if ($content['info_enddate'] < $this->bo->user_time_now) // parent-enddate is in the past => empty { $content['info_enddate'] = ''; } From 9f2d156c937f5de9ca85f475744fbfd518ae0947 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sat, 28 Aug 2004 18:04:24 +0000 Subject: [PATCH 048/177] showing time for the startdate --- infolog/setup/etemplates.inc.php | 152 ++++++++++++++++++++++++++----- 1 file changed, 129 insertions(+), 23 deletions(-) diff --git a/infolog/setup/etemplates.inc.php b/infolog/setup/etemplates.inc.php index 9ee8575b6c..9dce504842 100644 --- a/infolog/setup/etemplates.inc.php +++ b/infolog/setup/etemplates.inc.php @@ -1,48 +1,132 @@ 'infolog.customfields','template' => '','lang' => '','group' => '0','version' => '0.9.15.001','data' => 'a:7:{i:0;a:3:{s:1:\"F\";s:3:\"80%\";s:2:\"c2\";s:6:\"header\";s:2:\"c4\";s:6:\"header\";}i:1;a:6:{s:1:\"A\";a:2:{s:4:\"type\";s:5:\"label\";s:5:\"label\";s:3:\"Typ\";}s:1:\"B\";a:4:{s:4:\"type\";s:6:\"select\";s:4:\"name\";s:3:\"typ\";s:8:\"onchange\";s:1:\"1\";s:4:\"help\";s:52:\"select a typ to edit it\'s status-values or delete it\";}s:1:\"C\";a:4:{s:4:\"type\";s:6:\"button\";s:5:\"label\";s:6:\"Delete\";s:4:\"name\";s:14:\"button[delete]\";s:4:\"help\";s:24:\"deletes the selected typ\";}s:1:\"D\";a:5:{s:4:\"type\";s:4:\"text\";s:4:\"size\";s:5:\"10,10\";s:4:\"name\";s:8:\"new_name\";s:4:\"help\";s:26:\"name of new type to create\";s:4:\"blur\";s:8:\"new name\";}s:1:\"E\";a:4:{s:4:\"type\";s:6:\"button\";s:5:\"label\";s:6:\"Create\";s:4:\"name\";s:14:\"button[create]\";s:4:\"help\";s:37:\"creates a new typ with the given name\";}s:1:\"F\";a:5:{s:4:\"type\";s:5:\"label\";s:4:\"span\";s:10:\",error_msg\";s:7:\"no_lang\";s:1:\"1\";s:5:\"align\";s:6:\"center\";s:4:\"name\";s:9:\"error_msg\";}}i:2;a:6:{s:1:\"A\";a:4:{s:4:\"type\";s:5:\"label\";s:4:\"span\";s:3:\"all\";s:5:\"label\";s:21:\"Custom status for typ\";s:4:\"name\";s:3:\"typ\";}s:1:\"B\";a:1:{s:4:\"type\";s:5:\"label\";}s:1:\"C\";a:1:{s:4:\"type\";s:5:\"label\";}s:1:\"D\";a:1:{s:4:\"type\";s:5:\"label\";}s:1:\"E\";a:1:{s:4:\"type\";s:5:\"label\";}s:1:\"F\";a:1:{s:4:\"type\";s:5:\"label\";}}i:3;a:6:{s:1:\"A\";a:4:{s:4:\"type\";s:8:\"template\";s:4:\"size\";s:6:\"status\";s:4:\"span\";s:3:\"all\";s:4:\"name\";s:6:\"status\";}s:1:\"B\";a:1:{s:4:\"type\";s:5:\"label\";}s:1:\"C\";a:1:{s:4:\"type\";s:5:\"label\";}s:1:\"D\";a:1:{s:4:\"type\";s:5:\"label\";}s:1:\"E\";a:1:{s:4:\"type\";s:5:\"label\";}s:1:\"F\";a:1:{s:4:\"type\";s:5:\"label\";}}i:4;a:6:{s:1:\"A\";a:3:{s:4:\"type\";s:5:\"label\";s:4:\"span\";s:3:\"all\";s:5:\"label\";s:13:\"Custom fields\";}s:1:\"B\";a:1:{s:4:\"type\";s:5:\"label\";}s:1:\"C\";a:1:{s:4:\"type\";s:5:\"label\";}s:1:\"D\";a:1:{s:4:\"type\";s:5:\"label\";}s:1:\"E\";a:1:{s:4:\"type\";s:5:\"label\";}s:1:\"F\";a:1:{s:4:\"type\";s:5:\"label\";}}i:5;a:6:{s:1:\"A\";a:4:{s:4:\"type\";s:8:\"template\";s:4:\"size\";s:6:\"fields\";s:4:\"span\";s:3:\"all\";s:4:\"name\";s:6:\"fields\";}s:1:\"B\";a:1:{s:4:\"type\";s:5:\"label\";}s:1:\"C\";a:1:{s:4:\"type\";s:5:\"label\";}s:1:\"D\";a:1:{s:4:\"type\";s:5:\"label\";}s:1:\"E\";a:1:{s:4:\"type\";s:5:\"label\";}s:1:\"F\";a:1:{s:4:\"type\";s:5:\"label\";}}i:6;a:6:{s:1:\"A\";a:6:{s:4:\"type\";s:4:\"hbox\";s:4:\"size\";s:1:\"3\";s:4:\"span\";s:3:\"all\";i:1;a:4:{s:4:\"type\";s:6:\"button\";s:5:\"label\";s:4:\"Save\";s:4:\"name\";s:12:\"button[save]\";s:4:\"help\";s:33:\"saves the changes made and leaves\";}i:2;a:4:{s:4:\"type\";s:6:\"button\";s:5:\"label\";s:5:\"Apply\";s:4:\"name\";s:13:\"button[apply]\";s:4:\"help\";s:19:\"applies the changes\";}i:3;a:4:{s:4:\"type\";s:6:\"button\";s:5:\"label\";s:6:\"Cancel\";s:4:\"name\";s:14:\"button[cancel]\";s:4:\"help\";s:22:\"leaves without saveing\";}}s:1:\"B\";a:1:{s:4:\"type\";s:5:\"label\";}s:1:\"C\";a:1:{s:4:\"type\";s:5:\"label\";}s:1:\"D\";a:1:{s:4:\"type\";s:5:\"label\";}s:1:\"E\";a:1:{s:4:\"type\";s:5:\"label\";}s:1:\"F\";a:1:{s:4:\"type\";s:5:\"label\";}}}','size' => '','style' => '.header { font-weight: bold; font-size: 120%; } +$templ_data[] = array('name' => 'infolog.customfields','template' => '','lang' => '','group' => '0','version' => '0.9.15.001','data' => 'a:7:{i:0;a:3:{s:1:"F";s:3:"80%";s:2:"c2";s:6:"header";s:2:"c4";s:6:"header";}i:1;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Typ";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:3:"typ";s:8:"onchange";s:1:"1";s:4:"help";s:52:"select a typ to edit it\'s status-values or delete it";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"name";s:14:"button[delete]";s:4:"help";s:24:"deletes the selected typ";}s:1:"D";a:5:{s:4:"type";s:4:"text";s:4:"size";s:5:"10,10";s:4:"name";s:8:"new_name";s:4:"help";s:26:"name of new type to create";s:4:"blur";s:8:"new name";}s:1:"E";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:14:"button[create]";s:4:"help";s:37:"creates a new typ with the given name";}s:1:"F";a:5:{s:4:"type";s:5:"label";s:4:"span";s:10:",error_msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";s:4:"name";s:9:"error_msg";}}i:2;a:6:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:21:"Custom status for typ";s:4:"name";s:3:"typ";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:3;a:6:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"status";s:4:"span";s:3:"all";s:4:"name";s:6:"status";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:13:"Custom fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:5;a:6:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"fields";s:4:"span";s:3:"all";s:4:"name";s:6:"fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:6;a:6:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:33:"saves the changes made and leaves";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";s:4:"help";s:19:"applies the changes";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:22:"leaves without saveing";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}','size' => '','style' => '.header { font-weight: bold; font-size: 120%; } .error_msg { color: red; font-style: italics; }','modified' => '1061729975',); -$templ_data[] = array('name' => 'infolog.customfields.fields','template' => '','lang' => '','group' => '0','version' => '0.9.15.001','data' => 'a:3:{i:0;a:2:{s:2:\"c1\";s:2:\"th\";s:2:\"c2\";s:7:\"row,top\";}i:1;a:7:{s:1:\"A\";a:2:{s:4:\"type\";s:5:\"label\";s:5:\"label\";s:3:\"Typ\";}s:1:\"B\";a:2:{s:4:\"type\";s:5:\"label\";s:5:\"label\";s:4:\"Name\";}s:1:\"C\";a:2:{s:4:\"type\";s:5:\"label\";s:5:\"label\";s:5:\"Label\";}s:1:\"D\";a:2:{s:4:\"type\";s:5:\"label\";s:5:\"label\";s:20:\"Values for selectbox\";}s:1:\"E\";a:2:{s:4:\"type\";s:5:\"label\";s:5:\"label\";s:14:\"Length
Rows\";}s:1:\"F\";a:2:{s:4:\"type\";s:5:\"label\";s:5:\"label\";s:5:\"Order\";}s:1:\"G\";a:4:{s:4:\"type\";s:5:\"label\";s:5:\"label\";s:6:\"Action\";s:5:\"align\";s:6:\"center\";s:4:\"help\";s:18:\"deletes this field\";}}i:2;a:7:{s:1:\"A\";a:4:{s:4:\"type\";s:6:\"select\";s:4:\"size\";s:3:\"All\";s:4:\"name\";s:11:\"${row}[typ]\";s:4:\"help\";s:41:\"for which types should this field be used\";}s:1:\"B\";a:4:{s:4:\"type\";s:4:\"text\";s:4:\"size\";s:5:\"20,32\";s:4:\"name\";s:12:\"${row}[name]\";s:4:\"help\";s:83:\"the name used internaly (<= 20 chars), changeing it makes existing data unavailible\";}s:1:\"C\";a:4:{s:4:\"type\";s:4:\"vbox\";s:4:\"size\";s:1:\"2\";i:1;a:4:{s:4:\"type\";s:4:\"text\";s:4:\"size\";s:4:\",255\";s:4:\"name\";s:13:\"${row}[label]\";s:4:\"help\";s:30:\"the text displayed to the user\";}i:2;a:2:{s:4:\"type\";s:5:\"label\";s:4:\"name\";s:13:\"${row}[label]\";}}s:1:\"D\";a:4:{s:4:\"type\";s:8:\"textarea\";s:4:\"size\";s:4:\"2,30\";s:4:\"name\";s:14:\"${row}[values]\";s:4:\"help\";s:40:\"each value is a line like [=		 diff --git a/phpgwapi/js/htmlarea/plugins/UploadImage/upload-image.js b/phpgwapi/js/htmlarea/plugins/UploadImage/upload-image.js index 757ef7de5e..61af0b06cd 100755 --- a/phpgwapi/js/htmlarea/plugins/UploadImage/upload-image.js +++ b/phpgwapi/js/htmlarea/plugins/UploadImage/upload-image.js @@ -1,16 +1,18 @@ -// UploadImage Plugin for HTMLArea-3.0 -// Implementation by Mihai Bazon. Sponsored by http://thycotic.com -// -// htmlArea v3.0 - Copyright (c) 2002 interactivetools.com, inc. -// This notice MUST stay intact for use (see license.txt). -// -// A free WYSIWYG editor replacement for