Changeset 873

Timestamp:

12/10/06 13:00:44 (2 years ago)

Author:

fumiakiy

Message:

Implemented automatic creation of mtview.php. mt-upgrade now removes the Dynamic Boot Strapper, and it is no longer one of the default templates. Also added is the option to 'build all templates dynamically'. BugId: 32010

Files:

• branches/wheeljack/default_templates/dynamic_site_bootstrapper.tmpl (deleted)
• branches/wheeljack/lib/MT/App/CMS.pm (modified) (9 diffs)
• branches/wheeljack/lib/MT/DefaultTemplates.pm (modified) (1 diff)
• branches/wheeljack/lib/MT/L10N/ja.pm (modified) (1 diff)
• branches/wheeljack/lib/MT/Upgrade.pm (modified) (2 diffs)
• branches/wheeljack/tmpl/cms/cfg_archives.tmpl (modified) (5 diffs)

branches/wheeljack/lib/MT/App/CMS.pm

@@ -72 +72 @@
-        'cfg_archives' => \&cfg_archives,
-        'cfg_archives_do_add' => \&cfg_archives_do_add,
+        'js_check_mtview' => \&js_check_mtview,
-        'cfg_prefs' => \&cfg_prefs,
-        'cfg_entries' => \&cfg_entries,
@@ -4388 +4389 @@
-    if ($screen eq 'cfg_archives') {
-        if (my $dcty = $app->param('dynamicity')) {
-
+
+
+
-        }
-        $app->cfg_archives_save($obj);
@@ -8194 +8197 @@
-        $blog->custom_dynamic_templates eq 'archives';
-    $param{dynamic_custom} = $blog->custom_dynamic_templates eq 'custom';
+    $param{dynamic_all} = $blog->custom_dynamic_templates eq 'all';
-    $param{show_build_options} = $app->config('ObjectDriver') =~ m/^DBI::(postgres|sqlite|mysql)/;
-    $iter = MT::Template->load_iter({ blog_id => $blog->id });
@@ -10210 +10214 @@
-sub update_dynamicity {
-    my $app = shift;
-
+, $cache, $conditional
-    my $dcty = $blog->custom_dynamic_templates;
-    if ($dcty eq 'none') {
@@ -10227 +10231 @@
-        }
-    } elsif ($dcty eq 'custom') {
+    } elsif ($dcty eq 'all') {
+        require MT::Template;
+        my @templates = MT::Template->load({
+            blog_id => $blog->id,
+            type => [ 'index', 'archive', 'individual', 'category' ],
+        });
+        for my $tmpl (@templates) {
+            $tmpl->build_dynamic(1);
+            $tmpl->save();
+        }
-    }
-
@@ -10242 +10256 @@
-            my $contents = "";
-            if (open(HT, $htaccess_path)) {
-
+local 
-                $contents = <HT>;
-                close HT;
@@ -10301 +10315 @@
-        }; if ($@) { print STDERR $@; } 
-        
+        eval {
+            my $mtview_path = File::Spec->catfile($blog->site_path(), "mtview.php");
+            my $mv_contents = '';
+            if (-f $mtview_path) {
+                open(my $mv, "<$mtview_path");
+                while (my $line = <$mv>) {
+                    $mv_contents .= "//$line" if ($line !~ /<\?(?:php)?|\?>/);
+                }
+                close $mv;
+            }
+            my $cgi_path = MT->instance->server_path() || "";
+            $cgi_path =~ s!/*$!!;
+            my $mtphp_path = File::Spec->canonpath("$cgi_path/php/mt.php");
+            my $blog_id = $blog->id;
+            my $config = MT->instance->{cfg_file};
+            my $cache_code = $cache ? "\n    \$mt->caching = true;" : '';
+            my $conditional_code = $conditional ? "\n    \$mt->conditional = true;" : '';
+            my $mtview = <<MTVIEW;
+<?php
+$mv_contents
+    include('$mtphp_path');
+    \$mt = new MT($blog_id, '$config');$cache_code$conditional_code
+    \$mt->view();
+?>
+MTVIEW
+            $blog->file_mgr->mkpath($blog->site_path);
+
+            open(my $mv, ">$mtview_path")
+                || die "Couldn't open $mtview_path for appending";
+            print $mv $mtview || die "Couldn't write to $mtview_path";
+            close $mv;
+        }; if ($@) { print STDERR $@; } 
+
-        my $compiled_template_path = File::Spec->catfile($blog->site_path(), 
-                                                         'templates_c');
@@ -10316 +10363 @@
-        }
-            # FIXME: use FileMgr
+
+        if ($cache) {
+            my $cache_path = File::Spec->catfile($blog->site_path(), 'cache');
+            $app->config('DirUmask', '0000');
+            $fmgr->mkpath($cache_path);
+            $app->config('DirUmask', $saved_umask);
+            if (-d $cache_path) {
+                $app->add_return_arg('no_write_cachepath' => 1)
+                    unless (-w $cache_path);
+            } else {
+                $app->add_return_arg('no_cachepath' => 1)
+                    unless (-d $cache_path);
+            }
+        }
-    }
-    $app->add_return_arg(dynamic_set => 1);
+}
+
+sub js_check_mtview {
+    my $app = shift;
+    $app->validate_magic or return;
+    my $blog_id = $app->param('blog_id');
+    my $blog = MT::Blog->load($blog_id, { cached_ok => 1 });
+    return $app->errtrans('Blog (ID: [_1]) can\'t be found', $blog_id) if !defined($blog);
+
+    my $cache = 0;
+    my $conditional = 0;
+    my $mtview_path = File::Spec->catfile($blog->site_path(), "mtview.php");
+    if (-f $mtview_path) {
+        open my($fh), $mtview_path;
+        while (my $line = <$fh>) {
+            $cache = 1 if $line =~ m/^\s*\$mt->caching\s*=\s*true;/i;
+            $conditional = 1 if $line =~ /^\s*\$mt->conditional\s*=\s*true;/i;
+        }
+        close $fh;
+    }
+    $app->send_http_header('text/javascript');
+    $app->{no_print_body} = 1;
+    $app->print("{cache: $cache, conditional: $conditional}");
-}
-
@@ -10850 +10934 @@
-    $param{targz} = $@ ? 0 : 1;
-    eval "require Archive::Zip;";
+    eval "require IO::String;";
-    $param{zip} = $@ ? 0 : 1;
+
-    $app->build_page('backup_restore.tmpl', \%param);
-}

branches/wheeljack/lib/MT/DefaultTemplates.pm

@@ -16 +16 @@
-            'type' => 'index',
-            'rebuild_me' => '1'
-          },
-          {
-              'outfile' => 'mtview.php',
-              'name' => 'Dynamic Site Bootstrapper',
-              'type' => 'index',
-              'rebuild_me' => 1,
-          },
-          {

branches/wheeljack/lib/MT/L10N/ja.pm

@@ -2387 +2387 @@
-¥åŠ›ã—ないでください。',
-    'Dynamic Publishing:' => '再構築オプション: ',
-
-
-
+
+
+
+
-    'Archive Mapping' => 'アヌカむブ・マッピング',
-    '_USAGE_ARCHIVE_MAPS' => 'この画面では、各アヌカむブに耇数のテンプレヌトを蚭定するこずができたす。䟋えば、月別のアヌカむブを2぀䜜り、1぀は1か月分の゚ントリヌのリストにしお、もう1぀は、カレンダヌのように゚ントリヌを芋られるようにする、ずいったこずができたす。',

branches/wheeljack/lib/MT/Upgrade.pm

@@ -566 +566 @@
-            }
-        },
+        'core_remove_dynamic_site_bootstrapper' => {
+            code => \&remove_mtviewphp,
+            version_limit => 3.303,
+            priority => 5.1,
+        },
-    );
-}
@@ -1031 +1036 @@
-    }
-
+    1;
+}
+
+sub remove_mtviewphp {
+    my $self = shift;
+    my (%param) = @_;
+
+    require MT::Template;
+    $self->progress(MT->translate('Removing Dynamic Site Bootstrapper index template...'));
+    MT::Template->remove( { type => 'index', outfile => 'mtview.php' } );
-    1;
-}

branches/wheeljack/tmpl/cms/cfg_archives.tmpl

@@ -2 +2 @@
-
-<div id="cfg-archives">
+<script type="text/javascript" src="<TMPL_VAR NAME=STATIC_URI>js/tc/client.js"></script>
-
-<script type="text/javascript">
@@ -113 +114 @@
-}
-
+function toggleDynamicOptions(selection) {
+    var fld = getByID('dynamic_options_area');
+    if (fld) {
+        if (selection.value == 'none') {
+            fld.style.display = 'none';
+        } else {
+            fld.style.display = 'block';
+            TC.Client.call({
+                'load': function(c, response) {
+                    var result;
+                    try {
+                        result = eval('('+response+')');
+                        var cache = getByID("dynamic_cache");
+                        if (cache)
+                            cache.checked = result.cache;
+                        var condition = getByID("dynamic_conditional");
+                        if (condition)
+                            condition.checked = result.conditional;
+                        var progress = getByID("progress-bar");
+                        if (progress) {
+                            progress.style.display = "none";
+                        } else {
+                        }
+                        var area = getByID('dynamic_options');
+                        if (area) {
+                            area.style.display = "block";
+                        }
+                    } catch ( e ) {
+                        alert(e.message);
+                    }
+                },
+                'method': 'POST',
+                'uri': '<TMPL_VAR NAME=MT_URL>',
+                'arguments': { '__mode': 'js_check_mtview',
+                    'blog_id': '<TMPL_VAR NAME=BLOG_ID>',
+                    'magic_token': '<TMPL_VAR NAME=MAGIC_TOKEN>'}
+            });
+        }
+    }
+    return false;
+}
-//-->
-</script>
@@ -158 +200 @@
-<TMPL_ELSE>
-
+<TMPL_IF NAME=NO_CACHE_PATH>
+<div class="error-message"><MT_TRANS phrase="Error: Movable Type was not able to create a directory to cache your dynamic templates. You should create a directory called <code>[_1]</code> underneath your blog directory." params="cache"></div>
+
+<TMPL_ELSE>
+
+<TMPL_IF NAME=NO_WRITE_CACHE_PATH>
+<div class="error-message"><MT_TRANS phrase="Error: Movable Type cannot write to the template cache directory. Please check the permissions for the directory called <code>[_1]</code> underneath your blog directory." params="cache"></div>
+
+<TMPL_ELSE>
+
-<TMPL_IF NAME=SAVED>
-<div class="message"><MT_TRANS phrase="Your weblog's archive configuration has been saved.">
@@ -164 +216 @@
-</TMPL_IF>
-<br /><TMPL_INCLUDE NAME="rebuild-stub.tmpl"></div>
+</TMPL_IF>
+</TMPL_IF>
-</TMPL_IF>
-</TMPL_IF>
@@ -301 +355 @@
-<TMPL_IF NAME=SHOW_BUILD_OPTIONS>
-<div class="setting">
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-</div>
-</div>