From cd78a8db7b6bed3a43368a720cfc16ad5d6d17ac Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 13 Mar 2009 13:12:43 +0000 Subject: [PATCH] Minor changes --- htdocs/admin/index.php | 6 ++-- htdocs/langs/ca_ES/admin.lang | 2 +- htdocs/langs/en_US/admin.lang | 2 +- htdocs/langs/es_ES/admin.lang | 2 +- htdocs/langs/es_ES/main.lang | 1 + htdocs/langs/fr_FR/admin.lang | 2 +- htdocs/langs/fr_FR/main.lang | 1 + htdocs/langs/pt_PT/admin.lang | 2 +- htdocs/lib/security.lib.php | 38 ++++++++++++------------ htdocs/main.inc.php | 2 +- htdocs/theme/auguria/img/login_logo.png | Bin 3211 -> 0 bytes htdocs/theme/dolibarr_logo_2.png | Bin 5770 -> 0 bytes htdocs/theme/eldy/img/login_logo.png | Bin 3211 -> 0 bytes htdocs/user/passwordforgotten.php | 30 +++++++++---------- 14 files changed, 45 insertions(+), 43 deletions(-) delete mode 100644 htdocs/theme/auguria/img/login_logo.png delete mode 100644 htdocs/theme/dolibarr_logo_2.png delete mode 100644 htdocs/theme/eldy/img/login_logo.png diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php index 5b18393830d..2889b38127b 100644 --- a/htdocs/admin/index.php +++ b/htdocs/admin/index.php @@ -51,14 +51,14 @@ print '
Doliba
 if ($mesg) print $mesg.'<br>';
 
 print "; -print $langs->trans("SetupDescription1")."
