--- /tmp/dsg/dolibarr/htdocs/bookmarks/github_bookmarks.lib.php +++ /tmp/dsg/dolibarr/htdocs/bookmarks/client_bookmarks.lib.php @@ -29,176 +29,182 @@ */ function printDropdownBookmarksList() { - global $conf, $user, $db, $langs; - - require_once DOL_DOCUMENT_ROOT.'/bookmarks/class/bookmark.class.php'; - require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'; - - $langs->load("bookmarks"); - - $url = $_SERVER["PHP_SELF"]; - - if (!empty($_SERVER["QUERY_STRING"])) { - $url .= (dol_escape_htmltag($_SERVER["QUERY_STRING"]) ? '?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]) : ''); - } else { - global $sortfield, $sortorder; - $tmpurl = ''; - // No urlencode, all param $url will be urlencoded later - if ($sortfield) { - $tmpurl .= ($tmpurl ? '&' : '').'sortfield='.$sortfield; - } - if ($sortorder) { - $tmpurl .= ($tmpurl ? '&' : '').'sortorder='.$sortorder; - } - if (is_array($_POST)) { - foreach ($_POST as $key => $val) { - if (preg_match('/^search_/', $key) && $val != '') { - $tmpurl .= ($tmpurl ? '&' : '').$key.'='.$val; - } - } - } - $url .= ($tmpurl ? '?'.$tmpurl : ''); - } - - $searchForm = ''."\n"; - $searchForm .= '
'; - - // Generate the return string - if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { - $html = $searchForm; - - $html .= ' + global $conf, $user, $db, $langs; + + require_once DOL_DOCUMENT_ROOT.'/bookmarks/class/bookmark.class.php'; + require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'; + + $langs->load("bookmarks"); + + $url = $_SERVER["PHP_SELF"]; + + if (!empty($_SERVER["QUERY_STRING"])) + { + $url .= (dol_escape_htmltag($_SERVER["QUERY_STRING"]) ? '?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]) : ''); + } + else + { + global $sortfield, $sortorder; + $tmpurl = ''; + // No urlencode, all param $url will be urlencoded later + if ($sortfield) $tmpurl .= ($tmpurl ? '&' : '').'sortfield='.$sortfield; + if ($sortorder) $tmpurl .= ($tmpurl ? '&' : '').'sortorder='.$sortorder; + if (is_array($_POST)) + { + foreach ($_POST as $key => $val) + { + if (preg_match('/^search_/', $key) && $val != '') $tmpurl .= ($tmpurl ? '&' : '').$key.'='.$val; + } + } + $url .= ($tmpurl ? '?'.$tmpurl : ''); + } + + $searchForm = ''."\n"; + $searchForm .= ''; + + // Generate the return string + if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { + $html = $searchForm; + + $html .= ' '; - } else { - $html = ' - -'; @@ -239,7 +243,7 @@ } print ' | '; - if ($action == 'edit') print 'title).'">'; + if ($action == 'edit') print 'title).'">'; else print $object->title; print ' | '; - if ($action == 'edit') print 'url).'">'; + if ($action == 'edit') print 'url).'">'; else print 'target ? ' target="_blank"' : '').'>'.$object->url.''; print ' | '; @@ -260,8 +264,10 @@ if ($action == 'edit') { $liste = array(1=>$langs->trans("OpenANewWindow"), 0=>$langs->trans("ReplaceWindow")); - print $form->selectarray('target', $liste, GETPOSTISSET("target") ? GETPOST("target") : $object->target); - } else { + print $form->selectarray('target', $liste, isset($_POST["target"]) ? $_POST["target"] : $object->target); + } + else + { if ($object->target == 0) print $langs->trans("ReplaceWindow"); if ($object->target == 1) print $langs->trans("OpenANewWindow"); } @@ -270,14 +276,18 @@ print '
'.$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 ' |
'.$langs->trans("Position").' | '; - if ($action == 'edit') print 'position).'">'; + if ($action == 'edit') print 'position).'">'; else print $object->position; 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 " | ";