Changeset 7173

Timestamp:

04/15/04 13:55:14 (5 years ago)

Author:

indeyets

Message:

removed deprecated HAVE_MIDGARD_SITEGROUP ifdef's

Files:

• trunk/src/apis/php4/article.c (modified) (4 diffs)
• trunk/src/apis/php4/element.c (modified) (2 diffs)
• trunk/src/apis/php4/event.c (modified) (7 diffs)
• trunk/src/apis/php4/eventmember.c (modified) (3 diffs)
• trunk/src/apis/php4/group.c (modified) (1 diff)
• trunk/src/apis/php4/host.c (modified) (6 diffs)
• trunk/src/apis/php4/member.c (modified) (4 diffs)
• trunk/src/apis/php4/mgd_internal.h (modified) (4 diffs)
• trunk/src/apis/php4/mgd_oop.h (modified) (5 diffs)
• trunk/src/apis/php4/midgard.c (modified) (3 diffs)
• trunk/src/apis/php4/oop.c (modified) (7 diffs)
• trunk/src/apis/php4/page.c (modified) (4 diffs)
• trunk/src/apis/php4/pageelement.c (modified) (2 diffs)
• trunk/src/apis/php4/pagelink.c (modified) (6 diffs)
• trunk/src/apis/php4/person.c (modified) (1 diff)
• trunk/src/apis/php4/sitegroup.c (modified) (2 diffs)
• trunk/src/apis/php4/snippet.c (modified) (2 diffs)
• trunk/src/apis/php4/snippetdir.c (modified) (2 diffs)
• trunk/src/apis/php4/style.c (modified) (2 diffs)
• trunk/src/apis/php4/topic.c (modified) (2 diffs)
• trunk/src/apis/ruby/core.c (modified) (3 diffs)
• trunk/src/core/midgard/midgard/internal.h (modified) (1 diff)
• trunk/src/core/midgard/midgard/midgard.h.in (modified) (7 diffs)
• trunk/src/core/midgard/repligard/export.c (modified) (6 diffs)
• trunk/src/core/midgard/repligard/import.c (modified) (6 diffs)
• trunk/src/core/midgard/repligard/main.c.in (modified) (6 diffs)
• trunk/src/core/midgard/src/access.c (modified) (3 diffs)
• trunk/src/core/midgard/src/midgard.c (modified) (39 diffs)
• trunk/src/core/midgard/src/pageresolve.c (modified) (4 diffs)
• trunk/src/core/midgard/src/tree.c (modified) (3 diffs)
• trunk/src/core/midgard/src/tree_core.c (modified) (3 diffs)
• trunk/src/core/midgard/test/pageresolve.c (modified) (1 diff)
• trunk/src/httpd/apache1/mod_midgard.c (modified) (12 diffs)

trunk/src/apis/php4/article.c

