[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] bookmarks/inc class.ui.inc.php, 1.12 class.sqlquery.i
From: |
ceb |
Subject: |
[Phpgroupware-cvs] bookmarks/inc class.ui.inc.php, 1.12 class.sqlquery.inc.php, 1.7 class.so.inc.php, 1.6 class.bo.inc.php, 1.8 |
Date: |
Tue, 21 Jun 2005 17:25:00 +0200 |
Update of bookmarks/inc
Modified Files:
Branch: MAIN
class.ui.inc.php lines: +7 -5
class.sqlquery.inc.php lines: +2 -2
class.so.inc.php lines: +9 -9
class.bo.inc.php lines: +6 -4
Log Message:
bugfix #6312 + header correction
====================================================
Index: bookmarks/inc/class.ui.inc.php
diff -u bookmarks/inc/class.ui.inc.php:1.11 bookmarks/inc/class.ui.inc.php:1.12
--- bookmarks/inc/class.ui.inc.php:1.11 Wed May 4 13:35:48 2005
+++ bookmarks/inc/class.ui.inc.php Tue Jun 21 15:25:16 2005
@@ -1,14 +1,16 @@
<?php
/**
- * Bookmarks
+ * phpGroupWare - Bookmarks
+ * http://www.phpgroupware.org
* @author Joseph Engo
* @author Michael Totschnig
- * @copyright Copyright (C) 1998 Padraic Renaghan
* @copyright Copyright (C) 2005 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package bookmarks
* @version $Id$
- * @internal http://www.renaghan.com/bookmarker
+ * @internal Based on Bookmarker, Copyright (C) 1998 Padraic Renaghan,
http://www.renaghan.com/bookmarker
+ * @internal Ported to phpGroupWare by Joseph Engo
+ * @internal Ported to three-layered design by Michael Totschnig
* @todo Class must be renamed to avoid conflicts
*/
@@ -1208,4 +1210,4 @@
$this->t->pfp('out','body');
$GLOBALS['phpgw']->common->phpgw_footer();
}
- }
\ No newline at end of file
+ }
====================================================
Index: bookmarks/inc/class.sqlquery.inc.php
diff -u bookmarks/inc/class.sqlquery.inc.php:1.6
bookmarks/inc/class.sqlquery.inc.php:1.7
--- bookmarks/inc/class.sqlquery.inc.php:1.6 Thu Apr 28 18:59:46 2005
+++ bookmarks/inc/class.sqlquery.inc.php Tue Jun 21 15:25:16 2005
@@ -4,7 +4,7 @@
* @author Boris Erdmann, Kristian Koehntopp
* @author Michael Totschnig
* @copyright Copyright (C) 1998-2000 NetUSE AG
- * @copyright Copyright (C) 2005 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @copyright Portions Copyright (C) 2005 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package bookmarks
* @version $Id$
====================================================
Index: bookmarks/inc/class.so.inc.php
diff -u bookmarks/inc/class.so.inc.php:1.5 bookmarks/inc/class.so.inc.php:1.6
--- bookmarks/inc/class.so.inc.php:1.5 Thu Apr 28 18:59:46 2005
+++ bookmarks/inc/class.so.inc.php Tue Jun 21 15:25:16 2005
@@ -1,18 +1,19 @@
<?php
/**
- * Bookmarks
+ * phpGroupWare - Bookmarks
+ * http://www.phpgroupware.org
* @author Joseph Engo
* @author Michael Totschnig
- * @copyright Copyright (C) 1998 Padraic Renaghan
* @copyright Copyright (C) 2005 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package bookmarks
* @version $Id$
- * @internal http://www.renaghan.com/bookmarker
+ * @internal Based on Bookmarker, Copyright (C) 1998 Padraic Renaghan,
http://www.renaghan.com/bookmarker
+ * @internal Ported to phpGroupWare by Joseph Engo
+ * @internal Ported to three-layered design by Michael Totschnig
* @todo Class must be renamed to avoid conflicts
*/
-
/**
* Bookmarks storage object class
*
@@ -25,7 +26,7 @@
function so()
{
- $this->db = $GLOBALS['phpgw']->db;
+ $this->db = $GLOBALS['phpgw']->db;
}
function _list($cat_list,$public_user_list,$start,$where_clause)
@@ -150,7 +151,7 @@
$this->db->query("select bm_info from phpgw_bookmarks
where bm_id='$id'",__LINE__,__FILE__);
$this->db->next_record();
- $ts = explode(',',$GLOBALS['phpgw']->db->f('bm_info'));
+ $ts = explode(',',$this->db->f('bm_info'));
$timestamps = sprintf('%s,%s,%s',$ts[0],$ts[1],time());
@@ -165,7 +166,6 @@
if ($this->db->query($query,__LINE__,__FILE__))
{
-
return true;
}
else
@@ -190,4 +190,4 @@
}
return true;
}
- }
\ No newline at end of file
+ }
====================================================
Index: bookmarks/inc/class.bo.inc.php
diff -u bookmarks/inc/class.bo.inc.php:1.7 bookmarks/inc/class.bo.inc.php:1.8
--- bookmarks/inc/class.bo.inc.php:1.7 Thu Apr 28 18:59:46 2005
+++ bookmarks/inc/class.bo.inc.php Tue Jun 21 15:25:16 2005
@@ -1,14 +1,16 @@
<?php
/**
- * Bookmarks
+ * phpGroupWare - Bookmarks
+ * http://www.phpgroupware.org
* @author Joseph Engo
* @author Michael Totschnig
- * @copyright Copyright (C) 1998 Padraic Renaghan
* @copyright Copyright (C) 2005 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package bookmarks
* @version $Id$
- * @internal http://www.renaghan.com/bookmarker
+ * @internal Based on Bookmarker, Copyright (C) 1998 Padraic Renaghan,
http://www.renaghan.com/bookmarker
+ * @internal Ported to phpGroupWare by Joseph Engo
+ * @internal Ported to three-layered design by Michael Totschnig
* @todo Class must be renamed to avoid conflicts
*/
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] bookmarks/inc class.ui.inc.php, 1.12 class.sqlquery.inc.php, 1.7 class.so.inc.php, 1.6 class.bo.inc.php, 1.8,
ceb <=