php-blog-cvs Mailing List for Serendipity PHP Weblog System (Page 551)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/php-blog/jBlog
In directory sc8-pr-cvs1:/tmp/cvs-serv575

Modified Files:
	jBlog-xmlrpc.php jBlog_functions.inc.php db.sql 
Log Message:
categories partially implemented

to update your schema
alter table jBlog_entries add (categoryid int) 

and add jBlog_category (at the bottom of db.sql)

categories must be added by hand

Posts via xml-rpc now support categories and clients which
support mt.getCategoryList via XML-RPC
 


Index: jBlog-xmlrpc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog-xmlrpc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6

--- jBlog-xmlrpc.php	10 Mar 2003 06:04:28 -0000	1.5
+++ jBlog-xmlrpc.php	13 Mar 2003 03:35:59 -0000	1.6
@@ -73,6 +73,8 @@
 
 function mt_getCategoryList($message)
 {
+    global $jBlog;
+
     $val = $message->params[1];
     $username = $val->getval();
     $val = $message->params[2];
@@ -80,8 +82,16 @@
     if(!jBlog_authenticate_author($username, $password)) {
         return new XML_RPC_Response('', 4, "Authentication Failed");
     }
-    return  new XML_RPC_Response( new XML_RPC_Value(array(), 'array'));
-//    return  new XML_RPC_Response( new XML_RPC_Value(array(new XML_RPC_Value(array( 'categoryId' => new XML_RPC_Value('1'), 'categoryName' => new XML_RPC_Value('default')), 'struct')), 'array'));
+    $cats = jBlog_fetchCategories($jBlog['authorid']);
+    $xml_entries_vals = array();
+    foreach ( $cats as $cat ) {
+        $xml_entries_vals[] = new XML_RPC_Value(
+            array(
+              'categoryId' => new XML_RPC_Value($cat['categoryid'], 'string'),
+              'categoryName' => new XML_RPC_Value($cat['category_name'], 'string')), 'struct'); 
+    }
+    $xml_entries = new XML_RPC_Value($xml_entries_vals, 'array');
+    return  new XML_RPC_Response($xml_entries); 
 }
 
 function mt_getRecentPostTitles($message)
@@ -152,7 +162,7 @@
     $val = $message->params[4];
     $entry['body']  = $val->getval();
     $entry['user'] = $username;
-    $id = jBlog_updertEntry($entry);
+    $id = jBlog_updateEntry($entry);
     return  new XML_RPC_Response( new XML_RPC_Value($id, 'string'));
 }
 
@@ -192,8 +202,9 @@
     $entry['body'] = $post_array['description'];
     $entry['extended'] = $post_array['mt_text_more'];
     $entry['user'] = $username;
+    $entry['authorid'] = $jBlog['authorid'];
     $entry['id'] = $postid;
-    $id = jBlog_updertEntry($entry);
+    $id = jBlog_updateEntry($entry);
     return  new XML_RPC_Response( new XML_RPC_Value($id));
 }
 
@@ -230,13 +241,24 @@
 
 function metaWeblog_setPostCategories($message)
 {
+    global $jBlog;
+    $val = $message->params[0];
+    $postid = $val->getval(); 
     $val = $message->params[1];
     $username = $val->getval();
     $val = $message->params[2];
     $password = $val->getval();
+    $val = $message->params[3];
+    $categories = $val->getval();
+    $category_ids = array();
+    foreach ($categories as $cat) {
+        $val = $cat['categoryId'];
+        $category_ids[] = $val->getval();
+    } 
     if(!jBlog_authenticate_author($username, $password)) {
         return new XML_RPC_Response('', 4, "Authentication Failed");
     }
+    jBlog_updateEntryCategories($postid, $category_ids);
     return  new XML_RPC_Response( new XML_RPC_Value(1, 'boolean'));
 }
 

Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- jBlog_functions.inc.php	11 Mar 2003 19:23:21 -0000	1.56
+++ jBlog_functions.inc.php	13 Mar 2003 03:35:59 -0000	1.57
@@ -189,7 +189,7 @@
         $limit = "LIMIT $limit";
     }
 
