lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Qual: Factorize code

Browse Source
This commit is contained in:
Laurent Destailleur 2009-05-04 18:38:01 +00:00
parent 4759b06d2b
commit ce47ff029d
7 changed files with 322 additions and 333 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
htdocs/admin/mails.php
View File

@ -32,7 +32,7 @@ $langs->load("admin");
$langs->load("mails"); $langs->load("mails");
if (!$user->admin) if (!$user->admin)
accessforbidden(); accessforbidden();
$substitutionarrayfortest=array( $substitutionarrayfortest=array(
'__ID__' => 'TESTIdRecord', '__ID__' => 'TESTIdRecord',
@ -43,8 +43,8 @@ $substitutionarrayfortest=array(
/* /*
* Actions * Actions
*/ */
if (isset($_POST["action"]) && $_POST["action"] == 'update') if (isset($_POST["action"]) && $_POST["action"] == 'update')
{ {
@ -101,7 +101,7 @@ if ($_POST['addfile'] || $_POST['addfilehtml'])
* Send mail * Send mail
*/ */
if (($_POST['action'] == 'send' || $_POST['action'] == 'sendhtml') if (($_POST['action'] == 'send' || $_POST['action'] == 'sendhtml')
&& ! $_POST['addfile'] && ! $_POST['addfilehtml'] && ! $_POST['cancel']) && ! $_POST['addfile'] && ! $_POST['addfilehtml'] && ! $_POST['cancel'])
{ {
$error=0; $error=0;
@ -171,8 +171,8 @@ if (($_POST['action'] == 'send' || $_POST['action'] == 'sendhtml')
/* /*
* View * View
*/ */
$linuxlike=1; $linuxlike=1;
if (eregi('^win',PHP_OS)) $linuxlike=0; if (eregi('^win',PHP_OS)) $linuxlike=0;
@ -226,7 +226,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
$listofmethods['mail']='PHP mail function'; $listofmethods['mail']='PHP mail function';
$listofmethods['smtps']='SMTP/SMTPS socket library'; $listofmethods['smtps']='SMTP/SMTPS socket library';
// SuperAdministrator access only // SuperAdministrator access only
if ((!$conf->global->MAIN_MODULE_MULTICOMPANY) || ($conf->global->MAIN_MODULE_MULTICOMPANY && $user->admin && !$user->entity)) if ((empty($conf->global->MAIN_MODULE_MULTICOMPANY)) || ($user->admin && !$user->entity))
{ {
print $html->select_array('MAIN_MAIL_SENDMODE',$listofmethods,$conf->global->MAIN_MAIL_SENDMODE); print $html->select_array('MAIN_MAIL_SENDMODE',$listofmethods,$conf->global->MAIN_MAIL_SENDMODE);
} }
@ -236,7 +236,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
elseif ($conf->global->MAIN_MAIL_SENDMODE == 'smtps') $text = 'SMTPS library'; elseif ($conf->global->MAIN_MAIL_SENDMODE == 'smtps') $text = 'SMTPS library';
else { $text = $langs->trans("Undefined"); } else { $text = $langs->trans("Undefined"); }
$htmltext = $langs->trans("ContactSuperAdminForChange"); $htmltext = $langs->trans("ContactSuperAdminForChange");
print $html->textwithredstar($text,$htmltext); print $html->textwithpicto($text,$htmltext,1,0,'superadmin');
} }
print '</td></tr>'; print '</td></tr>';
@ -255,7 +255,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
print $langs->trans("MAIN_MAIL_SMTP_SERVER",$smtpserver); print $langs->trans("MAIN_MAIL_SMTP_SERVER",$smtpserver);
print '</td><td>'; print '</td><td>';
// SuperAdministrator access only // SuperAdministrator access only
if ((!$conf->global->MAIN_MODULE_MULTICOMPANY) || ($conf->global->MAIN_MODULE_MULTICOMPANY && $user->admin && !$user->entity)) if ((empty($conf->global->MAIN_MODULE_MULTICOMPANY)) || ($user->admin && !$user->entity))
{ {
print '<input class="flat" name="MAIN_MAIL_SMTP_SERVER" size="18" value="' . $conf->global->MAIN_MAIL_SMTP_SERVER . '">'; print '<input class="flat" name="MAIN_MAIL_SMTP_SERVER" size="18" value="' . $conf->global->MAIN_MAIL_SMTP_SERVER . '">';
} }
@ -263,7 +263,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
{ {
$text = $conf->global->MAIN_MAIL_SMTP_SERVER ? $conf->global->MAIN_MAIL_SMTP_SERVER : $smtpserver; $text = $conf->global->MAIN_MAIL_SMTP_SERVER ? $conf->global->MAIN_MAIL_SMTP_SERVER : $smtpserver;
$htmltext = $langs->trans("ContactSuperAdminForChange"); $htmltext = $langs->trans("ContactSuperAdminForChange");
print $html->textwithredstar($conf->global->MAIN_MAIL_SMTP_SERVER,$htmltext); print $html->textwithpicto($text,$htmltext,1,0,'superadmin');
} }
} }
print '</td></tr>'; print '</td></tr>';
@ -283,7 +283,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
print $langs->trans("MAIN_MAIL_SMTP_PORT",$smtpport); print $langs->trans("MAIN_MAIL_SMTP_PORT",$smtpport);
print '</td><td>'; print '</td><td>';
// SuperAdministrator access only // SuperAdministrator access only
if ((!$conf->global->MAIN_MODULE_MULTICOMPANY) || ($conf->global->MAIN_MODULE_MULTICOMPANY && $user->admin && !$user->entity)) if ((empty($conf->global->MAIN_MODULE_MULTICOMPANY)) || ($user->admin && !$user->entity))
{ {
print '<input class="flat" name="MAIN_MAIL_SMTP_PORT" size="3" value="' . $conf->global->MAIN_MAIL_SMTP_PORT . '">'; print '<input class="flat" name="MAIN_MAIL_SMTP_PORT" size="3" value="' . $conf->global->MAIN_MAIL_SMTP_PORT . '">';
} }
@ -291,7 +291,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
{ {
$text = $conf->global->MAIN_MAIL_SMTP_PORT ? $conf->global->MAIN_MAIL_SMTP_PORT : $smtpport; $text = $conf->global->MAIN_MAIL_SMTP_PORT ? $conf->global->MAIN_MAIL_SMTP_PORT : $smtpport;
$htmltext = $langs->trans("ContactSuperAdminForChange"); $htmltext = $langs->trans("ContactSuperAdminForChange");
print $html->textwithredstar($text,$htmltext); print $html->textwithpicto($text,$htmltext,1,0,'superadmin');
} }
} }
print '</td></tr>'; print '</td></tr>';
@ -302,14 +302,14 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>';
// SuperAdministrator access only // SuperAdministrator access only
if ((!$conf->global->MAIN_MODULE_MULTICOMPANY) || ($conf->global->MAIN_MODULE_MULTICOMPANY && $user->admin && !$user->entity)) if ((empty($conf->global->MAIN_MODULE_MULTICOMPANY)) || ($user->admin && !$user->entity))
{ {
print '<input class="flat" name="MAIN_MAIL_SMTPS_ID" size="32" value="' . $conf->global->MAIN_MAIL_SMTPS_ID . '">'; print '<input class="flat" name="MAIN_MAIL_SMTPS_ID" size="32" value="' . $conf->global->MAIN_MAIL_SMTPS_ID . '">';
} }
else else
{ {
$htmltext = $langs->trans("ContactSuperAdminForChange"); $htmltext = $langs->trans("ContactSuperAdminForChange");
print $html->textwithredstar($conf->global->MAIN_MAIL_SMTPS_ID,$htmltext); print $html->textwithpicto($conf->global->MAIN_MAIL_SMTPS_ID,$htmltext,1,0,'superadmin');
} }
print '</td></tr>'; print '</td></tr>';
} }
@ -320,14 +320,14 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>';
// SuperAdministrator access only // SuperAdministrator access only
if ((!$conf->global->MAIN_MODULE_MULTICOMPANY) || ($conf->global->MAIN_MODULE_MULTICOMPANY && $user->admin && !$user->entity)) if ((empty($conf->global->MAIN_MODULE_MULTICOMPANY)) || ($user->admin && !$user->entity))
{ {
print '<input class="flat" name="MAIN_MAIL_SMTPS_PW" size="32" value="' . $conf->global->MAIN_MAIL_SMTPS_PW . '">'; print '<input class="flat" name="MAIN_MAIL_SMTPS_PW" size="32" value="' . $conf->global->MAIN_MAIL_SMTPS_PW . '">';
} }
else else
{ {
$htmltext = $langs->trans("ContactSuperAdminForChange"); $htmltext = $langs->trans("ContactSuperAdminForChange");
print $html->textwithredstar($conf->global->MAIN_MAIL_SMTPS_PW,$htmltext); print $html->textwithpicto($conf->global->MAIN_MAIL_SMTPS_PW,$htmltext,1,0,'superadmin');
} }
print '</td></tr>'; print '</td></tr>';
} }