"; -print $langs->trans("AreaForAdminOnly").' '.img_picto($langs->trans("Administrator"),'star').'
'; +print $langs->trans("SetupDescription1").'
'; +print $langs->trans("AreaForAdminOnly").'
'; print "
"; print $langs->trans("SetupDescription2")."
"; print "
"; print img_picto('','puce').' '.$langs->trans("SetupDescription3")."
"; -print "
"; +//print "
"; print img_picto('','puce').' '.$langs->trans("SetupDescription4")."
"; print "
"; diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang index 869c5d3f03d..644aac5b751 100644 --- a/htdocs/langs/ca_ES/admin.lang +++ b/htdocs/langs/ca_ES/admin.lang @@ -632,7 +632,7 @@ Audit = Auditoria ListEvents = Auditoria d'esdeveniments ListOfSecurityEvents = Llistat d'esdeveniments de seguretat Dolibarr LogEventDesc = Podeu habilitar el registre d'esdeveniments de seguretat Dolibarr aquí. Els administradors poden veure el seu contingut a través de menú Eines del sistema->Auditoria. Atenció, aquesta característica pot consumir una gran quantitat de dades a la base de dades. -AreaForAdminOnly = Aquestes funcions només són accessibles a un usuari administrador. La funció d'administrador i els ajuts per als administradors són definides en Dolibarr pel següent símbol: +AreaForAdminOnly = Aquestes funcions només són accessibles a un usuari administrador. SystemInfoDesc = La informació del sistema és informació tècnica accessible només en només lectura als administradors. SystemAreaForAdminOnly = Aquesta àrea només és accessible als usuaris de tipus administradors. Cap permís Dolibarr permet estendre el cercle de usuaris autoritzats a aquesta áera. CompanyFundationDesc = Edita en aquesta pàgina tota la informació coneguda sobre l'empresa o associació a administrar diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 9f064a72167..6971fd39705 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -634,7 +634,7 @@ Audit=Audit ListEvents=Audit events ListOfSecurityEvents=List of Dolibarr security events LogEventDesc=You can enable the log for Dolibarr security events here. Administrators can then see its content via menu System tools - Audit. Warning, this feature can consume a large amount of data in database. -AreaForAdminOnly=Those features can be used by administrator users only. Administrator features and help are identified in Dolibarr by the following picto: +AreaForAdminOnly=Those features can be used by administrator users only. SystemInfoDesc=System information is miscellanous technical information you get in read only mode and visible for administrators only. SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit. CompanyFundationDesc=Edit on this page all known information of the company or fundation you need to manage diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index cc56fbd9950..8a063e2b903 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -632,7 +632,7 @@ Audit = Auditoría ListEvents = Auditoría de eventos ListOfSecurityEvents = Listado de eventos de seguridad Dolibarr LogEventDesc = Puede habilitar el registro de eventos de seguridad Dolibarr aquí. Los administradores pueden ver su contenido a través de menú Herramientas del sistema - Auditoria.Atención, esta característica puede consumir una gran cantidad de datos en la base de datos. -AreaForAdminOnly = Estas funciones solo son accesibles a un usuario administrador. La función de administrador y las ayudas para los administradores son definidas en Dolibarr por el siguiente símbolo: +AreaForAdminOnly = Estas funciones solo son accesibles a un usuario administrador. SystemInfoDesc = La información del sistema es información técnica accesible solamente en solo lectura a los administradores. SystemAreaForAdminOnly = Esta área solo es accesible a los usuarios de tipo administradores. Ningún permiso Dolibarr permite extender el círculo de usuarios autorizados a esta áera. CompanyFundationDesc = Editar en esta página toda la información conocida sobre la empresa o asociación a administrar diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang index 57c5a9739fe..021cb7ce16d 100644 --- a/htdocs/langs/es_ES/main.lang +++ b/htdocs/langs/es_ES/main.lang @@ -36,6 +36,7 @@ ErrorNoVATRateDefinedForSellerCountry = Error, ningún tipo de IVA definido para ErrorFailedToSaveFile = Error, el registro del archivo falló. ErrorOnlyPngJpgSupported = Error, solamente se soportan los formatos de imagen jpg y png. ErrorImageFormatNotSupported = Su PHP no soporta las funciones de conversión de este formato de imagen. +GoToHelpPage=Read help (may require an Internet access) RecordSaved = Registro guardado LevelOfFeature = Nivel de funciones NotDefined = No definida diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 28c2f4925ec..7490a1a9e78 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -633,7 +633,7 @@ Audit=Audit ListEvents=Audit évènements ListOfSecurityEvents=Liste des évènements de sécurité Dolibarr LogEventDesc=Vous pouvez activer ici, le traçage de l'historique des evènements d'audit de sécurité. Cet historique est consultable aux administrateurs dans le menu Outils systèmes - Audit. Attention, cette fonctionnalité peut consommer un gros volume de données. -AreaForAdminOnly=Ces fonctions ne sont accessibles qu'à un utilisateur administrateur. La fonction d'administrateur et les aides pour les administrateurs sont identifiées dans Dolibarr par le picto suivant: +AreaForAdminOnly=Ces fonctions ne sont accessibles qu'à un utilisateur administrateur. SystemInfoDesc=Les informations systèmes sont des informations techniques diverses accessibles en lecture seule aux administrateurs uniquement. SystemAreaForAdminOnly=Cet espace n'est accessible qu'aux utilisateurs de type administrateurs. Aucune permission Dolibarr ne permet d'étendre le cercle des utilisateurs autorisés à cet espace. CompanyFundationDesc=Éditer sur cette page toutes les informations connues sur la société ou association que vous devez gérer diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index 9441602572a..6dfb7d3f940 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -36,6 +36,7 @@ ErrorNoVATRateDefinedForSellerCountry=Erreur, aucun taux tva défini pour le pay ErrorFailedToSaveFile=Erreur, l'enregistrement du fichier a échoué. ErrorOnlyPngJpgSupported=Erreur, seuls les formats images .jpg et .png sont supportés. ErrorImageFormatNotSupported=Votre PHP ne supporte pas les fonctions de conversion de ce format d'image. +GoToHelpPage=Consulter l'aide (peut nécessiter un accès internet) RecordSaved=Enregistrement sauvegardé LevelOfFeature=Niveau de fonctionnalités NotDefined=Non défini diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang index 18204b11a3c..7548ba86811 100644 --- a/htdocs/langs/pt_PT/admin.lang +++ b/htdocs/langs/pt_PT/admin.lang @@ -630,7 +630,7 @@ Audit=Auditoría ListEvents=Auditoría de eventos ListOfSecurityEvents=Listado de eventos de segurança Dolibarr LogEventDesc=Pode activar o registo de eventos de segurança Dolibarr aquí. os administradores podem ver o seu conteudo a través de menu ferramentas do sistema - Auditoria.Atenção, esta característica pode consumir uma gran quantidade de dados na base de dados. -AreaForAdminOnly=Estas funções solo são accesibles a um Utilizador administrador. a função de administrador e as ayudas para os administradores são definidas em Dolibarr por o siguiente símbolo: +AreaForAdminOnly=Estas funções solo são accesibles a um Utilizador administrador. SystemInfoDesc=Esta informação do sistema é informação técnica acessíveis só de leitura a aos administradores. SystemAreaForAdminOnly=Esta área só é acessíveis a os Utilizadores de tipo administradores. nenhum permissão Dolibarr permite extender o círculo de Utilizadores autorizados a esta áera. CompanyFundationDesc=Editar em esta página toda a informação conhecida sobre a empresa o associação a administrar diff --git a/htdocs/lib/security.lib.php b/htdocs/lib/security.lib.php index 1fbbd06bc73..a53e343b9f6 100644 --- a/htdocs/lib/security.lib.php +++ b/htdocs/lib/security.lib.php @@ -90,7 +90,7 @@ function dol_loginfunction($langs,$conf,$mysoc) print ''."\n"; // Body - print ''."\n"; + print ''."\n\n"; // Start Form print '
'."\n"; // Table 1 - print ''; $title='Dolibarr '.DOL_VERSION; if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $title=$conf->global->MAIN_APPLICATION_TITLE; - print ''; - print '
'.$title.'
'; - print '
'; + print ''."\n";; + print ''."\n"; + print '
'.$title.'
'."\n"; + print '
'."\n\n"; // Table 2 - print ''; + print '
'."\n"; print ''; @@ -117,10 +117,8 @@ function dol_loginfunction($langs,$conf,$mysoc) print ''; print ''; - $title=$langs->trans("SessionName").': '.session_name(); - if ($conf->main_authentication) $title.=", ".$langs->trans("AuthenticationMode").': '.$conf->main_authentication; - // Show logo (search in order: small company logo, large company logo, theme logo, common logo) + $title=''; $width=0; $urllogo=DOL_URL_ROOT.'/theme/login_logo.png'; if (! empty($mysoc->logo_small) && is_readable($conf->societe->dir_logos.'/thumbs/'.$mysoc->logo_small)) @@ -132,11 +130,11 @@ function dol_loginfunction($langs,$conf,$mysoc) $urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&file='.urlencode($mysoc->logo); $width=96; } - elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/login_logo.png')) + elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.png')) { - $urllogo=DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/login_logo.png'; + $urllogo=DOL_URL_ROOT.'/theme/dolibarr_logo.png'; } - print ''; print ''."\n"; @@ -174,12 +172,12 @@ function dol_loginfunction($langs,$conf,$mysoc) print ''; } - print '
 
  '.$langs->trans("Login").'  logo
('.$langs->trans("PasswordForgotten").')
'; + print ''."\n"; // Hidden fields - print ''; + print ''."\n"; - print '
'; + print ''."\n"; // Message if (! empty($_SESSION["dol_loginmesg"])) @@ -187,11 +185,11 @@ function dol_loginfunction($langs,$conf,$mysoc) print '
'; print $_SESSION["dol_loginmesg"]; $_SESSION["dol_loginmesg"]=""; - print '
'; + print '
'."\n"; } if (! empty($conf->global->MAIN_HOME)) { - print '
'; + print '
'; $i=0; while (eregi('__\(([a-zA-Z]+)\)__',$conf->global->MAIN_HOME,$reg) && $i < 100) { @@ -199,11 +197,13 @@ function dol_loginfunction($langs,$conf,$mysoc) $i++; } print nl2br($conf->global->MAIN_HOME); - print '

'; + print '

'."\n"; } print "\n"; - print ''; + print ''."\n"; + print ''."\n"; + print ''."\n"; // Fin entete html print "\n\n"; diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 03fb16a416f..22e7ba9b9c9 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1,7 +1,7 @@ * Copyright (C) 2003 Xavier Dutoit - * Copyright (C) 2004-2008 Laurent Destailleur + * Copyright (C) 2004-2009 Laurent Destailleur * Copyright (C) 2004 Sebastien Di Cintio * Copyright (C) 2004 Benoit Mortier * Copyright (C) 2005-2007 Regis Houssin diff --git a/htdocs/theme/auguria/img/login_logo.png b/htdocs/theme/auguria/img/login_logo.png deleted file mode 100644 index 2337863c34061df85c0f0ad60381847d7b780cc0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3211 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 diff --git a/htdocs/theme/eldy/img/login_logo.png b/htdocs/theme/eldy/img/login_logo.png deleted file mode 100644 index 2337863c34061df85c0f0ad60381847d7b780cc0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3211 zcmWkwc|26z8=nRfvSle!cJgbpm3`lh$d+oXQDm!mjcg;5X_*=&Cfi)1x@5U%8T*uV zyp^tOW1lS5h!~M2d7Iz${XEY-_dMrW&a?b+$ZoCw<|3?d>SyyH0n3bjjen|Jh0ByS-?{!l9yD-`O*gI!za z1yCq-ncGP(J061d^>r?Ho43J1z}^N60lW<+%-jZy><|%~#YQx^^Xps=Zyh1Tnul0# z+p*akS(g6Y!A~EPGFoOa!fx2oco5f(mAd5+5LPR<>f(}G5Kmr>E=n&$QNCycJH3Fgr zLqG(FjZ^^1h6n)!h!V_UF&Hm0U^<0P4Q8_-1{eWRa1anoM+l5)uO@Id=6K;iII+eu$ zSS&_gcO84XiEM8VEYe0Em(As{ao$J>BpHZ6AYdKsk!jj5AT5geqXqyzvYu!y+6&S8CM0RaG+DG-D-i{kzwL%bu#!_^aI`E57^newwv zwpL#8ql}yf0aEL7U5`j4{#U2Ry;CwsC~LRZv@MDy2NS8ze+Jsp+?CU$_OBSh_D)IW z9c8tnHp~6Jq!xZ-ce0P1SVUE)O>e(vb?hg5X*?=< z=E(gT*(Cqg+%;qMWZ2!8)7+HC)%j};31MYnV|u!Jef`TT1g^_MqvD84mW55j$j^s) zWsQA(%{LeyUVX4z?i~3(%ibFAYdjO{Fui`k?C2>Ka?)z@gbw)f$GtXSFl|g&`X>JQ z;{2a~h<6KFf&WcZV`+~zgTc?{=JbHme)%SyWHocY!RX6h78zP^nty-YNGS-vY@U54 zL$>FkS-h}+2>PIvSEZY@`C8=@H}?$5$J$+?AEiLGai?(~$!n%pCTcS?Gh<#@GR>Kl zUpBr_JAZc`Ea)NIzfusib+3)koM?T!V*Rb{S5~!S0501}vaj?UI;YdLN^KJl6%+)F zDo=-6T%fa7n=kHuP)7($_*kJ}ua5p{9bzV5bi}zu=EyNJt18G!L;6_H%N9v@&?!v)!p_;9)jw6_tSsq$>n?q7h74=U><}&I;hNZt9i$l zuk3uta~r*(rhHzJCPI+$ToNfL%**>d)*T!Z_ce4e5?(*R2oQbVmt#k~Oo@dK9?4;)xX znqPW|<8;`%*o_3RFzkT}iw%5|HYEZwf7~NBx5mHIy7-fko91zC34Vd*J@V&ShFt}4 zp-q<@meqbW3$|L3FCA|elv|45v?;!)RD>~8Xqw=xiu#;-xNm6ZjG}S*sz}RA^Km1i z?;($w}b*iZ2M6R`s%F6^s-uWdhLCC)66}{!XsW4>A1o+idyf zjR6t4wJFrNsO9?7V+Vzcj(j$n_9#qqGHuUwDb#?tF1jG+^XF^62lz%86!ysq_x{~9 zvzj$Iu8xVJm{32y4MFD@W*g<|fboK2X zh#MCi%d{5bdtqezy7&s}d;U>l`XN)4Zeq%BD6mP^}7saHFY%S` zjDspZy~BWCUc1ET#YA^E($iS2YjKyq|Wd=1|)T1{_L@y+L7#<|^D=aMW?cW!bo}O;0E)t$=qux)mId_#W z1an)hI4TO%EC)NopX$A~xwXU;lu2{YE;~__@F`a|z)mnts6S8*MK8TnlwKt(Ac!eW z{#QcT-BY{UHr7z~y2Gr+7G?w!h4Bw|cFub7?oy<|6G2GRS~$OY5G`SnAgOAS+nB_U zZPo6x>GoW(NQ>!JzLHcCA?u3%@4q(fC#KprOG*Ni zPn?(&SG;w>ynOYa2NdR zwb!{?uOpJ`!dY<(?Bzb^am8qbfaOg?u^jmxo9TmsmxOM%b%;I@Rl$*$XiFxaZ? +/* Copyright (C) 2007-2009 Laurent Destailleur * * 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 @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/** - \file htdocs/user/passwordforgotten.php - \brief Page demande nouveau mot de passe - \version $Id$ -*/ +/** + * \file htdocs/user/passwordforgotten.php + * \brief Page demande nouveau mot de passe + * \version $Id$ + */ // This is to make Dolibarr working with Plesk set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs'); @@ -88,10 +88,10 @@ if ($_POST["action"] == 'buildnewpassword' && $_POST["username"]) { require_once DOL_DOCUMENT_ROOT.'/../external-libs/Artichow/Artichow.cfg.php'; require_once ARTICHOW."/AntiSpam.class.php"; - + // We create anti-spam object $object = new AntiSpam(); - + // Verify code if (! $object->check('dol_antispam_value',$_POST['code'],true)) { @@ -120,7 +120,7 @@ if ($_POST["action"] == 'buildnewpassword' && $_POST["username"]) // Failed $message = '
'.$langs->trans("ErrorFailedToChangePassword").'
'; } - else + else { // Success if ($edituser->send_password($user,$newpassword,1) > 0) @@ -145,7 +145,7 @@ if ($_POST["action"] == 'buildnewpassword' && $_POST["username"]) /* * Affichage page */ - + $conf->css = "theme/".$conf->theme."/".$conf->theme.".css"; // Si feuille de style en php existe if (file_exists(DOL_DOCUMENT_ROOT.'/'.$conf->css.".php")) $conf->css.=".php"; @@ -198,7 +198,7 @@ print '
'."\n"; // Table 1 -print ''."\n"; +print '
'."\n"; if (file_exists(DOL_DOCUMENT_ROOT.'/logo.png')) { print '
'; @@ -217,7 +217,7 @@ if ($mode == 'dolibarr' || $mode == 'dolibarr_mdb2') $disabled=''; if ($conf->global->MAIN_SECURITY_ENABLE_SENDPASSWORD) $disabled=''; // To force button enabled // Table 2 -print ''."\n"; +print '
'."\n"; print ''."\n"; @@ -256,13 +256,13 @@ if (function_exists("imagecreatefrompng") && ! $disabled) //print "Info session: ".session_name().session_id();print_r($_SESSION); print ''; print ''; print ''; } @@ -290,7 +290,7 @@ else print '
 
  '.$langs->trans("SecurityCode").''; - + print ''; print ''; print ''; print ''; print '
'.img_refresh().'
'; - + print '

'; if ($message) -{ +{ print '
'; print $message.'

'; }