-    $query = "SELECT * FROM {$jBlog['dbPrefix']}entries e, {$jBlog['dbPrefix']}authors a WHERE e.authorid = a.authorid " . $and .
+    $query = "SELECT * FROM {$jBlog['dbPrefix']}entries e, {$jBlog['dbPrefix']}authors a left join {$jBlog['dbPrefix']}category c ON e.categoryid = c.categoryid  WHERE e.authorid = a.authorid " . $and .
              "ORDER BY timestamp DESC $limit";
     $ret = jBlog_db_query($query);
     if (!$ret) {
@@ -214,6 +214,22 @@
 }
 
 /**
+* Fetches a users categories
+**/
+function jBlog_fetchCategories($authorid) {
+	global $jBlog;
+    $querystring = "SELECT * FROM ".$jBlog['dbPrefix']."category 
+                    WHERE authorid = $authorid";
+    $query       = mysql_db_query($jBlog["dbName"], $querystring);
+    $retval = array();
+    while( $row = mysql_fetch_assoc($query)) {
+        $retval[] = $row;
+    }
+    return $retval;
+}
+
+
+/**
 * Give it a raw searchstring, it'll search
 **/
 function jBlog_searchEntries($term) {
@@ -279,7 +295,8 @@
 				. $entry['id']
 				. ".html\">Posted by "
 				. htmlentities($entry['username'])
-				. " at "
+				. ($entry['category_name']?(" in ${entry['category_name']}"):"")
+                ." at "
 				. date("H:i", $entry['timestamp'])
 				. "</a>";
 
@@ -849,7 +866,35 @@
 
     jBlog_purgeEntry($entry['id'], $entry['timestamp']);
    
-    return !$query  ? mysql_error() : true;
+    return mysql_error()?mysql_error():$entry['id'];
+}
+
+function jBlog_updateEntry($entry) {
+	global $jBlog;
+
+    $newEntry = 0;
+    $exflag = 0;
+
+	if (!is_numeric($entry["id"])) {
+        return;
+    }
+    if(strlen($entry["extended"])) {
+        $exflag = 1;
+    }
+    $querystring = "UPDATE ".$jBlog["dbPrefix"]."entries 
+                    SET title = '".mysql_escape_string($entry["title"])."',
+                        body = '".mysql_escape_string($entry["body"])."',
+                        extended = '".mysql_escape_string($entry["extended"])."',
+                        exflag = '$exflag' WHERE id = ".$entry["id"];
+    $query = mysql_db_query($jBlog["dbName"], $querystring);
+    if($exflag) {
+        jBlog_handle_references($entry['id'], $jBlog['blogTitle'], $entry['title'], $entry['extended'], $newEntry);
+    }
+    else {
+        jBlog_handle_references($entry['id'], $jBlog['blogTitle'], $entry['title'], $entry['body'], $newEntry);
+    }
+    jBlog_purgeEntry($entry['id'], $entry['timestamp']);
+    return mysql_error()?mysql_error():$entry['id'];
 }
 
 /**
@@ -1385,12 +1430,13 @@
     mysql_db_query($jBlog['dbName'], $gc);
 }
 
-function jBlog_displayTopReferrers() {
+function jBlog_displayTopReferrers($limit=10) {
     global $jBlog;
     $query = "SELECT url, sum(count) total
               FROM $jBlog[dbPrefix]referrers
               GROUP BY url
-              ORDER BY total desc";
+              ORDER BY total desc
+              LIMIT $limit";
     $cursor = mysql_db_query($jBlog['dbName'], $query);
     if($num_rows = mysql_num_rows($cursor)) {
         while($row = mysql_fetch_assoc($cursor)) {
@@ -1470,6 +1516,22 @@
 	}
 	$init = true;
 }
+
+function jBlog_updateEntryCategories($postid, $categories) {
+    global $jBlog;
+    if(!$postid || !$categories) {
+        return;
+    }
+    $query = "UPDATE $jBlog[dbPrefix]entries set categoryid = $categories[0] where id = $postid";
+    mysql_db_query($jBlog['dbName'], $query);
+    $fp = fopen("/tmp/a", "w");
+    fwrite($fp,$query);
+    if(mysql_error()) {
+        fwrite($fp, mysql_error());
+    }
+    fclose($fp);
+}
+
 
 define("JBLOG_FUNCTIONS_LOADED", true);
 ?>

Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/jBlog/db.sql,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- db.sql	11 Mar 2003 19:26:39 -0000	1.16
+++ db.sql	13 Mar 2003 03:35:59 -0000	1.17
@@ -45,6 +45,7 @@
   exflag int(1) default null,
   author varchar(20) default null,
   authorid int(11) default null,
+  categoryid int(11) default null,
   primary key  (id),
   fulltext key title (title,body,extended)
 ) type=myisam;
@@ -101,3 +102,11 @@
 	sort_order int(4) not null,
 	PRIMARY KEY(name)
 );
+
+CREATE TABLE {PREFIX}category (
+  categoryid int(11) NOT NULL auto_increment,
+  category_name varchar(255) default NULL,
+  category_description text,
+  authorid int(11) default NULL,
+  PRIMARY KEY  (categoryid)
+) TYPE=MyISAM;






2003	Jan	Feb	Mar (179)	Apr (56)	May (53)	Jun (65)	Jul (70)	Aug (89)	Sep (50)	Oct (38)	Nov (12)	Dec (12)
2004	Jan (57)	Feb (226)	Mar (172)	Apr (194)	May (120)	Jun (162)	Jul (297)	Aug (156)	Sep (312)	Oct (180)	Nov (358)	Dec (362)
2005	Jan (275)	Feb (224)	Mar (202)	Apr (157)	May (133)	Jun (115)	Jul (211)	Aug (257)	Sep (135)	Oct (116)	Nov (106)	Dec (81)
2006	Jan (74)	Feb (94)	Mar (59)	Apr (125)	May (50)	Jun (71)	Jul (45)	Aug (80)	Sep (3)	Oct (44)	Nov (50)	Dec (38)
2007	Jan (46)	Feb (33)	Mar (24)	Apr (28)	May (19)	Jun (37)	Jul (66)	Aug (73)	Sep (87)	Oct (33)	Nov (39)	Dec (37)
2008	Jan (20)	Feb (54)	Mar (47)	Apr (68)	May (10)	Jun (13)	Jul (13)	Aug (25)	Sep (11)	Oct (22)	Nov (22)	Dec (34)
2009	Jan (34)	Feb (35)	Mar (11)	Apr (10)	May (15)	Jun (18)	Jul (28)	Aug (22)	Sep (9)	Oct (12)	Nov (6)	Dec (32)
2010	Jan (11)	Feb (7)	Mar (9)	Apr (3)	May (16)	Jun (1)	Jul (2)	Aug (25)	Sep (9)	Oct (8)	Nov (4)	Dec (8)
2011	Jan (17)	Feb (1)	Mar (6)	Apr (7)	May (5)	Jun (2)	Jul (12)	Aug (3)	Sep (18)	Oct (3)	Nov (2)	Dec
2012	Jan (92)	Feb (74)	Mar (64)	Apr (55)	May (44)	Jun (91)	Jul (35)	Aug (42)	Sep (32)	Oct (56)	Nov (42)	Dec (81)
2013	Jan (117)	Feb (130)	Mar (33)	Apr (36)	May (155)	Jun (241)	Jul (113)	Aug (70)	Sep (50)	Oct (55)	Nov (34)	Dec (36)
2014	Jan (94)	Feb (67)	Mar (177)	Apr (67)	May (147)	Jun (137)	Jul (58)	Aug (56)	Sep (62)	Oct (35)	Nov (118)	Dec (53)
2015	Jan (204)	Feb (165)	Mar (275)	Apr (42)	May (58)	Jun (91)	Jul (81)	Aug (62)	Sep (23)	Oct (63)	Nov (29)	Dec (110)
2016	Jan (82)	Feb (55)	Mar (48)	Apr (92)	May (77)	Jun (41)	Jul (27)	Aug (41)	Sep (101)	Oct (84)	Nov (12)	Dec (18)
2017	Jan (44)	Feb (40)	Mar (23)	Apr (79)	May (27)	Jun (12)	Jul (20)	Aug (14)	Sep (3)	Oct (9)	Nov (4)	Dec (9)
2018	Jan (5)	Feb (23)	Mar (150)	Apr (114)	May (63)	Jun (25)	Jul (23)	Aug (54)	Sep (43)	Oct (10)	Nov (9)	Dec (1)
2019	Jan (1)	Feb (27)	Mar (27)	Apr (64)	May (21)	Jun (17)	Jul (12)	Aug (81)	Sep (15)	Oct (25)	Nov (15)	Dec (13)
2020	Jan (5)	Feb (4)	Mar (95)	Apr (59)	May (53)	Jun (22)	Jul (3)	Aug (13)	Sep (10)	Oct (4)	Nov (3)	Dec (1)
2021	Jan (20)	Feb (32)	Mar (34)	Apr (22)	May (58)	Jun (43)	Jul (35)	Aug (2)	Sep (14)	Oct (1)	Nov (2)	Dec
2022	Jan (2)	Feb (6)	Mar (4)	Apr	May (5)	Jun (4)	Jul (3)	Aug (5)	Sep (6)	Oct (3)	Nov (38)	Dec (15)
2023	Jan (26)	Feb (12)	Mar (3)	Apr (9)	May (2)	Jun (5)	Jul (8)	Aug	Sep (39)	Oct (11)	Nov (3)	Dec (3)
2024	Jan (19)	Feb (20)	Mar (15)	Apr (12)	May (2)	Jun (12)	Jul (4)	Aug (9)	Sep	Oct	Nov	Dec
2025	Jan (72)	Feb (80)	Mar (92)	Apr (35)	May (19)	Jun (26)	Jul (30)	Aug (2)	Sep (35)	Oct	Nov	Dec

php-blog-cvs Mailing List for Serendipity PHP Weblog System (Page 551)

A reliable, secure & extensible PHP blog | Not mainstream since 2002

php-blog-cvs — Serendipity commit list