4
htdocs/admin/security_other.php
View File

@ -203,7 +203,7 @@ if (function_exists("imagecreatefrompng"))
else else
{ {
$html = new Form($db); $html = new Form($db);
$desc = $html->textwithwarning('',$langs->transnoentities("EnableGDLibraryDesc"),1); $desc = $html->textwithpicto('',$langs->transnoentities("EnableGDLibraryDesc"),1,0,'warning');
print $desc; print $desc;
} }
print "</td>"; print "</td>";
@ -246,7 +246,7 @@ if (function_exists("cl_scanfile")) // Clamav
else else
{ {
$html = new Form($db); $html = new Form($db);
$desc = $html->textwithwarning('',$langs->transnoentities("EnablePhpAVModuleDesc"),1); $desc = $html->textwithpicto('',$langs->transnoentities("EnablePhpAVModuleDesc"),1,0,'warning');
print $desc; print $desc;
} }
print "</td>"; print "</td>";

2
htdocs/admin/system/database.php
View File

@ -128,7 +128,7 @@ else
} }
if ($show==0) print $row[1]; if ($show==0) print $row[1];
if ($show==1) print $html->textwithhelp($row[1],$text); if ($show==1) print $html->textwithhelp($row[1],$text);
if ($show==2) print $html->textwithwarning($row[1],$text); if ($show==2) print $html->textwithpicto($row[1],$text,1,0,'warning');
print '</td>'; print '</td>';
print "</tr>\n"; print "</tr>\n";
} }

