Clean code
This commit is contained in:
parent
9d6e3be5d1
commit
7865381434
@ -86,9 +86,9 @@ if ($resql)
|
|||||||
print '<tr class="oddeven">';
|
print '<tr class="oddeven">';
|
||||||
if ($objp->public)
|
if ($objp->public)
|
||||||
{
|
{
|
||||||
print "<td>".dolGetFirstLastname($objp->firstname, $objp->lastname)." ".$objp->societe."</td>\n";
|
print "<td>".dolGetFirstLastname($objp->firstname, $objp->lastname)." ".dol_escape_htmltag($objp->societe)."</td>\n";
|
||||||
} else {
|
} else {
|
||||||
print "<td>Anonyme Anonyme</td>\n";
|
print "<td>".$langs->trans("Anonymous")."</td>\n";
|
||||||
}
|
}
|
||||||
print "<td>".dol_print_date($db->jdate($objp->datedon))."</td>\n";
|
print "<td>".dol_print_date($db->jdate($objp->datedon))."</td>\n";
|
||||||
print '<td class="right">'.number_format($objp->amount, 2, '.', ' ').' '.$langs->trans("Currency".$conf->currency).'</td>';
|
print '<td class="right">'.number_format($objp->amount, 2, '.', ' ').' '.$langs->trans("Currency".$conf->currency).'</td>';
|
||||||
@ -97,7 +97,7 @@ if ($resql)
|
|||||||
}
|
}
|
||||||
print "</table>";
|
print "</table>";
|
||||||
} else {
|
} else {
|
||||||
print "Aucun don publique";
|
print $langs->trans("Donation");
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
dol_print_error($db);
|
dol_print_error($db);
|
||||||
|
|||||||
@ -24,3 +24,4 @@
|
|||||||
require '../../master.inc.php';
|
require '../../master.inc.php';
|
||||||
|
|
||||||
header("Location: ".DOL_URL_ROOT.'/public/error-404.php');
|
header("Location: ".DOL_URL_ROOT.'/public/error-404.php');
|
||||||
|
exit;
|
||||||
@ -194,6 +194,7 @@ $text = '';
|
|||||||
if (!empty($conf->global->ONLINE_SIGN_NEWFORM_TEXT))
|
if (!empty($conf->global->ONLINE_SIGN_NEWFORM_TEXT))
|
||||||
{
|
{
|
||||||
$langs->load("members");
|
$langs->load("members");
|
||||||
|
$reg = array();
|
||||||
if (preg_match('/^\((.*)\)$/', $conf->global->ONLINE_SIGN_NEWFORM_TEXT, $reg)) $text .= $langs->trans($reg[1])."<br>\n";
|
if (preg_match('/^\((.*)\)$/', $conf->global->ONLINE_SIGN_NEWFORM_TEXT, $reg)) $text .= $langs->trans($reg[1])."<br>\n";
|
||||||
else $text .= $conf->global->ONLINE_SIGN_NEWFORM_TEXT."<br>\n";
|
else $text .= $conf->global->ONLINE_SIGN_NEWFORM_TEXT."<br>\n";
|
||||||
$text = '<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
|
$text = '<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
|
||||||
@ -256,9 +257,9 @@ if ($source == 'proposal')
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (!$found && !$mesg) $mesg = $langs->trans("ErrorBadParameters");
|
if (!$found && !$mesg) $mesg = $langs->transonentitiesnoconv("ErrorBadParameters");
|
||||||
|
|
||||||
if ($mesg) print '<tr><td align="center" colspan="2"><br><div class="warning">'.$mesg.'</div></td></tr>'."\n";
|
if ($mesg) print '<tr><td align="center" colspan="2"><br><div class="warning">'.dol_escape_htmltag($mesg).'</div></td></tr>'."\n";
|
||||||
|
|
||||||
print '</table>'."\n";
|
print '</table>'."\n";
|
||||||
print "\n";
|
print "\n";
|
||||||
|
|||||||
@ -241,14 +241,13 @@ print '<div with="100%" id="tablepublicpayment">';
|
|||||||
print '<div class="opacitymedium">'.$langs->trans("ThisIsInformationOnJobPosition").' :</div>'."\n";
|
print '<div class="opacitymedium">'.$langs->trans("ThisIsInformationOnJobPosition").' :</div>'."\n";
|
||||||
|
|
||||||
$error = 0;
|
$error = 0;
|
||||||
$var = false;
|
|
||||||
$found = true;
|
$found = true;
|
||||||
|
|
||||||
print '<br>';
|
print '<br>';
|
||||||
|
|
||||||
// Label
|
// Label
|
||||||
print $langs->trans("Label").' : ';
|
print $langs->trans("Label").' : ';
|
||||||
print '<b>'.$object->label.'</b><br>';
|
print '<b>'.dol_escape_htmltag($object->label).'</b><br>';
|
||||||
|
|
||||||
// Date
|
// Date
|
||||||
print $langs->trans("DateExpected").' : ';
|
print $langs->trans("DateExpected").' : ';
|
||||||
@ -263,7 +262,7 @@ print '</b><br>';
|
|||||||
// Remuneration
|
// Remuneration
|
||||||
print $langs->trans("Remuneration").' : ';
|
print $langs->trans("Remuneration").' : ';
|
||||||
print '<b>';
|
print '<b>';
|
||||||
print $object->remuneration_suggested;
|
print dol_escape_htmltag($object->remuneration_suggested);
|
||||||
print '</b><br>';
|
print '</b><br>';
|
||||||
|
|
||||||
// Contact
|
// Contact
|
||||||
|
|||||||
@ -162,6 +162,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
|
|||||||
|
|
||||||
$url = 'view.php?action=view_ticket&track_id='.GETPOST('track_id', 'alpha');
|
$url = 'view.php?action=view_ticket&track_id='.GETPOST('track_id', 'alpha');
|
||||||
header("Location: ".$url);
|
header("Location: ".$url);
|
||||||
|
exit;
|
||||||
} else {
|
} else {
|
||||||
$action = '';
|
$action = '';
|
||||||
setEventMessages($object->error, $object->errors, 'errors');
|
setEventMessages($object->error, $object->errors, 'errors');
|
||||||
@ -238,17 +239,17 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
|
|||||||
|
|
||||||
// Ref
|
// Ref
|
||||||
print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td>';
|
print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td>';
|
||||||
print $object->dao->ref;
|
print dol_escape_htmltag($object->dao->ref);
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
|
|
||||||
// Tracking ID
|
// Tracking ID
|
||||||
print '<tr><td>'.$langs->trans("TicketTrackId").'</td><td>';
|
print '<tr><td>'.$langs->trans("TicketTrackId").'</td><td>';
|
||||||
print $object->dao->track_id;
|
print dol_escape_htmltag($object->dao->track_id);
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
|
|
||||||
// Subject
|
// Subject
|
||||||
print '<tr><td>'.$langs->trans("Subject").'</td><td>';
|
print '<tr><td>'.$langs->trans("Subject").'</td><td>';
|
||||||
print $object->dao->subject;
|
print dol_escape_htmltag($object->dao->subject);
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
|
|
||||||
// Statut
|
// Statut
|
||||||
@ -258,17 +259,17 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
|
|||||||
|
|
||||||
// Type
|
// Type
|
||||||
print '<tr><td>'.$langs->trans("Type").'</td><td>';
|
print '<tr><td>'.$langs->trans("Type").'</td><td>';
|
||||||
print $object->dao->type_label;
|
print dol_escape_htmltag($object->dao->type_label);
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
|
|
||||||
// Category
|
// Category
|
||||||
print '<tr><td>'.$langs->trans("Category").'</td><td>';
|
print '<tr><td>'.$langs->trans("Category").'</td><td>';
|
||||||
print $object->dao->category_label;
|
print dol_escape_htmltag($object->dao->category_label);
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
|
|
||||||
// Severity
|
// Severity
|
||||||
print '<tr><td>'.$langs->trans("Severity").'</td><td>';
|
print '<tr><td>'.$langs->trans("Severity").'</td><td>';
|
||||||
print $object->dao->severity_label;
|
print dol_escape_htmltag($object->dao->severity_label);
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
|
|
||||||
// Creation date
|
// Creation date
|
||||||
@ -314,7 +315,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
|
|||||||
|
|
||||||
// Progression
|
// Progression
|
||||||
print '<tr><td>'.$langs->trans("Progression").'</td><td>';
|
print '<tr><td>'.$langs->trans("Progression").'</td><td>';
|
||||||
print ($object->dao->progress > 0 ? $object->dao->progress : '0').'%';
|
print ($object->dao->progress > 0 ? dol_escape_htmltag($object->dao->progress) : '0').'%';
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
|
|
||||||
print '</table>';
|
print '</table>';
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user