diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index 9e86de34c58..e3787b18c89 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -47,7 +47,6 @@ $subscriptionstatic=new Cotisation($db);
print_fiche_titre($langs->trans("MembersArea"));
-print '
';
- print '| '.$langs->trans("Parameter").' | '.$langs->trans("Value").' |
';
+ print '| '.$langs->trans("Parameter").' | '.$langs->trans("Value").' |
';
+
// Hide any PDF informations
$var=!$var;
- print '| '.$langs->trans("HideAnyVATInformationOnPDF").' | ';
+ print ' |
| '.$langs->trans("HideAnyVATInformationOnPDF").' | ';
print yn($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT,1);
print ' |
';
+
+ // Encrypt and protect PDF
+ $var=!$var;
+ print "";
+ print '| ';
+ $text = $langs->trans("ProtectAndEncryptPdfFiles");
+ $desc = $form->textwithpicto($text,$langs->transnoentities("ProtectAndEncryptPdfFilesDesc"),1);
+ print $desc;
+ print ' | ';
+ print '';
+ if($conf->global->PDF_SECURITY_ENCRYPTION == 1)
+ {
+ print img_picto($langs->trans("Active"),'tick');
+ }
+ print ' | ';
+ print '';
+ if ($conf->global->PDF_SECURITY_ENCRYPTION == 0)
+ {
+ print ''.$langs->trans("Activate").'';
+ }
+ if($conf->global->PDF_SECURITY_ENCRYPTION == 1)
+ {
+ print ''.$langs->trans("Disable").'';
+ }
+ print " | ";
+
+ print "";
+ print '
';
+
if ($conf->global->MAIN_FEATURES_LEVEL > 1)
{
//Desc
$var=!$var;
- print '| '.$langs->trans("HideDescOnPDF").' | ';
+ print ' |
| '.$langs->trans("HideDescOnPDF").' | ';
print yn($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC,1);
print ' |
';
//Ref
$var=!$var;
- print '| '.$langs->trans("HideRefOnPDF").' | ';
+ print ' |
| '.$langs->trans("HideRefOnPDF").' | ';
print yn($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF,1);
print ' |
';
//Details
$var=!$var;
- print '| '.$langs->trans("HideDetailsOnPDF").' | ';
+ print ' |
| '.$langs->trans("HideDetailsOnPDF").' | ';
print yn($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS,1);
print ' |
';
}
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index a78d2354141..9c4bfc67af4 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -154,19 +154,6 @@ else if ($action == 'disable_encryptdbpassconf')
}
}
-if ($action == 'activate_pdfsecurity')
-{
- dolibarr_set_const($db, "PDF_SECURITY_ENCRYPTION", "1",'chaine',0,'',$conf->entity);
- header("Location: security.php");
- exit;
-}
-else if ($action == 'disable_pdfsecurity')
-{
- dolibarr_del_const($db, "PDF_SECURITY_ENCRYPTION",$conf->entity);
- header("Location: security.php");
- exit;
-}
-
if ($action == 'activate_MAIN_SECURITY_DISABLEFORGETPASSLINK')
{
dolibarr_set_const($db, "MAIN_SECURITY_DISABLEFORGETPASSLINK", '1','chaine',0,'',$conf->entity);
@@ -364,37 +351,6 @@ print "";
print "";
print '';
-// Encryption et protection des PDF
-$var=!$var;
-print "";
-print '| ';
-$text = $langs->trans("ProtectAndEncryptPdfFiles");
-$desc = $form->textwithpicto($text,$langs->transnoentities("ProtectAndEncryptPdfFilesDesc"),1);
-print $desc;
-print ' | ';
-print '';
-if($conf->global->PDF_SECURITY_ENCRYPTION == 1)
-{
- print img_picto($langs->trans("Active"),'tick');
-}
-
-print ' | ';
-
-print '';
-if ($conf->global->PDF_SECURITY_ENCRYPTION == 0)
-{
- print ''.$langs->trans("Activate").'';
-}
-if($conf->global->PDF_SECURITY_ENCRYPTION == 1)
-{
- print ''.$langs->trans("Disable").'';
-}
-print " | ";
-
-print "";
-print '
';
-
-
// Disable link "Forget password" on logon
$var=!$var;
diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index 7f5abf388eb..8056080be23 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -1,5 +1,5 @@
+/* Copyright (C) 2004-2013 Laurent Destailleur
* Copyright (C) 2005-2012 Regis Houssin
*
* This program is free software; you can redistribute it and/or modify
@@ -111,7 +111,7 @@ if ($action == 'confirm_purge' && $confirm == 'yes' && $user->admin)
* View
*/
-llxHeader();
+llxHeader('',$langs->trans("Audit"));
$form=new Form($db);
@@ -124,11 +124,11 @@ $sql.= " u.login";
$sql.= " FROM ".MAIN_DB_PREFIX."events as e";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = e.fk_user";
$sql.= " WHERE e.entity = ".$conf->entity;
-if ($search_code) { $usefilter++; $sql.=" AND e.type LIKE '%".$search_code."%'"; }
-if ($search_ip) { $usefilter++; $sql.=" AND e.ip LIKE '%".$search_ip."%'"; }
-if ($search_user) { $usefilter++; $sql.=" AND u.login LIKE '%".$search_user."%'"; }
-if ($search_desc) { $usefilter++; $sql.=" AND e.description LIKE '%".$search_desc."%'"; }
-if ($search_ua) { $usefilter++; $sql.=" AND e.user_agent LIKE '%".$search_ua."%'"; }
+if ($search_code) { $usefilter++; $sql.=" AND e.type LIKE '%".$db->escape($search_code)."%'"; }
+if ($search_ip) { $usefilter++; $sql.=" AND e.ip LIKE '%".$db->escape($search_ip)."%'"; }
+if ($search_user) { $usefilter++; $sql.=" AND u.login LIKE '%".$db->escape($search_user)."%'"; }
+if ($search_desc) { $usefilter++; $sql.=" AND e.description LIKE '%".$db->escape($search_desc)."%'"; }
+if ($search_ua) { $usefilter++; $sql.=" AND e.user_agent LIKE '%".$db->escape($search_ua)."%'"; }
$sql.= $db->order($sortfield,$sortorder);
$sql.= $db->plimit($conf->liste_limit+1, $offset);
//print $sql;
@@ -138,7 +138,14 @@ if ($result)
$num = $db->num_rows($result);
$i = 0;
- print_barre_liste($langs->trans("ListOfSecurityEvents"), $page, $_SERVER["PHP_SELF"],"",$sortfield,$sortorder,'',$num,0,'setup');
+ $param='';
+ if ($search_code) $param.='&search_code='.$search_code;
+ if ($search_ip) $param.='&search_ip='.$search_ip;
+ if ($search_user) $param.='&search_user='.$search_user;
+ if ($search_desc) $param.='&search_desc='.$search_desc;
+ if ($search_ua) $param.='&search_ua='.$search_ua;
+
+ print_barre_liste($langs->trans("ListOfSecurityEvents"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, 0, 'setup');
if ($action == 'purge')
{
@@ -178,7 +185,7 @@ if ($result)
print '';
print '';
- print '';
+ //print '';
print ' | ';
print '';
diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index cf0138a0022..532a95f7317 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -60,9 +60,9 @@ llxHeader('',$title,'','',0,0,$arrayofjs,$arrayofcss);
print_fiche_titre($title);
-print '';
-
-print '| ';
+//print '';
+//print ' | ';
+print '';
print ' ';
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index cfcd8ee121c..c30d75192d8 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -87,8 +87,9 @@ llxHeader();
print_fiche_titre($langs->trans("CustomerArea"));
+print '';
+/*
print ' ';
-
print '';
if ((! empty($conf->propal->enabled) && $user->rights->propale->lire) ||
(! empty($conf->contrat->enabled) && $user->rights->contrat->lire) ||
@@ -96,6 +97,7 @@ if ((! empty($conf->propal->enabled) && $user->rights->propale->lire) ||
{
print '| ';
}
+*/
// Recherche Propal
if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
@@ -256,7 +258,8 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
}
}
-if ((! empty($conf->propal->enabled) && $user->rights->propale->lire) ||
+
+/*if ((! empty($conf->propal->enabled) && $user->rights->propale->lire) ||
(! empty($conf->contrat->enabled) && $user->rights->contrat->lire) ||
(! empty($conf->commande->enabled) && $user->rights->commande->lire))
{
@@ -266,8 +269,8 @@ if ((! empty($conf->propal->enabled) && $user->rights->propale->lire) ||
else
{
print ' | ';
-}
-
+}*/
+print '';
$NBMAX=3;
@@ -542,11 +545,10 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
}
-print ' | ';
-print ' ';
+//print ' |
';
+print '';
-print '';
+
+//print '';
+//print '';
+print '';
+
$var=false;
print ' ';
@@ -159,10 +162,8 @@ if ($resql)
}
-/*
- *
- */
-print '| ';
+//print ' | ';
+print '';
/*
@@ -272,7 +273,9 @@ if ($resql)
}
else dol_print_error($db);
-print ' | ';
+
+//print ' | ';
+print '';
llxFooter();
diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php
index c03004cf7b5..ec832a670d2 100644
--- a/htdocs/fourn/index.php
+++ b/htdocs/fourn/index.php
@@ -50,8 +50,11 @@ llxHeader("",$langs->trans("SuppliersArea"));
print_fiche_titre($langs->trans("SuppliersArea"));
-print '';
-print '';
+
+//print '';
+//print '';
+print '';
+
// Orders
$commande = new CommandeFournisseur($db);
@@ -221,8 +224,10 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
}
}
-print " | \n";
-print '';
+
+//print ' | ';
+print '';
+
/*
* List last modified supliers
@@ -314,10 +319,11 @@ if (count($companystatic->SupplierCategories))
print " \n";
}
-print " | \n";
-print " \n";
-$db->close();
+//print " | \n";
+print '';
llxFooter();
+
+$db->close();
?>
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index bb5baaaf698..f0ab56ae6f0 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -66,9 +66,11 @@ llxHeader("",$langs->trans("ProductsAndServices"),$helpurl);
print_fiche_titre($transAreaType);
-print '';
-print '';
+//print '';
+//print '';
+print '';
+
/*
* Zone recherche produit/service
@@ -156,7 +158,10 @@ print $total;
print ' | ';
print ' ';
-print ' | ';
+
+//print ' | ';
+print '';
+
/*
* Last modified products
@@ -253,7 +258,8 @@ else
dol_print_error($db);
}
-print ' | ';
+//print ' |
';
+print '