45
htdocs/html.form.class.php
View File

@ -145,12 +145,12 @@ class Form
} }
/** /**
* \brief Affiche un texte avec picto help qui affiche un tooltip * \brief Show a text with a picto and a tooltip on picto
* \param text Texte à afficher * \param text Text to show
* \param htmltooltip Contenu html du tooltip * \param htmltooltip Content of tooltip
* \param direction 1=Le picto est après, -1=le picto est avant * \param direction 1=Icon is after text, -1=Icon is before text
* \param usehelpcursor 1=Utilise curseur help, 0=Curseur par defaut * \param usehelpcursor 1=Use a help cursor, 0=Use default cursor
* \return string Code html du texte,picto * \return string HTML code of text, picto, tooltip
*/ */
function textwithhelp($text,$htmltext,$direction=1,$usehelpcursor=1) function textwithhelp($text,$htmltext,$direction=1,$usehelpcursor=1)
{ {
@ -161,33 +161,22 @@ class Form
} }
/** /**
* \brief Affiche un texte avec picto warning qui affiche un tooltip * \brief Show a text with a picto and a tooltip on picto
* \param text Texte à afficher * \param text Text to show
* \param htmltooltip Contenu html du tooltip * \param htmltooltip Content of tooltip
* \param direction 1=Le picto est après, -1=le picto est avant * \param direction 1=Icon is after text, -1=Icon is before text
* \return string Code html du texte,picto * \param usehelpcursor 1=Use a help cursor, 0=Use default cursor
* \return string HTML code of text, picto, tooltip
*/ */
function textwithwarning($text,$htmltext,$direction=1) function textwithpicto($text,$htmltext,$direction=1,$usehelpcursor=0,$type='help')
{ {
global $conf; global $conf;
$alt=''; $alt='';
if ($type == 'help') $img=img_help($usehelpcursor,$alt);
if ($type == 'warning') $img=img_warning($alt);
if ($type == 'superadmin') $img=img_redstar($alt);
if (empty($conf->use_javascript_ajax)) $alt='Help disabled (javascript disabled)'; if (empty($conf->use_javascript_ajax)) $alt='Help disabled (javascript disabled)';
return $this->textwithtooltip($text,$htmltext,2,$direction,img_warning($alt)); return $this->textwithtooltip($text,$htmltext,2,$direction,$img);
}
/**
* \brief Affiche un texte avec picto redstar qui affiche un tooltip
* \param text Texte à afficher
* \param htmltooltip Contenu html du tooltip
* \param direction 1=Le picto est après, -1=le picto est avant
* \return string Code html du texte,picto
*/
function textwithredstar($text,$htmltext,$direction=1)
{
global $conf;
$alt='';
if (empty($conf->use_javascript_ajax)) $alt='Help disabled (javascript disabled)';
return $this->textwithtooltip($text,$htmltext,2,$direction,img_redstar($alt));
} }

