emile Sun Mar 4 13:54:00 2001 EDT
Modified files:
/php4/ext/midgard oop.c
Log:
Fetch sitegroup field if available
Index: php4/ext/midgard/oop.c
diff -u php4/ext/midgard/oop.c:1.9 php4/ext/midgard/oop.c:1.10
--- php4/ext/midgard/oop.c:1.9 Tue Feb 27 17:00:32 2001
+++ php4/ext/midgard/oop.c Sun Mar 4 13:54:00 2001
@@ -1,4 +1,4 @@
-/* $Id: oop.c,v 1.9 2001/02/28 01:00:32 davidg Exp $
+/* $Id: oop.c,v 1.10 2001/03/04 21:54:00 emile Exp $
Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
Copyright (C) 2000 The Midgard Project ry
Copyright (C) 2000 Emile Heyns, Aurora SA <[EMAIL PROTECTED]>
@@ -454,6 +454,12 @@
void php_midgard_get_object(zval *return_value, int table, int id)
{
+#if HAV_MIDGARD_SITEGROUPS
+#define MGD_GET_OBJECT_SITEGROUP_FIELD ",sitegroup"
+#else
+#define MGD_GET_OBJECT_SITEGROUP_FIELD ""
+#endif
+
switch (table) {
case MIDGARD_OBJECT_ARTICLE:
php_midgard_get(&MidgardArticle, return_value,
@@ -467,37 +473,42 @@
"Unix_Timestamp(approved) AS approved,approver,"
"Unix_Timestamp(locked) AS locked,locker,"
"url,icon,view,print,"
- CALENDAR_FIELDS,
+ CALENDAR_FIELDS
+ MGD_GET_OBJECT_SITEGROUP_FIELD,
"article", id);
break;
case MIDGARD_OBJECT_BLOBS:
php_midgard_get(&MidgardAttachment, return_value,
- "id,name,title,mimetype,score,author,created,ptable,pid",
+ "id,name,title,mimetype,score,author,created,ptable,pid"
+ MGD_GET_OBJECT_SITEGROUP_FIELD,
"blobs", id);
break;
case MIDGARD_OBJECT_ELEMENT:
php_midgard_get(&MidgardElement, return_value,
- "id,style,name,value",
+ "id,style,name,value" MGD_GET_OBJECT_SITEGROUP_FIELD,
"element", id);
break;
case MIDGARD_OBJECT_EVENT:
php_midgard_get(&MidgardEvent, return_value,
"id,up,start,end,title,description,"
- "type,extra,owner,creator,created,revisor,revised,revision,busy",
+ "type,extra,owner,creator,created,revisor,revised,revision,busy"
+ MGD_GET_OBJECT_SITEGROUP_FIELD,
"event", id);
break;
case MIDGARD_OBJECT_EVENTMEMBER:
- php_midgard_get(&MidgardEventMember, return_value, "id,eid,uid,extra",
+ php_midgard_get(&MidgardEventMember, return_value, "id,eid,uid,extra"
+ MGD_GET_OBJECT_SITEGROUP_FIELD,
"eventmember", id);
break;
case MIDGARD_OBJECT_FILE:
php_midgard_get(&MidgardFile, return_value,
- "id,article,type,name,content,size,md5",
+ "id,article,type,name,content,size,md5"
+ MGD_GET_OBJECT_SITEGROUP_FIELD,
"file", id);
break;
@@ -505,14 +516,16 @@
php_midgard_get(&MidgardGroup, return_value,
"id,name,official," ADDRESS_FIELDS ","
GROUP_HOMEPAGE_FIELDS "," GROUP_EMAIL_FIELDS ","
- "extra,owner",
+ "extra,owner"
+ MGD_GET_OBJECT_SITEGROUP_FIELD,
"grp", id);
break;
case MIDGARD_OBJECT_HOST:
php_midgard_get(&MidgardHost, return_value,
"id,name,port,online,root,style,info&1 AS
auth,owner,prefix,"
- HOSTNAME_FIELD,
+ HOSTNAME_FIELD
+ MGD_GET_OBJECT_SITEGROUP_FIELD,
"host", id);
break;
@@ -520,32 +533,37 @@
php_midgard_get(&MidgardImage, return_value,
"id,src,x,y,info&1=1 AS offline,"
"If(info&1,Concat('<img src=\"/img/',src,"
- "'\" width=\"',x,'\" height=\"',y,'\">'),'') AS img",
+ "'\" width=\"',x,'\" height=\"',y,'\">'),'') AS img"
+ MGD_GET_OBJECT_SITEGROUP_FIELD,
"image", id);
break;
case MIDGARD_OBJECT_MEMBER:
php_midgard_get(&MidgardMember, return_value,
- "id,gid,uid,extra", "member", id);
+ "id,gid,uid,extra" MGD_GET_OBJECT_SITEGROUP_FIELD,
+ "member", id);
break;
case MIDGARD_OBJECT_PAGE:
php_midgard_get(&MidgardPage, return_value,
"id,up,name,style,title,changed,content,author,"
- "info&1=1 AS auth,info&2=2 AS active",
+ "info&1=1 AS auth,info&2=2 AS active"
+ MGD_GET_OBJECT_SITEGROUP_FIELD,
"page", id);
break;
case MIDGARD_OBJECT_PAGEELEMENT:
php_midgard_get(&MidgardPageElement, return_value,
- "id,page,name,value,info&1 AS inherit",
+ "id,page,name,value,info&1 AS inherit"
+ MGD_GET_OBJECT_SITEGROUP_FIELD,
"pageelement", id);
break;
#if HAVE_MIDGARD_PAGELINKS
case MIDGARD_OBJECT_PAGELINK:
php_midgard_get(&MidgardPagelink, return_value,
- "id,up,name,target,grp,owner",
+ "id,up,name,target,grp,owner"
+ MGD_GET_OBJECT_SITEGROUP_FIELD,
"pagelink", id);
break;
#endif
@@ -559,7 +577,8 @@
ADDRESS_FIELDS "," PHONE_FIELDS ","
HOMEPAGE_FIELDS "," EMAIL_FIELDS ","
"Date_format(birthdate,'%d.%m.%Y') AS birthdate,extra,"
- "img,topic,department,office,pgpkey," PUBLIC_FIELDS,
+ "img,topic,department,office,pgpkey," PUBLIC_FIELDS
+ MGD_GET_OBJECT_SITEGROUP_FIELD,
"person", id);
else
php_midgard_get(&MidgardPerson, return_value,
@@ -578,12 +597,15 @@
PUBLIC_FIELD(16,email) ","
"'' AS birthdate," PUBLIC_FIELD(32,extra) ","
PUBLIC_FIELD(32,img) ",topic,department,office,pgpkey,"
- PUBLIC_FIELDS, "person", id);
+ PUBLIC_FIELDS
+ MGD_GET_OBJECT_SITEGROUP_FIELD,
+ "person", id);
break;
case MIDGARD_OBJECT_PREFERENCE:
php_midgard_get(&MidgardPreferences, return_value,
- "id,uid,domain,name,value", "preference", id);
+ "id,uid,domain,name,value" MGD_GET_OBJECT_SITEGROUP_FIELD,
+ "preference", id);
break;
#if HAVE_MIDGARD_SITEGROUPS
@@ -596,24 +618,28 @@
case MIDGARD_OBJECT_SNIPPET:
php_midgard_get(&MidgardSnippet, return_value,
"id,up,name,code,doc,author,creator,created,revisor,"
- "revised,revision",
+ "revised,revision" MGD_GET_OBJECT_SITEGROUP_FIELD,
"snippet", id);
break;
case MIDGARD_OBJECT_SNIPPETDIR:
- php_midgard_get(&MidgardSnippetdir, return_value,
"id,up,name,description,owner",
+ php_midgard_get(&MidgardSnippetdir, return_value,
+"id,up,name,description,owner"
+ MGD_GET_OBJECT_SITEGROUP_FIELD,
"snippetdir", id);
break;
case MIDGARD_OBJECT_STYLE:
- php_midgard_get(&MidgardStyle, return_value, "id,up,name,owner", "style",
id);
+ php_midgard_get(&MidgardStyle, return_value, "id,up,name,owner"
+ MGD_GET_OBJECT_SITEGROUP_FIELD,
+ "style", id);
break;
case MIDGARD_OBJECT_TOPIC:
php_midgard_get(&MidgardTopic, return_value,
"id,up,score,name,description,extra,owner,code,"
"creator,Unix_timestamp(created) as created,"
- "revisor,Unix_timestamp(revised) as revised,revision",
+ "revisor,Unix_timestamp(revised) as revised,revision"
+ MGD_GET_OBJECT_SITEGROUP_FIELD,
"topic", id);
break;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
