| '.$langs->trans("Owner").' | ';
if ($action == 'edit' && $user->admin)
{
- print img_picto('', 'user').' '.$form->select_dolusers(GETPOSTISSET('userid') ? GETPOST('userid', 'int') : ($object->fk_user ? $object->fk_user : ''), 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
- } else {
+ print img_picto('', 'user').' '.$form->select_dolusers(isset($_POST['userid']) ? $_POST['userid'] : ($object->fk_user ? $object->fk_user : ''), 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+ }
+ else
+ {
if ($object->fk_user > 0)
{
$fuser = new User($db);
$fuser->fetch($object->fk_user);
print $fuser->getNomUrl(1);
- } else {
+ }
+ else
+ {
print $langs->trans("Public");
}
}
@@ -285,7 +295,7 @@
// Position
print ' |
*
* 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
@@ -27,12 +27,12 @@
// Load translation files required by the page
$langs->loadLangs(array('bookmarks', 'admin'));
-$action = GETPOST('action', 'aZ09');
+$action = GETPOST('action', 'alpha');
$massaction = GETPOST('massaction', 'alpha');
$show_files = GETPOST('show_files', 'int');
$confirm = GETPOST('confirm', 'alpha');
$toselect = GETPOST('toselect', 'array');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'bookmarklist'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'myobjectlist'; // To manage different context of search
// Security check
if (!$user->rights->bookmark->lire) {
@@ -42,8 +42,8 @@
// Load variable for pagination
$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'aZ09comma');
-$sortorder = GETPOST('sortorder', 'aZ09comma');
+$sortfield = GETPOST('sortfield', 'alpha');
+$sortorder = GETPOST('sortorder', 'alpha');
$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; } // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
$offset = $limit * $page;
@@ -72,7 +72,9 @@
{
header("Location: ".$_SERVER["PHP_SELF"]);
exit;
- } else {
+ }
+ else
+ {
setEventMessages($object->error, $object->errors, 'errors');
}
}
@@ -113,7 +115,9 @@
if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
{
$num = $nbtotalofrecords;
-} else {
+}
+else
+{
$sql .= $db->plimit($limit + 1, $offset);
$resql = $db->query($sql);
@@ -154,7 +158,7 @@
print '';
$newcardbutton = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/bookmarks/card.php?action=create&backtopage='.urlencode(DOL_URL_ROOT.'/bookmarks/list.php'), '', !empty($user->rights->bookmark->creer));
+$newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/bookmarks/card.php?action=create', '', !empty($user->rights->bookmark->creer));
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'bookmark', 0, $newcardbutton, '', $limit, 0, 0, 1);
@@ -197,14 +201,14 @@
// Title
print "";
$linkintern = 1;
- if ($linkintern) print '';
+ if ($linkintern) print "url."\">";
print $title;
if ($linkintern) print "";
print " | \n";
// Url
print '';
- if (!$linkintern) print 'target ? ' target="newlink" rel="noopener"' : '').'>';
+ if (!$linkintern) print 'target ? ' target="newlink"' : '').'>';
print $link;
if (!$linkintern) print '';
print " | \n";
@@ -226,7 +230,9 @@
}
$tmpuser = $cacheOfUsers[$obj->fk_user];
print $tmpuser->getNomUrl(1);
- } else {
+ }
+ else
+ {
print $langs->trans("Public");
}
print "\n";
@@ -241,12 +247,14 @@
print '';
if ($user->rights->bookmark->creer)
{
- print ''.img_edit()."";
+ print 'rowid."&backtopage=".urlencode($_SERVER["PHP_SELF"]).'">'.img_edit()."";
}
if ($user->rights->bookmark->supprimer)
{
- print 'rowid.'">'.img_delete().'';
- } else {
+ print 'rowid.'">'.img_delete().'';
+ }
+ else
+ {
print " ";
}
print " | ";