6
htdocs/user/fiche.php
View File

@ -892,7 +892,7 @@ else
// Administrateur // Administrateur
print '<tr><td width="25%" valign="top">'.$langs->trans("Administrator").'</td>'; print '<tr><td width="25%" valign="top">'.$langs->trans("Administrator").'</td>';
print '<td>'.yn($fuser->admin); print '<td>'.yn($fuser->admin);
if ($fuser->admin && !$fuser->entity) if ($conf->global->MAIN_MODULE_MULTICOMPANY && $fuser->admin && ! $fuser->entity)
{ {
print ' '.img_redstar($langs->trans("SuperAdministrator")); print ' '.img_redstar($langs->trans("SuperAdministrator"));
} }
@ -1337,7 +1337,7 @@ else
$text='<input size="12" maxlength="32" type="text" class="flat" name="password" value="'.$fuser->pass.'">'; $text='<input size="12" maxlength="32" type="text" class="flat" name="password" value="'.$fuser->pass.'">';
if ($dolibarr_main_authentication && $dolibarr_main_authentication == 'http') if ($dolibarr_main_authentication && $dolibarr_main_authentication == 'http')
{ {
$text=$html->textwithwarning($text,$langs->trans("DolibarrInHttpAuthenticationSoPasswordUseless",$dolibarr_main_authentication)); $text=$html->textwithpicto($text,$langs->trans("DolibarrInHttpAuthenticationSoPasswordUseless",$dolibarr_main_authentication),1,0,'warning');
} }
} }
else else
@ -1366,7 +1366,7 @@ else
{ {
$yn = yn($fuser->admin); $yn = yn($fuser->admin);
print '<input type="hidden" name="admin" value="'.$fuser->admin.'">'; print '<input type="hidden" name="admin" value="'.$fuser->admin.'">';
print $html->textwithwarning($yn,$langs->trans("DontChangeSuperAdmin")); print $html->textwithpicto($yn,$langs->trans("DontChangeSuperAdmin"),1,0,'warning');
} }
print '</td></tr>'; print '</td></tr>';
} }

2
htdocs/user/home.php
View File

@ -99,7 +99,7 @@ if ($resql)
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print "<td><a href=\"".DOL_URL_ROOT."/user/fiche.php?id=$obj->rowid\">".img_object($langs->trans("ShowUser"),"user")." ".$obj->firstname." ".$obj->name."</a>"; print "<td><a href=\"".DOL_URL_ROOT."/user/fiche.php?id=$obj->rowid\">".img_object($langs->trans("ShowUser"),"user")." ".$obj->firstname." ".$obj->name."</a>";
if ($obj->admin && !$obj->entity) if ($conf->global->MAIN_MODULE_MULTICOMPANY && $obj->admin && ! $obj->entity)
{ {
print img_redstar($langs->trans("SuperAdministrator")); print img_redstar($langs->trans("SuperAdministrator"));
} }

2
htdocs/user/index.php
View File

@ -98,7 +98,7 @@ if ($result)
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td><a href="fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowUser"),"user").' '.$obj->login.'</a>'; print '<td><a href="fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowUser"),"user").' '.$obj->login.'</a>';
if ($obj->admin && !$obj->entity) if ($conf->global->MAIN_MODULE_MULTICOMPANY && $obj->admin && ! $obj->entity)
{ {
print img_redstar($langs->trans("SuperAdministrator")); print img_redstar($langs->trans("SuperAdministrator"));
} }