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

Bookmarks can be publics

Browse Source
This commit is contained in:
Laurent Destailleur 2009-02-01 13:30:33 +00:00
parent a6c856b4b8
commit 971a470dde
3 changed files with 137 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
htdocs/bookmarks/bookmark.class.php
View File

@ -40,10 +40,11 @@ class Bookmark
var $fk_user; var $fk_user;
var $datec; var $datec;
var $url; var $url;
var $target; var $target; // 0=replace, 1=new window
var $title; var $title;
var $favicon; var $favicon;
/** /**
* \brief Constructeur * \brief Constructeur
* \param db Handler d'accès base de données * \param db Handler d'accès base de données
@ -61,7 +62,7 @@ class Bookmark
*/ */
function fetch($id) function fetch($id)
{ {
$sql = "SELECT rowid, fk_user, ".$this->db->pdate("dateb")." as datec, url, target,"; $sql = "SELECT rowid, fk_user, dateb as datec, url, target,";
$sql.= " title, favicon"; $sql.= " title, favicon";
$sql.= " FROM ".MAIN_DB_PREFIX."bookmark"; $sql.= " FROM ".MAIN_DB_PREFIX."bookmark";
$sql.= " WHERE rowid = ".$id; $sql.= " WHERE rowid = ".$id;
@ -76,7 +77,7 @@ class Bookmark
$this->ref = $obj->rowid; $this->ref = $obj->rowid;
$this->fk_user = $obj->fk_user; $this->fk_user = $obj->fk_user;
$this->datec = $obj->datec; $this->datec = $this->db->jdate($obj->datec);
$this->url = $obj->url; $this->url = $obj->url;
$this->target = $obj->target; $this->target = $obj->target;
$this->title = $obj->title; $this->title = $obj->title;
@ -87,7 +88,7 @@ class Bookmark
} }
else else
{ {
dolibarr_print_error ($this->db); dolibarr_print_error($this->db);
return -1; return -1;
} }
} }
@ -98,19 +99,25 @@ class Bookmark
*/ */
function create() function create()
{ {
// Clean parameters
$this->url=trim($this->url);
$this->title=trim($this->title);
$this->db->begin(); $this->db->begin();
$sql = "INSERT INTO ".MAIN_DB_PREFIX."bookmark (fk_user,dateb,url,target"; $sql = "INSERT INTO ".MAIN_DB_PREFIX."bookmark (fk_user,dateb,url,target";
$sql.= " ,title,favicon"; $sql.= " ,title,favicon";
if ($this->fk_soc) $sql.=",fk_soc"; if ($this->fk_soc) $sql.=",fk_soc";
$sql.= ")"; $sql.= ") VALUES (";
$sql.= " VALUES ('".$this->fk_user."', ".$this->db->idate(mktime()).","; $sql.= ($this->fk_user > 0?"'".$this->fk_user."'":"0").",";
$sql.= " ".$this->db->idate(gmmktime()).",";
$sql.= " '".$this->url."', '".$this->target."',"; $sql.= " '".$this->url."', '".$this->target."',";
$sql.= " '".addslashes($this->title)."', '".$this->favicon."'"; $sql.= " '".addslashes($this->title)."', '".$this->favicon."'";
if ($this->fk_soc) $sql.=",".$this->fk_soc; if ($this->fk_soc) $sql.=",".$this->fk_soc;
$sql.= ")"; $sql.= ")";
$resql = $this->db->query ($sql);
dolibarr_syslog("Bookmark::update sql=".$sql, LOG_DEBUG);
$resql = $this->db->query ($sql);
if ($resql) if ($resql)
{ {
$id = $this->db->last_insert_id(MAIN_DB_PREFIX."bookmark"); $id = $this->db->last_insert_id(MAIN_DB_PREFIX."bookmark");
@ -143,22 +150,27 @@ class Bookmark
*/ */
function update() function update()
{ {
$sql = "UPDATE ".MAIN_DB_PREFIX."bookmark"; // Clean parameters
$sql.= " SET fk_user = '".$this->fk_user."'"; $this->url=trim($this->url);
$sql.= " ,dateb = '".$this->datec."'"; $this->title=trim($this->title);
$sql.= " ,url = '".$this->url."'";
$sql = "UPDATE ".MAIN_DB_PREFIX."bookmark";
$sql.= " SET fk_user = ".($this->fk_user > 0?"'".$this->fk_user."'":"0");
$sql.= " ,dateb = '".$this->db->idate($this->datec)."'";
$sql.= " ,url = '".addslashes($this->url)."'";
$sql.= " ,target = '".$this->target."'"; $sql.= " ,target = '".$this->target."'";
$sql.= " ,title = '".$this->title."'"; $sql.= " ,title = '".addslashes($this->title)."'";
$sql.= " ,favicon = '".$this->favicon."'"; $sql.= " ,favicon = '".$this->favicon."'";
$sql.= " WHERE rowid = ".$this->id; $sql.= " WHERE rowid = ".$this->id;
dolibarr_syslog("Bookmark::update sql=".$sql, LOG_DEBUG);
if ($this->db->query ($sql)) if ($this->db->query ($sql))
{ {
return 1; return 1;
} }
else else
{ {
$this->error=$this->db->error(); $this->error=$this->db->lasterror();
return -1; return -1;
} }
} }
@ -173,6 +185,7 @@ class Bookmark
$sql = "DELETE FROM ".MAIN_DB_PREFIX."bookmark"; $sql = "DELETE FROM ".MAIN_DB_PREFIX."bookmark";
$sql .= " WHERE rowid = ".$id; $sql .= " WHERE rowid = ".$id;
dolibarr_syslog("Bookmark::remove sql=".$sql, LOG_DEBUG);
$resql=$this->db->query ($sql); $resql=$this->db->query ($sql);
if ($resql) if ($resql)
{ {
@ -180,7 +193,7 @@ class Bookmark
} }
else else
{ {
$this->error=$this->db->error(); $this->error=$this->db->lasterror();
return -1; return -1;
} }

112
htdocs/bookmarks/fiche.php
View File

@ -34,17 +34,18 @@ $action=isset($_GET["action"])?$_GET["action"]:$_POST["action"];
$title=isset($_GET["title"])?$_GET["title"]:$_POST["title"]; $title=isset($_GET["title"])?$_GET["title"]:$_POST["title"];
$url=isset($_GET["url"])?$_GET["url"]:$_POST["url"]; $url=isset($_GET["url"])?$_GET["url"]:$_POST["url"];
$target=isset($_GET["target"])?$_GET["target"]:$_POST["target"]; $target=isset($_GET["target"])?$_GET["target"]:$_POST["target"];
$userid=isset($_GET["userid"])?$_GET["userid"]:$_POST["userid"];
/* /*
* Actions * Actions
*/ */
if ($action == 'add' || $action == 'addproduct') if ($action == 'add' || $action == 'addproduct' || $action == 'update')
{ {
if ($_POST["cancel"]) if ($_POST["cancel"])
{ {
$urlsource=(! empty($_GET["urlsource"]))?$_GET["urlsource"]:((! empty($url))?$url:DOL_URL_ROOT.'/bookmarks/liste.php'); $urlsource=(! empty($_REQUEST["urlsource"]))?urldecode($_REQUEST["urlsource"]):((! empty($url))?urldecode($url):DOL_URL_ROOT.'/bookmarks/liste.php');
header("Location: ".$urlsource); header("Location: ".$urlsource);
exit; exit;
} }
@ -52,22 +53,25 @@ if ($action == 'add' || $action == 'addproduct')
$mesg=''; $mesg='';
$bookmark=new Bookmark($db); $bookmark=new Bookmark($db);
$bookmark->fk_user=$user->id; if ($action == 'update') $bookmark->fetch($_POST["id"]);
$bookmark->fk_user=$userid;
$bookmark->title=$title; $bookmark->title=$title;
$bookmark->url=$url; $bookmark->url=$url;
$bookmark->target=$target; $bookmark->target=$target;
if (! $title) $mesg.=($mesg?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->trans("BookmarkTitle")); if (! $title) $mesg.=($mesg?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->trans("BookmarkTitle"));
if (! $url) $mesg.=($mesg?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->trans("UrlOrLink")); if (! $url) $mesg.=($mesg?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->trans("UrlOrLink"));
if (! $mesg) if (! $mesg)
{ {
$bookmark->favicon='none'; $bookmark->favicon='none';
$res=$bookmark->create(); if ($action == 'update') $res=$bookmark->update();
else $res=$bookmark->create();
if ($res > 0) if ($res > 0)
{ {
$urlsource=isset($_GET["urlsource"])?$_GET["urlsource"]:DOL_URL_ROOT.'/bookmarks/liste.php'; $urlsource=isset($_REQUEST["urlsource"])?urldecode($_REQUEST["urlsource"]):DOL_URL_ROOT.'/bookmarks/liste.php';
header("Location: ".$urlsource); header("Location: ".$urlsource);
exit; exit;
} }
@ -90,7 +94,6 @@ if ($action == 'add' || $action == 'addproduct')
$mesg='<div class="error">'.$mesg.'</div>'; $mesg='<div class="error">'.$mesg.'</div>';
$action='create'; $action='create';
} }
} }
if ($_GET["action"] == 'delete') if ($_GET["action"] == 'delete')
@ -140,12 +143,18 @@ if ($action == 'create')
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td width="25%">'.$langs->trans("BookmarkTitle").'</td><td><input class="flat" name="title" size="30" value="'.$title.'"></td><td>'.$langs->trans("SetHereATitleForLink").'</td></tr>'; print '<tr><td width="25%">'.$langs->trans("BookmarkTitle").'</td><td><input class="flat" name="title" size="30" value="'.$title.'"></td><td>'.$langs->trans("SetHereATitleForLink").'</td></tr>';
print '<tr><td>'.$langs->trans("UrlOrLink").'</td><td><input class="flat" name="url" size="50" value="'.$url.'"></td><td>'.$langs->trans("UseAnExternalHttpLinkOrRelativeDolibarrLink").'</td></tr>'; print '<tr><td>'.$langs->trans("UrlOrLink").'</td><td><input class="flat" name="url" size="50" value="'.$url.'"></td><td>'.$langs->trans("UseAnExternalHttpLinkOrRelativeDolibarrLink").'</td></tr>';
print '<tr><td>'.$langs->trans("BehaviourOnClick").'</td><td>'; print '<tr><td>'.$langs->trans("BehaviourOnClick").'</td><td>';
$liste=array(1=>$langs->trans("OpenANewWindow"),0=>$langs->trans("ReplaceWindow")); $liste=array(0=>$langs->trans("ReplaceWindow"),1=>$langs->trans("OpenANewWindow"));
$html->select_array('target',$liste,1); $html->select_array('target',$liste,1);
print '</td><td>'.$langs->trans("ChooseIfANewWindowMustBeOpenedOnClickOnBookmark").'</td></tr>'; print '</td><td>'.$langs->trans("ChooseIfANewWindowMustBeOpenedOnClickOnBookmark").'</td></tr>';
print '<tr><td>'.$langs->trans("Owner").'</td><td>';
$html->select_users(isset($_POST['userid'])?$_POST['userid']:$user->id,'userid',1);
print '</td><td>&nbsp;</td></tr>';
print '<tr><td colspan="3" align="center">'; print '<tr><td colspan="3" align="center">';
print '<input type="submit" class="button" value="'.$langs->trans("CreateBookmark").'" name="create"> &nbsp; '; print '<input type="submit" class="button" value="'.$langs->trans("CreateBookmark").'" name="create"> &nbsp; ';
print '<input type="submit" class="button" value="'.$langs->trans("Cancel").'" name="cancel">'; print '<input type="submit" class="button" value="'.$langs->trans("Cancel").'" name="cancel">';
@ -160,7 +169,7 @@ if ($action == 'create')
if ($_GET["id"] > 0 && ! eregi('^add',$_GET["action"])) if ($_GET["id"] > 0 && ! eregi('^add',$_GET["action"]))
{ {
/* /*
* Fiche bookmark en mode edition * Fiche bookmark en mode visu ou edition
*/ */
$bookmark=new Bookmark($db); $bookmark=new Bookmark($db);
$bookmark->fetch($_GET["id"]); $bookmark->fetch($_GET["id"]);
@ -168,39 +177,86 @@ if ($_GET["id"] > 0 && ! eregi('^add',$_GET["action"]))
dolibarr_fiche_head($head, $hselected, $langs->trans("Bookmark")); dolibarr_fiche_head($head, $hselected, $langs->trans("Bookmark"));
if ($_GET["action"] == 'edit')
{
print '<form name="edit" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
print '<input type="hidden" name="action" value="update">';
print '<input type="hidden" name="id" value="'.$bookmark->id.'">';
print '<input type="hidden" name="urlsource" value="'.urlencode(DOL_URL_ROOT.'/bookmarks/fiche.php?id='.$bookmark->id).'">';
}
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td>'.$bookmark->ref.'</td></tr>'; print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td>'.$bookmark->ref.'</td></tr>';
print '<tr><td>'.$langs->trans("BookmarkTitle").'</td><td>'.$bookmark->title.'</td></tr>';
print '<tr><td>'.$langs->trans("BookmarkTitle").'</td><td>';
if ($_GET["action"] == 'edit') print '<input class="flat" name="title" size="30" value="'.(isset($_POST["title"])?$_POST["title"]:$bookmark->title).'">';
else print $bookmark->title;
print '</td></tr>';
print '<tr><td>'.$langs->trans("UrlOrLink").'</td><td>'; print '<tr><td>'.$langs->trans("UrlOrLink").'</td><td>';
print '<a href="'.(eregi('^http',$bookmark->url)?$bookmark->url:DOL_URL_ROOT.$bookmark->url).'" target="'.($bookmark->target?"":"newlink").'">'.$bookmark->url.'</a></td></tr>'; if ($_GET["action"] == 'edit') print '<input class="flat" name="url" size="80" value="'.(isset($_POST["url"])?$_POST["url"]:$bookmark->url).'">';
else print '<a href="'.(eregi('^http',$bookmark->url)?$bookmark->url:DOL_URL_ROOT.$bookmark->url).'"'.($bookmark->target?' target="_blank"':'').'>'.$bookmark->url.'</a>';
print '</td></tr>';
print '<tr><td>'.$langs->trans("BehaviourOnClick").'</td><td>'; print '<tr><td>'.$langs->trans("BehaviourOnClick").'</td><td>';
if ($bookmark->target == 0) print $langs->trans("OpenANewWindow"); if ($_GET["action"] == 'edit')
if ($bookmark->target == 1) print $langs->trans("ReplaceWindow");
print '</td></tr>';
print '<tr><td>'.$langs->trans("Owner").'</td><td>';
if ($bookmark->fk_user)
{ {
$fuser=new User($db); $liste=array(1=>$langs->trans("OpenANewWindow"),0=>$langs->trans("ReplaceWindow"));
$fuser->id=$bookmark->fk_user; $html->select_array('target',$liste,isset($_POST["target"])?$_POST["target"]:$bookmark->target);
$fuser->fetch(); }
//$fuser->nom=$fuser->login; $fuser->prenom=''; else
print $fuser->getNomUrl(1); {
} if ($bookmark->target == 0) print $langs->trans("ReplaceWindow");
else if ($bookmark->target == 1) print $langs->trans("OpenANewWindow");
{ }
print $langs->trans("Public");
}
print '</td></tr>'; print '</td></tr>';
print '<tr><td>'.$langs->trans("Owner").'</td><td>';
if ($_GET["action"] == 'edit' && $user->admin)
{
$html->select_users(isset($_POST['userid'])?$_POST['userid']:($bookmark->fk_user?$bookmark->fk_user:$user->id),'userid',1);
}
else
{
if ($bookmark->fk_user)
{
$fuser=new User($db);
$fuser->id=$bookmark->fk_user;
$fuser->fetch();
//$fuser->nom=$fuser->login; $fuser->prenom='';
print $fuser->getNomUrl(1);
}
else
{
print $langs->trans("Public");
}
}
print '</td></tr>';
print '<tr><td>'.$langs->trans("DateCreation").'</td><td>'.dolibarr_print_date($bookmark->datec,'dayhour').'</td></tr>'; print '<tr><td>'.$langs->trans("DateCreation").'</td><td>'.dolibarr_print_date($bookmark->datec,'dayhour').'</td></tr>';
if ($_GET["action"] == 'edit') print '<tr><td colspan="2" align="center"><input class="button" type="submit" name="save" value="'.$langs->trans("Save").'"> &nbsp; &nbsp; <input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'"></td></tr>';
print '</table>'; print '</table>';
if ($_GET["action"] == 'edit') print '</form>';
print "</div>\n"; print "</div>\n";
print "<div class=\"tabsAction\">\n"; print "<div class=\"tabsAction\">\n";
// Supprimer // Edit
if ($user->rights->bookmark->supprimer) if ($user->rights->bookmark->creer && $_GET["action"] != 'edit')
{
print " <a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?id=".$bookmark->id."&amp;action=edit\">".$langs->trans("Edit")."</a>\n";
}
// Remove
if ($user->rights->bookmark->supprimer && $_GET["action"] != 'edit')
{ {
print " <a class=\"butActionDelete\" href=\"liste.php?bid=".$bookmark->id."&amp;action=delete\">".$langs->trans("Delete")."</a>\n"; print " <a class=\"butActionDelete\" href=\"liste.php?bid=".$bookmark->id."&amp;action=delete\">".$langs->trans("Delete")."</a>\n";
} }

2
htdocs/user/group/fiche.php
View File

@ -167,7 +167,7 @@ if ($action == 'create')
if ($message) { print $message."<br>"; } if ($message) { print $message."<br>"; }
print '<form action="fiche.php" method="post">'; print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
print '<input type="hidden" name="action" value="add">'; print '<input type="hidden" name="action" value="add">';
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';