emile Sat Mar 10 14:43:11 2001 EDT
Modified files:
/php4/ext/midgard attachment.c element.c event.c eventmember.c
file.c group.c host.c image.c member.c
mgd_internal.h midgard.c page.c pageelement.c
pagelink.c php_midgard.h preferences.c snippet.c
snippetdir.c style.c topic.c
Log:
Fetch sitegroup field when listing objects
Index: php4/ext/midgard/attachment.c
diff -u php4/ext/midgard/attachment.c:1.7 php4/ext/midgard/attachment.c:1.8
--- php4/ext/midgard/attachment.c:1.7 Wed Feb 28 07:50:06 2001
+++ php4/ext/midgard/attachment.c Sat Mar 10 14:43:10 2001
@@ -1,4 +1,4 @@
-/* $Id: attachment.c,v 1.7 2001/02/28 15:50:06 davidg Exp $
+/* $Id: attachment.c,v 1.8 2001/03/10 22:43:10 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]>
@@ -224,7 +224,7 @@
}
php_midgard_select(&MidgardAttachment, return_value,
- "id,name,title,mimetype,score,author,created",
+ "id,name,title,mimetype,score,author,created"
+SITEGROUP_SELECT,
"blobs", "ptable=$q AND pid=$d", order,
(*zv_table)->value.str.val, (*zv_id)->value.lval);
}
Index: php4/ext/midgard/element.c
diff -u php4/ext/midgard/element.c:1.6 php4/ext/midgard/element.c:1.7
--- php4/ext/midgard/element.c:1.6 Tue Mar 6 02:35:02 2001
+++ php4/ext/midgard/element.c Sat Mar 10 14:43:10 2001
@@ -1,4 +1,4 @@
-/* $Id: element.c,v 1.6 2001/03/06 10:35:02 emile Exp $
+/* $Id: element.c,v 1.7 2001/03/10 22:43:10 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]>
@@ -27,7 +27,7 @@
IDINIT;
CHECK_MGD;
php_midgard_select(&MidgardElement, return_value,
- "id,name", "element", "style=$d", "name", id);
+ "id,name" SITEGROUP_SELECT, "element", "style=$d", "name",
+id);
}
MGD_FUNCTION(ret_type, get_element, (type param))
Index: php4/ext/midgard/event.c
diff -u php4/ext/midgard/event.c:1.9 php4/ext/midgard/event.c:1.10
--- php4/ext/midgard/event.c:1.9 Tue Mar 6 02:35:02 2001
+++ php4/ext/midgard/event.c Sat Mar 10 14:43:10 2001
@@ -1,4 +1,4 @@
-/* $Id: event.c,v 1.9 2001/03/06 10:35:02 emile Exp $
+/* $Id: event.c,v 1.10 2001/03/10 22:43:10 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]>
@@ -278,12 +278,12 @@
if (typev == -1)
php_midgard_select(&MidgardEvent, return_value, "id,up,start,end,title,"
- "description,type,extra,owner,busy",
+ "description,type,extra,owner,busy"
+SITEGROUP_SELECT,
"event", "event.up=$d",
sortv, (*id)->value.lval);
else
php_midgard_select(&MidgardEvent, return_value, "id,up,start,end,title,"
- "description,type,extra,owner,busy",
+ "description,type,extra,owner,busy"
+SITEGROUP_SELECT,
"event",
"event.type=$d AND event.up=$d",
sortv, typev, (*id)->value.lval);
@@ -335,7 +335,7 @@
if (typev == -1)
php_midgard_select(&MidgardEvent, return_value, "id,up,start,end,title,"
- "description,type,extra,owner,busy",
+ "description,type,extra,owner,busy"
+SITEGROUP_SELECT,
"event", "event.up=$d AND "
"((event.start>=$d AND
event.start<=$d) OR "
"(event.start<=$d AND
event.end>=$d) OR "
@@ -346,7 +346,7 @@
(*start)->value.lval,(*end)->value.lval);
else
php_midgard_select(&MidgardEvent, return_value, "id,up,start,end,title,"
- "description,type,extra,owner,busy",
+ "description,type,extra,owner,busy"
+SITEGROUP_SELECT,
"event",
"event.type=$d AND event.up=$d AND "
"((event.start>=$d AND
event.start<=$d) OR "
@@ -402,12 +402,12 @@
RETURN_FALSE_BECAUSE(MGD_ERR_ERROR);
if (typev == -1)
php_midgard_select(&MidgardEvent, return_value,
"id,up,start,end,title,"
- "description,type,extra,owner,busy",
+ "description,type,extra,owner,busy"
+SITEGROUP_SELECT,
"event", "event.id IN $D",
sortv, events);
else
php_midgard_select(&MidgardEvent, return_value,
"id,up,start,end,title,"
- "description,type,extra,owner,busy",
+ "description,type,extra,owner,busy"
+SITEGROUP_SELECT,
"event",
"event.type=$d AND event.id IN $D",
sortv, typev, events);
@@ -417,11 +417,11 @@
else {
if (typev == -1)
php_midgard_select(&MidgardEvent, return_value,
"id,up,start,end,title,"
- "description,type,extra,owner,busy",
+ "description,type,extra,owner,busy"
+SITEGROUP_SELECT,
"event", NULL, sortv);
else
php_midgard_select(&MidgardEvent, return_value,
"id,up,start,end,title,"
- "description,type,extra,owner,busy",
+ "description,type,extra,owner,busy"
+SITEGROUP_SELECT,
"event", "event.type=$d",
sortv, typev);
}
@@ -478,7 +478,7 @@
RETURN_FALSE_BECAUSE(MGD_ERR_ERROR);
if (typev == -1)
php_midgard_select(&MidgardEvent, return_value,
"id,up,start,end,title,"
- "description,type,extra,owner,busy",
+ "description,type,extra,owner,busy"
+SITEGROUP_SELECT,
"event", "event.id in $D
AND "
"((event.start>=$d AND
event.start<=$d) OR "
"(event.start<=$d AND
event.end>=$d) OR "
@@ -489,7 +489,7 @@
(*start)->value.lval,(*end)->value.lval);
else
php_midgard_select(&MidgardEvent, return_value,
"id,up,start,end,title,"
- "description,type,extra,owner,busy",
+ "description,type,extra,owner,busy"
+SITEGROUP_SELECT,
"event",
"event.type=$d AND event.id IN $D AND "
"((event.start>=$d AND
event.start<=$d) OR "
@@ -503,7 +503,7 @@
} else {
if (typev == -1)
php_midgard_select(&MidgardEvent, return_value,
"id,up,start,end,title,"
- "description,type,extra,owner,busy",
+ "description,type,extra,owner,busy"
+SITEGROUP_SELECT,
"event",
"((event.start>=$d AND
event.start<=$d) OR "
"(event.start<=$d AND
event.end>=$d) OR "
@@ -514,7 +514,7 @@
(*start)->value.lval,(*end)->value.lval);
else
php_midgard_select(&MidgardEvent, return_value,
"id,up,start,end,title,"
- "description,type,extra,owner,busy",
+ "description,type,extra,owner,busy"
+SITEGROUP_SELECT,
"event",
"event.type=$d AND "
"((event.start>=$d AND
event.start<=$d) OR "
Index: php4/ext/midgard/eventmember.c
diff -u php4/ext/midgard/eventmember.c:1.6 php4/ext/midgard/eventmember.c:1.7
--- php4/ext/midgard/eventmember.c:1.6 Tue Mar 6 02:35:02 2001
+++ php4/ext/midgard/eventmember.c Sat Mar 10 14:43:10 2001
@@ -1,4 +1,4 @@
-/* $Id: eventmember.c,v 1.6 2001/03/06 10:35:02 emile Exp $
+/* $Id: eventmember.c,v 1.7 2001/03/10 22:43:10 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]>
@@ -238,6 +238,9 @@
php_midgard_select(&MidgardEventMember, return_value,
"eventmember.id AS
id,eid,uid,eventmember.extra"
", " EMAIL_FIELDS ", " NAME_FIELDS
+#if HAVE_MIDGARD_SITEGROUPS
+ ",eventmember.sitegroup"
+#endif
, "eventmember,person",
"eid=$d AND person.id=eventmember.uid",
sortv, (*id)->value.lval);
@@ -248,6 +251,9 @@
"eventmember.id AS id,eid,uid,eventmember.extra"
", " NAME_FIELDS ", " EVENT_PUBLIC_FIELD(16,email)
", " EVENT_EMAIL_FIELD
+#if HAVE_MIDGARD_SITEGROUPS
+ ",eventmember.sitegroup"
+#endif
,mgd_user(mgd_handle()), mgd_user(mgd_handle()));
php_midgard_select(&MidgardEventMember, return_value, query,
"eventmember,person",
"eid=$d AND person.id=eventmember.uid",
Index: php4/ext/midgard/file.c
diff -u php4/ext/midgard/file.c:1.6 php4/ext/midgard/file.c:1.7
--- php4/ext/midgard/file.c:1.6 Tue Mar 6 02:35:02 2001
+++ php4/ext/midgard/file.c Sat Mar 10 14:43:10 2001
@@ -1,4 +1,4 @@
-/* $Id: file.c,v 1.6 2001/03/06 10:35:02 emile Exp $
+/* $Id: file.c,v 1.7 2001/03/10 22:43:10 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]>
@@ -25,7 +25,7 @@
{
IDINIT;
CHECK_MGD;
- php_midgard_select(&MidgardFile, return_value,
"id,article,type,name,content,size,md5", "file", "article=$d", "name", id);
+ php_midgard_select(&MidgardFile, return_value,
+"id,article,type,name,content,size,md5" SITEGROUP_SELECT, "file", "article=$d",
+"name", id);
}
MGD_FUNCTION(ret_type, get_file, (type param))
Index: php4/ext/midgard/group.c
diff -u php4/ext/midgard/group.c:1.7 php4/ext/midgard/group.c:1.8
--- php4/ext/midgard/group.c:1.7 Tue Mar 6 02:35:02 2001
+++ php4/ext/midgard/group.c Sat Mar 10 14:43:10 2001
@@ -1,4 +1,4 @@
-/* $Id: group.c,v 1.7 2001/03/06 10:35:02 emile Exp $
+/* $Id: group.c,v 1.8 2001/03/10 22:43:10 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]>
@@ -37,7 +37,7 @@
switch (ZEND_NUM_ARGS()) {
case 0:
php_midgard_select(&MidgardGroup, return_value,
- "id,name,official", "grp", NULL, "name");
+ "id,name,official" SITEGROUP_SELECT, "grp", NULL, "name");
return;
case 1:
if (zend_get_parameters_ex(1, &id) == SUCCESS) {
@@ -49,7 +49,7 @@
}
if((*id)->value.lval && !mgd_exists_id(mgd_handle(), "grp", "id=$d",
(*id)->value.lval))
RETURN_FALSE_BECAUSE(MGD_ERR_NOT_EXISTS);
- php_midgard_select(&MidgardGroup, return_value, "id,name,official", "grp",
"owner=$d", "name",(*id)->value.lval);
+ php_midgard_select(&MidgardGroup, return_value, "id,name,official"
+SITEGROUP_SELECT, "grp", "owner=$d", "name",(*id)->value.lval);
}
MGD_FUNCTION(ret_type, get_group, (type param))
Index: php4/ext/midgard/host.c
diff -u php4/ext/midgard/host.c:1.6 php4/ext/midgard/host.c:1.7
--- php4/ext/midgard/host.c:1.6 Tue Mar 6 02:35:02 2001
+++ php4/ext/midgard/host.c Sat Mar 10 14:43:10 2001
@@ -1,4 +1,4 @@
-/* $Id: host.c,v 1.6 2001/03/06 10:35:02 emile Exp $
+/* $Id: host.c,v 1.7 2001/03/10 22:43:10 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]>
@@ -36,14 +36,14 @@
switch (ZEND_NUM_ARGS()) {
case 0:
php_midgard_select(&MidgardHost, return_value,
- "id,name,port,online,root,style,owner,info&1 AS auth,prefix,"
HOSTNAME_FIELD,
+ "id,name,port,online,root,style,owner,info&1 AS auth,prefix,"
+HOSTNAME_FIELD SITEGROUP_SELECT,
"host", NULL, "hostname, online DESC");
return;
case 1:
if (zend_get_parameters_ex(1, &id) == SUCCESS) {
convert_to_long_ex(id);
php_midgard_select(&MidgardHost, return_value,
- "id,name,port,online,root,style,owner,info&1 AS
auth,prefix," HOSTNAME_FIELD ,
+ "id,name,port,online,root,style,owner,info&1 AS
+auth,prefix," HOSTNAME_FIELD SITEGROUP_SELECT,
"host", "root=$d", "hostname, online DESC",
(*id)->value.lval);
break;
} /* else fall through */
Index: php4/ext/midgard/image.c
diff -u php4/ext/midgard/image.c:1.5 php4/ext/midgard/image.c:1.6
--- php4/ext/midgard/image.c:1.5 Tue Feb 27 17:00:31 2001
+++ php4/ext/midgard/image.c Sat Mar 10 14:43:10 2001
@@ -1,4 +1,4 @@
-/* $Id: image.c,v 1.5 2001/02/28 01:00:31 davidg Exp $
+/* $Id: image.c,v 1.6 2001/03/10 22:43:10 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]>
@@ -27,7 +27,7 @@
CHECK_MGD;
if (ZEND_NUM_ARGS() != 0)
WRONG_PARAM_COUNT;
- php_midgard_select(&MidgardImage, return_value, "id,src,x,y,info&1 AS online",
+ php_midgard_select(&MidgardImage, return_value, "id,src,x,y,info&1 AS online"
+SITEGROUP_SELECT,
"image", NULL, NULL);
}
Index: php4/ext/midgard/member.c
diff -u php4/ext/midgard/member.c:1.5 php4/ext/midgard/member.c:1.6
--- php4/ext/midgard/member.c:1.5 Tue Feb 27 17:00:31 2001
+++ php4/ext/midgard/member.c Sat Mar 10 14:43:10 2001
@@ -1,4 +1,4 @@
-/* $Id: member.c,v 1.5 2001/02/28 01:00:31 davidg Exp $
+/* $Id: member.c,v 1.6 2001/03/10 22:43:10 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]>
@@ -27,8 +27,11 @@
CHECK_MGD;
php_midgard_select(&MidgardMember, return_value, "member.id AS id, person.id AS
uid,"
NAME_FIELD " AS name," RNAME_FIELD " AS rname,department,"
- "member.extra as extra",
- "person,member", "member.gid=$d AND member.uid=person.id",
+ "member.extra as extra"
+#if HAVE_MIDGARD_SITEGROUPS
+ ",member.sitegroup"
+#endif
+ , "person,member", "member.gid=$d AND member.uid=person.id",
"lastname,firstname", id);
}
@@ -39,8 +42,11 @@
if (!isuserowner(id)) RETURN_FALSE_BECAUSE(MGD_ERR_ACCESS_DENIED);
php_midgard_select(&MidgardMember, return_value,
"distinct member.id AS id, gid, "
- "IF(gid!=0,name,'Midgard Administrators') AS
name",
- "grp,member", "member.uid=$d AND member.gid IN (0,grp.id)",
+ "IF(gid!=0,name,'Midgard Administrators') AS
+name"
+#if HAVE_MIDGARD_SITEGROUPS
+ ",member.sitegroup"
+#endif
+ , "grp,member", "member.uid=$d AND member.gid IN (0,grp.id)",
"name", id);
}
Index: php4/ext/midgard/mgd_internal.h
diff -u php4/ext/midgard/mgd_internal.h:1.9 php4/ext/midgard/mgd_internal.h:1.10
--- php4/ext/midgard/mgd_internal.h:1.9 Tue Mar 6 09:56:17 2001
+++ php4/ext/midgard/mgd_internal.h Sat Mar 10 14:43:10 2001
@@ -1,4 +1,4 @@
-/* $Id: mgd_internal.h,v 1.9 2001/03/06 17:56:17 davidg Exp $
+/* $Id: mgd_internal.h,v 1.10 2001/03/10 22:43:10 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]>
@@ -224,10 +224,16 @@
"'\\\">',email,'</a>'))"
#define GROUP_EMAIL_FIELDS "email," GROUP_EMAIL_FIELD " AS emaillink"
+#if HAVE_MIDGARD_SITEGROUPS
+#define SITEGROUP_SELECT ",sitegroup"
+#else
+#define SITEGROUP_SELECT ""
+#endif
+
/* Person macroses */
#define PERSON_SELECT \
"id,username," NAME_FIELD " AS name," RNAME_FIELD " AS rname,extra," \
- "topic,department,office,info&1 AS admin,info>1 AS public"
+ "topic,department,office,info&1 AS admin,info>1 AS public" SITEGROUP_SELECT
/* Article macroses */
#define CALENDAR_FIELD \
@@ -258,6 +264,13 @@
"Date_Format(From_Days(To_Days(calstart)+caldays),'%d.%m.%Y') As calstop"
#define ARTICLE_CALENDAR CALENDAR_FIELDS
+
+#if HAVE_MIDGARD_SITEGROUPS
+#define ARTICLE_SITEGROUP_SELECT ",article.sitegroup"
+#else
+#define ARTICLE_SITEGROUP_SELECT ""
+#endif
+
#define ARTICLE_SELECT \
"article.id AS id,article.name AS name,title,abstract,content,author," \
NAME_FIELD " AS authorname,article.topic AS topic," \
@@ -268,7 +281,8 @@
"Unix_Timestamp(article.created) AS created,article.creator AS creator," \
"Unix_Timestamp(revised) AS revised,revisor,revision," \
"Unix_Timestamp(locked) AS locked,locker," \
- "Unix_Timestamp(approved) AS approved,approver"
+ "Unix_Timestamp(approved) AS approved,approver" ARTICLE_SITEGROUP_SELECT
+
#define ARTICLE_SELECT_FAST \
"id,name,title,abstract,content,author,topic," \
"Date_format(article.created,'%d.%m.%Y') AS date," \
@@ -278,7 +292,8 @@
"Unix_Timestamp(article.created) AS created,article.creator AS creator," \
"Unix_Timestamp(revised) AS revised,revisor,revision," \
"Unix_Timestamp(locked) AS locked,locker," \
- "Unix_Timestamp(approved) AS approved,approver"
+ "Unix_Timestamp(approved) AS approved,approver" SITEGROUP_SELECT
+
#define ARTICLE_FROM "article,person"
#define ARTICLE_FROM_FAST "article"
Index: php4/ext/midgard/midgard.c
diff -u php4/ext/midgard/midgard.c:1.21 php4/ext/midgard/midgard.c:1.22
--- php4/ext/midgard/midgard.c:1.21 Tue Mar 6 09:56:17 2001
+++ php4/ext/midgard/midgard.c Sat Mar 10 14:43:10 2001
@@ -1,4 +1,4 @@
-/* $Id: midgard.c,v 1.21 2001/03/06 17:56:17 davidg Exp $
+/* $Id: midgard.c,v 1.22 2001/03/10 22:43:10 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]>
@@ -757,9 +757,10 @@
php_error(E_WARNING,"You must pass the fourth parameter by
reference.");
return 0;
}
- ALLOC_ZVAL(return_value); ZVAL_NULL(return_value);
- ALLOC_ZVAL(args[0]); ZVAL_LONG(args[0], id);
- ALLOC_ZVAL(args[1]); ZVAL_LONG(args[1], level);
+
+ MAKE_STD_ZVAL(return_value); ZVAL_NULL(return_value);
+ MAKE_STD_ZVAL(args[0]); ZVAL_LONG(args[0], id);
+ MAKE_STD_ZVAL(args[1]); ZVAL_LONG(args[1], level);
args[2] = xp[0]; // DG: is this needed ?
->zval_copy_ctor(args[2]);
if(call_user_function(CG(function_table), NULL,
Index: php4/ext/midgard/page.c
diff -u php4/ext/midgard/page.c:1.11 php4/ext/midgard/page.c:1.12
--- php4/ext/midgard/page.c:1.11 Tue Mar 6 02:35:02 2001
+++ php4/ext/midgard/page.c Sat Mar 10 14:43:10 2001
@@ -1,4 +1,4 @@
-/* $Id: page.c,v 1.11 2001/03/06 10:35:02 emile Exp $
+/* $Id: page.c,v 1.12 2001/03/10 22:43:10 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]>
@@ -63,7 +63,11 @@
IDINIT;
CHECK_MGD;
php_midgard_select(&MidgardPage, return_value, "page.id AS
id,name,style,title,changed,author,"
- NAME_FIELD " AS authorname", "page,person",
+ NAME_FIELD " AS authorname"
+#if HAVE_MIDGARD_SITEGROUPS
+ ",page.sitegroup"
+#endif
+ , "page,person",
"up=$d AND person.id=page.author", "name", id);
}
Index: php4/ext/midgard/pageelement.c
diff -u php4/ext/midgard/pageelement.c:1.6 php4/ext/midgard/pageelement.c:1.7
--- php4/ext/midgard/pageelement.c:1.6 Tue Mar 6 02:35:02 2001
+++ php4/ext/midgard/pageelement.c Sat Mar 10 14:43:10 2001
@@ -1,4 +1,4 @@
-/* $Id: pageelement.c,v 1.6 2001/03/06 10:35:02 emile Exp $
+/* $Id: pageelement.c,v 1.7 2001/03/10 22:43:10 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]>
@@ -25,7 +25,7 @@
{
IDINIT;
CHECK_MGD;
- php_midgard_select(&MidgardPageElement, return_value, "id,name", "pageelement",
"page=$d", "name", id);
+ php_midgard_select(&MidgardPageElement, return_value, "id,name" SITEGROUP_SELECT,
+"pageelement", "page=$d", "name", id);
}
MGD_FUNCTION(ret_type, get_page_element, (type param))
Index: php4/ext/midgard/pagelink.c
diff -u php4/ext/midgard/pagelink.c:1.5 php4/ext/midgard/pagelink.c:1.6
--- php4/ext/midgard/pagelink.c:1.5 Tue Feb 27 17:00:32 2001
+++ php4/ext/midgard/pagelink.c Sat Mar 10 14:43:10 2001
@@ -1,4 +1,4 @@
-/* $Id: pagelink.c,v 1.5 2001/02/28 01:00:32 davidg Exp $
+/* $Id: pagelink.c,v 1.6 2001/03/10 22:43:10 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]>
@@ -56,8 +56,11 @@
"page.title,"
"page.changed,"
"page.author,"
- NAME_FIELD " AS authorname",
- "pagelink,page,person",
+ NAME_FIELD " AS authorname"
+#if HAVE_MIDGARD_SITEGROUPS
+ ",pagelink.sitegroup"
+#endif
+ , "pagelink,page,person",
"pagelink.up=$d AND pagelink.target=page.id AND person.id=page.author",
"pagelink.name", id);
}
@@ -77,8 +80,11 @@
"page.title,"
"page.changed,"
"page.author,"
- NAME_FIELD " AS authorname",
- "pagelink,page,person",
+ NAME_FIELD " AS authorname"
+#if HAVE_MIDGARD_SITEGROUPS
+ ",pagelink.sitegroup"
+#endif
+ , "pagelink,page,person",
"pagelink.target=$d AND pagelink.up=page.id AND person.id=page.author",
"pagelink.name", id);
}
Index: php4/ext/midgard/php_midgard.h
diff -u php4/ext/midgard/php_midgard.h:1.7 php4/ext/midgard/php_midgard.h:1.8
--- php4/ext/midgard/php_midgard.h:1.7 Mon Feb 26 10:14:29 2001
+++ php4/ext/midgard/php_midgard.h Sat Mar 10 14:43:10 2001
@@ -1,4 +1,4 @@
-/* $Id: php_midgard.h,v 1.7 2001/02/26 18:14:29 andi Exp $
+/* $Id: php_midgard.h,v 1.8 2001/03/10 22:43:10 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]>
@@ -31,7 +31,7 @@
#include <php.h>
#include <midgard/midgard.h>
#include <midgard/apache.h>
-#include <Zend/zend_modules.h>
+/* #include <Zend/zend_modules.h> */
midgard_request_config *mgd_rcfg();
midgard_directory_config *mgd_dcfg();
Index: php4/ext/midgard/preferences.c
diff -u php4/ext/midgard/preferences.c:1.6 php4/ext/midgard/preferences.c:1.7
--- php4/ext/midgard/preferences.c:1.6 Tue Mar 6 02:35:02 2001
+++ php4/ext/midgard/preferences.c Sat Mar 10 14:43:10 2001
@@ -1,4 +1,4 @@
-/* $Id: preferences.c,v 1.6 2001/03/06 10:35:02 emile Exp $
+/* $Id: preferences.c,v 1.7 2001/03/10 22:43:10 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]>
@@ -57,11 +57,11 @@
RETURN_FALSE_BECAUSE(MGD_ERR_ACCESS_DENIED);
if (domain)
- php_midgard_select(&MidgardPreferences, return_value,
"id,uid,domain,name,value",
+ php_midgard_select(&MidgardPreferences, return_value,
+"id,uid,domain,name,value" SITEGROUP_SELECT,
"preference", "uid=$d AND
domain=$q", "name",
user, domain);
else
- php_midgard_select(&MidgardPreferences, return_value,
"id,uid,domain,name,value",
+ php_midgard_select(&MidgardPreferences, return_value,
+"id,uid,domain,name,value" SITEGROUP_SELECT,
"preference", "uid=$d",
"domain,name", user);
}
Index: php4/ext/midgard/snippet.c
diff -u php4/ext/midgard/snippet.c:1.6 php4/ext/midgard/snippet.c:1.7
--- php4/ext/midgard/snippet.c:1.6 Tue Mar 6 02:35:02 2001
+++ php4/ext/midgard/snippet.c Sat Mar 10 14:43:10 2001
@@ -1,4 +1,4 @@
-/* $Id: snippet.c,v 1.6 2001/03/06 10:35:02 emile Exp $
+/* $Id: snippet.c,v 1.7 2001/03/10 22:43:10 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]>
@@ -47,7 +47,7 @@
{
IDINIT;
CHECK_MGD;
- php_midgard_select(&MidgardSnippet, return_value,
"id,name,author,creator,created,revisor,revised,revision", "snippet", "up=$d", "name",
id);
+ php_midgard_select(&MidgardSnippet, return_value,
+"id,name,author,creator,created,revisor,revised,revision" SITEGROUP_SELECT,
+"snippet", "up=$d", "name", id);
}
MGD_FUNCTION(ret_type, get_snippet, (type param))
Index: php4/ext/midgard/snippetdir.c
diff -u php4/ext/midgard/snippetdir.c:1.8 php4/ext/midgard/snippetdir.c:1.9
--- php4/ext/midgard/snippetdir.c:1.8 Tue Mar 6 02:35:02 2001
+++ php4/ext/midgard/snippetdir.c Sat Mar 10 14:43:10 2001
@@ -1,4 +1,4 @@
-/* $Id: snippetdir.c,v 1.8 2001/03/06 10:35:02 emile Exp $
+/* $Id: snippetdir.c,v 1.9 2001/03/10 22:43:10 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]>
@@ -39,7 +39,7 @@
WRONG_PARAM_COUNT;
convert_to_long_ex(id);
- php_midgard_select(&MidgardSnippetdir, return_value, "id,name", "snippetdir",
"up=$d", "name", (*id)->value.lval);
+ php_midgard_select(&MidgardSnippetdir, return_value, "id,name" SITEGROUP_SELECT,
+"snippetdir", "up=$d", "name", (*id)->value.lval);
}
MGD_FUNCTION(ret_type, get_snippetdir, (type param))
Index: php4/ext/midgard/style.c
diff -u php4/ext/midgard/style.c:1.7 php4/ext/midgard/style.c:1.8
--- php4/ext/midgard/style.c:1.7 Tue Mar 6 02:35:02 2001
+++ php4/ext/midgard/style.c Sat Mar 10 14:43:10 2001
@@ -1,4 +1,4 @@
-/* $Id: style.c,v 1.7 2001/03/06 10:35:02 emile Exp $
+/* $Id: style.c,v 1.8 2001/03/10 22:43:10 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]>
@@ -35,7 +35,7 @@
switch (ZEND_NUM_ARGS()) {
case 0:
- php_midgard_select(&MidgardStyle, return_value, "id,name", "style", NULL,
"name");
+ php_midgard_select(&MidgardStyle, return_value, "id,name" SITEGROUP_SELECT,
+"style", NULL, "name");
return;
case 1:
if (zend_get_parameters_ex(1, &id) == SUCCESS) {
@@ -45,7 +45,7 @@
default:
WRONG_PARAM_COUNT;
}
- php_midgard_select(&MidgardStyle, return_value, "id,name", "style", "up=$d",
"name",
+ php_midgard_select(&MidgardStyle, return_value, "id,name" SITEGROUP_SELECT,
+"style", "up=$d", "name",
(*id)->value.lval);
}
Index: php4/ext/midgard/topic.c
diff -u php4/ext/midgard/topic.c:1.11 php4/ext/midgard/topic.c:1.12
--- php4/ext/midgard/topic.c:1.11 Tue Mar 6 02:35:02 2001
+++ php4/ext/midgard/topic.c Sat Mar 10 14:43:10 2001
@@ -1,4 +1,4 @@
-/* $Id: topic.c,v 1.11 2001/03/06 10:35:02 emile Exp $
+/* $Id: topic.c,v 1.12 2001/03/10 22:43:10 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]>
@@ -96,7 +96,7 @@
php_midgard_select(&MidgardTopic, return_value,
"id,score,name,owner,extra,description,code,created,"
- "revised,creator,revisor",
+ "revised,creator,revisor" SITEGROUP_SELECT,
"topic", "up=$d", sortv, (*id)->value.lval);
}
--
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]