@@ -888 +888 @@
-
-        if (up && ((*up)->value.lval != 0)) {
-
-
+
-                                                                                "src.id=$d AND tgt.id=$d"
-                                                                                " AND (src.sitegroup=tgt.sitegroup"
@@ -895 +894 @@
-                                                                                        " OR tgt.sitegroup=0)",
-                                                                                (*id)->value.lval, (*up)->value.lval)) {
-
-
-
-
-
-
-
+
+
+
-
-        if (!isarticleowner((*id)->value.lval)) {
@@ -1392 +1387 @@
-                convert_to_long_ex(newtopic);
-
-#if HAVE_MIDGARD_SITEGROUPS
-        /* newtopic must be in same SG or be 0 */
-        if (newtopic && !mgd_exists_bool(mgd_handle(), "topic,article",
@@ -1401 +1395 @@
-                                        (*newtopic)->value.lval, (*id)->value.lval)) {
-                RETURN_FALSE_BECAUSE(MGD_ERR_SITEGROUP_VIOLATION);
-   
-
+       
+
-        r_id = mgd_copy_article(mgd_handle(), (*id)->value.lval, newtopic ? (*newtopic)->value.lval : 0);
-#if HAVE_MIDGARD_QUOTA

trunk/src/apis/php4/element.c

@@ -493 +493 @@
-    convert_to_long_ex(newstyle);
-
-#if HAVE_MIDGARD_SITEGROUPS
-  /* newstyle must be in same SG or be 0 */
-  if (newstyle && !mgd_exists_bool(mgd_handle(), "style,element",
@@ -502 +501 @@
-                                   (*newstyle)->value.lval, (*id)->value.lval))
-    RETURN_FALSE_BECAUSE(MGD_ERR_SITEGROUP_VIOLATION);
-#endif
-
-        r_id = mgd_copy_element(mgd_handle(), (*id)->value.lval,

trunk/src/apis/php4/event.c

@@ -970 +970 @@
-                        where=mgd_format(mgd_handle(),pool,EVENT_COUNT_WHERE_43,
-                                         (*startn)->value.lval,(*endn)->value.lval,
-
-
-
-
-
+
+
-                else {
-                        table=EVENT_COUNT_TABLE_2;
-                        where=mgd_format(mgd_handle(),pool,EVENT_COUNT_WHERE_4,
-                                         (*startn)->value.lval,(*endn)->value.lval,
-
-
-
-
-
+
+
+
-                }
-            break;
@@ -995 +990 @@
-                where=mgd_format(mgd_handle(),pool,EVENT_COUNT_WHERE_3,
-                                 (*startn)->value.lval,(*endn)->value.lval,
-
-
-
-
-
+
+
-            break;
-        }
@@ -1008 +1000 @@
-                pool=mgd_alloc_pool();
-                where=mgd_format(mgd_handle(),pool,EVENT_COUNT_WHERE_2,
-
-
-
-
-
+
+
-            break;
-        }
@@ -1020 +1009 @@
-                pool=mgd_alloc_pool();
-                where=mgd_format(mgd_handle(),pool,EVENT_COUNT_WHERE_1,
-
-
-
-
-
+
+
-            break;
-        }
-    case 0:
-                pool=mgd_alloc_pool();
-#if HAVE_MIDGARD_SITEGROUPS
-                where=mgd_format(mgd_handle(),pool,EVENT_COUNT_WHERE_0,
-                                 mgd_sitegroup(mgd_handle()));
-#else
-                where=EVENT_COUNT_WHERE_0;
-#endif
-            break;
-    default:
@@ -1091 +1073 @@
-                                                 tsstart,tsend,
-                                                 tsstart,tsend,
-
-
-
-
-
+
+
-        } else {
-                where=mgd_format(mgd_handle(),pool,EVENT_MONTH_WHERE,
-                                                 tsstart,tsend,
-                                                 tsstart,tsend,
-
-
-
-
-
+
+
-        }
-        php_midgard_select_count_event_in_month(return_value,
@@ -1124 +1100 @@
-    convert_to_long_ex(root);
-
-#if HAVE_MIDGARD_SITEGROUPS
-        /* root must be in same SG or be 0 */
-        if ((*root)->value.lval != 0 && !mgd_exists_bool(mgd_handle(), "event src, event tgt",
@@ -1132 +1107 @@
-                                                                                        " OR tgt.sitegroup=0)",
-                                                                                (*id)->value.lval,(*root)->value.lval)) RETURN_FALSE_BECAUSE(MGD_ERR_SITEGROUP_VIOLATION);
-#endif
-
-    id_r = mgd_copy_event(mgd_handle(),  (*id)->value.lval);

trunk/src/apis/php4/eventmember.c

@@ -242 +242 @@
-                                                   "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", 
@@ -255 +253 @@
-                                 ", " 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",
@@ -277 +273 @@
-        res = mgd_query(mgd_handle(),"SELECT count(*) FROM $s WHERE eid=$d"
-                              EVENT_SITEGROUP, "eventmember" , id
-#if HAVE_MIDGARD_SITEGROUPS
-                                                 ,mgd_sitegroup(mgd_handle())
-#endif                                           
-                                                 );
-        if(res && mgd_fetch(res)) {

trunk/src/apis/php4/group.c

@@ -173 +173 @@
-        convert_to_long_ex(owner);
-
-#if HAVE_MIDGARD_SITEGROUPS
-//   Creating a group in SG0 is needed in Asgard to avoid reloging twice
-//   Note: creating a group in SG0  is absolutely useless outside of Asgard.
-//   if (mgd_sitegroup(mgd_handle()) == 0)
-//      RETURN_FALSE_BECAUSE(MGD_ERR_SITEGROUP_VIOLATION);
-#endif
-
-        if (!isgroupowner((*owner)->value.lval))
-      
+               
-
-   if ((*owner)->value.lval != 0

trunk/src/apis/php4/host.c

@@ -194 +194 @@
-#endif /* HAVE_MIDGARD_MULTILANG */
-
-#if HAVE_MIDGARD_SITEGROUPS
-        if (!mgd_isroot(mgd_handle()))
-                RETURN_FALSE_BECAUSE(MGD_ERR_ACCESS_DENIED);
-#else
-        if (!mgd_isadmin(mgd_handle()))
-                RETURN_FALSE_BECAUSE(MGD_ERR_ACCESS_DENIED);
-#endif
-
-        if ((*root)->value.lval != 0
@@ -273 +268 @@
-
-                if (
-#if HAVE_MIDGARD_SITEGROUPS
-                           !mgd_isroot(mgd_handle()) ||
-#endif
-                           !MGD_PROPFIND(self, "prefix", prefix))
-                        prefix = NULL;
@@ -297 +290 @@
-            }
-
-#if HAVE_MIDGARD_SITEGROUPS
-                                if (mgd_isroot(mgd_handle())) {
-                                        convert_to_string_ex(prefix);
-                                } else
-                                        prefix = NULL;
-#endif
-                                break;
-#if HAVE_MIDGARD_MULTILANG
@@ -312 +303 @@
-            }
-
-#if HAVE_MIDGARD_SITEGROUPS
-                                if (mgd_isroot(mgd_handle())) {
-                                        convert_to_string_ex(prefix);
-                                } else
-                                        prefix = NULL;
-#endif
-                                break;
-#endif /* HAVE_MIDGARD_MULTILANG */
@@ -350 +339 @@
-                              (*prefix)->value.str.val);
-
-#if HAVE_MIDGARD_SITEGROUPS
-        if (mgd_isroot(mgd_handle()))
-                name_port_sql =
-                   mgd_format(mgd_handle(), pool, ",name=$q,port=$d",
-                              (*name)->value.str.val, (*port)->value.lval);
-#else
-        name_port_sql =
-           mgd_format(mgd_handle(), pool, ",name=$q,port=$d",
-                      (*name)->value.str.val, (*port)->value.lval);
-#endif
-
-        if ((*root)->value.lval != 0
@@ -404 +387 @@
-    IDINIT;
-        CHECK_MGD;
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-}
-

trunk/src/apis/php4/member.c

@@ -28 +28 @@
-    php_midgard_select(&MidgardMember, return_value, "member.id AS id, person.id AS uid,"
-                   NAME_FIELD " AS name," RNAME_FIELD " AS rname,department,"
-
-
-
-
+
-                   , "person,member", "member.gid=$d AND member.uid=person.id",
-                   "lastname,firstname", id);
@@ -44 +41 @@
-                                        "distinct member.id AS id, gid, "
-                                        "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);
@@ -114 +109 @@
-                RETURN_FALSE_BECAUSE(MGD_ERR_ACCESS_DENIED);
-
-#if HAVE_MIDGARD_SITEGROUPS
-        if ((*gid)->value.lval == 0) {
-                /* only root can put users in root group */
@@ -147 +141 @@
-                           RETURN_FALSE_BECAUSE(MGD_ERR_NOT_EXISTS);
-        }
-#endif
-
-        php_midgard_create(return_value, self, "member", "uid,gid,extra", "$d,$d,$q",

trunk/src/apis/php4/mgd_internal.h

@@ -230 +230 @@
-  "handphone,If(handphone=''||(homephone=''&&workphone=''),'',', ')," \
-  "homephone,If(homephone=''||workphone='','',', ')," \
-ö
+ￜ
-#define PHONE_FIELDS "handphone,homephone,workphone," PHONE_FIELD " AS phone"
-
@@ -254 +254 @@
-#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 */
@@ -295 +291 @@
-#define ARTICLE_CALENDAR CALENDAR_FIELDS
-
-#if HAVE_MIDGARD_SITEGROUPS
-#if ! HAVE_MIDGARD_MULTILANG
-#define ARTICLE_SITEGROUP_SELECT ",article.sitegroup"
-#else
-#define ARTICLE_SITEGROUP_SELECT ",article.sitegroup as sitegroup"
-#endif
-#else
-#define ARTICLE_SITEGROUP_SELECT ""
-#endif
-
@@ -365 +357 @@
-
-/* Macroses for Events */
-#if HAVE_MIDGARD_SITEGROUPS
-#define EVENT_SITEGROUP     " AND sitegroup in (0,$d)"
-#define EVENT_SITEGROUP2    " AND event.sitegroup in (0,$d)"\
-                                                        " AND eventmember.sitegroup in (0,$d)"
-#else
-#define EVENT_SITEGROUP     ""
-#define EVENT_SITEGROUP2    ""
-#endif
-#define EVENT_COUNT_WHERE_0 "start>=Unix_Timestamp(Now())" EVENT_SITEGROUP
-#define EVENT_COUNT_WHERE_1 "start>=Unix_Timestamp(Now())"\

trunk/src/apis/php4/mgd_oop.h

@@ -112 +112 @@
-MGD_FUNCTION(ret_type, update_event_member, (type param));
-
-#if HAVE_MIDGARD_SITEGROUPS
-MGD_FUNCTION(ret_type, oop_sitegroup_set, (type param));
-MGD_FUNCTION(ret_type, oop_sitegroup_get, (type param));
@@ -119 +118 @@
-MGD_FUNCTION(ret_type, delete_sitegroup, (type param));
-MGD_FUNCTION(ret_type, update_sitegroup, (type param));
-#endif
-
-MGD_FUNCTION(ret_type, oop_style_create, (type param));
@@ -180 +178 @@
-   const char *fields, const char *tables,
-   const char *where, const char *order, ...);
-#if HAVE_MIDGARD_SITEGROUPS
-void php_midgard_sitegroup_get(MidgardClass *species,
-               zval * return_value, int grouped,
-               const char *fields, const char *table, int id);
-#endif
-void php_midgard_get(MidgardClass *species, zval * return_value,
-   const char *fields, const char *table, int id);
@@ -224 +220 @@
-extern MidgardClass MidgardQuota;
-#endif /* HAVE_MIDGARD_MULTILANG */
-#if HAVE_MIDGARD_SITEGROUPS
-extern MidgardClass MidgardSitegroup;
-#endif
-#if HAVE_MIDGARD_PAGELINKS
-extern MidgardClass MidgardPagelink;
@@ -235 +229 @@
-*/
-#ifdef YOU_WANT_TO_TEST
-
+
+
+
+
+
+
+
+
-#define MIDGARD_OOP_SITEGROUP_METHODS \
-        PHP_FALIAS(setsitegroup,      mgd_oop_sitegroup_set, NULL) \
-        PHP_FALIAS(getsitegroup,      mgd_oop_sitegroup_get, NULL) \
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-#endif /* YOU_WANT_TO_TEST */
-

trunk/src/apis/php4/midgard.c

@@ -327 +327 @@
-MGD_FE(delete_preference, NULL)
-MGD_FE(has_sitegroups, NULL)
-#if HAVE_MIDGARD_SITEGROUPS
-MGD_FE(list_sitegroups, NULL)
-MGD_FE(create_sitegroup, NULL)
@@ -333 +332 @@
-MGD_FE(update_sitegroup, NULL)
-MGD_FE(delete_sitegroup, NULL)
-#endif
-MGD_FE(snippet_exists, NULL)
-MGD_FE(list_snippets, NULL)
@@ -756 +754 @@
-#endif /* HAVE_MIDGARD_MULTILANG */
-
-#if HAVE_MIDGARD_SITEGROUPS
-        add_property_long(return_value, "root", mgd_isroot(mgd));
-        add_property_long(return_value, "sitegroup", mgd_sitegroup(mgd));
-#endif
-
-        mm_argv = (char**)rcfg->argv->elts;

trunk/src/apis/php4/oop.c

@@ -236 +236 @@
-}
-
-#if HAVE_MIDGARD_SITEGROUPS
-void php_midgard_sitegroup_get(MidgardClass *species, zval * return_value,
-               int grouped, const char *fields, const char *table, int id);
@@ -254 +253 @@
-  php_midgard_sitegroup_get_lang(species, return_value, 1, fields, table, id, lang);
-}
-
-
+
+
-void php_midgard_sitegroup_get(MidgardClass *species, zval * return_value,
-               int grouped, const char *fields, const char *table, int id)
-#else
-void php_midgard_get(MidgardClass *species, zval * return_value,
-                     const char *fields, const char *table, int id)
-#endif
-{
-#if ! HAVE_MIDGARD_MULTILANG
@@ -282 +277 @@
-        CHECK_MGD;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        } else {
-#endif /* HAVE_MIDGARD_MULTILANG */
-                res = mgd_ungrouped_record(mgd_handle(), fields, table, id);
-
-
-
-
-
-
+
-
-   if (!res || !mgd_fetch(res)) {
@@ -609 +597 @@
-#if HAVE_MIDGARD_MULTILANG
-void php_midgard_get_object_all_langs(zval *return_value, int table, int id) { 
-#if HAVE_MIDGARD_SITEGROUPS
-#define MGD_GET_OBJECT_SITEGROUP_FIELD ",sitegroup"
-#else
-#define MGD_GET_OBJECT_SITEGROUP_FIELD ""
-#endif
-
-   switch (table) {
@@ -645 +629 @@
-void php_midgard_get_object(zval *return_value, int table, int id)
-{
-#if HAVE_MIDGARD_SITEGROUPS
-#define MGD_GET_OBJECT_SITEGROUP_FIELD ",sitegroup"
-#else
-#define MGD_GET_OBJECT_SITEGROUP_FIELD ""
-#endif
-
-   switch (table) {
@@ -832 +812 @@
-         break;
-
-#if HAVE_MIDGARD_SITEGROUPS
-      case MIDGARD_OBJECT_SITEGROUP:
-         php_midgard_sitegroup_get(&MidgardSitegroup, return_value, 0, "*",
-            "sitegroup", id);
-         break;
-#endif
-#if HAVE_MIDGARD_QUOTA
-      case MIDGARD_OBJECT_QUOTA:
@@ -1014 +992 @@
-   &MidgardPerson,
-   &MidgardPreferences,
-#if HAVE_MIDGARD_SITEGROUPS
-   &MidgardSitegroup,
-#endif
-   &MidgardSnippet,
-   &MidgardSnippetdir,

trunk/src/apis/php4/page.c

@@ -79 +79 @@
-    convert_to_long_ex(root);
-
-#if HAVE_MIDGARD_SITEGROUPS
-        /* root must be in same SG or be 0 */
-        if ((*root)->value.lval != 0 && !mgd_exists_bool(mgd_handle(), "page src, page tgt",
@@ -87 +86 @@
-                                                                                        " OR tgt.sitegroup=0)",
-                                                                                (*id)->value.lval,(*root)->value.lval)) RETURN_FALSE_BECAUSE(MGD_ERR_SITEGROUP_VIOLATION);
-#endif
-
-        id_r = mgd_copy_page(mgd_handle(),  (*id)->value.lval);
@@ -105 +103 @@
-      PHP_UPDATE_REPLIGARD("page",id_r);
-#if HAVE_MIDGARD_MULTILANG
-ü
+ￜ
-#endif /* HAVE_MIDGARD_MULTILANG */
-   }
@@ -126 +124 @@
-#endif /* HAVE_MIDGARD_MULTILANG */
-               NAME_FIELD " AS authorname"
-#if HAVE_MIDGARD_SITEGROUPS
-         ",page.sitegroup"
-#endif
-#if ! HAVE_MIDGARD_MULTILANG
-         , "page,person",

trunk/src/apis/php4/pageelement.c

@@ -548 +548 @@
-  if(newpage) convert_to_long_ex(newpage);
-
-#if HAVE_MIDGARD_SITEGROUPS
-  /* newpage must be in same SG or be 0 */
-  if (newpage && (*newpage)->value.lval != 0
@@ -557 +556 @@
-                          " OR tgt.sitegroup=0)",
-                          (*id)->value.lval, (*newpage)->value.lval)) RETURN_FALSE_BECAUSE(MGD_ERR_SITEGROUP_VIOLATION);
-#endif
-
-

trunk/src/apis/php4/pagelink.c

@@ -58 +58 @@
-                "page.author,"
-            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",
@@ -82 +80 @@
-                "page.author,"
-            NAME_FIELD " AS authorname"
-
-
-
+
-                , "pagelink,page,person",
-            "pagelink.target=$d AND pagelink.up=page.id AND person.id=page.author",
@@ -171 +167 @@
-                RETURN_FALSE_BECAUSE(MGD_ERR_DUPLICATE);
-        
-#if HAVE_MIDGARD_SITEGROUPS
-        /* up must be in same SG or be 0 */
-        if ((*up)->value.lval != 0 && !mgd_exists_id(mgd_handle(), "page",
@@ -192 +187 @@
-                        (*owner)->value.lval, mgd_sitegroup(mgd_handle())))
-                RETURN_FALSE_BECAUSE(MGD_ERR_SITEGROUP_VIOLATION);
-#endif
-
-    php_midgard_create(return_value, self, "pagelink",
@@ -236 +230 @@
-                RETURN_FALSE_BECAUSE(MGD_ERR_ACCESS_DENIED);
-
-#if HAVE_MIDGARD_SITEGROUPS
-        /* target must be in same SG or be 0 */
-        if ((*target)->value.lval == 0 || !mgd_exists_bool(mgd_handle(), "page,pagelink",
@@ -258 +251 @@
-                                                                                        " OR grp.sitegroup=0)",
-                                                                                (*id)->value.lval, (*owner)->value.lval)) RETURN_FALSE_BECAUSE(MGD_ERR_SITEGROUP_VIOLATION);
-#endif
-
-    php_midgard_update(return_value, "pagelink",

trunk/src/apis/php4/person.c

@@ -464 +464 @@
-                                                                                "this.id=$d"
-                                                                                " AND other.id<>$d AND other.username=$q"
-#if HAVE_MIDGARD_SITEGROUPS
-                                                                                " AND this.sitegroup=other.sitegroup"
-#endif
-                                                                                ,
-                                                                                (*uid)->value.lval, (*uid)->value.lval,

trunk/src/apis/php4/sitegroup.c

@@ -24 +24 @@
-MGD_FUNCTION(ret_type, has_sitegroups, (type param))
-{
-#if HAVE_MIDGARD_SITEGROUPS
-        RETURN_TRUE;
-
-
-
-
-
-
+
+
-MGD_FUNCTION(ret_type, list_sitegroups, (type param))
-{
@@ -347 +342 @@
-   };*/
-
-#endif

trunk/src/apis/php4/snippet.c

@@ -615 +615 @@
-                convert_to_long_ex(newsnippetdir);
-
-#if HAVE_MIDGARD_SITEGROUPS
-        /* newsnippetdir must be in same SG or be 0 */
-        if (newsnippetdir && !mgd_exists_bool(mgd_handle(), "snippetdir,snippet",
@@ -624 +623 @@
-                                    (*newsnippetdir)->value.lval, (*id)->value.lval))
-                RETURN_FALSE_BECAUSE(MGD_ERR_SITEGROUP_VIOLATION);
-#endif
-
-        r_id = mgd_copy_snippet(mgd_handle(), (*id)->value.lval,

trunk/src/apis/php4/snippetdir.c

@@ -107 +107 @@
-        mgd_exists_id(mgd_handle(), "topic", "up=$d AND name=$q", up, name)) return 0;
-
-#if HAVE_MIDGARD_SITEGROUPS
-        /* up must be in same SG or be 0 */
-        if (up != 0 && !mgd_exists_id(mgd_handle(), "snippetdir",
@@ -117 +116 @@
-                        "id=$d",
-                        snippetdir_owner_id)) return 0;
-#endif
-        id = mgd_create(mgd, table, "name,up,owner", "$q,$d,$d", name,
-                        up,snippetdir_owner_id);

trunk/src/apis/php4/style.c

@@ -245 +245 @@
-   }
-
-#if HAVE_MIDGARD_SITEGROUPS
-        /* root must be in same SG or be 0 */
-   if (root) {
@@ -256 +255 @@
-        RETURN_FALSE_BECAUSE(MGD_ERR_SITEGROUP_VIOLATION);
-   }
-#endif
-
-    id_r = mgd_copy_style(mgd_handle(),  (*id)->value.lval);

trunk/src/apis/php4/topic.c

@@ -387 +387 @@
-   }
-
-#if HAVE_MIDGARD_SITEGROUPS
-        /* root must be in same SG or be 0 */
-        if (new_root != 0 &&
@@ -396 +395 @@
-                           (*id)->value.lval, new_root))
-                RETURN_FALSE_BECAUSE(MGD_ERR_SITEGROUP_VIOLATION);
-#endif
-
-        id_r = mgd_copy_topic(mgd_handle(), (*id)->value.lval);

trunk/src/apis/ruby/core.c

@@ -506 +506 @@
-}
-
-#if HAVE_MIDGARD_SITEGROUPS
-static VALUE 
-smf_midgard_connection_is_root(self) 
@@ -533 +532 @@
-    return self;
-}
-#endif
-
-static VALUE smf_midgard_connection_force_admin(self) 
@@ -649 +647 @@
-        rb_define_method(smc_Connection, "is_member", smf_midgard_connection_is_member, 1);
-
-#if HAVE_MIDGARD_SITEGROUPS
-        rb_define_method(smc_Connection, "is_root", smf_midgard_connection_is_root, 0);
-        rb_define_method(smc_Connection, "force_root", smf_midgard_connection_force_root, 0);
-#endif