Changeset 16181

Timestamp:

04/21/08 21:42:11 (6 months ago)

Author:

piotras

Message:

Do not add pages array to $_MIDGARD.
Set current style id.
Explicitly set current connection's rcfg

Files:

• trunk/midgard/apis/php5/midgard.c (modified) (4 diffs)

trunk/midgard/apis/php5/midgard.c

@@ -452 +452 @@
-                return;
-        
-        /* rcfg is already associated with midgard_connection */
-        MidgardRequestConfig *rcfg = midgard_http_host_get_request_config(http_host);
+        if(!midgard_connection_set_request_config(mgd_handle(), rcfg))
+                g_warning("Couldn't set request configuration for current connection");
-
-        return;
@@ -598 +599 @@
-    php_printf("This program makes use of the Midgard Content Management engine:<br />");
-    php_printf("&copy; 1998-2001 The Midgard Project Ry - 2000-2001 Aurora Linux<br />\n");
-7
+8
-    php_info_print_box_end();
-
@@ -832 +833 @@
-                                midgard_connection_get_sitegroup_id(mgd));
-
-                /* PAGES */
-                i = 0;
-                
-                zval *pages;
-                MAKE_STD_ZVAL(pages);
-                array_init(pages);
-
-                if(rcfg->pages != NULL) {
-                
-                        array = rcfg->pages;
-                        
-                        for(i = 0; i < array->n_values; i++) {
-                        
-                                GValue *oval = g_value_array_get_nth(array, i);
-                                GObject *object = g_value_get_object(oval);
-
-                                zval *zobject = NULL;
-                                MAKE_STD_ZVAL(zobject);
-                                php_midgard_gobject_init(zobject, 
-                                                G_OBJECT_TYPE_NAME(object),
-                                                object, FALSE);
-
-                                zend_hash_next_index_insert(
-                                                HASH_OF(pages), 
-                                                &zobject, sizeof(zval *), NULL);                
-                        }
-                }
-                
-                add_assoc_zval(mgd_php_globals, "pages", pages);
-
-                guint id = 0;
-
-                /* PAGE ID */
-                if(rcfg->page)  
@@ -883 +853 @@
-                add_assoc_bool(mgd_php_globals, "auth", rcfg->auth_required);
-
-
+
+
+
+
+
-                
-        }