* Changed Mode=WP action for iPhone/Android.

[modchxj/mod_chxj.git] / src / chxj_xhtml_mobile_1_0.c

diff --git a/src/chxj_xhtml_mobile_1_0.c b/src/chxj_xhtml_mobile_1_0.c
index 997fd8f..fd403f9 100644 (file)
--- a/src/chxj_xhtml_mobile_1_0.c
+++ b/src/chxj_xhtml_mobile_1_0.c
@@ -1091,12 +1091,22 @@ s_xhtml_1_0_end_head_tag(void *pdoc, Node *UNUSED(child))
  * @return The conversion result is returned.
  */
 static char *
-s_xhtml_1_0_start_title_tag(void *pdoc, Node *UNUSED(node)) 
+s_xhtml_1_0_start_title_tag(void *pdoc, Node *node)
 {
   xhtml_t      *xhtml = GET_XHTML(pdoc);
   Doc          *doc   = xhtml->doc;
 
   W_L("<title>");
+  if (xhtml->conf->use_google_analytics) {
+    xhtml->pagetitle = "";
+    Node         *child;
+    for (child = qs_get_child_node(doc,node);
+         child;
+         child = qs_get_next_node(doc,child)) {
+      char *textval = qs_get_node_value(doc,child);
+      xhtml->pagetitle = apr_pstrcat(doc->r->pool, xhtml->pagetitle, textval, NULL);
+    }
+  }
   return xhtml->out;
 }
 
@@ -1337,7 +1347,7 @@ s_xhtml_1_0_end_body_tag(void *pdoc, Node *UNUSED(child))
 
 
   if (xhtml->conf->use_google_analytics) {
-    char *src = chxj_google_analytics_get_image_url(xhtml->doc->r);
+    char *src = chxj_google_analytics_get_image_url(xhtml->doc->r, xhtml->pagetitle);
     W_L("<img src=\"");
     W_V(src);
     W_L("\" />");
@@ -4219,7 +4229,7 @@ s_xhtml_1_0_start_img_tag(void *pdoc, Node *node)
     if (STRCASEEQ('s','S',"src",name)) {
       value = chxj_encoding_parameter(r, value, 1);
       value = chxj_add_cookie_parameter(r, value, xhtml->cookie);
-      value = chxj_add_cookie_no_update_parameter(r, value);
+      value = chxj_add_cookie_no_update_parameter(r, value, 1);
       value = chxj_img_rewrite_parameter(r,xhtml->conf,value);
 #ifdef IMG_NOT_CONVERT_FILENAME
       attr_src = value;