Changeset 2104

Timestamp:

04/25/08 12:34:53 (7 months ago)

Author:

takayama

Message:

Implemented BugId:71811, BugId:79438
* Added SSI support into the Dynamic Publishing
* Added cache option support

Files:

• branches/release-36/php/lib/function.mtinclude.php (modified) (4 diffs)
• branches/release-36/php/lib/mtdb_base.php (modified) (2 diffs)
• branches/release-36/php/mt.php.pre (modified) (1 diff)

branches/release-36/php/lib/function.mtinclude.php

@@ -24 +24 @@
-    }
-
-    static $_include_cache = array();
-    $blog_id = $args['blog_id'];
-    $blog_id or $blog_id = $ctx->stash('blog_id');
-    $cache_id = '';
-
-    # Try to read from cache
-    global $mt;
-
-    $cache_enable = false;
-    $cacje_key = '';
-    $cache_ttl = 0;
-    $blog = $ctx->mt->db->fetch_blog($blog_id);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    if (isset($args['module']) && ($args['module'])) {
-        $module = $args['module'];
@@ -69 +36 @@
-        }
-    }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if (isset($_include_cache[$cache_id])) {
-            $_var_compiled = $_include_cache[$cache_id];
-        } else {
-
-
-
-
+
+
-                _clear_vars($ctx, $ext_args);
-                return $ctx->error("Error compiling template module '$module'");
-            }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        }
-    } elseif (isset($args['file']) && ($args['file'])) {
-        $file = $args['file'];
-        $base_filename = basename($file);
-        global $restricted_include_filenames;
-        if (array_key_exists(strtolower($base_filename), $restricted_include_filenames)) {
-            _clear_vars($ctx, $ext_args);
-            return "";
-        }
-        $cache_id = 'file::' . $blog_id . '::' . $file;
-        if (isset($_include_cache[$cache_id])) {
-            $_var_compiled = $_include_cache[$cache_id];
-        } else {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-                _clear_vars($ctx, $ext_args);
-                return $ctx->error("Error compiling template file '$file'");
-            }
+            $_include_cache[$cache_id] = $_var_compiled;
-        }
-    } elseif (isset($args['type']) && ($args['type'])) {
@@ -188 +220 @@
-    }
-
+    if ($ssi_enable) {
+        $include_dir = dirname($include_file);
+        if (!file_exists($include_dir) && !is_dir($include_dir)) {
+            mkdir($include_dir, 0777, true);
+        }
+        if (is_writable($include_dir)) {
+            if ($h_file = fopen($include_file, 'w')) {
+                fwrite($h_file, $_contents);
+                fclose($h_file);
+            }
+        }
+    }
+
-    return $_contents;
+}
+
+function _get_template_from_file ($ctx, $file, $blog_id) {
+    $base_filename = basename($file);
+    global $restricted_include_filenames;
+    if (array_key_exists(strtolower($base_filename), $restricted_include_filenames)) {
+        return '';
+    }
+    if (is_file($file) && is_readable($file)) {
+        $contents = @file($file);
+        $tmpl = implode('', $contents);
+    } else {
+        $blog = $ctx->stash('blog');
+        if ($blog['blog_id'] != $blog_id) {
+            $blog = $ctx->mt->db->fetch_blog($blog_id);
+        }
+        $path = $blog['blog_site_path'];
+        if (!preg_match('!/$!', $path))
+            $path .= '/';
+        $path .= $file;
+        if (is_file($path) && is_readable($path)) {
+            $contents = @file($path);
+            $tmpl = implode('', $contents);
+        } else {
+            return false;
+        }
+    }
+
+    return $tmpl;
-}
-
@@ -199 +273 @@
-    $ctx->__stash['vars'] =& $vars;
-}
+
+function _include_path($path) {
+    $path_array = array();
+    if (preg_match('/^\//', $path)) {
+        $path_array = preg_split('/\//', $path, -1, PREG_SPLIT_NO_EMPTY);
+    } else {
+        $path_array = preg_split('/\//', $path, -1, PREG_SPLIT_NO_EMPTY);
+        global $mt;
+        array_unshift($path_array, $mt->config('IncludesDir'));
+    }
+    return $path_array;
+}
-?>

branches/release-36/php/lib/mtdb_base.php

@@ -152 +152 @@
-        $result = $this->get_results($sql, ARRAY_A);
-        return $result;
+    }
+
+    function fetch_template_meta($type, $name, $blog_id, $global) {
+        if ($type === 'identifier') {
+            $col = 'template_identifier';
+            $type_filter = "";
+        } else {
+            $col = 'template_name';
+            $type_filter = "and template_type='$type'";
+        }
+        if (!isset($global)) {
+            $blog_filter = "and template_blog_id in (".$this->escape($blog_id).",0)";
+        } elseif ($global) {
+            $blog_filter = "and template_blog_id=0";
+        } else {
+            $blog_filter = "and template_blog_id=".$this->escape($blog_id);
+        }
+
+        $tmpl_name = $this->escape($name);
+
+        $sql = "
+            select
+                template_id, template_name, template_modified_on
+            from
+                mt_template
+            where
+                $col = '$tmpl_name'
+                $blog_filter
+                $type_filter
+            order by
+                template_blog_id desc";
+        $row = $this->get_row($sql, ARRAY_A);
+        if (!$row) return '';
+
+        $data = $this->get_meta('template', $row['template_id']);
+        return array_merge($row, $data);
-    }
-
@@ -3097 +3133 @@
-        $this->query($sql);
-    }
+
+    function get_latest_touch($blog_id, $types) {
+        $type_user = false;
+        if (is_array($types)) {
+            $array = preg_grep('/author/', $types);
+            if (!empty($array)) $type_user = true;
+        } else {
+            $type_user = $types == 'author';
+        }
+
+        $blog_filter = '';
+        if (!empty($blog_id)) {
+            if ($type_user)
+                $blog_filter = 'and touch_blog_id = 0';
+            else
+                $blog_filter = 'and touch_blog_id = ' . $blog_id;
+        }
+
+        $type_filter = '';
+        if (!empty($types)) {
+            if ($type_user) {
+                $type_filter = 'and touch_object_type ="author"';
+            } else {
+                if (is_array($types)) {
+                    foreach ($types as $type) {
+                        if ($type_filter != '') $type_filter .= ',';
+                        $type_filter .= "'$type'";
+                    }
+                    $type_filter = 'and touch_object_type in (' . $type_filter . ')';
+                } else {
+                    $type_filter = 'and touch_object_type ="' . $type_filter . '"';
+                }
+            }
+        }
+
+        $sql = "
+            select
+                touch_modified_on
+            from
+                mt_touch
+            where
+                1 = 1
+                $blog_filter
+                $type_filter
+            order by
+                touch_modified_on desc
+            <LIMIT>";
+
+        $sql = $this->apply_limit_sql($sql, 1);
+        $result = $this->get_row($sql, ARRAY_N);
+
+        if (!empty($result))
+            return $result[0];
+
+        return false;
+    }
+
-}

branches/release-36/php/mt.php.pre

@@ -363 +363 @@
-        isset($cfg['timeoffset']) or
-            $cfg['timeoffset'] = '__DEFAULT_TIMEZONE__';
+        isset($cfg['includesdir']) or
+            $cfg['includesdir'] = 'includes_c';
-    }
-