.gitignore COPYING build/mt-dists/MTOS.mk default_templates/sidebar.mtml mt-static/images/arrow-left-blue.gif mt-static/images/arrow-left-gray.gif mt-static/images/arrow-left-green.gif mt-static/images/arrow-right-blue.gif mt-static/images/arrow-right-gray.gif mt-static/images/arrow-right-green.gif mt-static/images/asset/audio-success.gif mt-static/images/asset/audio-warning.gif mt-static/images/asset/audio.gif mt-static/images/asset/file-success.gif mt-static/images/asset/file-warning.gif mt-static/images/asset/file.gif mt-static/images/asset/image-success.gif mt-static/images/asset/image-warning.gif mt-static/images/asset/image.gif mt-static/images/asset/video-success.gif mt-static/images/asset/video-warning.gif mt-static/images/asset/video.gif mt-static/images/beta_icons/beta_icon.png mt-static/images/beta_icons/beta_icon_system.png mt-static/images/content-inner-listing-system.gif mt-static/images/content-inner-listing.gif mt-static/images/content-inner-system.gif mt-static/images/content-inner-tw-listing-system.gif mt-static/images/content-inner-tw-listing.gif mt-static/images/content-inner-tw-system.gif mt-static/images/content-inner-tw.gif mt-static/images/content-inner-twt-listing-system.gif mt-static/images/content-inner-twt-listing.gif mt-static/images/content-inner-twt-system.gif mt-static/images/content-inner-twt.gif mt-static/images/content-inner-wm.gif mt-static/images/content-inner-wt-listing-system.gif mt-static/images/content-inner-wt-listing.gif mt-static/images/content-inner-wt-system.gif mt-static/images/content-inner-wt.gif mt-static/images/content-inner.gif mt-static/images/content-system.jpg mt-static/images/content.jpg mt-static/images/divider.gif mt-static/images/nav_icons/color/entry.gif mt-static/images/nav_icons/color/page.gif mt-static/images/next.gif mt-static/images/preview.gif mt-static/images/previous.gif mt-static/images/status-widget-bar-bottom.gif mt-static/images/status-widget-bar-top.gif mt-static/images/status_icons/draft-k.gif mt-static/images/status_icons/future-k.gif mt-static/images/status_icons/share.gif mt-static/images/status_icons/success-k.gif mt-static/images/status_icons/view-k.gif mt-static/images/status_icons/warning-k.gif php/lib/block.mtauthorhasentry.php php/lib/block.mtauthorhaspage.php php/lib/block.mtloop.php plugins/WXRImporter/lib/WXRImporter/Worker/Downloader.pm plugins/WidgetManager/default_widgets/about_this_page.mtml plugins/WidgetManager/default_widgets/archive_meta_widget.mtml plugins/WidgetManager/default_widgets/author_archive_list.mtml plugins/WidgetManager/default_widgets/calendar.mtml plugins/WidgetManager/default_widgets/category_archive_list.mtml plugins/WidgetManager/default_widgets/creative_commons.mtml plugins/WidgetManager/default_widgets/current_author_monthly_archive_list.mtml plugins/WidgetManager/default_widgets/current_category_monthly_archive_list.mtml plugins/WidgetManager/default_widgets/date_based_author_archives.mtml plugins/WidgetManager/default_widgets/date_based_category_archives.mtml plugins/WidgetManager/default_widgets/main_index_meta_widget.mtml plugins/WidgetManager/default_widgets/monthly_archive_dropdown.mtml plugins/WidgetManager/default_widgets/monthly_archive_list.mtml plugins/WidgetManager/default_widgets/pages_list.mtml plugins/WidgetManager/default_widgets/powered_by.mtml plugins/WidgetManager/default_widgets/recent_assets.mtml plugins/WidgetManager/default_widgets/recent_comments.mtml plugins/WidgetManager/default_widgets/recent_entries.mtml plugins/WidgetManager/default_widgets/search.mtml plugins/WidgetManager/default_widgets/signin.mtml plugins/WidgetManager/default_widgets/syndication.mtml plugins/WidgetManager/default_widgets/tag_cloud.mtml plugins/WidgetManager/default_widgets/technorati_search.mtml tmpl/cms/dialog/refresh_templates.tmpl tmpl/cms/edit_asset.tmpl tmpl/cms/include/asset_upload.tmpl tmpl/cms/refresh_results.tmpl @@ -39,14 +39,21 @@ mt-static/themes/unity-purple #mt-static/themes/unity-tricolor # Conditional SKIP rule; format: #?(var=value) RULE +#?package=MT ^COPYING +^addons #?package=MT ^addons +^mt-cp.cgi #?package=MT ^mt-cp.cgi +^mt-static/addons #?package=MT ^mt-static/addons +^mt-static/themes/tristan-blue #?package=MT ^mt-static/themes/tristan-blue +#?package=MTE ^COPYING #?package=MTE ^addons/Community.pack #?package=MTE ^mt-static/addons/Community.pack #?package=MTE ^mt-cp.cgi #?package=MTE ^mt-static/themes/tristan-blue +#?package=MTCS ^COPYING #?package=MTCS ^addons/Enterprise.pack #?package=MTCS ^mt-static/addons/Enterprise.pack @@ -148,3 +155,4 @@ Makefile ^MT.*\.gz index\.html\..* build-language-stamp +.gitignore MANIFEST.SKIP @@ -87,6 +87,7 @@ lib/MT.pm: %: %.pre build-language-stamp build/mt-dists/$(BUILD_PACKAGE).mk buil -e 's!__SCHEMA_VERSION__!$(SCHEMA_VERSION)!g' \ -e 's!__API_VERSION__!$(API_VERSION)!g' \ -e 's!__NEWSBOX_URL__!$(NEWSBOX_URL)!g' \ + -e 's!__LEARNINGNEWS_URL__!$(LEARNINGNEWS_URL)!g' \ -e 's!__SUPPORT_URL__!$(SUPPORT_URL)!g' \ -e 's!__NEWS_URL__!$(NEWS_URL)!g' \ -e 's!__HELP_URL__!$(HELP_URL)!g' \ Makefile @@ -1,3 +1,7 @@ +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# # $Id$ package Build; @@ -27,9 +31,6 @@ Build - Movable Type build functionality A C<Build> object contains the internal routines needed to build Movable Type distributions in multiple languages. -Please see the full documentation at: -https://intranet.sixapart.com/wiki/index.php/Movable_Type:MT_Export-Deploy - =cut use strict; @@ -40,6 +41,7 @@ use File::Basename; use File::Copy; use File::Path; use File::Spec; +use File::Find; use Getopt::Long; use IO::File; use LWP::UserAgent; @@ -63,20 +65,21 @@ sub get_options { 'cleanup!' => 1, # Remove the exported directory after deployment. 'date!' => 1, # Toggle date stamping. 'debug' => 0, # Turn on/off the actual system calls. - 'deploy:s' => '', #($ENV{USER}||$ENV{USERNAME}).'@rongo:/usr/local/cifs/intranet/mt-interest/', - 'deploy-uri=s' => 'https://intranet.sixapart.com/mt-interest', + 'deploy:s' => '', + 'deploy-uri=s' => '', 'build!' => 1, # Build distribution files? 'email-bcc:s' => undef, 'email-body=s' => '', # Constructed at run-time. 'email-cc:s' => undef, - 'email-from=s' => ( $ENV{USER} || $ENV{USERNAME} ) .'@sixapart.com', - 'email-host=s' => 'mail.sixapart.com', + 'email-from=s' => ( $ENV{USER} || $ENV{USERNAME} ), + 'email-host=s' => 'localhost', 'email-subject=s' => '', # Constructed at run-time. 'export!' => 1, # To export or not to export. That is the question. 'export-dir=s' => '', # Constructed at run-time. 'footer=s' => "<br/><b>SOFTWARE IS PROVIDED FOR TESTING ONLY - NOT FOR PRODUCTION USE.</b>\n", 'footer-tmpl=s' => 'tmpl/cms/include/copyright.tmpl', 'help|h' => 0, # Show the program usage. + 'license=s' => undef, 'http-user=s' => undef, 'http-pass=s' => undef, 'ldap' => 0, # Use LDAP (and don't initialize the database). @@ -92,12 +95,12 @@ sub get_options { 'prod-dir=s' => 'Production_Builds', 'qa' => 0, # Command-line --option alias 'repo=s' => 'trunk', # Reset at runtime depending on branch,tag. - 'repo-uri=s' => '', #'https://intranet.sixapart.com/repos/eng', + 'repo-uri=s' => '', 'rev!' => 1, # Toggle revision stamping. 'revision=s' => undef, # Constructed at run-time. 'stage' => 0, # Command-line --option alias - 'stage-dir=s' => '/var/www/html/mt-stage', - 'stage-uri=s' => 'http://mt.sixapart.com', + 'stage-dir=s' => '', + 'stage-uri=s' => '', 'short-lang=s' => '', # Constructed at run-time. 'stamp=s' => $ENV{BUILD_VERSION_ID}, 'symlink!' => 1, # Make build symlinks when staging. @@ -173,9 +176,10 @@ sub setup { $self->set_repo(); # Create the build-stamp if one is not already defined. - if( !$self->{'stamp=s'} ) { + if( !$self->{'stamp=s'} || $args{language} ) { # Read-in the configuration variables for substitution. my $config = $self->read_conf( "build/mt-dists/default.mk", "build/mt-dists/$self->{'pack=s'}.mk" ); + $self->{'license=s'} ||= $config->{LICENSE}; my @stamp = (); push @stamp, $config->{PRODUCT_VERSION} . ( $self->{'alpha=s'} ? "a$self->{'alpha=s'}" @@ -221,12 +225,13 @@ sub make { if( $self->{'build!'} ) { $self->verbose_command( sprintf( - '%s build/mt-dists/make-dists --package=%s --language=%s --stamp=%s %s', + '%s build/mt-dists/make-dists --package=%s --language=%s --stamp=%s %s --license=%s', $^X, $self->{'pack=s'}, $self->{'lang=s'}, $self->{'export-dir=s'}, - ($self->{'verbose!'} ? '--silent' : '') + ($self->{'verbose!'} ? '--silent' : ''), + $self->{'license=s'} || '', )); } else { @@ -456,8 +461,8 @@ sub stage_distro { my $fh = IO::File->new( ">$config" ); print $fh <<CONFIG; CGIPath $url -DefaultSiteURL http://mt.sixapart.com/blogs/ -DefaultSiteRoot /var/www/html/mt-stage/blogs/ +# DefaultSiteURL http://example.com/blogs/ +# DefaultSiteRoot /var/www/html/blogs/ Database $db ObjectDriver DBI::mysql DBUser root @@ -466,7 +471,7 @@ CONFIG if( $self->{'ldap'} ) { print $fh <<CONFIG; AuthenticationModule LDAP -AuthLDAPURL ldap://ldap.sixapart.com/dc=sixapart,dc=com +# AuthLDAPURL ldap://ldap.example.com/dc=example,dc=com CONFIG } @@ -772,8 +777,8 @@ sub notify { $self->{'stage'} ? ' - Staging' : $self->{'qa'} ? ' - QA' : ''; # If an email-cc exists, add a comma in front of the QA address. - $self->{'email-cc:s'} .= ($self->{'email-cc:s'} ? ',' : '') . 'sixapart@qasource.com' - if $self->{'qa'}; + # $self->{'email-cc:s'} .= ($self->{'email-cc:s'} ? ',' : '') + # if $self->{'qa'}; # Show the deployed URL's. $self->{'email-body=s'} = sprintf "File URL(s):\n%s\n\n", join( "\n", @{ $distros->{url} } ) @@ -896,9 +901,6 @@ sub usage { # --qa # --stage - Please see the full documentation at: - https://intranet.sixapart.com/wiki/index.php/Movable_Type:MT_Export-Deploy - USAGE exit; } build/Build.pm @@ -1,5 +1,11 @@ #!/usr/bin/perl + +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# # $Id$ + use strict; use warnings; use lib 'build'; build/exportmt.pl @@ -1,3 +1,11 @@ +#!/usr/bin/perl + +# Movable Type (r) Open Source (C) 2005-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + use strict; use Getopt::Long; build/l10n/diff.pl @@ -1,4 +1,10 @@ -#! /usr/local/bin/perl +#!/usr/bin/perl + +# Movable Type (r) Open Source (C) 2005-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ use strict; build/l10n/trans.pl @@ -1,5 +1,11 @@ #! /usr/bin/perl -w +# Movable Type (r) Open Source (C) 2005-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + my $wc =0; # New: count the number of words left to translate! BEGIN { build/l10n/wrap.pl @@ -1,4 +1,11 @@ #!/usr/bin/perl -w + +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + use strict; if (grep { /--help/ } @ARGV) { build/make-l10n @@ -1,7 +1,7 @@ PRODUCT_NAME = Movable Type Core PRODUCT_VERSION = 4.02 -SCHEMA_VERSION = 4.0034 +SCHEMA_VERSION = 4.0035 API_VERSION = 4.02 # BUILD_LANGUAGE = en_US @@ -11,6 +11,7 @@ PORTAL_URL = http://www.sixapart.com/movabletype/ SUPPORT_URL = http://www.sixapart.com/movabletype/support/ NEWS_URL = http://www.sixapart.com/movabletype/news/ NEWSBOX_URL = http://www.sixapart.com/movabletype/news/mt4_news_widget.html +LEARNINGNEWS_URL = http://learning.movabletype.org/newsbox.html HELP_URL = http://www.sixapart.com/movabletype/docs/4.0/ CATEGORY_NAME_NODASH = 0 DEFAULT_TIMEZONE = 0 build/mt-dists/default.mk @@ -5,6 +5,7 @@ PORTAL_URL = http://www.sixapart.jp/movabletype/ SUPPORT_URL = http://www.sixapart.jp/movabletype/support/ NEWS_URL = http://www.sixapart.jp/movabletype/ NEWSBOX_URL = http://www.sixapart.jp/movabletype/news/newsbox.html +LEARNINGNEWS_URL = http://www.movabletype.jp/newsbox.html HELP_URL = http://www.movabletype.jp/documentation/ CATEGORY_NAME_NODASH = 1 DEFAULT_TIMEZONE = 9 build/mt-dists/ja.mk @@ -1,11 +1,16 @@ #!/usr/bin/perl -w + +# Movable Type (r) (C) 2001-2007 Six Apart, Ltd. All Rights Reserved. +# This code cannot be redistributed without permission from www.sixapart.com. +# For more information, consult your Movable Type license. # # $Id$ -# + use strict; use lib 'extlib', 'lib'; use ExtUtils::Manifest qw( maniread manicopy mkmanifest ); use File::Copy; +use File::Find; use File::Spec::Functions; use File::Basename; use Getopt::Long; @@ -13,12 +18,14 @@ use Getopt::Long; my $langlist = ''; my $stamp = ''; my $package = ''; +my $license = ''; my $silent = 0; GetOptions( 'language:s' => \$langlist, 'package:s' => \$package, 'silent' => \$silent, + 'license:s' => \$license, 'stamp:s' => \$stamp, ) or die "ERROR: Couldn't get the command-line options"; @@ -40,14 +47,15 @@ my $orig = eval { my $skip_rules = `cat $skip`; if ($skip_rules =~ m/^#\?/m) { # conditional rule - move($skip, $skip_bak); + move($skip, $skip_bak); } my @languages = split(/,/, $langlist); @languages = qw( en_US nl fr de es ja ) unless @languages; for my $lang (@languages) { - $options{language} = $lang; - $options{package} = $package; + $options{language} = $lang; + $options{package} = $package; + $options{license} = $license; print join(" ", @languages), "\n"; my $short_lang = $lang; @@ -65,7 +73,7 @@ for my $lang (@languages) { verbose_command("$make clean"); # to clean MT.pm verbose_command($make); - make_manifest_skip($skip_rules, $skip); + make_manifest_skip($skip_rules, $skip); # my $lang_skip = "$skip.$lang"; # if (-e $lang_skip) { @@ -76,6 +84,10 @@ for my $lang (@languages) { mkmanifest(); manicopy(maniread(), $distname, 'best'); + if (($license || '') ne 'GPL') { + assign_license( $distname ); + } + verbose_command("find $distname -name .exists | xargs rm"); verbose_command("chmod +x $distname/*.cgi"); verbose_command("chmod +x $distname/tools/*"); @@ -94,31 +106,80 @@ END { move($skip_bak, $skip) if -e $skip_bak; } +sub assign_license { + my ($dir) = @_; + find( { wanted => \&process_file_for_license, no_chdir => 1 }, + $dir ); +} + +sub process_file_for_license { + my $file = $_; + + # skip any '.git', '.svn' directory + return if $file =~ m! / \. !x; + + # must be a file, not a directory + return unless -f $file; + + # must have a source file extension or be a utility script (extensionless) + return unless $file =~ m! / ( [A-Za-z0-9_.-]+ \. ( pl | php | pm | cgi | js | t ) | [a-z0-9_-] + ) $ !x; + + my $content; + open FIN, "<$file"; + { + local $/; + $content = <FIN>; + } + close FIN; + + my $open = quotemeta('# Movable Type (r) Open Source (C)'); + + # skip file if it doesn't contain the Open Source license + return unless $content =~ m/$open/; + + my $close = quotemeta('# GNU General Public License, version 2.'); + + # non-distributable license text + my $license = <<EOT; + +# This code cannot be redistributed without permission from www.sixapart.com. +# For more information, consult your Movable Type license. +EOT + chomp($license); + + $content =~ s{$open (\d+(-\d+)?).*?$close} + { '# Movable Type (r) (C) ' . $1 . ' Six Apart, Ltd. All Rights Reserved.' . $license }se; + + open FOUT, ">$file"; + print FOUT $content; + close FOUT; +} + sub make_manifest_skip { - my ($rules, $file) = @_; - my @rules = split /\n/, $rules; - - my @result; - foreach my $rule (@rules) { - if ($rule =~ m/^#\?([^=]+)=([^ ]+) +(.+)$/) { - # a conditional rule - my $var = $1; - my $val = $2; - my $skip = $3; - - if (($options{$var} || '') eq $val) { - push @result, $skip; - } - } - push @result, $rule; - } - - my $result = join "\n", @result; - - local *FOUT; - open *FOUT, ">$file"; - print FOUT $result; - close FOUT; + my ($rules, $file) = @_; + my @rules = split /\n/, $rules; + + my @result; + foreach my $rule (@rules) { + if ($rule =~ m/^#\?([^=]+)=([^ ]+) +(.+)$/) { + # a conditional rule + my $var = $1; + my $val = $2; + my $skip = $3; + + if (($options{$var} || '') eq $val) { + push @result, $skip; + } + } + push @result, $rule; + } + + my $result = join "\n", @result; + + local *FOUT; + open *FOUT, ">$file"; + print FOUT $result; + close FOUT; } sub verbose_command { build/mt-dists/make-dists @@ -1,3 +1,9 @@ +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + package MT::L10N::lang_tag; ## <--- Replace "lang_tag" with proper tag. use strict; use MT::L10N; build/sample.pm @@ -1,9 +1,10 @@ #!/usr/bin/perl -#is svn working? - -# Six Apart Theme Repo -# https://svn.sixapart.com/repos/themes/ +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ use strict; use warnings; build/theme-builder.pl @@ -401,12 +401,12 @@ ul { list-style: disc outside; } margin-bottom: 5px; } -.widget-cloud .widget-list { +.widget-tag-cloud .widget-list { margin-right: 0; margin-left: 0; } -.widget-cloud .widget-list-item { +.widget-tag-cloud .widget-list-item { display: inline; margin: 0 5px 0 0; padding: 0; @@ -414,23 +414,23 @@ ul { list-style: disc outside; } background: none; } -.widget-cloud .rank-1 { font-size: 1.75em; } -.widget-cloud .rank-2 { font-size: 1.75em; } -.widget-cloud .rank-3 { font-size: 1.625em; } -.widget-cloud .rank-4 { font-size: 1.5em; } -.widget-cloud .rank-5 { font-size: 1.375em; } -.widget-cloud .rank-6 { font-size: 1.25em; } -.widget-cloud .rank-7 { font-size: 1.125em; } -.widget-cloud .rank-8 { font-size: 1em; } -.widget-cloud .rank-9 { font-size: 0.95em; } -.widget-cloud .rank-10 { font-size: 0.9em; } +.widget-tag-cloud .rank-1 { font-size: 1.75em; } +.widget-tag-cloud .rank-2 { font-size: 1.75em; } +.widget-tag-cloud .rank-3 { font-size: 1.625em; } +.widget-tag-cloud .rank-4 { font-size: 1.5em; } +.widget-tag-cloud .rank-5 { font-size: 1.375em; } +.widget-tag-cloud .rank-6 { font-size: 1.25em; } +.widget-tag-cloud .rank-7 { font-size: 1.125em; } +.widget-tag-cloud .rank-8 { font-size: 1em; } +.widget-tag-cloud .rank-9 { font-size: 0.95em; } +.widget-tag-cloud .rank-10 { font-size: 0.9em; } #footer .widget-content { margin-top: 0; margin-bottom: 0; } -.widget-assets .widget-content .widget-list { +.widget-recent-assets .widget-content .widget-list { overflow: auto; margin-right: 0; } default_templates/base_theme.mtml @@ -6,6 +6,9 @@ <MTSetVar name="feedback_template" value="1"> <MTSetVarBlock name="page_title"><__trans phrase="Comment on [_1]" params="<$MTEntryTitle$>"></MTSetVarBlock> <MTSetVarBlock name="title"><$MTBlogName encode_html="1"$>: <$MTGetVar name="page_title"$></MTSetVarBlock> +<MTSetVarBlock name="html_head"> +<script type="text/javascript" src="<$MTLink template="javascript"$>"></script> +</MTSetVarBlock> <$MTInclude module="<__trans phrase="Header">"$> default_templates/comment_preview.mtml @@ -2,10 +2,6 @@ <MTSetVar name="main_template" value="1"> <MTSetVar name="main_index" value="1"> <MTSetVar name="sidebar" value="1"> -<MTSetVar name="module_recent_entries" value="1"> -<MTSetVar name="module_category_archives" value="1"> -<MTSetVar name="module_author_archives" value="1"> -<MTSetVar name="module_monthly_archives" value="1"> <MTSetVarBlock name="title"><$MTBlogName encode_html="1"$></MTSetVarBlock> <$MTInclude module="<__trans phrase="Header">"$> default_templates/main_index.mtml @@ -1,6 +1,6 @@ -<__trans phrase="A new [_3] entitled '[_1]' has been published to [_2]." params="<$MTEntryTitle$>%%<$MTBlogName$>%%<$MTEntryClassLabel lower_case="1"$>"> +<__trans phrase="A new [lc,_3] entitled '[_1]' has been published to [_2]." params="<$MTEntryTitle$>%%<$MTBlogName$>%%<$MTEntryClassLabel$>"> -<__trans phrase="View [_1]:" params="<$MTEntryClass lower_case="1"$>"> <<mt:setvarblock name="entry_status"><$MTEntryStatus$></mt:setvarblock><mt:if name="entry_status" eq="Publish"><$MTEntryPermalink$><mt:else><mt:var name="entry_editurl"></mt:if>> +<__trans phrase="View [lc,_1]:" params="<$MTEntryClass$>"> <<mt:setvarblock name="entry_status"><$MTEntryStatus$></mt:setvarblock><mt:if name="entry_status" eq="Publish"><$MTEntryPermalink$><mt:else><mt:var name="entry_editurl"></mt:if>> ------------------------------------------------------------------------ <__trans phrase="[_1] Title: [_2]" params="<$MTEntryClassLabel lower_case="1"$>%%<$MTEntryTitle$>"> default_templates/notify-entry.mtml @@ -4,5 +4,7 @@ <__trans phrase="_USAGE_FORGOT_PASSWORD_2"> + <mt:var name="link_to_login"> + <mt:include module="<__trans phrase="Mail Footer">"> default_templates/recover-password.mtml @@ -33,7 +33,7 @@ </MTIfTagSearch> </MTIf> <MTIf name="module_about_context"> - <div class="widget-welcome widget"> + <div class="widget-about-this-page widget"> <h3 class="widget-header"> <MTIf name="entry_template"> <__trans phrase="About this Entry"> @@ -109,7 +109,7 @@ </div> </MTIf> <MTIf name="module_recent_entries"> - <div class="widget-archives widget"> + <div class="widget-archive widget"> <h3 class="widget-header"><__trans phrase="Recent Entries"></h3> <div class="widget-content"> <ul class="widget-list"> @@ -124,8 +124,8 @@ <MTIfNonZero tag="AssetCount"> <MTAssets type="image" lastn="10"> <MTAssetsHeader> - <div class="widget-assets widget"> - <h3 class="widget-header">Photos</h3> + <div class="widget-recent-assets widget"> + <h3 class="widget-header"><__trans phrase="Photos"></h3> <div class="widget-content"> <ul class="widget-list"></MTAssetsHeader> <li class="item"><a class="asset-image" href="<$MTAssetURL$>"><img src="<$MTAssetThumbnailURL height="70"$>" class="asset-img-thumb" alt="<$MTAssetLabel$>" title="<$MTAssetLabel$>" /></a></li> @@ -136,7 +136,7 @@ </MTAssets> </MTIfNonZero> </MTIf> -<MTIf name="module_category_archives"> +<MTIf name="main_index"> <MTIfArchiveTypeEnabled archive_type="Category"> <div class="widget-categories widget"> <h3 class="widget-header"><__trans phrase="Categories"></h3> @@ -161,7 +161,7 @@ </MTIfArchiveTypeEnabled> </MTIf> <MTIf name="main_index"> - <div class="widget-cloud widget"> + <div class="widget-tag-cloud widget"> <h3 class="widget-header"><__trans phrase="Tag Cloud"></h3> <div class="widget-content"> <ul class="widget-list"> @@ -172,7 +172,7 @@ </div> </div> </MTIf> -<MTIf name="module_author_archives"> +<MTIf name="main_index"> <MTIfArchiveTypeEnabled archive_type="Author"> <MTArchiveList archive_type="Author"> <MTArchiveListHeader> @@ -190,11 +190,11 @@ </MTArchiveList> </MTIfArchiveTypeEnabled> </MTIf> -<MTIf name="module_monthly_archives"> +<MTIf name="main_index"> <MTIfArchiveTypeEnabled archive_type="Monthly"> <MTArchiveList archive_type="Monthly"> <MTArchiveListHeader> - <div class="widget-archives widget"> + <div class="widget-archive widget"> <h3 class="widget-header"><__trans phrase="[_1] <a href="[_2]">Archives</a>" params="<$MTArchiveTypeLabel$>%%<$MTLink template="archive_index"$>"></h3> <div class="widget-content"> <ul class="widget-list"> default_templates/sidebar_2col.mtml @@ -1,7 +1,7 @@ <div id="beta"> <div id="beta-inner"> <MTIf name="module_about_context"> - <div class="widget-welcome widget"> + <div class="widget-about-this-page widget"> <h3 class="widget-header"> <MTIf name="entry_template"> <__trans phrase="About this Entry"> @@ -77,7 +77,7 @@ </div> </MTIf> <MTIf name="main_index"> - <div class="widget-cloud widget"> + <div class="widget-tag-cloud widget"> <h3 class="widget-header"><__trans phrase="Tag Cloud"></h3> <div class="widget-content"> <ul class="widget-list"> @@ -88,7 +88,7 @@ </div> </div> </MTIf> -<MTIf name="module_author_archives"> +<MTIf name="main_index"> <MTIfArchiveTypeEnabled archive_type="Author"> <MTArchiveList archive_type="Author"> <MTArchiveListHeader> @@ -106,11 +106,11 @@ </MTArchiveList> </MTIfArchiveTypeEnabled> </MTIf> -<MTIf name="module_monthly_archives"> +<MTIf name="main_index"> <MTIfArchiveTypeEnabled archive_type="Monthly"> <MTArchiveList archive_type="Monthly"> <MTArchiveListHeader> - <div class="widget-archives widget"> + <div class="widget-archive widget"> <h3 class="widget-header"><__trans phrase="[_1] <a href="[_2]">Archives</a>" params="<$MTArchiveTypeLabel$>%%<$MTLink template="archive_index"$>"></h3> <div class="widget-content"> <ul class="widget-list"> @@ -214,7 +214,7 @@ </MTIfTagSearch> </MTIf> <MTIf name="module_recent_entries"> - <div class="widget-archives widget"> + <div class="widget-archive widget"> <h3 class="widget-header"><__trans phrase="Recent Entries"></h3> <div class="widget-content"> <ul class="widget-list"> @@ -229,8 +229,8 @@ <MTIfNonZero tag="AssetCount"> <MTAssets type="image" lastn="10"> <MTAssetsHeader> - <div class="widget-assets widget"> - <h3 class="widget-header">Photos</h3> + <div class="widget-recent-assets widget"> + <h3 class="widget-header"><__trans phrase="Photos"></h3> <div class="widget-content"> <ul class="widget-list"></MTAssetsHeader> <li class="item"><a class="asset-image" href="<$MTAssetURL$>"><img src="<$MTAssetThumbnailURL height="70"$>" class="asset-img-thumb" alt="<$MTAssetLabel$>" title="<$MTAssetLabel$>" /></a></li> @@ -241,7 +241,7 @@ </MTAssets> </MTIfNonZero> </MTIf> -<MTIf name="module_category_archives"> +<MTIf name="main_index"> <MTIfArchiveTypeEnabled archive_type="Category"> <div class="widget-categories widget"> <h3 class="widget-header"><__trans phrase="Categories"></h3> default_templates/sidebar_3col.mtml @@ -2,7 +2,9 @@ package TheSchwartz; use strict; -use fields qw( databases retry_seconds dead_dsns retry_at funcmap_cache verbose all_abilities current_abilities current_job cached_drivers driver_cache_expiration ); +use fields qw( databases retry_seconds dead_dsns retry_at funcmap_cache verbose all_abilities current_abilities current_job cached_drivers driver_cache_expiration scoreboard ); + +our $VERSION = "1.06"; use Carp qw( croak ); use Data::ObjectDriver::Errors; @@ -34,6 +36,7 @@ sub new { $client->{retry_seconds} = delete $args{retry_seconds} || RETRY_DEFAULT; $client->set_verbose(delete $args{verbose}); + $client->set_scoreboard(delete $args{scoreboard}); $client->{driver_cache_expiration} = delete $args{driver_cache_expiration} || 0; croak "unknown options ", join(', ', keys %args) if keys %args; @@ -78,8 +81,8 @@ sub driver_for { ($db->{prefix} ? (prefix => $db->{prefix}) : ()), ); if ($cache_duration) { - $client->{cached_drivers}{$hashdsn}{driver} = $driver; - $client->{cached_drivers}{$hashdsn}{create_ts} = $t; + $client->{cached_drivers}{$hashdsn}{driver} = $driver; + $client->{cached_drivers}{$hashdsn}{create_ts} = $t; } } return $driver; @@ -266,6 +269,13 @@ sub find_job_for_workers { } } +sub get_server_time { + my TheSchwartz $client = shift; + my($driver) = @_; + my $unixtime_sql = $driver->dbd->sql_for_unixtime; + return $driver->rw_handle->selectrow_array("SELECT $unixtime_sql"); +} + sub _grab_a_job { my TheSchwartz $client = shift; my $hashdsn = shift; @@ -284,8 +294,7 @@ sub _grab_a_job { my $worker_class = $job->funcname; my $old_grabbed_until = $job->grabbed_until; - my $unixtime_sql = $driver->dbd->sql_for_unixtime; - my $server_time = $driver->rw_handle->selectrow_array("SELECT $unixtime_sql") + my $server_time = $client->get_server_time($driver) or die "expected a server time"; $job->grabbed_until($server_time + ($worker_class->grab_for || 1)); @@ -321,15 +330,21 @@ sub shuffled_databases { sub insert_job_to_driver { my $client = shift; my($job, $driver, $hashdsn) = @_; - #eval { + eval { ## Set the funcid of the job, based on the funcname. Since each ## database has a separate cache, this needs to be calculated based ## on the hashed DSN. Also: this might fail, if the database is dead. $job->funcid( $client->funcname_to_id($driver, $hashdsn, $job->funcname) ); + ## This is sub-optimal because of clock skew, but something is + ## better than a NULL value. And currently, nothing in TheSchwartz + ## code itself uses insert_time. TODO: use server time, but without + ## having to do a roundtrip just to get the server time. + $job->insert_time(time); + ## Now, insert the job. This also might fail. $driver->insert($job); - #}; + }; if ($@) { unless (OK_ERRORS->{ $driver->last_error || 0 }) { $client->mark_database_as_dead($hashdsn); @@ -564,6 +579,108 @@ sub set_verbose { $client->{verbose} = $logger; } +sub scoreboard { + my TheSchwartz $client = shift; + + return $client->{scoreboard}; +} + +sub set_scoreboard { + my TheSchwartz $client = shift; + my ($dir) = @_; + + return unless $dir; + + # They want the scoreboard but don't care where it goes + if (($dir eq '1') or ($dir eq 'on')) { + # Find someplace in tmpfs to save this + foreach my $d (qw(/var/run /dev/shm)) { + $dir = $d; + last if -e $dir; + } + } + + $dir .= '/theschwartz'; + unless (-e $dir) { + mkdir($dir, 0755) or die "Can't create scoreboard directory '$dir': $!"; + } + + $client->{scoreboard} = $dir."/scoreboard.$$"; +} + +sub start_scoreboard { + my TheSchwartz $client = shift; + + # Don't do anything if we're not configured to write to the scoreboard + my $scoreboard = $client->scoreboard; + return unless $scoreboard; + + # Don't do anything of (for some reason) we don't have a current job + my $job = $client->current_job; + return unless $job; + + my $class = $job->funcname; + + open(SB, '>', $scoreboard) + or $job->debug("Could not write scoreboard '$scoreboard': $!"); + print SB join("\n", ("pid=$$", + 'funcname='.($class||''), + 'started='.($job->grabbed_until-($class->grab_for||1)), + 'arg='._serialize_args($job->arg), + ) + ), "\n"; + close(SB); + + return; +} + +# Quick and dirty serializer. Don't use Data::Dumper because we don't need to +# recurse indefinitely and we want to truncate the output produced +sub _serialize_args { + my ($args) = @_; + + if (ref $args) { + if (ref $args eq 'HASH') { + return join ',', + map { ($_||'').'='.substr($args->{$_}||'', 0, 200) } + keys %$args; + } elsif (ref $args eq 'ARRAY') { + return join ',', + map { substr($_||'', 0, 200) } + @$args; + } + } else { + return $args; + } +} + +sub end_scoreboard { + my TheSchwartz $client = shift; + + # Don't do anything if we're not configured to write to the scoreboard + my $scoreboard = $client->scoreboard; + return unless $scoreboard; + + my $job = $client->current_job; + + open(SB, '>>', $scoreboard) + or $job->debug("Could not append scoreboard '$scoreboard': $!"); + print SB "done=".time."\n"; + close(SB); + + return; +} + +sub clean_scoreboard { + my TheSchwartz $client = shift; + + # Don't do anything if we're not configured to write to the scoreboard + my $scoreboard = $client->scoreboard; + return unless $scoreboard; + + unlink($scoreboard); +} + # current job being worked. so if something dies, work_safely knows which to mark as dead. sub current_job { my TheSchwartz $client = shift; @@ -575,6 +692,15 @@ sub set_current_job { $client->{current_job} = shift; } +DESTROY { + foreach my $arg (@_) { + # Call 'clean_scoreboard' on TheSchwartz objects + if (ref($arg) and $arg->isa('TheSchwartz')) { + $arg->clean_scoreboard; + } + } +} + 1; __END__ @@ -603,14 +729,14 @@ TheSchwartz - reliable job queue sub work { my $class = shift; my TheSchwartz::Job $job = shift; - + print "Workin' hard or hardly workin'? Hyuk!!\n"; $job->completed(); } package main; - + my $client = TheSchwartz->new( databases => $DATABASE_INFO ); $client->can_do('MyWorker'); $client->work(); @@ -788,6 +914,10 @@ Find and perform any jobs C<$client> can do, forever. When no job is available, the working process will sleep for C<$delay> seconds (or 5, if not specified) before looking again. +=head2 C<$client-E<gt>work_on($handle)> + +Given a job handle (a scalar string) I<$handle>, runs the job, then returns. + =head2 C<$client-E<gt>find_job_for_workers( [$abilities] )> Returns a C<TheSchwartz::Job> for a random job that the client can do. If @@ -808,5 +938,19 @@ Note the C<TheSchwartz> implementation of this function uses a C<LIKE> query to find matching jobs, with all the attendant performance implications for your job databases. +=head2 C<$client-E<gt>get_server_time( $driver )> + +Given an open driver I<$driver> to a database, gets the current server time from the database. + +=head1 COPYRIGHT, LICENSE & WARRANTY + +This software is Copyright 2007, Six Apart Ltd, cpan@sixapart.com. All +rights reserved. + +TheSchwartz is free software; you may redistribute it and/or modify it +under the same terms as Perl itself. + +TheScwhartz comes with no warranty of any kind. + =cut extlib/TheSchwartz.pm @@ -24,6 +24,8 @@ sub work_safely { $job->debug("Working on $class ..."); $job->set_as_current; + $client->start_scoreboard; + eval { $res = $class->work($job); }; @@ -37,6 +39,8 @@ sub work_safely { $cjob->failed('Job did not explicitly complete, fail, or get replaced'); } + $client->end_scoreboard; + # FIXME: this return value is kinda useless/undefined. should we even return anything? any callers? -brad return $res; } extlib/TheSchwartz/Worker.pm @@ -1,5 +1,6 @@ -# Copyright 2005-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. +# Movable Type (r) Open Source (C) 2005-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ extras/examples/plugins/BackupRestoreSample/BackupRestoreSample.pl @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ extras/examples/plugins/BackupRestoreSample/lib/BackupRestoreSample/Object.pm @@ -1,9 +1,13 @@ -# CommentByGoogleAccount plugin for Movable Type -# Author: Six Apart (http://www.sixapart.com) -# Released under the Artistic License +# Movable Type (r) Open Source (C) 2005-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ +# CommentByGoogleAccount plugin for Movable Type +# Author: Six Apart (http://www.sixapart.com) +# Released under the Artistic and GPLv2 License + package MT::Plugin::CommentByGoogleAccount; use strict; extras/examples/plugins/CommentByGoogleAccount/CommentByGoogleAccount.pl @@ -1,9 +1,13 @@ -# CommentByGoogleAccount plugin for Movable Type -# Author: Six Apart (http://www.sixapart.com) -# Released under the Artistic License +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ +# CommentByGoogleAccount plugin for Movable Type +# Author: Six Apart (http://www.sixapart.com) +# Released under the Artistic and GPLv2 License + package CommentByGoogleAccount; use strict; extras/examples/plugins/CommentByGoogleAccount/lib/CommentByGoogleAccount.pm @@ -1,9 +1,13 @@ -# FiveStarRating plugin for Movable Type -# Author: Six Apart (http://www.sixapart.com) -# Released under the Artistic License +# Movable Type (r) Open Source (C) 2005-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ +# FiveStarRating plugin for Movable Type +# Author: Six Apart (http://www.sixapart.com) +# Released under the Artistic and GPLv2 License + package MT::Plugin::FiveStarRating; use strict; extras/examples/plugins/FiveStarRating/plugins/FiveStarRating/FiveStarRating.pl @@ -1,5 +1,6 @@ -# Copyright 2005-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ extras/examples/plugins/FiveStarRating/plugins/FiveStarRating/lib/FiveStarRating.pm @@ -1,7 +1,8 @@ #!/usr/bin/perl -w -# Copyright 2005-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. +# Movable Type (r) Open Source (C) 2005-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ extras/examples/plugins/FiveStarRating/plugins/FiveStarRating/rate.cgi @@ -1,9 +1,13 @@ -# GoogleSearch plugin for Movable Type -# Author: Six Apart (http://www.sixapart.com) -# Released under the Artistic License +# Movable Type (r) Open Source (C) 2005-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ +# GoogleSearch plugin for Movable Type +# Author: Six Apart (http://www.sixapart.com) +# Released under the Artistic and GPLv2 License + package MT::Plugin::GoogleSearch; use strict; extras/examples/plugins/GoogleSearch/GoogleSearch.pl @@ -1,9 +1,13 @@ -# GoogleSearch plugin for Movable Type -# Author: Six Apart (http://www.sixapart.com) -# Released under the Artistic License +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ +# GoogleSearch plugin for Movable Type +# Author: Six Apart (http://www.sixapart.com) +# Released under the Artistic and GPLv2 License + package GoogleSearch::L10N; use strict; use base 'MT::Plugin::L10N'; extras/examples/plugins/GoogleSearch/lib/GoogleSearch/L10N.pm @@ -1,8 +1,12 @@ +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + # GoogleSearch plugin for Movable Type # Author: Six Apart (http://www.sixapart.com) -# Released under the Artistic License -# -# $Id: ja.pm 30952 2006-06-13 09:20:43Z jallen $ +# Released under the Artistic and GPLv2 License package GoogleSearch::L10N::de; extras/examples/plugins/GoogleSearch/lib/GoogleSearch/L10N/de.pm @@ -1,9 +1,13 @@ -# GoogleSearch plugin for Movable Type -# Author: Six Apart (http://www.sixapart.com) -# Released under the Artistic License +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ +# GoogleSearch plugin for Movable Type +# Author: Six Apart (http://www.sixapart.com) +# Released under the Artistic and GPLv2 License + package GoogleSearch::L10N::en_us; use strict; extras/examples/plugins/GoogleSearch/lib/GoogleSearch/L10N/en_us.pm @@ -1,8 +1,12 @@ +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + # GoogleSearch plugin for Movable Type # Author: Six Apart (http://www.sixapart.com) -# Released under the Artistic License -# -# $Id: ja.pm 30952 2006-06-13 09:20:43Z jallen $ +# Released under the Artistic and GPLv2 License package GoogleSearch::L10N::es; extras/examples/plugins/GoogleSearch/lib/GoogleSearch/L10N/es.pm @@ -1,8 +1,12 @@ +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + # GoogleSearch plugin for Movable Type # Author: Six Apart (http://www.sixapart.com) -# Released under the Artistic License -# -# $Id: ja.pm 30952 2006-06-13 09:20:43Z jallen $ +# Released under the Artistic and GPLv2 License package GoogleSearch::L10N::fr; extras/examples/plugins/GoogleSearch/lib/GoogleSearch/L10N/fr.pm @@ -1,9 +1,13 @@ -# GoogleSearch plugin for Movable Type -# Author: Six Apart (http://www.sixapart.com) -# Released under the Artistic License +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ +# GoogleSearch plugin for Movable Type +# Author: Six Apart (http://www.sixapart.com) +# Released under the Artistic and GPLv2 License + package GoogleSearch::L10N::ja; use strict; extras/examples/plugins/GoogleSearch/lib/GoogleSearch/L10N/ja.pm @@ -1,8 +1,12 @@ +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + # GoogleSearch plugin for Movable Type # Author: Six Apart (http://www.sixapart.com) -# Released under the Artistic License -# -# $Id: ja.pm 30952 2006-06-13 09:20:43Z jallen $ +# Released under the Artistic and GPLv2 License package GoogleSearch::L10N::nl; extras/examples/plugins/GoogleSearch/lib/GoogleSearch/L10N/nl.pm @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtgooglesearch($args, $content, &$ctx, &$repeat) { $localvars = array('google_result_item', 'google_results', '_result_count'); if (!isset($content)) { extras/examples/plugins/GoogleSearch/php/block.mtgooglesearch.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtgooglesearchresult($args, &$ctx) { $result = $ctx->stash('google_result_item'); $prop = $args['property']; extras/examples/plugins/GoogleSearch/php/function.mtgooglesearchresult.php @@ -1,7 +1,8 @@ #!/usr/bin/perl -w -# Copyright 2005-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. +# Movable Type (r) Open Source (C) 2005-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ extras/examples/plugins/l10nsample/l10nsample.cgi @@ -1,5 +1,6 @@ -# Copyright 2005-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. +# Movable Type (r) Open Source (C) 2005-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ extras/examples/plugins/l10nsample/l10nsample.pl @@ -1,5 +1,6 @@ -# Copyright 2005-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ extras/examples/plugins/l10nsample/lib/l10nsample.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ extras/examples/plugins/l10nsample/lib/l10nsample/L10N.pm @@ -1,3 +1,9 @@ +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + package l10nsample::L10N::en_us; use strict; extras/examples/plugins/l10nsample/lib/l10nsample/L10N/en_us.pm @@ -1,3 +1,9 @@ +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + package l10nsample::L10N::ja; use strict; extras/examples/plugins/l10nsample/lib/l10nsample/L10N/ja.pm @@ -1,5 +1,6 @@ -# Copyright 2004-2007 Six Apart. This code cannot be redistributed without -# permission from www.movabletype.org. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ extras/examples/plugins/mirror/lib/Mirror.pm @@ -1,4 +1,8 @@ -#!/usr/bin/perl +# Movable Type (r) Open Source (C) 2005-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ use strict; extras/examples/plugins/mirror/mirror.pl @@ -1,5 +1,11 @@ #!/usr/bin/perl -w +# Movable Type (r) Open Source (C) 2005-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + use strict; use lib "lib", ($ENV{MT_HOME} ? "$ENV{MT_HOME}/lib" : "../../lib"); use MT::Bootstrap App => 'Mirror'; extras/examples/plugins/mirror/mt-mirror.cgi @@ -1,9 +1,13 @@ -# reCaptcha plugin for Movable Type -# Author: Six Apart (http://www.sixapart.com) -# Released under the Artistic License +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ +# reCaptcha plugin for Movable Type +# Author: Six Apart (http://www.sixapart.com) +# Released under the Artistic and GPLv2 License + package reCaptcha; use strict; extras/examples/plugins/reCaptcha/lib/reCaptcha.pm @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once("captcha_lib.php"); class reCaptcha extends BaseCaptchaProvider { extras/examples/plugins/reCaptcha/php/init.reCaptcha.php @@ -1,9 +1,13 @@ -# reCaptcha plugin for Movable Type -# Author: Six Apart (http://www.sixapart.com) -# Released under the Artistic License +# Movable Type (r) Open Source (C) 2005-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ +# reCaptcha plugin for Movable Type +# Author: Six Apart (http://www.sixapart.com) +# Released under the Artistic and GPLv2 License + package MT::Plugin::reCaptcha; use strict; extras/examples/plugins/reCaptcha/reCaptcha.pl @@ -19,7 +19,7 @@ a:link, a:visited { - color: #61889b; + color: #33789c; } a:hover, index.html.de @@ -19,7 +19,7 @@ a:link, a:visited { - color: #61889b; + color: #33789c; } a:hover, index.html.en_US @@ -19,7 +19,7 @@ a:link, a:visited { - color: #61889b; + color: #33789c; } a:hover, index.html.es @@ -19,7 +19,7 @@ a:link, a:visited { - color: #61889b; + color: #33789c; } a:hover, index.html.fr @@ -19,7 +19,7 @@ a:link, a:visited { - color: #61889b; + color: #33789c; } a:hover, index.html.ja @@ -19,7 +19,7 @@ a:link, a:visited { - color: #61889b; + color: #33789c; } a:hover, index.html.nl @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -481,8 +481,7 @@ sub add_plugin { return; } $plugin->envelope($plugin_envelope); - Carp::confess -"You cannot register multiple plugin objects from a single script. $plugin_sig" + Carp::confess("You cannot register multiple plugin objects from a single script. $plugin_sig") if exists( $Plugins{$plugin_sig} ) && ( exists $Plugins{$plugin_sig}{object} ); @@ -961,6 +960,7 @@ sub init_core { my $defaults = $c->{registry}{config_settings}; $defaults->{DefaultLanguage}{default} = '__BUILD_LANGUAGE__'; $defaults->{NewsboxURL}{default} = '__NEWSBOX_URL__'; + $defaults->{LearningNewsURL}{default} = '__LEARNINGNEWS_URL__'; $defaults->{SupportURL}{default} = '__SUPPORT_URL__'; $defaults->{NewsURL}{default} = '__NEWS_URL__'; $defaults->{HelpURL}{default} = '__HELP_URL__'; @@ -1758,7 +1758,7 @@ sub static_file_path { if exists $app->{__static_file_path}; my $path = $app->config('StaticFilePath'); - return $app->{__static_file_path} = $path if $path && -d $path; + return $app->{__static_file_path} = $path if defined $path; # Attempt to derive StaticFilePath based on environment my $web_path = $app->config->StaticWebPath || 'mt-static'; @@ -1934,7 +1934,7 @@ sub build_page { } pop @{ $param->{page_titles} }; if (my $lang_id = $mt->current_language) { - $param->{local_lang_id} ||= lc $lang_id if $lang_id !~ m/^en/i; + $param->{local_lang_id} ||= lc $lang_id; } $param->{magic_token} = $mt->current_magic if $mt->user; @@ -1959,16 +1959,12 @@ sub build_page { $param->{packs_installed} = \@packs_installed; $param->{portal_url} = $mt->translate("http://www.movabletype.com/"); - my $tmpl_file; + my $tmpl_file = ''; if (UNIVERSAL::isa($file, 'MT::Template')) { $tmpl = $file; - $tmpl_file = (exists $file->{__file}) ? '.'.$file->{__file} : ''; + $tmpl_file = (exists $file->{__file}) ? $file->{__file} : ''; } else { $tmpl = $mt->load_tmpl($file) or return; - $tmpl_file = '.' . $file; - } - if ($tmpl_file) { - $tmpl_file =~ s/\.tmpl$//; } if (($mode && ($mode !~ m/delete/)) && ($mt->{login_again} || @@ -1989,6 +1985,12 @@ sub build_page { $tmpl->context()->stash('blog', $blog) if $blog; $tmpl->param($param) if $param; + + if ($tmpl_file) { + $tmpl_file = File::Basename::basename($tmpl_file); + $tmpl_file =~ s/\.tmpl$//; + $tmpl_file = '.' . $tmpl_file; + } $mt->run_callbacks('template_param' . $tmpl_file, $mt, $tmpl->param, $tmpl); my $output = $mt->build_page_in_mem($tmpl); @@ -2409,7 +2411,7 @@ sub handler_to_coderef { if ( $hdlr_pkg =~ s/(->|::)([^:]+)$// ) { # strip routine name $method = $2 if $1 eq '->'; } - if ( !defined(&$name) && !UNIVERSAL::can( $hdlr_pkg, 'AUTOLOAD' ) ) { + if ( !defined(&$name) && !$pkg->can( 'AUTOLOAD' ) ) { # The delayed option will return a coderef that delays the loading # of the package holding the handler routine. @@ -2460,7 +2462,7 @@ sub handler_to_coderef { no strict 'refs'; my $hdlr = ( defined &$name ? \&$name - : ( UNIVERSAL::can( $hdlr_pkg, 'AUTOLOAD' ) ? \&$name + : ( $pkg->can( 'AUTOLOAD' ) ? \&$name : undef ) ); use strict 'refs'; @@ -2479,7 +2481,7 @@ sub handler_to_coderef { ( defined &$name ? \&$name - : ( UNIVERSAL::can( $hdlr_pkg, 'AUTOLOAD' ) ? \&$name : undef ) + : ( $hdlr_pkg->can( 'AUTOLOAD' ) ? \&$name : undef ) ); } } @@ -2659,11 +2661,6 @@ configuration settings. Registers the standard set of periodic tasks that Movable Type provides and then invokes the C<init_tasks> method for each available plugin. -=head2 MT->add_task - -An alias for L<MT::TaskMgr-E<gt>add_task>. Refer to the L<MT::TaskMgr> -documentation for more information. - =head2 MT->run_tasks Initializes the tasks, running C<init_tasks> and invokes the task system @@ -2874,86 +2871,6 @@ Adds the plugin described by $plugin to the list of plugins displayed on the welcome page. The argument should be an object of the I<MT::Plugin> class. -=head2 MT->add_plugin_action($where, $action_link, $link_text) - -An alias to the active L<MT::App> instance C<add_plugin_action> method. -Please refer to the L<MT::App> module for further documentation. - -=head2 MT->add_itemset_action(\%options) - -An alias to the active L<MT::App::CMS> instance C<add_itemset_action> method. -Please refer to the L<MT::App::CMS> module for further documentation. - -=head2 MT->add_text_filter($key, \%options) - -Adds a text filter with the short name I<$key> and the options in -I<\%options>. - -The text filter will be added to MT's list of text filtering options in -the new/edit entry screen, and will be used for filtering all of the entry -fields, if the user has enabled filtering for those fields in the template -(for example, by default the entry body and extended text are both run -through the filter, but the excerpt is not). - -I<$key> should be a lower-case identifier containing only -alphanumerics and C<_> (that is, matching C</\w+/>). Since I<$key> is -stored as the filter name on a per-entry basis, it B<should not change>. -(In other words, don't call if I<foo> in one version and I<foo_bar> in -the next, if the filter does the same thing in each version.) - -The flip side of this, though, is that if your filter acts differently -from one version to the next, you B<should> change I<$key>, and you -should also change the filename of your plugin, so that the old -implementation--which may be associated with all of the entries in the user's -system--still works as usual. For example, if your C<foo> plugin changes -semantics drastically so that paragraph breaks are represented as two -C<E<lt>br /E<gt>> tags, rather than C<E<lt>pE<gt>> tags, you should change -the key of the new version to C<foo_2> (for example), and the filename to -F<foo_2.pl>. - -I<%options> can contain: - -=over 4 - -=item * label - -The short-but-descriptive label for the filter. This will be displayed in -the Movable Type UI as the name of the text filter. - -=item * on_format - -A reference to a subroutine that will be executed to filter a string of -text. The subroutine will always receive one argument, the string of text to -filter, and should return the filtered string. In some cases--for example, -when called while building a template--the subroutine will receive a -second argument, the I<MT::Template::Context> object handling the build. - -See the example below. - -=item * docs - -The URL (or filename) of a document containing documentation on your filter. -This will be displayed in a popup window when the user selects your filter -on the New/Edit Entry screen, then clicks the Help link (C<(?)>). - -If the value is a full URL (starting with C<http://>), the popup window -will open with that URL; otherwise, it is treated as a filename, assumed to -be in the user's F<docs> folder. - -=back - -Here's an example of adding a text filter for Wiki formatting, using the -I<Text::WikiFormat> CPAN module: - - MT->add_text_filter(wiki => { - label => 'Wiki', - on_format => sub { - require Text::WikiFormat; - Text::WikiFormat::format($_[0]); - }, - docs => 'http://www.foo.com/mt/wiki.html', - }); - =head2 MT->all_text_filters Returns a reference to a hash containing the registry of text filters. @@ -2979,12 +2896,6 @@ I<$entry>, you would use my $out = MT->apply_text_filters($entry->text, $entry->text_filters); -=head2 MT->add_log_class($class) - -Registers a new L<MT::Log> subclass with MT, which is used for presenting -specific types of log records in the activity log and activity feeds. See -L<MT::Log> for further documentation on custom log classes. - =head2 MT->add_callback($meth, $priority, $plugin, $code) Registers a new callback handler for a particular registered callback. @@ -3053,21 +2964,6 @@ Which would execute any handlers that registered in this fashion: MT->add_callback('MyClass::frobnitzes', 4, $plugin, \&frobnitz_hdlr); -=head2 MT->register_junk_filter( $filter ) - -Registers a new L<MT::JunkFilter> with Movable Type. Junk filters are -used to identify spam for incoming feedback. Please see documentation -for L<MT::JunkFilter> for more information. - -Example: - - require MT::JunkFilter; - MT->register_junk_filter(new MT::JunkFilter({ - name => "My Junk Filter", - code => sub { $plugin->my_junk_filter(@_) }, - plugin => $plugin, - })); - =head2 MT->run_callback($cb[, $arg1, $arg2, ...]) An internal routine used by C<run_callbacks> to invoke a single lib/MT.pm.pre @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -11,7 +11,7 @@ use base qw( MT ); use File::Spec; use MT::Request; -use MT::Util qw( encode_html offset_time_list decode_html encode_url is_valid_email is_valid_url ); +use MT::Util qw( encode_html offset_time_list decode_html encode_url is_valid_email is_url ); use MT::I18N qw( encode_text wrap_text ); my $COOKIE_NAME = 'mt_user'; @@ -176,6 +176,7 @@ sub filter_conditional_list { } return \%list; } + return undef; } sub page_actions { @@ -262,6 +263,7 @@ sub listing { || 'list_' . $type . '.tmpl'; my $iter_method = $opt->{iterator} || $opt->{Iterator} || 'load_iter'; my $param = $opt->{params} || $opt->{Params} || {}; + $param->{listing_screen} = 1; my $add_pseudo_new_user = delete $param->{pseudo_new_user} if exists $param->{pseudo_new_user}; my $hasher = $opt->{code} || $opt->{Code}; @@ -702,6 +704,8 @@ sub init_request { $app->{query} = CGI->new( $app->{no_read_body} ? {} : () ); } } + $app->init_query(); + $app->{return_args} = $app->{query}->param('return_args'); $app->cookies; @@ -714,6 +718,25 @@ sub init_request { $app->{init_request} = 1; } +sub init_query { + my $app = shift; + my $q = $app->{query}; + # CGI.pm has this terrible flaw in that if a POST is in effect, + # it totally ignores any query parameters. + if ($app->request_method eq 'POST') { + my $query_string; + if ($ENV{MOD_PERL}) { + $query_string = $q->r->args; + } else { + $query_string = $ENV{'QUERY_STRING'} if defined $ENV{'QUERY_STRING'}; + $query_string ||= $ENV{'REDIRECT_QUERY_STRING'} if defined $ENV{'REDIRECT_QUERY_STRING'}; + } + if (defined($query_string) and $query_string ne '') { + $q->parse_params($query_string); + } + } +} + sub registry { my $app = shift; my $ar = $app->SUPER::registry("applications", $app->id, @_); @@ -1230,7 +1253,7 @@ sub _is_commenter { last; } } - return $app->error($app->translate('You do not have rights; please contact your Movable Type system administrator for gaining access to this installation.')) + return $app->error($app->translate('Our apologies, but you do not have permission to access any blogs within this installation. If you feel you have reached this message in error, please contact your Movable Type system administrator.')) unless $has_system_permission; return -1; } @@ -1525,7 +1548,7 @@ sub create_user_pending { } $url = $q->param('url'); - if ( $url && !is_valid_url($url) ) { + if ( $url && !is_url($url) ) { return $app->error($app->translate("URL is invalid.")); } } @@ -1832,7 +1855,7 @@ sub request_method { if ($ENV{MOD_PERL}) { $app->{request_method} = Apache->request->method; } else { - $app->{request_method} = $ENV{REQUEST_METHOD}; + $app->{request_method} = $ENV{REQUEST_METHOD} || ''; } } $app->{request_method}; lib/MT/App.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -19,11 +19,16 @@ sub init { my $app = shift; $app->SUPER::init(@_) or return; $app->{template_dir} = 'feeds'; - $app->{requires_login} = 1; $app->{is_admin} = 1; $app->init_core_callbacks(); } +sub init_request { + my $app = shift; + $app->SUPER::init_request(@_); + $app->{requires_login} = 1; +} + # Defines the basic MT activity feeds. sub init_core_callbacks { my $app = shift; @@ -276,7 +281,12 @@ sub apply_log_filter { $arg{'level'} = \@types; } } elsif ($filter_col eq 'class') { - $arg{class} = [ split /,/, $val ]; + if ($val eq 'publish') { + $arg{category} = 'publish'; + } + else { + $arg{class} = [ split /,/, $val ]; + } } } $arg{blog_id} = [ split /,/, $param->{blog_id} ] @@ -509,8 +519,12 @@ sub _feed_system { } my $args = {}; - $args->{filter} = $filter || 'class'; - $args->{filter_val} = $filter_val || 'system,page,entry,comment,ping,search'; + unless ($filter && $filter_val) { + $filter = 'class'; + $filter_val = '*'; + } + $args->{filter} = $filter; + $args->{filter_val} = $filter_val; $args->{blog_id} = $blog_id if $blog_id; my $link = $app->base . $app->mt_uri( mode => 'view_log', args => $args ); my $param = { lib/MT/App/ActivityFeeds.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -15,7 +15,7 @@ use MT::Util qw( encode_html format_ts offset_time_list offset_time epoch2ts remove_html get_entry mark_odd_rows first_n_words perl_sha1_digest_hex is_valid_email relative_date ts2epoch perl_sha1_digest encode_url dirify encode_js is_valid_date - archive_file_for is_valid_url ); + archive_file_for is_url ); use MT::I18N qw( substr_text const length_text wrap_text encode_text break_up_text first_n_text guess_encoding ); use CGI; @@ -194,6 +194,8 @@ sub core_methods { 'restore_premature_cancel' => \&restore_premature_cancel, 'adjust_sitepath' => \&adjust_sitepath, 'system_check' => \&system_check, + 'dialog_refresh_templates' => \&dialog_refresh_templates, + 'refresh_all_templates' => \&refresh_all_templates, ## Comment Replies reply => \&reply, @@ -309,6 +311,31 @@ sub core_blog_stats_tabs { }; } +sub core_page_actions { + return { + list_templates => { + refresh_all_blog_templates => { + label => "Refresh Blog Templates", + dialog => 'dialog_refresh_templates', + condition => sub { + MT->app->blog, + }, + order => 1000, + }, + refresh_global_templates => { + label => "Refresh Global Templates", + code => sub { + MT->app->param('no_backup', 1); + MT::Plugin::TemplateRefresh->instance->refresh_all_templates(@_) }, + condition => sub { + ! MT->app->blog, + }, + order => 1000, + continue_prompt => MT->translate('This action will restore your global templates to factory settings without creating a backup. Click OK to continue or Cancel to abort.'), + }, + }, + }; +} sub js_recent_entries_for_tag { my $app = shift; my $user = $app->user or return; @@ -594,6 +621,14 @@ sub init_request { my $mode = $app->mode; + # Global 'blog_id' parameter check; if we get something + # other than an integer, die + if (my $blog_id = $app->param('blog_id')) { + if ($blog_id ne int($blog_id)) { + die $app->translate("Invalid request"); + } + } + if ( ( $mode ne 'logout' ) && ( $mode ne 'start_recover' ) && ( $mode ne 'recover' ) @@ -684,8 +719,9 @@ sub core_list_actions { code => \&publish_entries, permission => 'manage_pages', condition => sub { + return 0 if $app->mode eq 'view'; return $app->blog && $app->blog->site_path ? 1 : 0; - } + }, }, 'set_draft' => { label => "Unpublish Pages", @@ -693,8 +729,9 @@ sub core_list_actions { code => \&draft_entries, permission => 'manage_pages', condition => sub { + return 0 if $app->mode eq 'view'; return $app->blog && $app->blog->site_path ? 1 : 0; - } + }, }, 'add_tags' => { label => "Add Tags...", @@ -703,6 +740,9 @@ sub core_list_actions { input => 1, input_label => 'Tags to add to selected pages', permission => 'manage_pages', + condition => sub { + return 0 if $app->mode eq 'view'; + }, }, 'remove_tags' => { label => "Remove Tags...", @@ -711,12 +751,16 @@ sub core_list_actions { input => 1, input_label => 'Tags to remove from selected pages', permission => 'manage_pages', + condition => sub { + return 0 if $app->mode eq 'view'; + }, }, 'open_batch_editor' => { label => "Batch Edit Pages", code => \&open_batch_editor, order => 500, condition => sub { + return 0 if $app->mode eq 'view'; $app->param('blog_id') && ( $app->user->is_superuser() || $app->permissions->can_manage_pages ); @@ -822,6 +866,34 @@ sub core_list_actions { }, }, }, + 'blog' => { + refresh_blog_templates => { + label => "Refresh Template(s)", + code => sub { MT->app->refresh_all_templates(@_) }, + }, + }, + 'template' => { + refresh_tmpl_templates => { + label => "Refresh Template(s)", + code => sub { MT->app->refresh_individual_templates(@_) }, + permission => 'edit_templates', + }, + publish_index_templates => { + label => "Publish Template(s)", + code => sub { MT->app->publish_index_templates(@_) }, + permission => 'rebuild', + condition => sub { + my $app = MT->app; + my $tmpl_type = $app->param('filter_key'); + return $app->mode eq 'itemset_action' ? 1 + : !$app->blog ? 0 + : !$tmpl_type ? 0 + : $tmpl_type eq 'index_templates' ? 1 + : 0 + ; + }, + }, + }, }; } @@ -1277,6 +1349,14 @@ sub core_list_filters { !$app->param('blog_id'); }, }, + backup_templates => { + label => "Backup Templates", + order => 10000, + handler => sub { + my ($terms) = @_; + $terms->{type} = 'backup'; + }, + }, system_templates => { label => "System Templates", order => 500, @@ -1829,8 +1909,16 @@ sub init_core_callbacks { $pkg . 'not_junk_test' => \&_cb_notjunktest_filter, # assets + $pkg + . 'view_permission_filter.asset' => + \&CMSViewPermissionFilter_asset, + $pkg + . 'delete_permission_filter.asset' => + \&CMSDeletePermissionFilter_asset, + $pkg . 'pre_save.asset' => \&CMSPreSave_asset, $pkg . 'post_save.asset' => \&CMSPostSave_asset, $pkg . 'post_delete.asset' => \&CMSPostDelete_asset, + 'template_param.edit_asset' => \&CMSTemplateParam_edit_asset, } ); } @@ -2067,8 +2155,9 @@ sub reset_password { my $mail_enc = uc( $app->config('MailEncoding') || $charset ); $head{'Content-Type'} = qq(text/plain; charset="$mail_enc"); - my $body = - $app->build_email( 'recover-password.tmpl', { user_password => $pass } ); + my $body = $app->build_email( 'recover-password.tmpl', + { user_password => $pass, link_to_login => $app->base . $app->mt_uri } + ); $body = wrap_text( $body, 72 ); require MT::Mail; MT::Mail->send( \%head, $body ) @@ -2179,12 +2268,17 @@ sub _merge_default_assignments { sub build_asset_hasher { my $app = shift; + my (%param) = @_; + my ($default_thumb_width, $default_thumb_height, $default_preview_width, + $default_preview_height) = + @param{qw( ThumbWidth ThumbHeight PreviewWidth PreviewHeight )}; require File::Basename; require JSON; my %blogs; return sub { - my ( $obj, $row ) = @_; + my ( $obj, $row, %param ) = @_; + my ($thumb_width, $thumb_height) = @param{qw( ThumbWidth ThumbHeight )}; my $blog = $blogs{ $obj->blog_id } ||= $obj->blog; $row->{blog_name} = $blog ? $blog->name : '-'; $row->{url} = $obj->url; # this has to be called to calculate @@ -2216,8 +2310,23 @@ sub build_asset_hasher { my $meta = $obj->metadata; if ($obj->has_thumbnail) { $row->{has_thumbnail} = 1; - my ($thumb_file) = $obj->thumbnail_url( Height => 240, Width => 350 ); - $row->{thumbnail_url} = $meta->{thumbnail_url} = $thumb_file; + my $height = $thumb_height || $default_thumb_height || 240; + my $width = $thumb_width || $default_thumb_width || 350; + @$meta{qw( thumbnail_url thumbnail_width thumbnail_height )} + = $obj->thumbnail_url( Height => $height, Width => $width ); + + $meta->{thumbnail_width_offset} = int(($width - $meta->{thumbnail_width}) / 2); + $meta->{thumbnail_height_offset} = int(($height - $meta->{thumbnail_height}) / 2); + + if ($default_preview_width && $default_preview_height) { + @$meta{qw( preview_url preview_width preview_height )} + = $obj->thumbnail_url( + Height => $default_preview_height, + Width => $default_preview_width, + ); + $meta->{preview_width_offset} = int(($default_preview_width - $meta->{preview_width}) / 2); + $meta->{preview_height_offset} = int(($default_preview_height - $meta->{preview_height}) / 2); + } } my $ts = $obj->created_on; @@ -2232,7 +2341,10 @@ sub build_asset_hasher { format_ts( LISTING_TIMESTAMP_FORMAT, $ts, $blog, $app->user ? $app->user->preferred_language : undef ); $row->{created_on_relative} = relative_date( $ts, time, $blog ); } + + @$row{keys %$meta} = values %$meta; $row->{metadata_json} = JSON::objToJson($meta); + $row; }; } @@ -2283,7 +2395,8 @@ sub list_assets { } } - my $hasher = $app->build_asset_hasher; + my $hasher = $app->build_asset_hasher( ThumbWidth => 75, ThumbHeight => 75, + PreviewWidth => 240, PreviewHeight => 240 ); if ($class_filter) { my $asset_pkg = MT::Asset->class_handler($class_filter); @@ -2312,6 +2425,7 @@ sub list_assets { my $perms = $app->permissions; my %carry_params = map { $_ => $app->param($_) || '' } (qw( edit_field upload_mode require_type next_mode asset_select )); + $app->_set_start_upload_params(\%carry_params); $app->listing( { terms => \%terms, @@ -2425,6 +2539,7 @@ sub list_roles { has_expanded_mode => 1, search_label => $app->translate('Users'), object_type => 'role', + screen_id => 'list-role', }, } ); @@ -2648,6 +2763,7 @@ sub list_associations { search_label => $app->translate('Users'), object_type => 'association', pt_name => $app->translate('User'), + screen_id => "list-associations", }, } ); @@ -2776,7 +2892,8 @@ sub list_tag_for { $param{limit} = $limit; $param{offset} = $offset; $param{tag_object_type} = $params{TagObjectType}; - $param{tag_object_label_plural} = $params{TagObjectLabelPlural}; + $param{tag_object_label} = $params{TagObjectLabel} || $pkg->class_label; + $param{tag_object_label_plural} = $params{TagObjectLabelPlural} || $pkg->class_label_plural; $param{object_label} = $tag_class->class_label; $param{object_label_plural} = $tag_class->class_label_plural; $param{object_type} = 'tag'; @@ -2797,6 +2914,7 @@ sub list_tag_for { $app->add_breadcrumb( $app->translate('Tags') ); $param{screen_class} = "list-tag"; $param{screen_id} = "list-tag"; + $param{listing_screen} = 1; $app->load_tmpl( 'list_tag.tmpl', \%param ); } @@ -3549,73 +3667,20 @@ sub build_menus { sub get_newsbox_content { my $app = shift; - my $newsbox_url = $app->config('NewsboxURL'); if ( $newsbox_url && $newsbox_url ne 'disable' ) { - my $NEWSCACHE_TIMEOUT = 60 * 60 * 24; - my $sess_class = $app->model('session'); - my ($news_object) = (""); - my $retries = 0; - $news_object = $sess_class->load( { id => 'NW' } ); - my $refresh_news; - if ( $news_object - && ( $news_object->start() < ( time - $NEWSCACHE_TIMEOUT ) ) ) - { - $refresh_news = 1; - } - my $last_available_news = encode_text( $news_object->data(), 'utf-8', undef ) - if $news_object; - return $last_available_news unless $refresh_news || !$news_object; - - # don't block the dashboard for more than 10 seconds to fetch - # the news feed... - my $ua = $app->new_ua( { timeout => 10 } ); - return $last_available_news unless $ua; - - my $req = new HTTP::Request( GET => $newsbox_url ); - my $resp = $ua->request($req); - my $result = $resp->content(); - if ( !$resp->is_success() || !$result ) { - # failure; either timeout or worse - # if news_object is available, bump up it's expiration - # so we don't attempt to hit the server again - # for an hour - if (! $news_object ) { - $news_object = MT::Session->new; - $news_object->set_values( - { - id => 'NW', - kind => 'NW', - data => '' - } - ); - $last_available_news = ''; - $refresh_news = 1; - } - if (defined($last_available_news) && $refresh_news) { - $news_object->start( ( time - $NEWSCACHE_TIMEOUT ) + 60 * 60 ); - $news_object->save; - } - return $last_available_news; - } - require MT::Sanitize; + return MT::Util::get_newsbox_html($newsbox_url, 'NW'); + } + return q(); +} - # allowed html - my $spec = 'a href,* style class id,ul,li,div,span,br'; - $result = MT::Sanitize->sanitize( $result, $spec ); - $news_object = MT::Session->new(); - $news_object->set_values( - { - id => 'NW', - kind => 'NW', - start => time(), - data => $result - } - ); - $news_object->save(); - $result = encode_text( $result, 'utf-8', undef ); - return $result; +sub get_lmt_content { + my $app = shift; + my $newsbox_url = $app->config('LearningNewsURL'); + if ( $newsbox_url && $newsbox_url ne 'disable' ) { + return MT::Util::get_newsbox_html($newsbox_url, 'LW', 1); #cached only } + return q(); } sub make_blog_list { @@ -3983,6 +4048,7 @@ sub mt_news_widget { my ( $tmpl, $param ) = @_; $param->{news_html} = $app->get_newsbox_content() || ''; + $param->{learning_mt_news_html} = $app->get_lmt_content() || ''; } sub this_is_you_widget { @@ -4032,14 +4098,15 @@ sub this_is_you_widget { if ($last_post) { $param->{last_post_id} = $last_post->id; $param->{last_post_blog_id} = $last_post->blog_id; + $param->{last_post_blog_name} = $last_post->blog->name; $param->{last_post_ts} = $last_post->authored_on; } if (my ($url) = $user->userpic_url()) { $param->{author_userpic_url} = $url; - $param->{author_userpic_width} = 50; - $param->{author_userpic_height} = 50; } + $param->{author_userpic_width} = 50; + $param->{author_userpic_height} = 50; } sub list_pref { @@ -4253,6 +4320,9 @@ sub list_blogs { $param{nav_weblogs} = 1; $param{object_label} = $blog_class->class_label; $param{object_label_plural} = $blog_class->class_label_plural; + $param{screen_class} = "list-blog"; + $param{screen_id} = "list-blog"; + $param{listing_screen} = 1; return $app->load_tmpl( 'list_blog.tmpl', \%param ); } @@ -4361,6 +4431,7 @@ sub list_member { $row->{role_loop} = \@role_loop; $row->{auth_icon_url} = $obj->auth_icon_url; }; + $param->{screen_id} = "list-member"; return $app->listing( { @@ -4406,8 +4477,7 @@ sub list_authors { $terms{$filter_col} = $val; $param{filter} = $filter_col; $param{filter_val} = $val; - my $url_val = encode_url($val); - $param{filter_args} = "&filter=$filter_col&filter_val=$url_val"; + $param{filter_args} = "&filter=" . encode_url($filter_col) . "&filter_val=" . encode_url($val); } } elsif ($filter_key) { my $filters = $app->registry("list_filters", "sys_user") || {}; @@ -4505,6 +4575,8 @@ sub list_authors { $app->page_actions('list_authors'); $param{nav_authors} = 1; + $param{listing_screen} = 1; + $param{screen_id} = "list-author"; my $tmpl_file = $param{output} || 'list_author.tmpl'; $app->load_tmpl( $tmpl_file, \%param ); } @@ -4630,7 +4702,12 @@ sub apply_log_filter { } } elsif ( $filter_col eq 'class' ) { - $arg{class} = [ split /,/, $val ]; + if ($val eq 'publish') { + $arg{category} = 'publish'; + } + else { + $arg{class} = [ split /,/, $val ]; + } } } $arg{blog_id} = [ split /,/, $param->{blog_id} ] @@ -4670,8 +4747,7 @@ sub view_log { $param{filter_val} = $val; my %filter_arg = %{ $app->apply_log_filter( \%param ) }; $terms->{$_} = $filter_arg{$_} foreach keys %filter_arg; - my $url_val = encode_url($val); - $param{filter_args} = "&filter=$filter_col&filter_val=$url_val"; + $param{filter_args} = "&filter=" . encode_url($filter_col) . "&filter_val=" . encode_url($val); } # all classes of log objects @@ -4710,6 +4786,10 @@ sub view_log { { class_name => 'search', class_label => $app->translate("Search"), + }, + { + class_name => 'publish', + class_label => $app->translate("Publishing"), }; @class_loop = sort { $a->{class_label} cmp $b->{class_label} } @class_loop; $param{class_loop} = \@class_loop; @@ -4750,6 +4830,8 @@ sub view_log { $param{nav_log} = 1; $param{feed_name} = $app->translate("System Activity Feed"); $param{screen_class} = "list-log"; + $param{screen_id} = "list-log"; + $param{listing_screen} = 1; $param{feed_url} = $app->make_feed_link( 'system', $blog_id ? { blog_id => $blog_id } : undef ); @@ -4969,14 +5051,7 @@ sub export_log { ) }; } else { - %terms = %{ - $app->apply_log_filter( - { - filter => 'class', - filter_val => 'system,page,entry,comment,ping,search' - } - ) - }; + %terms = ( class => '*' ); } if ($blog) { $terms{blog_id} = $blog->id; @@ -6281,6 +6356,77 @@ sub edit_object { $param{type_author} = 1 if MT::Author::AUTHOR() == $obj->type; } + elsif ( $type eq 'asset' ) { + my $asset_class = $app->model('asset'); + $param{asset} = $obj; + $param{search_label} = $app->translate('Assets'); + + my $hasher = $app->build_asset_hasher( ThumbWidth => 75, ThumbHeight => 75 ); + $hasher->($obj, \%param, ThumbWidth => 240, ThumbHeight => 240); + + my $tag_delim = chr( $app->user->entry_prefs->{tag_delim} ); + require MT::Tag; + my $tags = MT::Tag->join( $tag_delim, $obj->tags ); + $param{tags} = $tags; + + my @related; + if ($obj->parent) { + my $parent = $asset_class->load($obj->parent); + push @related, $hasher->($parent, { asset => $parent, is_parent => 1 }); + + push @related, map { $hasher->($_, { asset => $_, is_sibling => 1 }) } + $asset_class->search({ + id => { op => '!=', value => $obj->id }, + class => '*', + parent => $obj->parent + }); + } + push @related, map { $hasher->($_, { asset => $_, is_child => 1 }) } + $asset_class->search({ + class => '*', + parent => $obj->id, + }); + $param{related} = \@related if @related; + + my @appears_in; + my $place_class = $app->model('objectasset'); + my $place_iter = $place_class->load_iter({ asset_id => $obj->id }); + while (my $place = $place_iter->()) { + my $entry_class = $app->model($place->object_ds); + my $entry = $entry_class->load($place->object_id); + my %entry_data = ( + id => $place->object_id, + class => $place->object_ds, + entry => $entry, + title => $entry->title, + ); + if (my $ts = $entry->authored_on) { + $entry_data{authored_on_ts} = $ts; + $entry_data{authored_on_formatted} = + format_ts( LISTING_DATETIME_FORMAT, $ts, undef, + $app->user ? $app->user->preferred_language : undef ); + } + if (my $ts = $entry->created_on) { + $entry_data{created_on_ts} = $ts; + $entry_data{created_on_formatted} = + format_ts( LISTING_DATETIME_FORMAT, $ts, undef, + $app->user ? $app->user->preferred_language : undef ); + } + push @appears_in, \%entry_data; + } + $param{appears_in} = \@appears_in if @appears_in; + + my $prev_asset = $obj->nextprev( + direction => 'previous', + terms => { class => '*', blog_id => $obj->blog_id }, + ); + my $next_asset = $obj->nextprev( + direction => 'next', + terms => { class => '*', blog_id => $obj->blog_id }, + ); + $param{previous_entry_id} = $prev_asset->id if $prev_asset; + $param{next_entry_id} = $next_asset->id if $next_asset; + } if ( $class->properties->{audit} ) { my $creator = MT::Author->load( @@ -6528,6 +6674,7 @@ sub edit_object { no warnings; @$sets = sort { $a->{order} <=> $b->{order} } @$sets; $param{'template_set_loop'} = $sets; + $param{'template_set_index'} = $#$sets; } } @@ -6732,6 +6879,20 @@ sub edit_object { $param{blog_file_extension} = $ext; } + my $rte; + if ($param{convert_breaks} eq 'richtext') { + ## Rich Text editor + $rte = lc($app->config('RichTextEditor')); + } + else { + $rte = 'archetype'; + } + my $editors = $app->registry("richtext_editors"); + my $edit_reg = $editors->{$rte} || $editors->{archetype}; + my $rich_editor_tmpl; + $rich_editor_tmpl = $edit_reg->{plugin}->load_tmpl($edit_reg->{template}); + $param{rich_editor} = $rich_editor_tmpl; + $param{object_type} = $type; $param{quickpost_js} = $app->quickpost_js($type); if ( 'page' eq $type ) { @@ -6964,6 +7125,7 @@ sub edit_object { my $tmpl_file = $param{output} || "edit_${type}.tmpl"; $param{object_type} ||= $type; unless ( $param{screen_class} ) { + $param{screen_id} = "edit-$type"; $param{screen_class} = "edit-$type"; $param{screen_class} .= " edit-entry" if $param{object_type} eq "page"; # to piggyback on edit-entry styles @@ -6971,6 +7133,12 @@ sub edit_object { return $app->load_tmpl( $tmpl_file, \%param ); } +sub CMSTemplateParam_edit_asset { + my ($cb, $app, $param, $tmpl) = @_; + my $asset = $param->{asset} or return; + $asset->edit_template_param(@_); +} + sub load_default_entry_prefs { my $app = shift; my $prefs; @@ -7251,6 +7419,12 @@ sub CMSViewPermissionFilter_category { return $perms->can_edit_categories(); } +sub CMSViewPermissionFilter_asset { + my ($eh, $app, $id) = @_; + my $perms = $app->permissions; + return $perms->can_edit_assets(); +} + sub CMSViewPermissionFilter_commenter { my $eh = shift; my ( $app, $id ) = @_; @@ -7358,7 +7532,7 @@ sub CMSSaveFilter_author { if ( $app->param('url') ) { my $url = $app->param('url'); return $eh->error( MT->translate("Website URL is imperfect") ) - unless is_valid_url($url); + unless is_url($url); } 1; } @@ -7952,9 +8126,11 @@ sub _convert_word_chars { return $s if 'utf-8' ne lc( $app->charset ); my $blog = $app->blog; - return $s if $blog->smart_replace == 2; + my $smart_replace = $blog ? $blog->smart_replace + : MT->config->NwcSmartReplace; + return $s if $smart_replace == 2; - if ( $blog->smart_replace ) { + if ($smart_replace) { # html character entity replacements $s =~ s/\342\200\231/&#8217;/g; @@ -8022,7 +8198,12 @@ sub CMSPreSave_entry { require MT::Tag; my $tag_delim = chr( $app->user->entry_prefs->{tag_delim} ); my @tags = MT::Tag->split( $tag_delim, $tags ); - $obj->set_tags(@tags); + if (@tags) { + $obj->set_tags(@tags); + } + else { + $obj->remove_tags(); + } } # update text heights if necessary @@ -8050,6 +8231,33 @@ sub CMSPreSave_entry { 1; } +sub CMSPreSave_asset { + my $eh = shift; + my ( $app, $obj ) = @_; + + # save tags + my $tags = $app->param('tags'); + if ( defined $tags ) { + my $blog = $app->blog; + my $fields = $blog ? $blog->smart_replace_fields + : MT->config->NwcReplaceField; + if ( $fields && $fields =~ m/tags/ig ) { + $tags = _convert_word_chars( $app, $tags ); + } + + require MT::Tag; + my $tag_delim = chr( $app->user->entry_prefs->{tag_delim} ); + my @tags = MT::Tag->split( $tag_delim, $tags ); + if (@tags) { + $obj->set_tags(@tags); + } + else { + $obj->remove_tags(); + } + } + 1; +} + sub CMSPostSave_blog { my $eh = shift; my ( $app, $obj, $original ) = @_; @@ -8069,7 +8277,8 @@ sub CMSPostSave_blog { $app->param('dynamic_cache') ? 1 : 0, $app->param('dynamic_conditional') ? 1 : 0 ); - $app->rebuild( BlogID => $obj->id, NoStatic => 1 ); + $app->rebuild( BlogID => $obj->id, NoStatic => 1 ) + or return $app->publish_error(); } else { require MT::Template; my @tmpls = MT::Template->load({ build_dynamic => 1}); @@ -8234,7 +8443,8 @@ sub CMSPostSave_comment { if ( $obj->visible || ( ( $obj->visible || 0 ) != ( $original->visible || 0 ) ) ) { - $app->rebuild_entry( Entry => $obj->entry_id, BuildIndexes => 1 ); + $app->rebuild_entry( Entry => $obj->entry_id, BuildIndexes => 1 ) + or return $app->publish_error(); } 1; } @@ -8251,7 +8461,8 @@ sub CMSPostSave_ping { if ( $obj->visible || ( ( $obj->visible || 0 ) != ( $original->visible || 0 ) ) ) { - $app->rebuild_entry( Entry => $entry, BuildIndexes => 1 ); + $app->rebuild_entry( Entry => $entry, BuildIndexes => 1 ) + or return $app->publish_error(); } } elsif ( $tb->category_id @@ -8267,7 +8478,8 @@ sub CMSPostSave_ping { sub CMSPostSave_trackback { my $eh = shift; my ( $app, $obj, $original ) = @_; - $app->rebuild_entry( Entry => $obj->entry_id, BuildIndexes => 1 ); + $app->rebuild_entry( Entry => $obj->entry_id, BuildIndexes => 1 ) + or return $app->publish_error(); 1; } @@ -8316,14 +8528,14 @@ sub CMSPostSave_template { BlogID => $obj->blog_id, Template => $obj, NoStatic => 1, - ); # XXXX + ) or return $app->publish_error(); # XXXX } else { $app->rebuild( BlogID => $obj->blog_id, TemplateID => $obj->id, NoStatic => 1, - ); + ) or return $app->publish_error(); } } 1; @@ -8503,6 +8715,13 @@ sub CMSDeletePermissionFilter_category { return $perms && $perms->can_edit_categories(); } +sub CMSDeletePermissionFilter_asset { + my ( $eh, $app, $obj ) = @_; + return 1 if $app->user->is_superuser(); + my $perms = $app->permissions; + return $perms && $perms->can_edit_assets(); +} + sub CMSDeletePermissionFilter_comment { my ( $eh, $app, $obj ) = @_; my $author = $app->user; @@ -9088,6 +9307,8 @@ sub save_object { # and template set to the defaults. if ( !$obj->id ) { $obj->language( $app->user->preferred_language ); + $obj->nofollow_urls(1); + $obj->follow_auth_links(1); my @authenticators = qw( MovableType ); foreach my $auth (qw( Vox LiveJournal )) { my $a = MT->commenter_authenticator($auth); @@ -9099,7 +9320,7 @@ sub save_object { push @authenticators, $auth; } $obj->commenter_authenticators( join ',', @authenticators ); - my $set = $app->param('template_set'); + my $set = $app->param('template_set') || 'mt_blog'; $obj->template_set( $set ); } @@ -9311,6 +9532,9 @@ sub list_template { elsif ( $type eq 'email' ) { $template_type = 'email'; } + elsif ( $type eq 'backup' ) { + $template_type = 'backup'; + } else { $template_type = 'system'; } @@ -9337,6 +9561,8 @@ sub list_template { $params->{page_actions} = $app->page_actions('list_templates'); $params->{search_label} = $app->translate("Templates"); $params->{blog_view} = 1; + $params->{refreshed} = $app->param('refreshed'); + $params->{published} = $app->param('published'); return $app->listing( { @@ -9812,7 +10038,7 @@ sub delete { # FIXME: enumeration of types if ( $type eq 'template' && $obj->type !~ - /(custom|index|archive|page|individual|category|widget)/o ) + /(custom|index|archive|page|individual|category|widget|backup)/o ) { $required_items++; } @@ -9829,7 +10055,8 @@ sub delete { require MT::Entry; for my $entry_id ( keys %rebuild_entries ) { my $entry = MT::Entry->load($entry_id); - $app->rebuild_entry( Entry => $entry, BuildDependencies => 1 ); + $app->rebuild_entry( Entry => $entry, BuildDependencies => 1 ) + or return $app->publish_error(); } for my $cat_id (@rebuild_cats) { @@ -9840,7 +10067,7 @@ sub delete { Category => $cat, BlogID => $blog_id, ArchiveType => 'Category' - ); + ) or return $app->publish_error(); } $app->run_callbacks( 'rebuild', MT::Blog->load($blog_id) ); $app->add_return_arg( @@ -10527,8 +10754,7 @@ sub list_commenter { $param{filter} = $filter_col; $param{filter_val} = $val; - my $url_val = encode_url($val); - $param{filter_args} = "&filter=$filter_col&filter_val=$url_val"; + $param{filter_args} = "&filter=" . encode_url($filter_col) . "&filter_val=" . encode_url($val); } } $arg{'offset'} = $offset if $offset; @@ -11158,7 +11384,7 @@ sub build_plugin_table { my $folder = $fld ? $app->translate( "Plugin Set: [_1]", $fld ) - : $app->translate("Plugins"); + : $app->translate("Individual Plugins"); my $row; my $icon = $app->static_path . 'images/plugin.gif'; @@ -11471,9 +11697,7 @@ sub list_pings { $terms{$filter_col} = $val; } } - ( my $url_val = $val ) =~ - s!([^a-zA-Z0-9_.-])!uc sprintf "%%%02x", ord($1)!eg; - $param{filter_args} = "&filter=$filter_col&filter_val=$url_val"; + $param{filter_args} = "&filter=" . encode_url($filter_col) . "&filter_val=" . encode_url($val); $param{filter} ||= $filter_col; $param{filter_val} ||= $val; $param{is_filtered} = 1; @@ -11567,6 +11791,8 @@ sub list_pings { $app->make_feed_link( 'ping', $blog_id ? { blog_id => $blog_id } : undef ); } + $param{screen_id} = "list-ping"; + $param{listing_screen} = 1; $app->add_breadcrumb( $app->translate('TrackBacks') ); $app->load_tmpl( "list_ping.tmpl", \%param ); } @@ -11865,9 +12091,7 @@ sub list_entries { else { $terms{$filter_col} = $filter_val; } - ( my $url_val = $filter_val ) =~ - s!([^a-zA-Z0-9_.-])!uc sprintf "%%%02x", ord($1)!eg; - $param{filter_args} = "&filter=$filter_col&filter_val=$url_val"; + $param{filter_args} = "&filter=" . encode_url($filter_col) . "&filter_val=" . encode_url($filter_val); if ( ( $filter_col eq 'normalizedtag' ) || ( $filter_col eq 'exacttag' ) ) @@ -11990,6 +12214,7 @@ sub list_entries { $param{page_actions} = $app->page_actions( $app->mode ); $param{list_filters} = $app->list_filters('entry'); $param{can_power_edit} = $blog_id && !$is_power_edit; + $param{can_republish} = $blog_id ? $perms->can_rebuild : 1; $param{is_power_edit} = $is_power_edit; $param{saved_deleted} = $q->param('saved_deleted'); $param{saved} = $q->param('saved'); @@ -12009,6 +12234,7 @@ sub list_entries { $param{feed_url} = $app->make_feed_link( $type, $blog_id ? { blog_id => $blog_id } : undef ); $app->add_breadcrumb( $pkg->class_label_plural ); + $param{listing_screen} = 1; unless ($blog_id) { $param{system_overview_nav} = 1; @@ -12017,7 +12243,7 @@ sub list_entries { unless ( $param{screen_class} ) { $param{screen_class} = "list-$type"; $param{screen_class} .= " list-entry" - if $param{object_type} eq "page"; # to piggyback on edit-entry styles + if $param{object_type} eq "page"; # to piggyback on list-entry styles } $param{mode} = $app->mode; if ( my $blog = MT::Blog->load($blog_id) ) { @@ -12794,10 +13020,6 @@ $ao if ( ( $obj->status || 0 ) == MT::Entry::RELEASE() || $status_old eq MT::Entry::RELEASE() ) { - if ( $app->config('PublishCommenterIcon') ) { - $app->publisher->make_commenter_icon($blog); - } - if ( $app->config('DeleteFilesAtRebuild') && $orig_obj ) { my $file = archive_file_for( $obj, $blog, $archive_type ); if ( $file ne $orig_file || $obj->status != MT::Entry::RELEASE() ) { @@ -12822,7 +13044,7 @@ $ao ? $previous_old->id : undef, OldNext => ($next_old) ? $next_old->id : undef - ) or return; + ) or return $app->publish_error(); $app->run_callbacks( 'rebuild', $blog ); 1; } @@ -12859,6 +13081,21 @@ $ao $app->_finish_rebuild_ping( $obj, !$id ); } +sub publish_error { + my $app = shift; + my ($msg) = @_; + if (defined $app->errstr) { + require MT::Log; + $app->log({ + message => $app->translate("Error during publishing: [_1]", (defined $msg ? $msg : $app->errstr)), + class => "system", + level => MT::Log::ERROR(), + category => "publish", + }) + } + return undef; +} + sub ping_continuation { my $app = shift; my ( $entry, $blog, %options ) = @_; @@ -13061,12 +13298,12 @@ sub list_category { my $entry_type; if ( $type eq 'category' ) { $entry_type = 'entry'; - return $app->return_to_dashboard( permission => 1 ) + return $app->return_to_dashboard( redirect => 1 ) unless $perms && $perms->can_edit_categories; } elsif ( $type eq 'folder' ) { $entry_type = 'page'; - return $app->return_to_dashboard( permission => 1 ) + return $app->return_to_dashboard( redirect => 1 ) unless $perms && $perms->can_manage_pages; } $entry_class = $app->model($entry_type); @@ -13223,6 +13460,53 @@ sub save_category { ); } +sub save_asset { + my $app = shift; + my $q = $app->param; + my $perms = $app->permissions; + my $type = $q->param('_type'); + my $class = $app->model($type) + or return $app->errtrans("Invalid request."); + + $app->validate_magic() or return; + + return $app->errtrans("Permission denied.") + unless $perms && $perms->can_edit_assets; + + my $blog_id = $q->param('blog_id'); + my $id = $q->param('id'); + my $obj = $id ? $class->load($id) : $class->new; + my $original = $obj->clone(); + + $obj->set_values_from_query($q); + + $app->run_callbacks( 'cms_pre_save.' . $type, $app, $obj, $original ) + || return $app->errtrans( "Saving [_1] failed: [_2]", $type, + $app->errstr ); + + $obj->save + or return $app->error( + $app->translate( + "Saving [_1] failed: [_2]", + $type, $obj->errstr + ) + ); + + $app->run_callbacks( 'cms_post_save.' . $type, $app, $obj, $original ); + + $app->redirect( + $app->uri( + 'mode' => 'view', + args => { + _type => $type, + blog_id => $blog_id, + id => $obj->id, + saved => 1, + } + ) + ); +} + sub cfg_blog { my $q = $_[0]->{query}; $q->param( '_type', 'blog' ); @@ -14477,12 +14761,13 @@ sub rebuild_pages { # FIXME: Rebuild the entire blog???? $app->rebuild( BlogID => $blog_id ) - or return; + or return $app->publish_error(); } elsif ( $type eq 'index' ) { return $app->error( $app->translate("Permission denied.") ) unless $perms->can_rebuild; - $app->rebuild_indexes( BlogID => $blog_id ) or return; + $app->rebuild_indexes( BlogID => $blog_id ) + or return $app->publish_error(); } elsif ( $type =~ /^index-(\d+)$/ ) { return $app->error( $app->translate("Permission denied.") ) @@ -14494,7 +14779,7 @@ sub rebuild_pages { BlogID => $blog_id, Template => $tmpl_saved, Force => 1 - ) or return; + ) or return $app->publish_error(); $order = $app->translate( "index template '[_1]'", $tmpl_saved->name ); } elsif ( $type =~ /^entry-(\d+)$/ ) { @@ -14508,7 +14793,7 @@ sub rebuild_pages { BuildDependencies => 1, OldPrevious => $q->param('old_previous'), OldNext => $q->param('old_next') - ) or return; + ) or return $app->publish_error(); $order = "entry '" . $entry->title . "'"; } elsif ( $archiver->category_based ) { @@ -14529,7 +14814,7 @@ sub rebuild_pages { NoIndexes => 1, Offset => $offset, FilterCallback => $cb, - ) or return; + ) or return $app->publish_error(); $offset += $count; } if ( $offset < $total ) { @@ -14568,7 +14853,7 @@ sub rebuild_pages { NoIndexes => 1, Offset => $offset, FilterCallback => $cb, - ) or return; + ) or return $app->publish_error(); $offset += $count; } if ( $offset < $total ) { @@ -15087,13 +15372,9 @@ sub send_notify { ); } -sub start_upload { +sub _set_start_upload_params { my $app = shift; - - $app->add_breadcrumb( $app->translate('Upload File') ); - my %param; - %param = @_ if @_; - my $label_path; + my ($param) = @_; if (my $perms = $app->permissions) { return $app->error( $app->translate("Permission denied.") ) @@ -15102,10 +15383,11 @@ sub start_upload { require MT::Blog; my $blog = MT::Blog->load($blog_id); - $param{enable_archive_paths} = $blog->column('archive_path'); - $param{local_site_path} = $blog->site_path; - $param{local_archive_path} = $blog->archive_path; - if ( $param{enable_archive_paths} ) { + $param->{enable_archive_paths} = $blog->column('archive_path'); + $param->{local_site_path} = $blog->site_path; + $param->{local_archive_path} = $blog->archive_path; + my $label_path; + if ( $param->{enable_archive_paths} ) { $label_path = $app->translate('Archive Root'); } else { @@ -15119,20 +15401,20 @@ sub start_upload { label => '<' . $app->translate($label_path) . '>' . '/' . $date_stamp, }; - if ( exists( $param{middle_path} ) - && ( $date_stamp eq $param{middle_path} ) ) + if ( exists( $param->{middle_path} ) + && ( $date_stamp eq $param->{middle_path} ) ) { $path_hash->{selected} = 1; - delete $param{archive_path}; + delete $param->{archive_path}; } push @extra_paths, $path_hash; - $param{extra_paths} = \@extra_paths; - $param{refocus} = 1; - $param{missing_paths} = + $param->{extra_paths} = \@extra_paths; + $param->{refocus} = 1; + $param->{missing_paths} = ( ( defined $blog->site_path || defined $blog->archive_path ) && ( -d $blog->site_path || -d $blog->archive_path ) ) ? 0 : 1; - if ( $param{missing_paths} ) { + if ( $param->{missing_paths} ) { if ( $app->user->is_superuser || $app->run_callbacks( @@ -15141,17 +15423,29 @@ sub start_upload { ) ) { - $param{have_permissions} = 1; + $param->{have_permissions} = 1; } } - $param{enable_destination} = 1; + $param->{enable_destination} = 1; } else { - $param{local_site_path} = ''; - $param{local_archive_path} = ''; + $param->{local_site_path} = ''; + $param->{local_archive_path} = ''; } + $param; +} + +sub start_upload { + my $app = shift; + + $app->add_breadcrumb( $app->translate('Upload File') ); + my %param; + %param = @_ if @_; + + $app->_set_start_upload_params(\%param); + for my $field (qw( entry_insert edit_field upload_mode require_type asset_select )) { $param{$field} ||= $app->param($field); @@ -15530,6 +15824,7 @@ sub _upload_file { "$!" ) ); + close $tmp_fh; my ( $vol, $path, $tmp ) = File::Spec->splitpath($tmp_file); return $app->load_tmpl( 'dialog/asset_replace.tmpl', @@ -16050,10 +16345,10 @@ sub do_search_replace { $is_dateranged, $ids, $datefrom_year, $datefrom_month, $datefrom_day, $dateto_year, $dateto_month, $dateto_day, $from, $to, $show_all, $do_search, - $orig_search + $orig_search, $quicksearch ) = map scalar $q->param($_), - qw( search replace do_replace case is_regex is_limited _type is_junk is_dateranged replace_ids datefrom_year datefrom_month datefrom_day dateto_year dateto_month dateto_day from to show_all do_search orig_search ); + qw( search replace do_replace case is_regex is_limited _type is_junk is_dateranged replace_ids datefrom_year datefrom_month datefrom_day dateto_year dateto_month dateto_day from to show_all do_search orig_search quicksearch ); if ( !$type || ( 'category' eq $type ) || ( 'folder' eq $type ) ) { @@ -16099,6 +16394,11 @@ sub do_search_replace { else { @cols = keys %{ $search_api->{$type}->{search_cols} }; } + my $quicksearch_id; + if ($quicksearch && ($search || '') ne '' && $search !~ m{ \D }xms) { + $quicksearch_id = $search; + unshift @cols, 'id'; + } foreach ( $datefrom_year, $datefrom_month, $datefrom_day, $dateto_year, $dateto_month, $dateto_day @@ -16153,6 +16453,11 @@ sub do_search_replace { if ( ( $do_search && $search ne '' ) || $show_all || $do_replace ) { my %terms; my %args; + ## we need to search all user/group for 'grant permissions', + ## if $blog_id is specified. it affects the setup_terms_args. + if ( $app->param('__mode') eq 'dialog_grant_role' ) { + $blog_id = 0; + } if (exists $api->{setup_terms_args}) { my $code = $app->handler_to_coderef($api->{setup_terms_args}); $code->(\%terms, \%args, $blog_id); @@ -16330,6 +16635,30 @@ sub do_search_replace { $app->translate( "Saving object failed: [_2]", $obj->errstr ) ); } if (@data) { + if ($quicksearch) { + my $obj; + if (1 == scalar @data) { + ($obj) = @data; + } + elsif (defined $quicksearch_id) { + ($obj) = grep { $_->id == $quicksearch_id } @data; + } + + if ($obj) { + my %args = ( + _type => $type, + id => $obj->id, + search_result => 1, + ); + $args{blog_id} = $obj->blog_id + if $obj->has_column('blog_id'); + return $app->redirect($app->uri( + mode => 'view', + args => \%args, + )); + } + } + if (my $meth = $search_api->{$type}{handler}) { $meth = $app->handler_to_coderef($meth); $meth->($app, items => \@data, param => \%param, type => $type ); @@ -16741,7 +17070,7 @@ sub add_map { TemplateMap => $map, TemplateID => scalar $q->param('template_id'), NoStatic => 1 - ); + ) or return $app->publish_error(); $app->{no_print_body} = 1; $app->send_http_header("text/plain"); $app->print($html); @@ -17291,7 +17620,8 @@ sub rebuild_these { my @blogs = $app->param('blog_ids'); foreach my $blog_id (@blogs) { my $blog = MT::Blog->load($blog_id) or next; - $app->rebuild_indexes( Blog => $blog ); + $app->rebuild_indexes( Blog => $blog ) + or return $app->publish_error(); } my $this_blog = MT::Blog->load( $app->param('blog_id') ); $app->run_callbacks( 'rebuild', $this_blog ); @@ -17338,7 +17668,7 @@ sub rebuild_these { Entry => $e, BuildDependencies => 1, BuildIndexes => 0 - ); + ) or return $app->publish_error(); } if (@rest) { foreach (@rest) { @@ -18863,12 +19193,14 @@ sub restore_directory { ? 'ignore' : $app->config('SchemaVersion'); + my $overwrite_template = $q->param('overwrite_global_templates') ? 1 : 0; + my @errors; my %error_assets; require MT::BackupRestore; my ( $deferred, $blogs, $assets ) = MT::BackupRestore->restore_directory( $dir, \@errors, \%error_assets, - $schema_version, sub { $app->_progress(@_); } ); + $schema_version, $overwrite_template, sub { $app->_progress(@_); } ); if ( scalar @errors ) { $$error = $app->translate('Error occured during restore process.'); @@ -18970,6 +19302,8 @@ sub restore_upload_manifest { $q->param('ignore_schema_conflict') ? 'ignore' : $app->config('SchemaVersion'); + $param->{overwrite_templates} = $q->param('overwrite_global_templates') ? 1 : 0; + $param->{dialog_mode} = 'dialog_restore_upload'; $param->{dialog_params} = 'start=1' @@ -18985,6 +19319,8 @@ sub restore_upload_manifest { . $param->{'last'} . '&amp;schema_version=' . $param->{schema_version} + . '&amp;overwrite_templates=' + . $param->{overwrite_templates} . '&amp;redirect=1'; $app->load_tmpl( 'restore.tmpl', $param ); @@ -19006,6 +19342,7 @@ sub dialog_restore_upload { my $is_asset = $q->param('is_asset') || 0; my $schema_version = $q->param('schema_version') || $app->config('SchemaVersion'); + my $overwrite_template = $q->param('overwrite_templates') ? 1 : 0; my $objects = {}; my $deferred = {}; @@ -19042,6 +19379,7 @@ sub dialog_restore_upload { $param->{deferred_json} = JSON::objToJson($deferred) if defined($deferred); $param->{blogs_meta} = $q->param('blogs_meta'); $param->{schema_version} = $schema_version; + $param->{overwrite_templates} = $overwrite_template; my $uploaded = $q->param('file'); if ( defined($uploaded) ) { @@ -19136,7 +19474,7 @@ sub dialog_restore_upload { else { ( $blog_ids, $asset_ids ) = eval { MT::BackupRestore->restore_process_single_file( $fh, $objects, - $deferred, \@errors, $schema_version, + $deferred, \@errors, $schema_version, $overwrite_template, sub { $app->_progress(@_) } ); }; if ($@) { @@ -19220,6 +19558,7 @@ sub dialog_restore_upload { $param->{next_mode} = 'dialog_restore_upload'; } } + MT->run_callbacks('restore', $objects, $deferred, \@errors, sub { $app->_progress(@_) }); $app->print( $app->build_page( 'dialog/restore_end.tmpl', $param ) ); close $fh if !$no_upload; @@ -19663,7 +20002,7 @@ sub do_reply { MT::Util::start_background_task( sub { $app->rebuild_entry( Entry => $parent->entry_id, BuildDependencies => 1 ) - or return $app->errtrans( "Publish failed: [_1]", $app->errstr ); + or return $app->publish_error( "Publish failed: [_1]", $app->errstr ); $app->_send_comment_notification( $comment, q(), $entry, $app->model('blog')->load( $param->{blog_id} ), $app->user ); } @@ -19708,7 +20047,7 @@ sub reply_preview { type => 'scalarref', source => \"<\$MTInclude module=\"$tmpl_name\"\$>", ); - my $ctx = MT::Template::Context->new; + my $ctx = $tmpl->context; ## Set timestamp as we would usually do in ObjectDriver. my @ts = MT::Util::offset_time_list( time, $entry->blog_id ); my $ts = sprintf "%04d%02d%02d%02d%02d%02d", $ts[5] + 1900, $ts[4] + 1, @@ -19738,6 +20077,411 @@ sub reply_preview { { %$param, text => $q->param('text'), preview_html => $html } ); } +sub dialog_refresh_templates { + my $app = shift; + $app->validate_magic or return; + + # permission check + my $perms = $app->permissions; + return $app->errtrans("Permission denied.") + unless $app->user->is_superuser || + $perms->can_administer_blog || + $perms->can_edit_templates; + + my $param = {}; + my $blog = $app->blog; + $param->{return_args} = $app->param('return_args'); + + if ($blog) { + $param->{blog_id} = $blog->id; + + my $sets = $app->registry("template_sets"); + $sets->{$_}{key} = $_ for keys %$sets; + $sets = $app->filter_conditional_list([ values %$sets ]); + + no warnings; # some sets may not define an order + @$sets = sort { $a->{order} <=> $b->{order} } @$sets; + $param->{'template_set_loop'} = $sets; + + my $existing_set = $blog->template_set || 'mt_blog'; + foreach (@$sets) { + if ($_->{key} eq $existing_set) { + $_->{selected} = 1; + } + } + $param->{'template_set_index'} = $#$sets; + + $param->{template_sets} = $sets; + } + + # load template sets + $app->build_page('dialog/refresh_templates.tmpl', + $param); +} + +sub refresh_all_templates { + my ($app) = @_; + + my $backup = 1; + if ($app->param('no_backup')) { + $backup = 0; + } + + if ($app->param('backup')) { + # refresh templates dialog uses a 'backup' field + $backup = 1; + } + + my $template_set = $app->param('template_set'); + my $refresh_type = $app->param('refresh_type') || 'refresh'; + + my $t = time; + + my @id; + if ($app->param('blog_id')) { + @id = ( scalar $app->param('blog_id') ); + } + else { + @id = $app->param('id'); + if (! @id) { + # refresh global templates + @id = ( 0 ); + } + } + + require MT::Template; + require MT::Blog; + require MT::Permission; + require MT::Util; + + foreach my $blog_id (@id) { + my $blog; + if ($blog_id) { + $blog = MT::Blog->load($blog_id); + next unless $blog; + } + if ( !$app->user->is_superuser() ) { + my $perms = MT::Permission->load( + { blog_id => $blog_id, author_id => $app->user->id } ); + if ( + !$perms + || ( !$perms->can_edit_templates() + && !$perms->can_administer_blog() ) + ) + { + next; + } + } + + my $tmpl_list; + if ($blog_id) { + + + if ($refresh_type eq 'clean') { + # the user wants to back up all templates and + # install the new ones + + my @ts = MT::Util::offset_time_list( $t, ( $blog_id ? $blog_id : undef ) ); + my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d", $ts[5] + 1900, + $ts[4] + 1, @ts[ 3, 2, 1, 0 ]; + + my $tmpl_iter = MT::Template->load_iter({ + blog_id => $blog_id, + type => { not => 'backup' }, + }); + + while (my $tmpl = $tmpl_iter->()) { + $tmpl->type('backup'); + # zap all template maps + require MT::TemplateMap; + MT::TemplateMap->remove({ + template_id => $tmpl->id, + }); + $tmpl->name( + $tmpl->name . ' (Backup from ' . $ts . ')' ); + $tmpl->identifier(undef); + $tmpl->rebuild_me(0); + $tmpl->linked_file(undef); + $tmpl->outfile(''); + $tmpl->save; + } + + # This also creates our template mappings + $blog->create_default_templates( $template_set || $blog->template_set || 'mt_blog' ); + + if ($template_set) { + $blog->template_set( $template_set ); + $blog->save; + } + + next; + + } + + require MT::DefaultTemplates; + $tmpl_list = MT::DefaultTemplates->templates($template_set || $blog->template_set) || MT::DefaultTemplates->templates(); + + } + else { + require MT::DefaultTemplates; + $tmpl_list = MT::DefaultTemplates->templates(); + } + + foreach my $val (@$tmpl_list) { + if ($blog_id) { + # when refreshing blog templates, + # skip over global templates which + # specify a blog_id of 0... + next if $val->{global}; + } + else { + next unless exists $val->{global}; + } + + if ( !$val->{orig_name} ) { + $val->{orig_name} = $val->{name}; + $val->{name} = $app->translate( $val->{name} ); + $val->{text} = $app->translate_templatized( $val->{text} ); + } + + my $orig_name = $val->{orig_name}; + + my @ts = MT::Util::offset_time_list( $t, ( $blog_id ? $blog_id : undef ) ); + my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d", $ts[5] + 1900, + $ts[4] + 1, @ts[ 3, 2, 1, 0 ]; + + my $terms = {}; + $terms->{blog_id} = $blog_id; + if ( $val->{type} =~ + m/^(archive|individual|page|category|index|custom|widget)$/ ) + { + $terms->{name} = $val->{name}; + } + else { + $terms->{identifier} = $val->{identifier}; + $terms->{type} = $val->{type}; + } + + # this should only return 1 template; we're searching + # within a given blog for a specific type of template (for + # "system" templates; or for a type + name, which should be + # unique for that blog. + my $tmpl = MT::Template->load($terms); + if ($tmpl && $backup) { + + # check for default template text... + # if it is a default template, then outright replace it + my $text = $tmpl->text; + $text =~ s/\s+//g; + + my $def_text = $val->{text}; + $def_text =~ s/\s+//g; + + # if it has been customized, back it up to a new tmpl record + if ($def_text ne $text) { + my $backup = $tmpl->clone; + delete $backup->{column_values} + ->{id}; # make sure we don't overwrite original + delete $backup->{changed_cols}->{id}; + $backup->name( + $backup->name . ' (Backup from ' . $ts . ')' ); + $backup->type('backup'); + # if ( $backup->type !~ + # m/^(archive|individual|page|category|index|custom|widget)$/ ) + # { + # $backup->type('custom') + # ; # system templates can't be created + # } + $backup->outfile(''); + $backup->linked_file( $tmpl->linked_file ); + $backup->identifier(undef); + $backup->rebuild_me(0); + $backup->build_dynamic(0); + $backup->save; + } + } + if ($tmpl) { + # we found that the previous template had not been + # altered, so replace it with new default template... + $tmpl->text( $val->{text} ); + $tmpl->identifier( $val->{identifier} ); + $tmpl->type( $val->{type} ) + ; # fixes mismatch of types for cases like "archive" => "individual" + $tmpl->linked_file(''); + $tmpl->save; + } + else { + # create this one... + my $tmpl = new MT::Template; + $tmpl->build_dynamic(0); + $tmpl->set_values( + { + text => $val->{text}, + name => $val->{name}, + type => $val->{type}, + identifier => $val->{identifier}, + outfile => $val->{outfile}, + rebuild_me => $val->{rebuild_me} + } + ); + $tmpl->blog_id($blog_id); + $tmpl->save + or return $app->error( + $app->translate("Error creating new template: ") + . $tmpl->errstr ); + } + } + } + + $app->add_return_arg( 'refreshed' => 1 ); + $app->call_return; +} + +sub refresh_individual_templates { + my ($app) = @_; + + require MT::Util; + + my $user = $app->user; + my $perms = $app->permissions; + return $app->error( + $app->translate( + "Permission denied.") + ) + #TODO: system level-designer permission + unless $user->is_superuser() || $user->can_edit_templates() + || ( $perms + && ( $perms->can_edit_templates() + || $perms->can_administer_blog ) ); + + my $set; + if ( my $blog_id = $app->param('blog_id') ) { + my $blog = $app->model('blog')->load($blog_id); + $set = $blog->template_set() + if $blog; + } + + require MT::DefaultTemplates; + my $tmpl_list = MT::DefaultTemplates->templates($set) or return; + + my $trnames = {}; + my $tmpl_types = {}; + my $tmpl_ids = {}; + my $tmpls = {}; + foreach my $tmpl (@$tmpl_list) { + $tmpl->{text} = $app->translate_templatized( $tmpl->{text} ); + $tmpl_ids->{ $tmpl->{identifier} } = $tmpl + if $tmpl->{identifier}; + $trnames->{ $app->translate( $tmpl->{name} ) } = $tmpl->{name}; + if ( $tmpl->{type} !~ m/^(archive|individual|page|category|index|custom|widget)$/ ) + { + $tmpl_types->{ $tmpl->{type} } = $tmpl; + } + else { + $tmpls->{ $tmpl->{type} }{ $tmpl->{name} } = $tmpl; + } + } + + my $t = time; + + my @msg; + my @id = $app->param('id'); + require MT::Template; + foreach my $tmpl_id (@id) { + my $tmpl = MT::Template->load($tmpl_id); + next unless $tmpl; + my $blog_id = $tmpl->blog_id; + + # FIXME: permission check -- for this blog_id + + my @ts = MT::Util::offset_time_list( $t, $blog_id ); + my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d", $ts[5] + 1900, + $ts[4] + 1, @ts[ 3, 2, 1, 0 ]; + + my $orig_name = $trnames->{ $tmpl->name } || $tmpl->name; + my $val = ( $tmpl->identifier ? $tmpl_ids->{ $tmpl->identifier() } : undef ) + || $tmpl_types->{ $tmpl->type() } + || $tmpls->{ $tmpl->type() }{$orig_name}; + if ( !$val ) { + push @msg, + $app->translate( +"Skipping template '[_1]' since it appears to be a custom template.", + $tmpl->name + ); + next; + } + + my $text = $tmpl->text; + $text =~ s/\s+//g; + + my $def_text = $val->{text}; + $def_text =~ s/\s+//g; + + if ($text ne $def_text) { + # if it has been customized, back it up to a new tmpl record + my $backup = $tmpl->clone; + delete $backup->{column_values} + ->{id}; # make sure we don't overwrite original + delete $backup->{changed_cols}->{id}; + $backup->name( $backup->name . ' (Backup from ' . $ts . ')' ); + if ( $backup->type !~ + m/^(archive|individual|page|category|index|custom|widget)$/ ) + { + $backup->type('custom'); # system templates can't be created + } + $backup->outfile(''); + $backup->linked_file( $tmpl->linked_file ); + $backup->rebuild_me(0); + $backup->build_dynamic(0); + $backup->identifier(undef); + $backup->save; + push @msg, + $app->translate( + 'Refreshing template <strong>[_3]</strong> with <a href="?__mode=view&amp;blog_id=[_1]&amp;_type=template&amp;id=[_2]">backup</a>', + $blog_id, $backup->id, $tmpl->name ); + + # we found that the previous template had not been + # altered, so replace it with new default template... + $tmpl->text( $val->{text} ); + $tmpl->identifier( $val->{identifier} ); + $tmpl->linked_file(''); + $tmpl->save; + } else { + push @msg, $app->translate("Skipping template '[_1]' since it has not been changed.", $tmpl->name); + } + } + my @msg_loop; + push @msg_loop, { message => $_ } foreach @msg; + + $app->build_page( 'refresh_results.tmpl', + { message_loop => \@msg_loop, return_url => $app->return_uri } ); +} + +sub publish_index_templates { + my $app = shift; + $app->validate_magic or return; + + # permission check + my $perms = $app->permissions; + return $app->errtrans("Permission denied.") + unless $app->user->is_superuser || + $perms->can_administer_blog || + $perms->can_rebuild; + + my $blog = $app->blog; + my $templates = MT->model('template')->lookup_multi([ $app->param('id') ]); + TEMPLATE: for my $tmpl (@$templates) { + next TEMPLATE if !defined $tmpl; + next TEMPLATE if $tmpl->blog_id != $blog->id; + $app->rebuild_indexes( + Blog => $blog, + Template => $tmpl, + ); + } + + $app->call_return( published => 1 ); +} + 1; __END__ lib/MT/App/CMS.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -13,7 +13,7 @@ use MT::App; use MT::Comment; use MT::I18N qw( wrap_text encode_text ); use MT::Util - qw( remove_html encode_html encode_url decode_url is_valid_email is_valid_url escape_unicode format_ts encode_js ); + qw( remove_html encode_html encode_url decode_url is_valid_email is_valid_url is_url escape_unicode format_ts encode_js ); use MT::Entry qw(:constants); use MT::Author; use MT::JunkFilter qw(:constants); @@ -868,7 +868,7 @@ sub post { } } if ( $comment->url ) { - if ( my $fixed = is_valid_url( $comment->url, 'stringent' ) ) { + if ( my $fixed = is_valid_url( $comment->url ) ) { $comment->url($fixed); } else { @@ -1021,30 +1021,24 @@ sub eval_comment { my $commenter_status; if ($commenter) { - if ( MT::Author::COMMENTER() eq $commenter->type ) { - $commenter_status = $commenter->commenter_status( $entry->blog_id ); - if ( $commenter_status == MT::Author::APPROVED() ) { - if ( $blog->publish_trusted_commenters ) { - $comment->approve; - return $comment; - } - else { - $comment->moderate; - return $comment; - } - } - if ( $commenter_status == MT::Author::PENDING() ) { - - # just in case record doesn't exist... - $commenter->pending( $entry->blog_id ); + $commenter_status = $commenter->commenter_status( $entry->blog_id ); + if ( $commenter_status == MT::Author::APPROVED() ) { + if ( $blog->publish_trusted_commenters ) { + $comment->approve; + return $comment; } - if ( $commenter_status == MT::Author::BANNED() ) { - return undef; + else { + $comment->moderate; + return $comment; } } - elsif ( MT::Author::AUTHOR() eq $commenter->type ) { - $comment->approve; - return $comment; + if ( $commenter_status == MT::Author::PENDING() ) { + + # just in case record doesn't exist... + $commenter->pending( $entry->blog_id ); + } + if ( $commenter_status == MT::Author::BANNED() ) { + return undef; } } @@ -1237,7 +1231,7 @@ sub _make_comment { $comment->entry_id( $entry->id ); $comment->author( remove_html($nick) ); $comment->email( remove_html($email) ); - $url = is_valid_url( $url, 'stringent' ); + $url = is_valid_url( $url ); $comment->url( $url eq 'http://' ? '' : $url ); $comment->text($text); @@ -1732,7 +1726,7 @@ sub save_commenter_profile { $param{error} = $app->translate('Email Address is invalid.'); return $app->build_page( 'profile.tmpl', \%param ); } - if ( $param{url} && !is_valid_url( $param{url} ) ) { + if ( $param{url} && !is_url( $param{url} ) ) { $param{error} = $app->translate('URL is invalid.'); return $app->build_page( 'profile.tmpl', \%param ); } lib/MT/App/Comments.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/App/NotifyList.pm @@ -1,12 +1,11 @@ -# Original Copyright 2001-2002 Jay Allen. -# Modifications and integration Copyright 2001-2007 Six Apart. -# This code cannot be redistributed without permission from www.sixapart.com. -# For more information, consult your Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ -## todo: -## optimize by combining query into a compiled sub +# Original Copyright 2001-2002 Jay Allen. +# Modifications and integration Copyright 2001-2007 Six Apart. package MT::App::Search; lib/MT/App/Search.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/App/Trackback.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -305,6 +305,7 @@ sub init_blog { no warnings; @$sets = sort { $a->{order} <=> $b->{order} } @$sets; $param{'template_set_loop'} = $sets; + $param{'template_set_index'} = $#$sets; if ($app->param('back')) { return $app->init_user; @@ -364,7 +365,7 @@ sub init_blog { blog_url => uri_escape($param{blog_url}), blog_path => uri_escape($param{blog_path}), blog_timezone => $param{blog_timezone}, - blog_template_set => $param{blog_template_set}, + blog_template_set => $param{blog_template_set} || 'mt_blog', }; my $steps; lib/MT/App/Upgrader.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/App/Viewer.pm @@ -1,7 +1,8 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.movabletype.org. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # -# $Id: Wizard.pm 32597 2006-06-28 02:51:44Z ytakayama $ +# $Id$ package MT::App::Wizard; @@ -87,7 +88,7 @@ sub init_core_registry { start => { order => 0, handler => \&start, - params => ['set_static_uri_to'], + params => [qw(set_static_uri_to set_static_file_to)], }, configure => { order => 100, @@ -222,7 +223,6 @@ sub run_step { my $h = $steps->{$curr_step}{handler}; my %param = $app->unserialize_config; - my $keys = $app->config_keys; if ($curr_step) { foreach (@{ $keys->{$curr_step} }) { @@ -268,15 +268,18 @@ sub pre_start { my %param; eval { use File::Spec; }; - my ($cfg, $cfg_exists); + my ($cfg, $cfg_exists, $static_file_path); if (!$@) { $cfg = File::Spec->catfile($app->{mt_dir}, 'mt-config.cgi'); $cfg_exists |= 1 if -f $cfg; + + $static_file_path = File::Spec->catfile($app->static_file_path); } $param{cfg_exists} = $cfg_exists; $param{valid_static_path} = 1 if $app->is_valid_static_path($app->static_path); - $param{mt_static_exists} = $app->mt_static_exists; + $param{mt_static_exists} = $app->mt_static_exists; + $param{static_file_path} = $static_file_path; return $app->build_page("start.tmpl", \%param); } @@ -319,11 +322,17 @@ sub build_page { sub start { my $app = shift; + my %param = @_; - # test for static_path my $static_path = $app->param('set_static_uri_to'); + my $static_file_path = defined $param{set_static_file_to} ? + $param{set_static_file_to} : + $app->param('set_static_file_to'); + $param{set_static_file_to} = $static_file_path; + + # test for static_path unless ($app->param('set_static_uri_to')) { - my %param = ('uri_invalid' => 1 ); + $param{uri_invalid} = 1; return $app->build_page("start.tmpl", \%param); } @@ -333,12 +342,27 @@ sub start { $static_path .= '/' unless $static_path =~ m!/$!; unless ($app->is_valid_static_path($static_path)) { - my %param = ('uri_invalid' => 1, set_static_uri_to => $app->param('set_static_uri_to') ); + $param{uri_invalid} = 1; + $param{set_static_uri_to} = $app->param('set_static_uri_to'); return $app->build_page("start.tmpl", \%param); } $app->config->set('StaticWebPath', $static_path); + # test for static_file_path + unless ($static_file_path) { + $param{file_invalid} = 1; + return $app->build_page("start.tmpl", \%param); + } + + if (!(-d $static_file_path) || !(-f File::Spec->catfile($static_file_path, "mt.js"))) { + $param{file_invalid} = 1; + $param{set_static_uri_to} = $app->param('set_static_uri_to'); + return $app->build_page("start.tmpl", \%param); + } + $param{config} = $app->serialize_config(%param); + $param{static_file} = $static_file_path; + # test for required packages... my $req = $app->registry("required_packages"); my @REQ; @@ -348,7 +372,7 @@ sub start { } my ($needed) = $app->module_check(\@REQ); if (@$needed) { - my %param = ( 'package_loop' => $needed ); + $param{package_loop} = $needed; $param{required} = 1; return $app->build_page("packages.tmpl", \%param); } @@ -366,7 +390,7 @@ sub start { } my ($db_missing) = $app->module_check(\@DATA); if ((scalar @$db_missing) == (scalar @DATA)) { - my %param = ( 'package_loop' => $db_missing ); + $param{package_loop} = $db_missing; $param{missing_db_or_optional} = 1; $param{missing_db} = 1; return $app->build_page("packages.tmpl", \%param); @@ -381,13 +405,13 @@ sub start { my ($opt_missing) = $app->module_check(\@OPT); push @$opt_missing, @$db_missing; if (@$opt_missing) { - my %param = ( 'package_loop' => $opt_missing ); + $param{package_loop} = $opt_missing; $param{missing_db_or_optional} = 1; $param{optional} = 1; return $app->build_page("packages.tmpl", \%param); } - my %param = ( 'success' => 1 ); + $param{success} = 1; return $app->build_page("packages.tmpl", \%param); } @@ -662,6 +686,8 @@ sub seed { $param{config} = $app->serialize_config(%param); } + $param{static_file_path} = $param{set_static_file_to}; + require URI; my $uri = URI->new($app->cgipath); $param{cgi_path} = $uri->path; lib/MT/App/Wizard.pm @@ -1,8 +1,8 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # -# $Id: Asset.pm 969 2006-12-21 01:47:02Z bchoate $ +# $Id$ package MT::Asset; @@ -334,6 +334,29 @@ sub on_upload { 1; } +sub edit_template_param { + my $asset = shift; + my ($cb, $app, $param, $tmpl) = @_; + return; +} + +sub set_values_from_query { + my $asset = shift; + my ($q) = @_; + + # Set the known columns from the form, if they're set. Subclasses can + # opt out or decorate this behavior by overriding the method. + my $names = $asset->column_names; + my %values; + for my $field (@$names) { + $values{$field} = $q->param($field) + if defined $q->param($field); + } + $asset->set_values(\%values); + + 1; +} + # $pseudo parameter causes function to return '%r' as # root instead of blog site path sub _make_cache_path { lib/MT/Asset.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Asset/Audio.pm @@ -1,8 +1,8 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # -# $Id: Image.pm 987 2006-12-27 07:25:12Z fumiakiy $ +# $Id$ package MT::Asset::Image; @@ -26,10 +26,15 @@ sub class_label_plural { sub metadata { my $obj = shift; my $meta = $obj->SUPER::metadata(@_); + + my $width = $obj->image_width; + my $height = $obj->image_height; + $meta->{image_width} = $width if defined $width; + $meta->{image_height} = $height if defined $height; $meta->{ MT->translate("Actual Dimensions") } = - MT->translate( "[_1] x [_2] pixels", - $obj->image_width, $obj->image_height ) - if defined $obj->image_width && defined $obj->image_height; + MT->translate( "[_1] x [_2] pixels", $width, $height ) + if defined $width && defined $height; + $meta; } @@ -304,7 +309,7 @@ q|<a href="%s" onclick="window.open('%s','popup','width=%d,height=%d,scrollbars= else { if ( $param->{thumb} ) { $text = sprintf( - '<a href="%s"><img alt="%s" src="%s" %s %s/></a>', + '<a href="%s"><img alt="%s" src="%s" %s %s /></a>', MT::Util::encode_html( $asset->url ), MT::Util::encode_html( $asset->label ), MT::Util::encode_html( $thumb->url ), @@ -314,7 +319,7 @@ q|<a href="%s" onclick="window.open('%s','popup','width=%d,height=%d,scrollbars= } else { $text = sprintf( - '<img alt="%s" src="%s" %s %s/>', + '<img alt="%s" src="%s" %s %s />', MT::Util::encode_html( $asset->label ), MT::Util::encode_html( $asset->url ), $dimensions, $wrap_style, @@ -645,6 +650,14 @@ sub on_upload { 1; } +sub edit_template_param { + my $asset = shift; + my ($cb, $app, $param, $tmpl) = @_; + + $param->{image_height} = $asset->image_height; + $param->{image_width} = $asset->image_width; +} + 1; __END__ lib/MT/Asset/Image.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Asset/Video.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Association.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Atom.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/AtomServer.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Auth.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Auth/BasicAuth.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Auth/LiveJournal.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Auth/MT.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Auth/OpenID.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Auth/TypeKey.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Auth/Vox.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Author.pm @@ -1,12 +1,13 @@ -# Copyright 2001-2006 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ package MT::BackupRestore; use strict; +use MT::Util qw( encode_url ); use Symbol; use base qw( MT::ErrorHandler ); @@ -15,6 +16,16 @@ use constant NS_MOVABLETYPE => 'http://www.sixapart.com/ns/movabletype'; use File::Spec; use File::Copy; +MT->add_callback('restore', 3, MT->instance, sub { + my ($cb, $objects, $deferred, $errors, $callback) = @_; + MT::BackupRestore->cb_restore_objects( $objects, $callback ); +}); + +MT->add_callback('restore_asset', 3, MT->instance, sub { + my ($cb, $asset, $callback) = @_; + MT::BackupRestore->cb_restore_asset( $asset, $callback ); +}); + sub _populate_obj_to_backup { my $pkg = shift; my ($blog_ids, $skip, $later) = @_; @@ -229,13 +240,9 @@ sub restore_file { my ($blog_ids, $asset_ids) = eval { $class->restore_process_single_file( $fh, $objects, $deferred, $errors, $schema_version, $overwrite, $callback ); }; + + MT->run_callbacks('restore', $objects, $deferred, $errors, $callback); $$errormsg = join('; ', @$errors); - #my @blog_ids; - #while (my ($key, $value) = each %$objects) { - # if ($key =~ /MT::Blog#/) { - # push @blog_ids, $value->id; - # } - #} ($deferred, $blog_ids); } @@ -285,7 +292,7 @@ sub restore_process_single_file { sub restore_directory { my $class = shift; - my ($dir, $errors, $error_assets, $schema_version, $callback) = @_; + my ($dir, $errors, $error_assets, $schema_version, $overwrite, $callback) = @_; my $manifest; my @files; @@ -324,7 +331,7 @@ sub restore_directory { open $fh, "<$filepath" or push @$errors, MT->translate("Can't open [_1]."), next; my ($tmp_blog_ids, $tmp_asset_ids) = eval { __PACKAGE__->restore_process_single_file( - $fh, \%objects, $deferred, $errors, $schema_version, $callback); }; + $fh, \%objects, $deferred, $errors, $schema_version, $overwrite, $callback); }; close $fh; last if $@; @@ -332,6 +339,8 @@ sub restore_directory { push @blog_ids, @$tmp_blog_ids if defined $tmp_blog_ids; push @asset_ids, @$tmp_asset_ids if defined $tmp_asset_ids; } + + MT->run_callbacks('restore', \%objects, $deferred, $errors, $callback); my $blog_ids = scalar(@blog_ids) ? \@blog_ids : undef; my $asset_ids = scalar(@asset_ids) ? \@asset_ids : undef; ($deferred, $blog_ids, $asset_ids); @@ -395,11 +404,170 @@ sub restore_asset { or $errors->{$id} = $!; } - $callback->(exists($errors->{$id}) ? - MT->translate('Failed: ') . $errors->{$id} : - MT->translate("Done.") + if ( exists $errors->{$id} ) { + return $callback->( MT->translate('Failed: ') . $errors->{$id} . "\n" ); + } + + $callback->( MT->translate("Done.") . "\n" ); + + MT->run_callbacks('restore_asset', $asset, $callback); + + 1; +} + +sub _sync_asset_id { + my ($text, $related) = @_; + + $text =~ s!<form([^>]*?\s)mt:asset-id=(["'])(\d+)(["'])([^>]*?)>(.+?)</form>! + my $old_id = $3; + my $asset = $related->{$old_id}; + my $result = '<form' . $1 . 'mt:asset-id=' . $2 . $asset->id . $4 . $5 . '>'; + my $html = $6; + my $filename = quotemeta(encode_url($asset->file_name)); + my $url = $asset->url; + my @children = MT->model('asset')->load( + { parent => $asset->id, blog_id => $asset->blog_id, class => '*' } + ); + my %children = map { + $_->id => { + 'filename' => quotemeta(encode_url($_->file_name)), + 'url' => $_->url + } + } @children; + $result .= $html . '</form>'; + $result; + !igem; + $text; +} + +sub cb_restore_objects { + my $pkg = shift; + my ($all_objects, $callback) = @_; + + my %entries; + my %assets; + my %old_ids; + for my $key ( keys %$all_objects ) { + if ( $key =~ /^MT::Entry#(\d+)$/ ) { + my $new_id = $all_objects->{$key}->id; + $entries{$new_id} = $all_objects->{$key}; + } elsif ( $key =~ /^MT::Asset#(\d+)$/ ) { + my $old_id = $1; + my $new_id = $all_objects->{$key}->id; + $assets{$new_id} = { + object => $all_objects->{$key}, + old_id => $old_id, + }; + } + } + + my $i = 0; + $callback->( + MT->translate("Restoring asset associations ... ( [_1] )", $i++), + 'cb-restore-entry-asset' + ); + for my $obj_id ( keys %entries ) { + my $entry = $entries{$obj_id}; + + my @placements = MT->model('objectasset')->load( { + object_id => $obj_id, + object_ds => 'entry', + blog_id => $entry->blog_id + }); + next unless @placements; + + my %related; + for my $placement ( @placements ) { + my $asset_hash = $assets{$placement->asset_id}; + next unless $asset_hash; + $related{ $asset_hash->{old_id} } = $asset_hash->{object}; + } + + $callback->( + MT->translate("Restoring asset associations in [lc,_1] ... ( [_2] )", $entry->class_label, $i++), + 'cb-restore-entry-asset' + ); + for my $col ( qw( text text_more ) ) { + my $text = $entry->$col; + next unless $text; + $text = _sync_asset_id( $text, \%related ); + $entry->$col($text); + } + $entry->update(); # directly call update to bypass processing in save() + } + $callback->( MT->translate("Done.") . "\n" ); + 1; +} + +sub _sync_asset_url { + my ($text, $asset) = @_; + + my $filename = quotemeta(encode_url($asset->file_name)); + my $url = $asset->url; + my $id = $asset->id; + my @children = MT->model('asset')->load( + { parent => $asset->id, blog_id => $asset->blog_id, class => '*' } ); - $callback->("\n"); + my %children = map { + $_->id => { + 'filename' => quotemeta(encode_url($_->file_name)), + 'url' => $_->url + } + } @children; + + $text =~ s!<form([^>]*?\s)mt:asset-id=(["'])$id(["'])([^>]*?)>(.+?)</form>! + my $result = '<form' . $1 . 'mt:asset-id=' . $2 . $id . $3 . $4 . '>'; + my $html = $5; + $html =~ s#<a([^>]*? )href=(["'])[^>]+?/$filename(["'])([^>]*?)>#<a$1href=$2$url$3$4>#gim; + $html =~ s#<img([^>]*? )src=(["'])[^>]+?/$filename(["'])([^>]*?)(/? *)>#<img$1src=$2$url$3$4$5>#gim; + if ( %children ) { + for my $child (values %children) { + my $child_filename = $child->{filename}; + my $child_url = $child->{url}; + $html =~ s#<img([^>]*? )src=(["'])[^>]+?/$child_filename(["'])([^>]*?)>#<img$1src=$2$child_url$3$4>#gim; + $html =~ s#<a([^>]*? )href=(["'])[^>]+?/$child_filename(["'])([^>]*?)>#<a$1href=$2$child_url$3$4>#gim; + $html =~ s#<a([^>]*? )onclick=(["'])[^>]+?/$child_filename(["'])([^>]*?)>#<a$1onclick=$2$child_url$3$4>#gim; + } + } + $result .= $html . '</form>'; + $result; + !igem; + $text; +} + +sub cb_restore_asset { + my $pkg = shift; + my ($asset, $callback) = @_; + + my @placements = MT->model('objectasset')->load( { + asset_id => $asset->id, + blog_id => $asset->blog_id + }); + + my $i = 0; + $callback->( + MT->translate('Restoring url of the assets ( [_1] )...', $i++), + 'cb-restore-asset-url' + ); + for my $placement (@placements) { + next unless 'entry' eq $placement->object_ds; + my $entry = MT->model('entry')->load( $placement->object_id ); + next unless $entry; + + $callback->( + MT->translate('Restoring url of the assets in [lc,_1] ( [_2] )...', $entry->class_label, $i++), + 'cb-restore-asset-url' + ); + for my $col ( qw( text text_more ) ) { + my $text = $entry->$col; + next unless $text; + $text = _sync_asset_url( $text, $asset ); + $entry->$col($text); + } + $entry->update(); # directly call update to bypass processing in save() + } + $callback->( MT->translate("Done.") . "\n" ); + 1; } sub _restore_asset_multi { @@ -966,6 +1134,12 @@ which are restored in the very session, and hash of asset_ids. TODO A method which reads specified directory, find a manifest file, and do the multi-file restore operation directed by the manifest file. +=head2 restore_object_asset + +Accepts an asset object just restored, populate associated entries, +and scan text and text_more for each entry. If association marker +(<form> tag) is found, replace asset id and URL to the new ones. + =head2 restore_asset TODO A method which restores the assets' actual files to the @@ -1005,7 +1179,7 @@ a callback to Backup callback, and Backup process will call the callbacks to give plugins a chance to add their own data to the backup file. Otherwise, plugin's object classes is likely be ignored in backup operation. -=item Restore +=item Restore.<element_name>:<xmlnamespace> Restore callbacks are called in convention like below: @@ -1037,6 +1211,53 @@ parameters described above. XML Namespace is required to be registered, so an xml node can be resolved into what plugins to be called back, and can be distinguished the same element name with each other. +=item restore + +Calling convention is: + + callback($cb, $objects, $deferred, $errors, $callback); + +This callback is called when all of the XML files in the particular +restore session are restored, thus, when $objects and $deferred +would not have any more objects in them. This callback is useful +for object classes which have relationships with other classes, +for the kind of classes may not be able to handle relationship +correctly until the associated objects would be successfully +restored. + +NOTE that this callback is called BEFORE blogs' site_path and +site_url are updated. Therefore, blog objects and other objects +which contains path information such as assets still have old +url and path in I<$objects>. + +$objects is an hash reference which contains all the restored objects +in the restore session. The hash keys are stored in the format +MT::ObjectClassName#old_id, and hash values are object reference +of the actually restored objects (with new id). Old ids are ids +which are stored in the XML files, while new ids are ids which +are restored. + +$deferred is an hash reference which contains information about +restore-deferred objects. Deferred objects are those objects +which appeared in the XMl file but could not be restored because +any parent objects are missing. The hash keys are stored in +the format MT::ObjectClassName#old_id and hash values are 1. + +$callback is a code reference which will print out the passed paramter. +Callback method can use this to communicate with users. + +=item restore_asset + +Calling convention is: + + callback($cb, $asset, $callback); + +This callback is called when asset's actual file is restored. +$asset has new url and path. + +$callback is a code reference which will print out the passed paramter. +Callback method can use this to communicate with users. + =head1 AUTHOR & COPYRIGHT Please see L<MT/AUTHOR & COPYRIGHT>. lib/MT/BackupRestore.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2006 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -262,7 +262,14 @@ sub end_element { $exists = 1 if $perm; } unless ($exists) { - if ($obj->save()) { + my $result; + if ( $obj->id ) { + $result = $obj->update(); + } + else { + $result = $obj->insert(); + } + if ( $result ) { if ($class =~ /MT::Asset(::.+)*/) { $class = 'MT::Asset'; } lib/MT/BackupRestore/BackupFileHandler.pm @@ -1,8 +1,8 @@ -# Copyright 2001-2006 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # -# $Id: ManifestFileHandler.pm 962 2006-12-20 11:49:08Z fumiakiy $ +# $Id$ package MT::BackupRestore::ManifestFileHandler; lib/MT/BackupRestore/ManifestFileHandler.pm @@ -1,3 +1,9 @@ +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + package MT::BasicAuthor; # fake out the require for this package since we're lib/MT/BasicAuthor.pm @@ -1,3 +1,9 @@ +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + package MT::BasicSession; # fake out the require for this package since we're lib/MT/BasicSession.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Blocklist.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Blog.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Bootstrap.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -145,10 +145,11 @@ sub compile { } } if ($is_container) { - if ($whole_tag !~ m|/>|) { + if ($whole_tag !~ m|/>$|) { my ($sec_end, $tag_end) = _consume_up_to(\$text,$sec_start,$tag); if ($sec_end) { - my $sec = substr $text, $sec_start, $sec_end - $sec_start; + my $sec = $tag =~ m/ignore/i ? '' # ignore MTIgnore blocks + : substr $text, $sec_start, $sec_end - $sec_start; if ($sec !~ m/<\$?MT/i) { $rec->[2] = [ ($sec ne '' ? ['TEXT', $sec ] : ()) ]; } lib/MT/Builder.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Callback.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Category.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Comment.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Compat/v3.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Component.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Config.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/ConfigMgr.pm @@ -1,3 +1,9 @@ +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + package MT::Core; use strict; @@ -173,7 +179,7 @@ BEGIN { order => 300, }, 'blog.edit_all_posts' => { - label => trans('Manage Entries'), + label => trans('Edit All Entries'), group => 'auth_pub', order => 400, }, @@ -272,6 +278,7 @@ BEGIN { 'AllowedTextFilters' => undef, 'Serializer' => { default => 'MT', }, 'SendMailPath' => { default => '/usr/lib/sendmail', }, + 'RsyncPath' => undef, 'TimeOffset' => { default => 0, }, 'WSSETimeout' => { default => 120, }, 'StaticWebPath' => { default => '', }, @@ -302,6 +309,7 @@ BEGIN { 'UploadPerms' => { default => '0666', }, 'NoTempFiles' => { default => 0, }, 'TempDir' => { default => '/tmp', }, + 'RichTextEditor' => { default => 'archetype', }, 'EntriesPerRebuild' => { default => 40, }, 'UseNFSSafeLocking' => { default => 0, }, 'NoLocking' => { default => 0, }, @@ -389,9 +397,9 @@ BEGIN { # 'MTNewsURL' => { # default => 'http://www.sixapart.com/movabletype/news/mt4_news_widget.html', # }, - # 'LearningNewsURL' => { - # default => 'http://learning.movabletype.org/newsbox.html', - # }, + 'LearningNewsURL' => { + default => 'http://learning.movabletype.org/newsbox.html', + }, # 'HackingNewsURL' => { # default => 'http://hacking.movabletype.org/newsbox.html', # }, @@ -404,7 +412,6 @@ BEGIN { 'TypeKeyVersion' => { default => '1.1' }, 'TransparentProxyIPs' => { default => 0, }, 'DebugMode' => { default => 0, }, - 'PublishCommenterIcon' => { default => 1, }, 'ShowIPInformation' => { default => 0, }, 'AllowComments' => { default => 1, }, 'AllowPings' => { default => 1, }, @@ -462,6 +469,7 @@ BEGIN { 'FuturePostFrequency' => { default => 1 }, 'AssetCacheDir' => { default => 'assets_c', }, 'MemcachedServers' => { type => 'ARRAY', }, + 'MemcachedNamespace' => undef, 'CommenterRegistration' => { type => 'HASH', default => { @@ -530,6 +538,12 @@ BEGIN { }, }, }, + richtext_editors => { + 'archetype' => { + label => 'Movable Type Default', + template => 'archetype_editor.tmpl', + }, + }, ping_servers => { 'weblogs' => { label => 'weblogs.com', @@ -675,7 +689,7 @@ sub load_junk_filters { sub load_core_tasks { my $cfg = MT->config; - return { + my $tasks = { 'FuturePost' => { label => 'Publish Scheduled Entries', frequency => $cfg->FuturePostFrequency * 60, # once per minute @@ -706,6 +720,18 @@ sub load_core_tasks { }, }, }; + if ( my $newsbox_url = $cfg->LearningNewsURL ) { + if ( $newsbox_url ne 'disable' ) { + $tasks->{LearningNewsRetrieval} = { + label => 'Retrieve Learning MT Updates', + frequency => 60 * 60 * 24, # once a day + code => sub { + MT::Util::get_newsbox_html($newsbox_url, 'LW'); + }, + }; + } + } + $tasks; } sub remove_temporary_files { lib/MT/Core.pm @@ -1,8 +1,9 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ + # Adapted from DateTime package to avoid requirement of DateTime package. package MT::DateTime; lib/MT/DateTime.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more details, consult -# your Movable Type license for details. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -161,6 +161,9 @@ BEGIN { 'sidebar_3col' => { label => 'Sidebar - 3 Column Layout', }, + 'sidebar' => { + label => 'Sidebar', + }, 'trackbacks' => { label => 'TrackBacks', }, lib/MT/DefaultTemplates.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -176,82 +176,20 @@ sub _nextprev { $label .= ':category='. $terms->{category_id} if exists $terms->{category_id}; return $obj->{$label} if $obj->{$label}; - # Selecting the adjacent object can be tricky since timestamps - # are not necessarily unique for entries. If we find that the - # next/previous object has a matching timestamp, keep selecting entries - # to select all entries with the same timestamp, then compare them using - # id as a secondary sort column. - - my ($id, $ts) = ($obj->id, $obj->authored_on); - my $args = { - 'sort' => 'authored_on', - 'direction' => $next ? 'ascend' : 'descend', - 'range_incl' => { 'authored_on' => 1 }, - }; + my $args = {}; if (my $cat_id = delete $terms->{category_id}) { my $join = MT::Placement->join_on('entry_id', { category_id => $cat_id } ); - if (exists $args->{join}) { - $args->{join} = [ $args->{join}, -and => $join ]; - } else { - $args->{join} = $join; - } + $args->{join} = $join; } - my $iter = $class->load_iter({ - blog_id => $obj->blog_id, - class => $obj->class, - authored_on => ($next ? [ $ts, undef ] : [ undef, $ts ]), - %{$terms} - }, $args); - - # This selection should always succeed, but handle situation if - # it fails by returning undef. - return unless $iter; - - # The 'same' array will hold any entries that have matching - # timestamps; we will then sort those by id to find the correct - # adjacent object. - my @same; - while (my $e = $iter->()) { - # Don't consider the object that is 'current' - next if $e->id == $id; - my $e_ts = $e->authored_on; - if ($e_ts eq $ts) { - # An object with the same timestamp should only be - # considered if the id is in the scope we're looking for - # (greater than for the 'next' object; less than for - # the 'previous' object). - push @same, $e - if $next && $e->id > $id or !$next && $e->id < $id; - } else { - # We found an object with a timestamp different than - # the 'current' object. - if (!@same) { - push @same, $e; - # We should check to see if this new timestamped object also - # has entries adjacent to _it_ that have the same timestamp. - while (my $e = $iter->()) { - push(@same, $e), next if $e->authored_on eq $e_ts; - $iter->('finish'), last; - } - } else { - $iter->('finish'); - } - return $obj->{$label} = $e unless @same; - last; - } - } - if (@same) { - # If we only have 1 element in @same, return that. - return $obj->{$label} = $same[0] if @same == 1; - # Sort remaining elements in @same by id. - @same = sort { $a->id <=> $b->id } @same; - # Return front of list (smallest id) if selecting 'next' - # object. Return tail of list (largest id) if selection 'previous'. - return $obj->{$label} = $same[$next ? 0 : $#same]; - } - return; + + return $obj->{$label} = $obj->nextprev( + direction => $direction, + terms => { blog_id => $obj->blog_id, class => $obj->class, %$terms }, + args => $args, + by => 'authored_on', + ); } sub trackback { lib/MT/Entry.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/ErrorHandler.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/FileInfo.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -23,8 +23,7 @@ sub new { sub init { my $fmgr = shift; - $fmgr->{cfg} = MT->config; - return $fmgr; + $fmgr; } sub get_data; lib/MT/FileMgr.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/FileMgr/DAV.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/FileMgr/FTP.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -59,7 +59,7 @@ sub _write_file { my($from, $to, $type) = @_; local *FH; my($umask, $perms); - my $cfg = $fmgr->{cfg}; + my $cfg = MT->config; if ($type && $type eq 'upload') { $umask = $cfg->UploadUmask; $perms = $cfg->UploadPerms; @@ -76,7 +76,7 @@ sub _write_file { binmode($from) if $fmgr->is_handle($from); } ## Lock file unless NoLocking specified. - flock FH, LOCK_EX unless $fmgr->{cfg}->NoLocking; + flock FH, LOCK_EX unless $cfg->NoLocking; seek FH, 0, 0; truncate FH, 0; my $bytes = 0; @@ -102,7 +102,7 @@ sub mkpath { my $fmgr = shift; my($path) = @_; require File::Path; - my $umask = oct $fmgr->{cfg}->DirUmask; + my $umask = oct MT->config->DirUmask; my $old = umask($umask); eval { File::Path::mkpath([$path], 0, 0777) }; return $fmgr->error($@) if $@; lib/MT/FileMgr/Local.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/FileMgr/SFTP.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Folder.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -23,9 +23,7 @@ BEGIN { _handle(decode => @_); }; } else { - *decode = sub { - Encode::decode(@_); - }; + *decode = \&Encode::decode; } }; lib/MT/I18N.pm @@ -1,5 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.movabletype.org +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/I18N/default.pm @@ -1,5 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.movabletype.org +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/I18N/en_us.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/I18N/ja.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/IPBanList.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Image.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Import.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/ImportExport.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/JunkFilter.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -22,6 +22,18 @@ sub language_name { sub encoding { 'iso-8859-1' } ## Latin-1 sub ascii_only { 0 } +sub lc { + my $lh = shift; + require MT::I18N; + MT::I18N::lowercase(@_); +} + +sub uc { + my $lh = shift; + require MT::I18N; + MT::I18N::uppercase(@_); +} + 1; __END__ lib/MT/L10N.pm @@ -1,5 +1,6 @@ - # Copyright 2003-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -58,8 +59,8 @@ use vars qw( @ISA %Lexicon ); 'Entry' => 'Eintrag', ## default_templates/notify-entry.mtml - 'A new [_3] entitled \'[_1]\' has been published to [_2].' => 'Ein neuer Eintrag namens \'[_1]\' wurde in [_2] veröffentlicht.', - 'View [_1]:' => '[_1] ansehen:', + 'A new [lc,_3] entitled \'[_1]\' has been published to [_2].' => 'Ein neuer Eintrag namens \'[_1]\' wurde in [_2] veröffentlicht.', + 'View [lc,_1]:' => '[_1] ansehen:', '[_1] Title: [_2]' => 'Titel: [_2]', 'Publish Date: [_1]' => 'Veröffentlichungsdatum:', 'Message from Sender:' => 'Nachricht des Absenders:', @@ -186,7 +187,7 @@ use vars qw( @ISA %Lexicon ); ## default_templates/javascript.mtml 'Thanks for signing in,' => 'Danke für Ihre Anmeldung, ', '. Now you can comment.' => '. Sie können jetzt Ihren Kommentar verfassen.', - 'sign out' => 'Abmelden', + 'sign out' => 'abmelden', 'You do not have permission to comment on this blog.' => 'Sie haben nicht die notwendige Berechtigung, um in diesem Blog Kommentare zu schreiben.', 'Sign in' => 'Anmelden', ' to comment on this entry.' => ' um diesen Eintrag zu kommentieren.', @@ -239,7 +240,7 @@ use vars qw( @ISA %Lexicon ); '[_1] ([_2])' => '[_1] ([_2])', 'About this Entry' => 'Über diese Seite', 'About this Archive' => 'Über dieses Archiv', - 'About Archives' => 'Über das Archiv', + 'About Archives' => 'Über die Archive', 'This page contains links to all the archived content.' => 'Diese Seite enthält Links zu allen archivierten Einträgen.', 'This page contains a single entry by [_1] published on <em>[_2]</em>.' => 'Diese Seite enthält einen einen einzelnen Eintrag von [_1] vom <em>[_2]</em>.', '<a href="[_1]">[_2]</a> was the previous entry in this blog.' => '<a href="[_1]">[_2]</a> ist der vorherige Eintrag in diesem Blog.', @@ -430,35 +431,35 @@ use vars qw( @ISA %Lexicon ); 'Can\'t load template' => 'Kann Vorlage nicht laden', 'Can\'t find template \'[_1]\'' => 'Kann Vorlage \'[_1]\' nicht finden', 'Can\'t find entry \'[_1]\'' => 'Kann Eintrag \'[_1]\' nicht finden', - 'You used a [_1] tag without any arguments.' => 'Sie haben einen [_1]-Befehl ohne Argument verwendet.', - 'You used an \'[_1]\' tag outside of the context of a author; perhaps you mistakenly placed it outside of an \'MTAuthors\' container?' => 'Sie haben ein \'[_1]\'-Befehl außerhalb eines Autoren-Kontexts verwendet - \'MTAuthors\'-Container erforderlich', + 'You used a [_1] tag without any arguments.' => 'Sie haben einen [_1]-Tag ohne Argument verwendet.', + 'You used an \'[_1]\' tag outside of the context of a author; perhaps you mistakenly placed it outside of an \'MTAuthors\' container?' => 'Sie haben ein \'[_1]\'-Tag außerhalb eines Autoren-Kontexts verwendet - \'MTAuthors\'-Container erforderlich', 'You have an error in your \'[_2]\' attribute: [_1]' => 'Fehler im \'[_2]\'-Attribut: [_1]', 'You have an error in your \'tag\' attribute: [_1]' => 'Fehler im \'tag\'-Attribut: [_1]', 'No such user \'[_1]\'' => 'Kein Benutzer \'[_1]\'', - 'You used an \'[_1]\' tag outside of the context of an entry; perhaps you mistakenly placed it outside of an \'MTEntries\' container?' => '\'[_1]\'-Befehl außerhalb eines Eintrags-Kontexts verwendet - \'MTEntries\'-Container erforderlich.', + 'You used an \'[_1]\' tag outside of the context of an entry; perhaps you mistakenly placed it outside of an \'MTEntries\' container?' => '\'[_1]\'-Tag außerhalb eines Eintrags-Kontexts verwendet - \'MTEntries\'-Container erforderlich.', 'You used <$MTEntryFlag$> without a flag.' => 'Sie haben <$MTEntryFlag$> ohne Flag verwendet.', - 'You used an [_1] tag for linking into \'[_2]\' archives, but that archive type is not published.' => 'Sie haben mit einem [_1]-Befehl \'[_2]\'-Archive verlinkt, ohne diese vorher zu veröffentlichen.', + 'You used an [_1] tag for linking into \'[_2]\' archives, but that archive type is not published.' => 'Sie haben mit einem [_1]-Tag \'[_2]\'-Archive verlinkt, ohne diese vorher zu veröffentlichen.', 'Could not create atom id for entry [_1]' => 'Konnte keine ATOM-ID für Eintrag [_1] erzeugen', 'To enable comment registration, you need to add a TypeKey token in your weblog config or user profile.' => 'Um die Registrierung von Kommentarautoren zu ermöglichen, geben Sie ein TypeKey-Token in den Weblogeinstellungen oder dem Benutzerenprofil an.', 'The MTCommentFields tag is no longer available; please include the [_1] template module instead.' => 'Der MTCommentFields-Befehl ist nicht mehr verfügbar. Bitte verwenden Sie stattdessen das [_1]-Vorlagenmodul.', - 'You used an [_1] tag without a date context set up.' => 'Sie haben einen [_1]-Befehl ohne Datumskontext verwendet.', - 'You used an \'[_1]\' tag outside of the context of a comment; perhaps you mistakenly placed it outside of an \'MTComments\' container?' => '\'[_1]\'-Befehl außerhalb eines Kommentar-Kontexts verwendet - \'MTComments\'-Container erforderlich.', + 'You used an [_1] tag without a date context set up.' => 'Sie haben einen [_1]-Tag ohne Datumskontext verwendet.', + 'You used an \'[_1]\' tag outside of the context of a comment; perhaps you mistakenly placed it outside of an \'MTComments\' container?' => '\'[_1]\'-Tag außerhalb eines Kommentar-Kontexts verwendet - \'MTComments\'-Container erforderlich.', '[_1] can be used only with Daily, Weekly, or Monthly archives.' => '[_1] kann nur mit Tages-, Wochen- oder Monatsarchiven verwendet werden.', 'Group iterator failed.' => 'Gruppeniterator fehlgeschlagen.', - 'You used an [_1] tag outside of the proper context.' => 'Sie haben ein [_1]-Befehl außerhalb seines Kontexts verwendet.', + 'You used an [_1] tag outside of the proper context.' => 'Sie haben ein [_1]-Tag außerhalb seines Kontexts verwendet.', 'Could not determine entry' => 'Konnte Eintrag nicht bestimmen', 'Invalid month format: must be YYYYMM' => 'Ungültiges Datumsformat: richtig ist JJJJMM', 'No such category \'[_1]\'' => 'Keine Kategorie \'[_1]\'', - '<\$MTCategoryTrackbackLink\$> must be used in the context of a category, or with the \'category\' attribute to the tag.' => '<\$MTCategoryTrackbackLink\$> muss im Kategoriekontext stehen oder mit dem \'category\'-Attribut des Befehls.', - 'You failed to specify the label attribute for the [_1] tag.' => 'Kein Label-Attribut für den [_1]-Befehl angegeben.', - 'You used an \'[_1]\' tag outside of the context of a ping; perhaps you mistakenly placed it outside of an \'MTPings\' container?' => '\'[_1]\'-Befehl außerhalb eines Ping-Kontextes verwendet - \'MTPings\'-Container erforderlich.', + '<\$MTCategoryTrackbackLink\$> must be used in the context of a category, or with the \'category\' attribute to the tag.' => '<\$MTCategoryTrackbackLink\$> muss im Kategoriekontext stehen oder mit dem \'category\'-Attribut des Tags.', + 'You failed to specify the label attribute for the [_1] tag.' => 'Kein Label-Attribut des [_1]-Tags angegeben.', + 'You used an \'[_1]\' tag outside of the context of a ping; perhaps you mistakenly placed it outside of an \'MTPings\' container?' => '\'[_1]\'-Tag außerhalb eines Ping-Kontextes verwendet - \'MTPings\'-Container erforderlich.', '[_1] used outside of [_2]' => '[_1] außerhalb [_2] verwendet', 'MT[_1] must be used in a [_2] context' => 'MT[_1] muss in einem [_2]-Kontext stehen', 'Cannot find package [_1]: [_2]' => 'Kann Paket [_1] nicht finden: [_2]', 'Error sorting [_2]: [_1]' => 'Fehler beim Sortieren von [_2]: [_1]', 'Edit' => 'Bearbeiten', - 'You used an \'[_1]\' tag outside of the context of an asset; perhaps you mistakenly placed it outside of an \'MTAssets\' container?' => '\'[_1]\'-Befehl außerhalb eines Asset-Kontexts verwendet - möglicherweise außerhalb eines \'MTAssets\'-Containers?', - 'You used an \'[_1]\' tag outside of the context of an page; perhaps you mistakenly placed it outside of an \'MTPages\' container?' => '\'[_1]\'-Befehl außerhalb eines Seiten-Kontexts verwendet - möglicherweise außerhalb eines \'MTPages\'-Containers?', + 'You used an \'[_1]\' tag outside of the context of an asset; perhaps you mistakenly placed it outside of an \'MTAssets\' container?' => '\'[_1]\'-Tag außerhalb eines Asset-Kontexts verwendet - möglicherweise außerhalb eines \'MTAssets\'-Containers?', + 'You used an \'[_1]\' tag outside of the context of an page; perhaps you mistakenly placed it outside of an \'MTPages\' container?' => '\'[_1]\'-Tag außerhalb eines Seiten-Kontexts verwendet - möglicherweise außerhalb eines \'MTPages\'-Containers?', 'You used an [_1] without a author context set up.' => '[_1] ohne vorhandenen Autorenkontext verwendet.', 'Can\'t load user.' => 'Kann Benutzerkonto nicht laden.', @@ -507,7 +508,7 @@ use vars qw( @ISA %Lexicon ); 'Invalid URL \'[_1]\'' => 'Ungültige Web-Adresse (URL) \'[_1]\'', 'Text entered was wrong. Try again.' => 'Der eingegebene Text ist falsch. Bitte versuchen Sie es erneut.', 'Comment save failed with [_1]' => 'Der Kommentar konnte nicht gespeichert werden: [_1]', - 'Comment on "[_1]" by [_2].' => 'Kommentar zu "[_1]" von [_2]', + 'Comment on "[_1]" by [_2].' => 'Kommentar zu "[_1]" von [_2].', 'Commenter save failed with [_1]' => 'Beim Speichern des Kommentarautors ist ein Fehler aufgetreten: [_1]', 'Publish failed: [_1]' => 'Veröffentlichung fehlgeschlagen: [_1]', 'Failed comment attempt by pending registrant \'[_1]\'' => 'Fehlgeschlagener Kommentierungsversuch durch schwebenden Kommentarautoren \'[_1]\'', @@ -625,7 +626,7 @@ use vars qw( @ISA %Lexicon ); 'Comments posted since [_1]' => 'Seit [_1] veröffentlichte Kommentare', 'Comments posted on or before [_1]' => 'Bis [_1] veröffentlichte Kommentare', 'Invalid blog' => 'Ungültiges Blog', - 'Password Recovery' => 'Erinnerungssatz zur Passwortanforderung', + 'Password Recovery' => 'Neues Passwort anfordern', 'Invalid password recovery attempt; can\'t recover password in this configuration' => 'Ungültiger Versuch der Passwortanforderung. Passwörter können in dieser Konfiguration nicht angefordert werden.', 'Invalid author_id' => 'Ungültige Autoren-ID', 'Can\'t recover password in this configuration' => 'Passwörter können in dieser Konfiguration nicht angefordert werden', @@ -658,7 +659,7 @@ use vars qw( @ISA %Lexicon ); 'Blog Activity Feed' => 'Aktivitätsfeed', '*User deleted*' => 'Benutzer gelöscht', 'All Feedback' => 'Feedback', - 'Activity Log' => 'Aktivitätsprotokoll', + 'Activity Log' => 'Aktivitäten', 'System Activity Feed' => 'Systemfeed', 'Activity log for blog \'[_1]\' (ID:[_2]) reset by \'[_3]\'' => 'Aktivitätsprotokoll von \'[_1]\' (ID:[_2]) on \'[_3]\' zurückgesetzt', 'Activity log reset by \'[_1]\'' => 'Aktivitätsprotokoll zurückgesetzt von \'[_1]\'', @@ -902,7 +903,7 @@ use vars qw( @ISA %Lexicon ); 'Role Name' => 'Rollenname', 'Roles Selected' => 'Gewählte Rollen', '' => ' ', - 'Grant Permissions' => 'Berechtigungen zuweisen', + 'Grant Permissions' => 'Rechte zuweisen', 'Backup' => 'Sichern', 'Backup & Restore' => 'Sichern & Wiederherstellen', 'Temporary directory needs to be writable for backup to work correctly. Please check TempDir configuration directive.' => 'Das temporäre Verzeichnis muss zur Durchführung der Sicherung beschreibbar sein. Bitte überprüfen Sie Ihre TempDir-Einstellung.', @@ -944,7 +945,7 @@ use vars qw( @ISA %Lexicon ); 'You can\'t reply to unpublished comment.' => 'Sie können nicht auf Kommentare antworten, die noch nicht veröffentlicht wurden.', 'entries' => 'Einträge', 'This is You' => 'Das sind Sie', - 'Handy Shortcuts' => 'Schnellzugriff', + 'Handy Shortcuts' => 'Nützliche Abkürzungen', 'Movable Type News' => 'News von Movable Type', 'Blog Stats' => 'Statistik', 'Publish Entries' => 'Einträge veröffentlichen', @@ -1841,27 +1842,26 @@ use vars qw( @ISA %Lexicon ); 'comment' => 'Kommentar', 'comments' => 'Kommentare', 'to publish' => 'zu Veröffentlichen', - 'Publish selected [_1] (a)' => 'Gewählte [_1] veröffentlichen', - 'Delete selected [_1] (x)' => 'Gewählte [_1] löschen (x)', - 'Report selected [_1] as Spam (j)' => 'Ausgewählte [_1] als Spam melden (j)', + 'Publish selected [lc,_1] (a)' => 'Gewählte [_1] veröffentlichen', + 'Delete selected [lc,_1] (x)' => 'Gewählte [_1] löschen (x)', + 'Report selected [lc,_1] as Spam (j)' => 'Ausgewählte [_1] als Spam melden (j)', 'Spam' => 'Spam', - 'Report selected [_1] as Not Spam and Publish (j)' => 'Ausgewählte [_1] als spamfrei melden und veröffentlichen', + 'Report selected [lc,_1] as Not Spam and Publish (j)' => 'Ausgewählte [_1] als spamfrei melden und veröffentlichen', 'Not Spam' => 'Nicht Spam', 'Are you sure you want to remove all comments reported as spam?' => 'Wirklich alle als Spam gemeldeten Kommentare löschen?', - 'Deletes all [_1] reported as Spam' => 'Alle als Spam gemeldeten [_1] löschen', + 'Deletes all [lc,_1] reported as Spam' => 'Alle als Spam gemeldeten [_1] löschen', 'Empty' => 'Leer', 'Ban This IP' => 'Diese IP-Adresse sperren', 'Status' => 'Status', 'Entry/Page' => 'Eintrag/Seite', - 'Date' => 'Zeitpunkt', + 'Date' => 'Datum', 'IP' => 'IP', 'Only show published comments' => 'Nur veröffentlichte Kommentare anzeigen', 'Published' => 'Veröffentlichen', 'Only show pending comments' => 'Nur nicht veröffentlichte Kommentare anzeigen', 'Pending' => 'Auf Moderation wartend', 'Edit this comment' => 'Kommentar bearbeiten', - '(1 reply)' => '(1 Antwort)', - '([_1] replies)' => '([_1] Antworten)', + '([quant,_1,reply,replies])' => '([quant,_1,Antwort,Antworten])', 'Reply' => 'Antworten', 'Trusted' => 'vertraut', 'Blocked' => 'Gesperrt', @@ -1869,7 +1869,7 @@ use vars qw( @ISA %Lexicon ); 'Edit this [_1] commenter' => '[_1] Kommentarautor bearbeiten', 'Search for comments by this commenter' => 'Nach Kommentaren von diesem Kommentarautor suchen', 'Anonymous' => 'Anonym', - 'View this [_1]' => '[_1] ansehen', + 'View this [lc,_1]' => '[_1] ansehen', 'Search for all comments from this IP address' => 'Nach Kommentaren von dieser IP-Adresse suchen', ## tmpl/cms/include/member_table.tmpl @@ -1986,21 +1986,21 @@ use vars qw( @ISA %Lexicon ); 'View the [_1] for this TrackBack' => '[_1] zu dem TrackBack ansehen', ## tmpl/cms/include/entry_table.tmpl - 'Save these [_1] (s)' => '[_1] speichern (s)', + 'Save these [lc,_1] (s)' => '[_1] speichern (s)', 'to republish' => 'zur erneuten Veröffentlichung', - 'Republish selected [_1] (r)' => 'Gewählte [_1] erneut veröffentlichen (r)', + 'Republish selected [lc,_1] (r)' => 'Gewählte [_1] erneut veröffentlichen (r)', 'Republish' => 'Seite', 'Last Modified' => 'Zuletzt geändert', 'Created' => 'Angelegt', 'Unpublished (Draft)' => 'Unveröffentlicht (Entwurf)', 'Unpublished (Review)' => 'Unveröffentlicht (Prüfung)', 'Scheduled' => 'Zu bestimmtem Zeitpunkt', - 'Only show unpublished [_1]' => 'Nur nicht veröffentlichte [_1] zeigen', - 'Only show published [_1]' => 'Nur veröffentlichte [_1] zeigen', - 'Only show [_1] for review' => 'Nur zu prüfende [_1] zeigen', - 'Only show scheduled [_1]' => 'Nur zeitgeplante [_1] zeigen', - 'Edit [_1]' => '[_1] bearbeiten', - 'View [_1]' => 'Zeige [_1]', + 'Only show unpublished [lc,_1]' => 'Nur nicht veröffentlichte [_1] zeigen', + 'Only show published [lc,_1]' => 'Nur veröffentlichte [_1] zeigen', + 'Only show [lc,_1] for review' => 'Nur zu prüfende [_1] zeigen', + 'Only show scheduled [lc,_1]' => 'Nur zeitgeplante [_1] zeigen', + 'Edit [lc,_1]' => '[_1] bearbeiten', + 'View [lc,_1]' => 'Zeige [_1]', ## tmpl/cms/include/login_mt.tmpl @@ -2143,7 +2143,7 @@ use vars qw( @ISA %Lexicon ); ## tmpl/cms/include/blog-left-nav.tmpl 'Creating' => 'Anlegen', 'Create Entry' => 'Neuen Eintrag schreiben', - 'Community' => 'Community', + 'Community' => 'Feedback', 'List Commenters' => 'Kommentarautoren auflisten', 'Edit Address Book' => 'Adressbuch bearbeiten', 'List Users &amp; Groups' => 'Benutzer und Gruppen auflisten', @@ -2198,9 +2198,9 @@ use vars qw( @ISA %Lexicon ); 'Upload New Image' => 'Neues Bild hochladen', 'Asset Name' => 'Assetname', 'View Asset' => 'Asset ansehen', - 'Next (s)' => 'Weiter (s)', + 'Next (s)' => 'Nächstes (s)', 'Insert (s)' => 'Einfügen (s)', - 'Next' => 'Weiter', + 'Next' => 'Nächstes', 'Insert' => 'Einfügen', 'No assets could be found.' => 'Keine Assets gefunden.', @@ -2416,7 +2416,7 @@ use vars qw( @ISA %Lexicon ); 'Commenting' => 'Kommentieren', 'Duplicate Roles' => 'Rollen duplizieren', 'These roles have the same privileges as this role' => 'Folgende Rollen haben die gleichen Berechtigungen wie diese Rolle', - 'Save changes to this [_1] (s)' => 'Änderungen an [_1] speichern (s)', + 'Save changes to this [lc,_1] (s)' => 'Änderungen an [_1] speichern (s)', ## tmpl/cms/cfg_plugin.tmpl 'System Plugin Settings' => 'System: Plugin-Einstellungen', @@ -2485,7 +2485,7 @@ use vars qw( @ISA %Lexicon ); 'Save (s)' => 'Sichern (s)', 'Save and Publish this template (r)' => 'Vorlage speichern und veröffentlichen (r)', 'Save &amp; Publish' => 'Speichern und veröffentlichen', - 'You have unsaved changes to your [_1] that will be lost.' => 'Es liegen nicht gespeicherte Änderungen vor, die verloren gehen werden.', + 'You have unsaved changes to your [lc,_1] that will be lost.' => 'Es liegen nicht gespeicherte Änderungen vor, die verloren gehen werden.', 'You must set the Template Name.' => 'Sie müssen einen Vorlagennamen angeben.', 'You must set the template Output File.' => 'Sie müssen einen Dateinamen angeben.', 'Please wait...' => 'Bitte warten...', @@ -2553,7 +2553,7 @@ use vars qw( @ISA %Lexicon ); 'All [_1]' => 'Alle [_1]', 'change' => 'ändern', '[_1] where [_2] is [_3]' => '[_1] mit [_2] [_3]', - 'Show only [_1] where' => 'Zeige nur [_1] mit ', + 'Show only [lc,_1] where' => 'Zeige nur [_1] mit ', 'status' => 'Status', 'tag (exact match)' => 'Tag (genau)', 'tag (fuzzy match)' => 'Tag (unscharf)', @@ -2572,13 +2572,13 @@ use vars qw( @ISA %Lexicon ); 'Comments from [_1]' => 'Kommentare von [_1]', 'commenter' => 'Kommentarautor', 'commenters' => 'Kommentarautoren', - 'Trust [_1] (t)' => '[_1] vertrauen (t)', + 'Trust [lc,_1] (t)' => '[_1] vertrauen (t)', 'Trust' => 'Vertrauen', - 'Untrust [_1] (t)' => '[_1] nicht mehr vertrauen (t)', + 'Untrust [lc,_1] (t)' => '[_1] nicht mehr vertrauen (t)', 'Untrust' => 'Nicht vertrauen', - 'Ban [_1] (b)' => '[_1] sperren (b)', + 'Ban [lc,_1] (b)' => '[_1] sperren (b)', 'Ban' => 'Sperren', - 'Unban [_1] (b)' => '[_1] entsperren (b)', + 'Unban [lc,_1] (b)' => '[_1] entsperren (b)', 'Unban' => 'Entsperren', 'The Name of the commenter' => 'Name des Kommentarautors', 'View all comments with this name' => 'Alle Kommentare mit diesem Autorennamen anzeigen', @@ -2668,7 +2668,7 @@ use vars qw( @ISA %Lexicon ); 'folder' => 'Ordner', 'folders' => 'Ordner', 'categories' => 'Kategorien', - 'Create [_1]' => '[_1] anlegen', + 'Create [lc,_1]' => '[_1] anlegen', 'Your [_1] has been saved.' => '[_1] gespeichert.', 'One or more errors occurred when sending update pings or TrackBacks.' => 'Es sind ein oder mehrere Fehler beim Senden von TrackBacks aufgetreten.', '_USAGE_VIEW_LOG' => 'Nähere Informationen zum aufgetretenen Fehler finden Sie im <a href="[_1]">Aktivitätsprotokoll</a>.', @@ -2697,13 +2697,12 @@ use vars qw( @ISA %Lexicon ); 'Publish Date' => 'Veröffent- lichungs- zeitpunkt', 'Make primary' => 'Als Hauptkategorie', 'Add sub category' => 'Unterkategorie hinzufügen', - 'Add [_1] name' => '[_1]-Name hinzufügen', - 'Add new parent [_1]' => 'Neue Eltern-[_1] hinzufügen', + 'Add [lc,_1] name' => '[_1]-Name hinzufügen', + 'Add new parent [lc,_1]' => 'Neue Eltern-[_1] hinzufügen', 'Add new' => 'Neue', - 'Save this [_1] (s)' => '[_1] speichern (s)', - 'Preview this [_1] (v)' => 'Vorschau auf [_1]', - 'Delete this [_1] (v)' => '[_1] löschen (v)', - 'Share this [_1]' => 'Benachrichtigung versenden', + 'Save this [lc,_1] (s)' => '[_1] speichern (s)', + 'Preview this [lc,_1] (v)' => 'Vorschau auf [_1]', + 'Share this [lc,_1]' => 'Benachrichtigung versenden', 'View published [_1]' => '[_1] ansehen', '&laquo; Previous' => '&laquo; Vorheriger', 'Next &raquo;' => 'Nächster &raquo;', @@ -2713,10 +2712,10 @@ use vars qw( @ISA %Lexicon ); '(comma-delimited list)' => '(Liste mit Kommatrennung)', '(space-delimited list)' => '(Liste mit Leerzeichentrennung)', '(delimited by \'[_1]\')' => '(Trennung durch \'[_1]\')', - 'Change [_1]' => '[_1] ändern', - 'Add [_1]' => '[_1] wählen', + 'Change [lc,_1]' => '[_1] ändern', + 'Add [lc,_1]' => '[_1] wählen', 'Unpublished' => 'Nicht veröffentlichen', - 'You must configure blog before you can publish this [_1].' => 'Vor dem Veröffentlichen müssen Sie das Blog konfigurieren.', + 'You must configure this blog before you can publish this [lc,_1].' => 'Vor dem Veröffentlichen müssen Sie das Blog konfigurieren.', 'Select entry date' => 'Eintragsdatum wählen', 'Unlock this entry&rsquo;s output filename for editing' => 'Dateinamen manuell bearbeiten', 'Warning: If you set the basename manually, it may conflict with another entry.' => 'Warnung: Wenn Sie den Basisnamen manuell einstellen, ist es nicht auszuschließen, daß der gewählte Name bereits existiert.', @@ -2831,7 +2830,7 @@ use vars qw( @ISA %Lexicon ); ## tmpl/cms/export.tmpl 'You must select a blog to export.' => 'Sie müssen wählen, welches Blog exportiert werden soll.', - '_USAGE_EXPORT_1' => 'Einträge, Kommentare und TrackBacks eines Blogs in einem Austauschformat speichern. Ein Export stellt <em>keine</em> komplette Sicherungskopie eines Blogs dar.', + '_USAGE_EXPORT_1' => 'Hier können Sie die Einträge, Kommentare und TrackBacks des ausgewählten Blogs exportieren. Ein Export stellt <em>keine</em> komplette Sicherungskopie eines Blogs dar.', 'Blog to Export' => 'Zu exportierendes Blog', 'Select a blog for exporting.' => 'Zu exportierendes Blog', 'Change blog' => 'Anderes Blog wählen', @@ -3026,13 +3025,13 @@ use vars qw( @ISA %Lexicon ); 'System Permissions' => 'Berechtigungen', 'Options' => 'Optionen', 'Create personal blog for user' => 'Persönliches Blog für den Benutzer anlegen', - 'Create [_1] (s)' => '[_1] anlegen (s)', + 'Create [lc,_1] (s)' => '[_1] anlegen (s)', '_USAGE_PASSWORD_RESET' => 'Hier können Sie das Passwort dieses Benutzers zurücksetzen. Dazu wird ein zufälliges neues Passwort erzeugt und an <strong>[_1]</strong> verschickt werden.', 'Initiate Password Recovery' => 'Passwort wiederherstellen', ## tmpl/cms/edit_comment.tmpl 'The comment has been approved.' => 'Kommentar freigeschaltet.', - 'Delete this [_1] (x)' => '[_1] löschen (x)', + 'Delete this [lc,_1] (x)' => '[_1] löschen (x)', 'Previous Comment' => 'Vorheriger Kommentar', 'Next Comment' => 'Nächster Kommentar', 'Manage Comments' => 'Kommentare verwalten', @@ -3079,7 +3078,7 @@ use vars qw( @ISA %Lexicon ); ## tmpl/cms/import.tmpl 'You must select a blog to import.' => 'Wählen Sie, in welches Blog importiert werden soll', - 'Transfer weblog entries into Movable Type from other Movable Type installations or even other blogging tools or export your entries to create a backup or copy.' => 'Einträge aus anderen Movable Type-Installationen oder aus anderen Weblog-Systemen übernehmen', + 'Transfer weblog entries into Movable Type from other Movable Type installations or even other blogging tools or export your entries to create a backup or copy.' => 'Mit der Import/Export-Funktionen können Einträge aus anderen Movable Type-Installationen oder aus anderen Weblog-Systemen übernommen werden. Bestehende Einträge können in einem Austauschformat gesichert werden.', 'Blog to Import' => 'Importziel', 'Select a blog to import.' => 'Wählen Sie, in welches Blog importiert werden soll', 'Importing from' => 'Importieren aus', @@ -3119,7 +3118,7 @@ use vars qw( @ISA %Lexicon ); 'Number of users in this system.' => 'Anzahl der Benutzer dieses Systems', 'Total Users' => 'Benutzer insgesamt', 'Active Users' => 'Aktive Benutzer', - 'Users who have logged in within 90 days are considered <strong>active</strong> in Movable Type license agreement.' => 'Als <strong>aktiv</strong> gelten nach den Movable Type-Lizenzbedingungen Benutzer, die sich innerhalb der letzten 90 Tage eingeloggt haben.', + 'Users who have logged in within 90 days are considered <strong>active</strong> in Movable Type license agreement.' => 'Benutzer, die sich innerhalb der letzten 90 Tage eingeloggt haben, gelten nach den Movable Type-Lizenzbedingungen als <strong>aktiv</strong>.', 'Movable Type could not find the script named \'mt-check.cgi\'. To resolve this issue, please ensure that the mt-check.cgi script exists and/or the CheckScript configuration parameter references it properly.' => 'Movable Type konnte die Datei \'mt-check.cgi\' nicht finden. Stellen Sie sicher, daß die Datei vorhanden ist und MTCheckScript die richtigen Pfadangaben enthält.', ## tmpl/cms/restore.tmpl @@ -3235,12 +3234,12 @@ use vars qw( @ISA %Lexicon ); 'Cancel (c)' => 'Abbrechen (c)', ## tmpl/cms/list_folder.tmpl - 'Your [_1] changes and additions have been made.' => 'Änderungen übernommen.', - 'You have successfully deleted the selected [_1].' => 'Änderungen übernommen.', - 'Create top level [_1]' => 'Neue Haupt[_1] anlegen', + 'Your [lc,_1] changes and additions have been made.' => 'Änderungen übernommen.', + 'You have successfully deleted the selected [lc,_1].' => 'Änderungen übernommen.', + 'Create top level [lc,_1]' => 'Neue Haupt[_1] anlegen', 'New Parent [_1]' => 'Neue Mutter[_1]', 'Top Level' => 'Hauptebene', - 'Move [_1]' => '[_1] verschieben', + 'Move [lc,_1]' => '[_1] verschieben', 'Move' => 'Verschieben', '[quant,_1,page,pages]' => '[quant,_1,Seite,Seiten]', @@ -3249,13 +3248,13 @@ use vars qw( @ISA %Lexicon ); 'permissions' => 'Berechtigungen', 'Remove selected assocations (x)' => 'Gewählte Zuweisungen löschen', 'Revoke Permission' => 'Berechtigung entziehen', - 'Grant Permission' => 'Berechtigung zuweisen', + 'Grant Permission' => 'Berechtigungen vergeben', 'You can not create associations for disabled users.' => 'Deaktivierte Benutzerkonten können nicht zugewiesen werden.', 'Assign Role to User' => 'Rolle an Benutzer zuweisen', 'Grant permission to a user' => 'Berechtigung an Benutzer vergeben', '[_1] <em>[_2]</em> is currently disabled.' => '[_1] <em>[_2]</em> ist derzeit deaktiviert.', 'You have successfully revoked the given permission(s).' => 'Berechtigungen erfolgreich entzogen', - 'You have successfully granted the given permission(s).' => 'Berechtigungen erfolgreich zugewiesen', + 'You have successfully granted the given permission(s).' => 'Berechtigungen erfolgreich vergeben', ## tmpl/cms/login.tmpl 'Your Movable Type session has ended.' => 'Ihre Movable Type-Sitzung ist abgelaufen oder Sie haben sich abgemeldet.', @@ -3413,7 +3412,7 @@ use vars qw( @ISA %Lexicon ); '[quant,_1,result,results] found' => '[quant,_1,Treffer,Treffer] gefunden', ## tmpl/cms/preview_strip.tmpl - 'You are previewing the [_1] titled &ldquo;[_2]&rdquo;' => 'Sie sehen eine Vorschau auf den [_1] namens &ldquo;[_2]&rdquo;', + 'You are previewing the [lc,_1] titled &ldquo;[_2]&rdquo;' => 'Sie sehen eine Vorschau auf den [_1] namens &ldquo;[_2]&rdquo;', ## tmpl/cms/edit_ping.tmpl 'The TrackBack has been approved.' => 'TrackBack wurde freigeschaltet.', @@ -3600,7 +3599,7 @@ use vars qw( @ISA %Lexicon ); 'Simple Footer' => 'Einfache Fußzeile', ## addons/Community.pack/templates/global/profile_edit_form.mtml - 'Go <a href="[_1]">back to the previous page</a> or <a href="[_2]">view your profile</a>.' => '<a href="[_1]">Zurück zur Ausgangsseite</a> oder <a href="[_2]">Profil ansehen</a>.', + 'Go <a href="[_1]">back to the previous page</a> or <a href="[_2]">view your profile</a>.' => '<a href="[_1]>Zurück zur Ausgangsseite</a> oder <a href="[_2]>Profil ansehen</a>.', 'Form Field' => 'Formularfeld', 'User Name' => 'Benutzername', 'Upload New Userpic' => 'Neues Benutzerbild hochladen', @@ -3671,17 +3670,17 @@ use vars qw( @ISA %Lexicon ); 'Blog Home' => 'Startseite', ## addons/Community.pack/templates/blog/entry_summary.mtml - 'A favorite' => 'Mein Favorit', + 'A favorite' => 'Ein Favorit', 'Favorite' => 'Favorit', ## addons/Community.pack/templates/blog/entry_response.mtml - 'Thank you for posting an entry.' => 'Danke für Ihren Beitrag!', + 'Thank you for posting an entry.' => 'Danke, daß Sie einen Eintrag geschrieben haben.', 'Entry Pending' => 'Eintrag noch nicht freigegeben', 'Your entry has been received and held for approval by the blog owner.' => 'Ihr Eintrag ist eingegangen und muss nun vom Blogbetreiber freigeschaltet werden.', 'Entry Posted' => 'Eintrag veröffentlicht', 'Your entry has been posted.' => 'Ihr Eintrag wurde veröffentlicht.', 'Your entry has been received.' => 'Ihr Eintrag ist eingegangen.', - 'Return to the <a href="[_1]">blog\'s main index</a>.' => 'Zurück zur <a href="[_1]">Indexseite</a>.', + 'Return to the <a href="[_1]">blog\'s main index</a>.' => 'Zurück zur <a href="[_1]">Startseite</a>.', ## addons/Community.pack/templates/blog/comment_response.mtml @@ -3739,7 +3738,7 @@ use vars qw( @ISA %Lexicon ); 'Start Topic' => 'Thema eröffnen', ## addons/Community.pack/templates/forum/entry_response.mtml - 'Thank you for posting a new topic to the forums.' => 'Danke für Ihren Beitrag!', + 'Thank you for posting a new topic to the forums.' => 'Danke, daß Sie ein neues Thema eröffnet haben!', 'Topic Pending' => 'Thema noch nicht freigegeben', 'The topic you posted has been received and held for approval by the forum administrators.' => 'Ihr Thema ist eingegangen und muss nun vom Forenadministrator freigeschaltet werden.', 'Topic Posted' => 'Thema veröffentlicht', @@ -3749,7 +3748,7 @@ use vars qw( @ISA %Lexicon ); ## addons/Community.pack/templates/forum/comment_response.mtml 'Reply Submitted' => 'Antwort eingegangen', 'Your reply has been accepted' => 'Ihre Antwort ist eingegangen.', - 'Thank you for your reply. It has been accepted and should appear momentarily.' => 'Vielen Dank für Ihre Antwort. Sie wird sofort veröffentlicht.', + 'Thank you for your reply. It has been accepted and should appear momentarily.' => 'Vielen Dank für Ihre Antwort. Sie erscheint sofort ohne weitere Moderation.', 'Reply Pending' => 'Moderation', 'Your reply has been received' => 'Ihre Antwort ist eingegangen.', 'Thank you for your reply. However, your reply is currently being held for approval by the forum\'s administrator.' => 'Vielen Dank für Ihre Antwort. Sie muss noch vom Forenadministrator freigeschaltet werden.', @@ -3783,8 +3782,8 @@ use vars qw( @ISA %Lexicon ); ## addons/Community.pack/templates/forum/javascript.mtml '. Now you can reply to this topic.' => '. Sie können nun Ihre Antwort schreiben.', - ' to comment on this topic.' => ' um dieses Thema zu kommentieren.', - ' to comment on this topic,' => ' um dieses Thema zu kommentieren,', + ' to comment on this topic.' => 'um dieses Thema zu kommentieren.', + ' to comment on this topic,' => 'um dieses Thema zu kommentieren,', ## addons/Community.pack/templates/forum/rss.mtml @@ -3806,7 +3805,7 @@ use vars qw( @ISA %Lexicon ); ## addons/Community.pack/templates/forum/comments.mtml '[_1] Replies' => '[_1] Antworten', - '_NUM_FAVORITES' => 'Favoriten', # Translate - New # OK + '_NUM_FAVORITES' => 'Favorit', # Translate - New # OK 'Favorite This' => 'Zum Favoriten machen', ## addons/Community.pack/templates/forum/search_results.mtml @@ -3895,7 +3894,7 @@ use vars qw( @ISA %Lexicon ); 'Unlock this for editing' => 'Zur Bearbeitung freischalten', 'Warning: Changing this field\'s basename may cause serious data loss.' => 'Achtung: Änderungen des Basisnamens eines Feldes kann zu erheblichen Datenverlusten führen!', 'Template Tag' => 'Vorlagenbefehl', - 'Create a custom template tag for this field.' => 'Einen eigenen Vorlagenbefehl für dieses Feld anlegen', + 'Create a custom template tag for this field.' => 'Einen eigenen Vorlagenbefehl für dieses Feld anlegen.', 'Example Template Code' => 'Beispiel-Vorlagencode', 'field' => 'Feld', 'fields' => 'Felder', @@ -4053,9 +4052,9 @@ use vars qw( @ISA %Lexicon ); ## addons/Enterprise.pack/tmpl/include/group_table.tmpl 'group' => 'Gruppe', 'groups' => 'Gruppen', - 'Enable selected [_1] (e)' => 'Gewählte [_1] aktivieren (e)', - 'Disable selected [_1] (d)' => 'Gewählte [_1] deaktivieren (d)', - 'Remove selected [_1] (d)' => 'Gewählte [_1] entfernen (d)', + 'Enable selected [lc,_1] (e)' => 'Gewählte [_1] aktivieren (e)', + 'Disable selected [lc,_1] (d)' => 'Gewählte [_1] deaktivieren (d)', + 'Remove selected [lc,_1] (d)' => 'Gewählte [_1] entfernen (d)', 'Only show enabled groups' => 'Nur aktivierte Gruppen zeigen', 'Only show disabled groups' => 'Nur deaktivierte Gruppen zeigen', @@ -4293,7 +4292,7 @@ use vars qw( @ISA %Lexicon ); 'Invalid URL: [_1]' => 'Ungültige URL: [_1]', ## plugins/StyleCatcher/tmpl/view.tmpl - 'Select a Style' => 'Stilvorlage wählen', + 'Select a Style' => 'Design wählen', '3-Columns, Wide, Thin, Thin' => 'Dreispaltig: breit - schmal - schmal', '3-Columns, Thin, Wide, Thin' => 'Dreispaltig: schmal - breit - schmal', '2-Columns, Thin, Wide' => 'Zweispaltig: schmal - breit', @@ -4308,9 +4307,9 @@ use vars qw( @ISA %Lexicon ); 'Stylesheet or Repository URL' => 'URL des Stylesheets oder der Sammlung', 'Stylesheet or Repository URL:' => 'URL des Stylesheets oder der Sammlung:', 'Download Styles' => 'Designs herunterladen', - 'Current theme for your weblog' => 'Aktuelles Thema Ihres Weblogs', - 'Current Style' => 'Derzeitiges Design', - 'Locally saved themes' => 'Lokal gespeicherte Themen', + 'Current theme for your weblog' => 'Aktuelles Theme Ihres Weblogs', + 'Current Style' => 'Derzeitige Design', + 'Locally saved themes' => 'Lokal gespeicherte Themes', 'Saved Styles' => 'Gespeicherte Designs', 'Default Styles' => 'Standarddesigns', 'Single themes from the web' => 'Einzelne Themes aus dem Web', @@ -4545,7 +4544,7 @@ use vars qw( @ISA %Lexicon ); 'Recent posts' => 'Aktuelle Einträge', 'Search form' => 'Suche', 'Recent comments' => 'Aktuelle Kommentare', - 'Tag cloud (sidebar)' => 'Tag-Wolke (Seitenleiste)', + 'Tag cloud (sidebar)' => 'Tag Cloud (Seitenleiste)', 'Monthly archive dropdown' => 'Monatsarchive (Dropdown)', 'Pages list (nested)' => 'Seitenliste (geschachtelt)', 'Photos' => 'Fotos', lib/MT/L10N/de.pm @@ -1,10 +1,11 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ package MT::L10N::en_us; # American English + use strict; use MT::L10N; use vars qw( @ISA %Lexicon ); @@ -32,7 +33,7 @@ sub ascii_only { ((ref $_[0]) || $_[0]) eq __PACKAGE__ } '_USAGE_VIEW_LOG' => 'Check the <a href="[_1]">Activity Log</a> for the error.', '_USAGE_FORGOT_PASSWORD_1' => 'You requested recovery of your Movable Type password. Your password has been changed in the system; here is the new password:', - '_USAGE_FORGOT_PASSWORD_2' => 'You should be able to log in to Movable Type using this new password. Once you have logged in, you should change your password to something more memorable.', + '_USAGE_FORGOT_PASSWORD_2' => 'You should be able to log in to Movable Type using this new password from the URL below. Once you have logged in, you should change your password to something more memorable.', '_BACKUP_TEMPDIR_WARNING' => 'Requested data has been backed up successfully in the [_1] directory. Make sure that you download and <strong>then delete</strong> files listed above from [_1] <strong>immediately</strong> because backup files contain sensitive information.', '_BACKUP_DOWNLOAD_MESSAGE' => 'Downloading of the backup file will start automatically in a few seconds. If for some reason it does not, click <a href="javascript:(void)" onclick="submit_form()">here</a> to start downloading manually. Please note that you can download the backup file only once for a session.', lib/MT/L10N/en_us.pm @@ -1,5 +1,6 @@ -# Copyright 2003-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -58,8 +59,8 @@ use vars qw( @ISA %Lexicon ); 'Entry' => 'Entrada', ## default_templates/notify-entry.mtml - 'A new [_3] entitled \'[_1]\' has been published to [_2].' => 'Un nuevo [_3] titulado \'[_1]\' ha sido publicado en [_2].', - 'View [_1]:' => 'Ver [_1]', + 'A new [lc,_3] entitled \'[_1]\' has been published to [_2].' => 'Un nuevo [lc,_3] titulado \'[_1]\' ha sido publicado en [_2].', + 'View [lc,_1]:' => 'Ver [lc,_1]', '[_1] Title: [_2]' => '[_1] Título: [_2]', 'Publish Date: [_1]' => 'Fecha de publicación: [_1]', 'Message from Sender:' => 'Mensaje del expeditor', @@ -1843,14 +1844,14 @@ que la dirección provista es correcta y le pertenece.', 'comment' => 'comentario', 'comments' => 'comentarios', 'to publish' => 'para publicar', - 'Publish selected [_1] (a)' => 'Publicar [_1] seleccionado [_1]', - 'Delete selected [_1] (x)' => 'Borrar [_1] seleccionadas (x)', - 'Report selected [_1] as Spam (j)' => 'Marcar como spam [_1] seleccionados (j)', + 'Publish selected [lc,_1] (a)' => 'Publicar [lc,_1] seleccionado [lc,_1]', + 'Delete selected [lc,_1] (x)' => 'Borrar [lc,_1] seleccionadas (x)', + 'Report selected [lc,_1] as Spam (j)' => 'Marcar como spam [lc,_1] seleccionados (j)', 'Spam' => 'Spam', - 'Report selected [_1] as Not Spam and Publish (j)' => 'Marcar como no spam y publicar [_1] seleccionados (j)', + 'Report selected [lc,_1] as Not Spam and Publish (j)' => 'Marcar como no spam y publicar [lc,_1] seleccionados (j)', 'Not Spam' => 'No es spam', 'Are you sure you want to remove all comments reported as spam?' => '¿Está seguro de que desea borrar todos los comentarios marcados como spam?', - 'Deletes all [_1] reported as Spam' => 'Borra todos los [_1] marcados como spam', + 'Deletes all [lc,_1] reported as Spam' => 'Borra todos los [lc,_1] marcados como spam', 'Empty' => 'Vacío', 'Ban This IP' => 'Bloquear esta IP', 'Status' => 'Estado', @@ -1862,8 +1863,7 @@ que la dirección provista es correcta y le pertenece.', 'Only show pending comments' => 'Mostrar solo comentarios pendientes', 'Pending' => 'Pendiente', 'Edit this comment' => 'Editar este comentario', - '(1 reply)' => '(1 respuesta)', - '([_1] replies)' => '([_1] respuestas)', + '([quant,_1,reply,replies])' => '([quant,_1,respuesta,respuestas])', 'Reply' => 'Responder', 'Trusted' => 'Confiado', 'Blocked' => 'Bloqueado', @@ -1871,7 +1871,7 @@ que la dirección provista es correcta y le pertenece.', 'Edit this [_1] commenter' => 'Editar comentarista [_1]', 'Search for comments by this commenter' => 'Buscar comentarios de este comentarista', 'Anonymous' => 'Anónimo', - 'View this [_1]' => 'Mostrar [_1]', + 'View this [lc,_1]' => 'Mostrar [lc,_1]', 'Search for all comments from this IP address' => 'Buscar todos los comentarios enviados desde esta dirección IP', ## tmpl/cms/include/member_table.tmpl @@ -1988,21 +1988,21 @@ que la dirección provista es correcta y le pertenece.', 'View the [_1] for this TrackBack' => 'Mostrar [_1] de este TrackBack', ## tmpl/cms/include/entry_table.tmpl - 'Save these [_1] (s)' => 'Guardar [_1] (s)', + 'Save these [lc,_1] (s)' => 'Guardar [lc,_1] (s)', 'to republish' => 'para reconstruir', - 'Republish selected [_1] (r)' => 'Reconstruir [_1] seleccionado (r)', + 'Republish selected [lc,_1] (r)' => 'Reconstruir [lc,_1] seleccionado (r)', 'Republish' => 'Reconstruir', 'Last Modified' => 'Última modificación', 'Created' => 'Creado', 'Unpublished (Draft)' => 'No publicado (Borrador)', 'Unpublished (Review)' => 'No publicado (Revisión)', 'Scheduled' => 'Programado', - 'Only show unpublished [_1]' => 'Mostrar solo las [_1] no publicadas', - 'Only show published [_1]' => 'Mostrar solo las [_1] publicadas', - 'Only show [_1] for review' => 'Mostrar solo las [_1] a revisar', - 'Only show scheduled [_1]' => 'Mostrar solo las [_1] programadas', - 'Edit [_1]' => 'Editar [_1]', - 'View [_1]' => 'Ver [_1]', + 'Only show unpublished [lc,_1]' => 'Mostrar solo las [lc,_1] no publicadas', + 'Only show published [lc,_1]' => 'Mostrar solo las [lc,_1] publicadas', + 'Only show [lc,_1] for review' => 'Mostrar solo las [lc,_1] a revisar', + 'Only show scheduled [lc,_1]' => 'Mostrar solo las [lc,_1] programadas', + 'Edit [lc,_1]' => 'Editar [lc,_1]', + 'View [lc,_1]' => 'Ver [lc,_1]', ## tmpl/cms/include/login_mt.tmpl @@ -2010,7 +2010,7 @@ que la dirección provista es correcta y le pertenece.', '_USER_DISABLED' => 'Deshabilitado', ## tmpl/cms/include/calendar.tmpl - '_LOCALE_WEEK_START' => '_LOCALE_WEEK_START', + '_LOCALE_WEEK_START' => '0', 'Sunday' => 'Domingo', 'Monday' => 'Lunes', 'Tuesday' => 'Martes', @@ -2418,7 +2418,7 @@ que la dirección provista es correcta y le pertenece.', 'Commenting' => 'Comentar', 'Duplicate Roles' => 'Duplicar roles', 'These roles have the same privileges as this role' => 'Estos roles tienen privilegios parecidos a este rol', - 'Save changes to this [_1] (s)' => 'Guardar cambios al [_1] (s)', + 'Save changes to this [lc,_1] (s)' => 'Guardar cambios al [lc,_1] (s)', ## tmpl/cms/cfg_plugin.tmpl 'System Plugin Settings' => 'Sistema de configuración de la extensión', @@ -2487,7 +2487,7 @@ que la dirección provista es correcta y le pertenece.', 'Save (s)' => 'Guardar (s)', 'Save and Publish this template (r)' => 'Guardar y publicar esta plantilla (r)', 'Save &amp; Publish' => 'Guardar &amp; Publicar', - 'You have unsaved changes to your [_1] that will be lost.' => 'Tiene cambios sin guardar en [_1] que se perderán.', + 'You have unsaved changes to your [lc,_1] that will be lost.' => 'Tiene cambios sin guardar en [lc,_1] que se perderán.', 'You must set the Template Name.' => 'Debe indicar el nombre de la plantilla.', 'You must set the template Output File.' => 'Debe indicar el fichero de salida de la plantilla.', 'Please wait...' => 'Por favor, espere...', @@ -2555,7 +2555,7 @@ que la dirección provista es correcta y le pertenece.', 'All [_1]' => 'Todos los [_1]', 'change' => 'cambiar', '[_1] where [_2] is [_3]' => '[_1] donde [_2] es [_3]', - 'Show only [_1] where' => 'Mostrar solo [_1] donde', + 'Show only [lc,_1] where' => 'Mostrar solo [lc,_1] donde', 'status' => 'estado', 'tag (exact match)' => 'etiqueta (coincidencia exacta)', 'tag (fuzzy match)' => 'etiqueta (coincidencia difusa)', @@ -2574,13 +2574,13 @@ que la dirección provista es correcta y le pertenece.', 'Comments from [_1]' => 'Comentarios de [_1]', 'commenter' => 'comentarista', 'commenters' => 'comentaristas', - 'Trust [_1] (t)' => 'Confiar en [_1] (t)', + 'Trust [lc,_1] (t)' => 'Confiar en [lc,_1] (t)', 'Trust' => 'Confianza', - 'Untrust [_1] (t)' => 'Desconfiar de [_1] (t)', + 'Untrust [lc,_1] (t)' => 'Desconfiar de [lc,_1] (t)', 'Untrust' => 'Desconfiar', - 'Ban [_1] (b)' => 'Bloquear [_1] (b)', + 'Ban [lc,_1] (b)' => 'Bloquear [lc,_1] (b)', 'Ban' => 'Bloquear', - 'Unban [_1] (b)' => 'Desbloquear [_1] (b)', + 'Unban [lc,_1] (b)' => 'Desbloquear [lc,_1] (b)', 'Unban' => 'Desbloquear', 'The Name of the commenter' => 'El nombre del comentarista', 'View all comments with this name' => 'Mostrar todos los comentarios con este nombre', @@ -2670,7 +2670,7 @@ que la dirección provista es correcta y le pertenece.', 'folder' => 'carpeta', 'folders' => 'carpetas', 'categories' => 'categorías', - 'Create [_1]' => 'Crear [_1]', + 'Create [lc,_1]' => 'Crear [lc,_1]', 'Your [_1] has been saved.' => 'Su [_1] ha sido guardada.', 'One or more errors occurred when sending update pings or TrackBacks.' => 'Ocurrieron uno o más errores durante el envío de pings o TrackBacks.', '_USAGE_VIEW_LOG' => 'Compruebe el error en el <a href="[_1]">Registro de actividad</a>.', @@ -2698,13 +2698,12 @@ que la dirección provista es correcta y le pertenece.', 'Publish Date' => 'Fecha de publicación', 'Make primary' => 'Hacer primario', 'Add sub category' => 'Añadir sub categoría', - 'Add [_1] name' => 'Añadir nombre de [_1]', - 'Add new parent [_1]' => 'Añadir nuevo padre [_1]', + 'Add [lc,_1] name' => 'Añadir nombre de [lc,_1]', + 'Add new parent [lc,_1]' => 'Añadir nuevo padre [lc,_1]', 'Add new' => 'Añadir nuevo', - 'Save this [_1] (s)' => 'Guardar [_1] (s)', - 'Preview this [_1] (v)' => 'Pre-ver [_1] (v)', - 'Delete this [_1] (v)' => 'Borrar [_1] (v)', - 'Share this [_1]' => 'Compartir [_1]', + 'Save this [lc,_1] (s)' => 'Guardar [lc,_1] (s)', + 'Preview this [lc,_1] (v)' => 'Pre-ver [lc,_1] (v)', + 'Share this [lc,_1]' => 'Compartir [lc,_1]', 'View published [_1]' => 'Ver [_1] publicada', '&laquo; Previous' => '&laquo; Anterior', 'Next &raquo;' => 'Siguiente &raquo;', @@ -2714,10 +2713,10 @@ que la dirección provista es correcta y le pertenece.', '(comma-delimited list)' => '(lista separada por comas)', '(space-delimited list)' => '(lista separada por espacios)', '(delimited by \'[_1]\')' => '(separado por \'[_1]\')', - 'Change [_1]' => 'Modificar [_1]', - 'Add [_1]' => 'Añadir [_1]', + 'Change [lc,_1]' => 'Modificar [lc,_1]', + 'Add [lc,_1]' => 'Añadir [lc,_1]', 'Unpublished' => 'No publicado', - 'You must configure blog before you can publish this [_1].' => 'Debe configurar el blog antes de poder publicar este [_1].', + 'You must configure this blog before you can publish this [lc,_1].' => 'Debe configurar el blog antes de poder publicar este [lc,_1].', 'Select entry date' => 'Seleccionar fecha de la entrada', 'Unlock this entry&rsquo;s output filename for editing' => 'Desbloquear el nombre del fichero de salida de la entrada para su edición', 'Warning: If you set the basename manually, it may conflict with another entry.' => 'Atención: Si introduce el nombre base manualmente, podría entrar en conflicto con otra entrada.', @@ -3027,13 +3026,13 @@ que la dirección provista es correcta y le pertenece.', 'System Permissions' => 'Permisos del sistema', 'Options' => 'Opciones', 'Create personal blog for user' => 'Crear blog personal para el usuario', - 'Create [_1] (s)' => 'Crear [_1] (s)', + 'Create [lc,_1] (s)' => 'Crear [lc,_1] (s)', '_USAGE_PASSWORD_RESET' => 'Puede iniciar la recuperación de la contraseña en nombre de este usuario. Si lo hace, se enviará un correo a <strong>[_1]</strong> con una nueva contraseña aleatoria.', 'Initiate Password Recovery' => 'Iniciar recuperación de contraseña', ## tmpl/cms/edit_comment.tmpl 'The comment has been approved.' => 'Se ha aprobado el comentario.', - 'Delete this [_1] (x)' => 'Borrar [_1] (x)', + 'Delete this [lc,_1] (x)' => 'Borrar [lc,_1] (x)', 'Previous Comment' => 'Comentario anterior', 'Next Comment' => 'Comentario siguiente', 'Manage Comments' => 'Administrar comentarios', @@ -3236,12 +3235,12 @@ que la dirección provista es correcta y le pertenece.', 'Cancel (c)' => 'Cancelar (c)', ## tmpl/cms/list_folder.tmpl - 'Your [_1] changes and additions have been made.' => 'Se han realizado los cambios y añadidos a la [_1].', - 'You have successfully deleted the selected [_1].' => 'Se han borrado con éxito las [_1] seleccionadas.', + 'Your [lc,_1] changes and additions have been made.' => 'Se han realizado los cambios y añadidos a la [lc,_1].', + 'You have successfully deleted the selected [lc,_1].' => 'Se han borrado con éxito las [lc,_1] seleccionadas.', 'Create top level [_1]' => 'Crear nueva [_1] de primer nivel', 'New Parent [_1]' => 'Nueva [_1] padre', 'Top Level' => 'Nivel superior', - 'Move [_1]' => 'Trasladar [_1]', + 'Move [lc,_1]' => 'Trasladar [lc,_1]', 'Move' => 'Trasladar', '[quant,_1,page,pages]' => '[quant,_1,página,páginas]', @@ -3414,7 +3413,7 @@ que la dirección provista es correcta y le pertenece.', '[quant,_1,result,results] found' => '[quant,_1,resultado]', ## tmpl/cms/preview_strip.tmpl - 'You are previewing the [_1] titled &ldquo;[_2]&rdquo;' => 'Esta es la vista previa del [_1] titulado &ldquo;[_2]&rdquo;', + 'You are previewing the [lc,_1] titled &ldquo;[_2]&rdquo;' => 'Esta es la vista previa del [lc,_1] titulado &ldquo;[_2]&rdquo;', ## tmpl/cms/edit_ping.tmpl 'The TrackBack has been approved.' => 'Se aprobó el TrackBack.', @@ -4056,9 +4055,9 @@ Búsqueda base: [_2]", ## addons/Enterprise.pack/tmpl/include/group_table.tmpl 'group' => 'grupo', 'groups' => 'grupos', - 'Enable selected [_1] (e)' => 'Active el [_1] seleccionado (e)', - 'Disable selected [_1] (d)' => 'Desactive el [_1] seleccionado (d)', - 'Remove selected [_1] (d)' => 'Borre el [_1] seleccionado (d)', + 'Enable selected [lc,_1] (e)' => 'Active el [lc,_1] seleccionado (e)', + 'Disable selected [lc,_1] (d)' => 'Desactive el [lc,_1] seleccionado (d)', + 'Remove selected [lc,_1] (d)' => 'Borre el [lc,_1] seleccionado (d)', 'Only show enabled groups' => 'Solo muestra los grupos activados', 'Only show disabled groups' => 'Solo muestra los grupos desactivados', lib/MT/L10N/es.pm @@ -1,5 +1,6 @@ -# Copyright 2003-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -58,8 +59,8 @@ use vars qw( @ISA %Lexicon ); 'Entry' => 'Note', ## default_templates/notify-entry.mtml - 'A new [_3] entitled \'[_1]\' has been published to [_2].' => 'Une nouvelle [_3] intitulée \'[_1]\' a été publiée sur [_2].', - 'View [_1]:' => 'Voir [_1]', + 'A new [lc,_3] entitled \'[_1]\' has been published to [_2].' => 'Une nouvelle [lc,_3] intitulée \'[_1]\' a été publiée sur [_2].', + 'View [lc,_1]:' => 'Voir [lc,_1]', '[_1] Title: [_2]' => 'Titre du [_1] : [_2]', 'Publish Date: [_1]' => 'Date de publication : [_1]', 'Message from Sender:' => 'Message de l\'expéditeur :', @@ -1841,14 +1842,14 @@ use vars qw( @ISA %Lexicon ); 'comment' => 'commentaire', 'comments' => 'commentaires', 'to publish' => 'pour publier', - 'Publish selected [_1] (a)' => 'Publier le [_1] sélectionné (a)', - 'Delete selected [_1] (x)' => 'Effacer [_1] sélectionné (x)', - 'Report selected [_1] as Spam (j)' => 'Notifier le [_1] sélectionné comme spam (j)', + 'Publish selected [lc,_1] (a)' => 'Publier le [lc,_1] sélectionné (a)', + 'Delete selected [lc,_1] (x)' => 'Effacer [lc,_1] sélectionné (x)', + 'Report selected [lc,_1] as Spam (j)' => 'Notifier le [lc,_1] sélectionné comme spam (j)', 'Spam' => 'Spam', - 'Report selected [_1] as Not Spam and Publish (j)' => 'Notifier le [_1] sélectionné comme n\'étant pas du spam et le publier (j)', + 'Report selected [lc,_1] as Not Spam and Publish (j)' => 'Notifier le [lc,_1] sélectionné comme n\'étant pas du spam et le publier (j)', 'Not Spam' => 'Non-spam', 'Are you sure you want to remove all comments reported as spam?' => 'Êtes-vous sûr(e) de vouloir supprimer tous les commentaires notifiés comme spam ?', - 'Deletes all [_1] reported as Spam' => 'Efface tous les [_1] notifiés comme spam', + 'Deletes all [lc,_1] reported as Spam' => 'Efface tous les [lc,_1] notifiés comme spam', 'Empty' => 'Vide', 'Ban This IP' => 'Bannir cette adresse IP', 'Status' => 'Statut', @@ -1860,8 +1861,7 @@ use vars qw( @ISA %Lexicon ); 'Only show pending comments' => 'N\'afficher que les commentaires en attente', 'Pending' => 'En attente', 'Edit this comment' => 'Editer ce commentaire', - '(1 reply)' => '(1 réponse)', - '([_1] replies)' => '([_1] réponses)', + '([quant,_1,reply,replies])' => '([quant,_1,réponse,réponses])', 'Reply' => 'Répondre', 'Trusted' => 'Fiable', 'Blocked' => 'Bloqués', @@ -1869,7 +1869,7 @@ use vars qw( @ISA %Lexicon ); 'Edit this [_1] commenter' => 'Modifier l\'auteur de commentaires de cette [_1]', 'Search for comments by this commenter' => 'Chercher les commentaires de cet auteur de commentaires', 'Anonymous' => 'Anonyme', - 'View this [_1]' => 'Voir ce(tte) [_1]', + 'View this [lc,_1]' => 'Voir ce(tte) [lc,_1]', 'Search for all comments from this IP address' => 'Rechercher tous les commentaires associés à cette adresse IP', ## tmpl/cms/include/member_table.tmpl @@ -1986,21 +1986,21 @@ use vars qw( @ISA %Lexicon ); 'View the [_1] for this TrackBack' => 'Voir [_1] pour ce trackback', ## tmpl/cms/include/entry_table.tmpl - 'Save these [_1] (s)' => 'Enregistrer ces [_1] (s)', + 'Save these [lc,_1] (s)' => 'Enregistrer ces [lc,_1] (s)', 'to republish' => 'pour republier', - 'Republish selected [_1] (r)' => 'Republier les [_1] sélectionnées', + 'Republish selected [lc,_1] (r)' => 'Republier les [lc,_1] sélectionnées', 'Republish' => 'Republier', 'Last Modified' => 'Dernière modification', 'Created' => 'Créé', 'Unpublished (Draft)' => 'Non publié (Brouillon)', 'Unpublished (Review)' => 'Non publié (Vérification)', 'Scheduled' => 'Planifié', - 'Only show unpublished [_1]' => 'Afficher uniquement les [_1] non publiées.', - 'Only show published [_1]' => 'Afficher uniquement les [_1] publiés', - 'Only show [_1] for review' => 'Afficher uniquement les [_1] à vérifier', - 'Only show scheduled [_1]' => 'Afficher uniquement les [_1] programmées', - 'Edit [_1]' => 'Modifier une [_1]', - 'View [_1]' => 'Voir [_1]', + 'Only show unpublished [lc,_1]' => 'Afficher uniquement les [lc,_1] non publiées.', + 'Only show published [lc,_1]' => 'Afficher uniquement les [lc,_1] publiés', + 'Only show [lc,_1] for review' => 'Afficher uniquement les [lc,_1] à vérifier', + 'Only show scheduled [lc,_1]' => 'Afficher uniquement les [lc,_1] programmées', + 'Edit [lc,_1]' => 'Modifier une [lc,_1]', + 'View [lc,_1]' => 'Voir [lc,_1]', ## tmpl/cms/include/login_mt.tmpl @@ -2416,7 +2416,7 @@ use vars qw( @ISA %Lexicon ); 'Commenting' => 'Commenter', 'Duplicate Roles' => 'Dupliquer les rôles', 'These roles have the same privileges as this role' => 'Ces rôles ont les même privilèges que ce rôle', - 'Save changes to this [_1] (s)' => 'Enregistrer les modifications de ce [_1] (s)', + 'Save changes to this [lc,_1] (s)' => 'Enregistrer les modifications de ce [lc,_1] (s)', ## tmpl/cms/cfg_plugin.tmpl 'System Plugin Settings' => 'Paramètres du système de plugins', @@ -2485,7 +2485,7 @@ use vars qw( @ISA %Lexicon ); 'Save (s)' => 'Enregistrer (s)', 'Save and Publish this template (r)' => 'Enregistrer et publier ce gabarit (r)', 'Save &amp; Publish' => 'Enregistrer &amp; publier', - 'You have unsaved changes to your [_1] that will be lost.' => 'Vous avez des modifications non sauvegardées dans votre [_1] qui seront perdues.', + 'You have unsaved changes to your [lc,_1] that will be lost.' => 'Vous avez des modifications non sauvegardées dans votre [lc,_1] qui seront perdues.', 'You must set the Template Name.' => 'Vous devez mettre un nom de gabarit.', 'You must set the template Output File.' => 'Vous devez configurer le fichier de sortie du gabarit.', 'Please wait...' => 'Merci de patienter...', @@ -2553,7 +2553,7 @@ use vars qw( @ISA %Lexicon ); 'All [_1]' => 'Tous(tes) les [_1]', 'change' => 'modifier', '[_1] where [_2] is [_3]' => '[_1] où [_2] est [_3]', - 'Show only [_1] where' => 'Afficher uniquement les [_1] où', + 'Show only [lc,_1] where' => 'Afficher uniquement les [lc,_1] où', 'status' => 'le statut', 'tag (exact match)' => 'le tag (exact)', 'tag (fuzzy match)' => 'le tag (fuzzy match)', @@ -2572,13 +2572,13 @@ use vars qw( @ISA %Lexicon ); 'Comments from [_1]' => 'Commentaires de [_1]', 'commenter' => 'l\'auteur de commentaires', 'commenters' => 'Auteurs de commentaire', - 'Trust [_1] (t)' => 'Marquer comme fiable [_1] (t)', + 'Trust [lc,_1] (t)' => 'Marquer comme fiable [lc,_1] (t)', 'Trust' => 'Fiable', - 'Untrust [_1] (t)' => 'Marquer comme non-fiable [_1] (t)', + 'Untrust [lc,_1] (t)' => 'Marquer comme non-fiable [lc,_1] (t)', 'Untrust' => 'Non Fiable', - 'Ban [_1] (b)' => 'Bannir [_1] (b)', + 'Ban [lc,_1] (b)' => 'Bannir [lc,_1] (b)', 'Ban' => 'Bannir', - 'Unban [_1] (b)' => 'Ne pas bannir [_1] (b)', + 'Unban [lc,_1] (b)' => 'Ne pas bannir [lc,_1] (b)', 'Unban' => 'Non banni', 'The Name of the commenter' => 'Le nom de l\'auteur de commentaires', 'View all comments with this name' => 'Afficher tous les commentaires associés à ce nom', @@ -2668,7 +2668,7 @@ use vars qw( @ISA %Lexicon ); 'folder' => 'Répertoire', 'folders' => 'Répertoires', 'categories' => 'Catégories', - 'Create [_1]' => 'Créer une [_1]', + 'Create [lc,_1]' => 'Créer une [lc,_1]', 'Your [_1] has been saved.' => 'Votre [_1] a été enregistrée.', 'One or more errors occurred when sending update pings or TrackBacks.' => 'Erreur lors de l\'envoi des pings ou des trackbacks.', '_USAGE_VIEW_LOG' => 'L\'erreur est enregistrée dans le <a href="[_1]">journal (logs)</a>.', @@ -2696,13 +2696,12 @@ use vars qw( @ISA %Lexicon ); 'Publish Date' => 'Date de publication', 'Make primary' => 'Rendre principal', 'Add sub category' => 'Ajouter une sous-catégorie', - 'Add [_1] name' => 'Ajouter le nom [_1]', - 'Add new parent [_1]' => 'Ajouter un nouveau [_1] parent', + 'Add [lc,_1] name' => 'Ajouter le nom [lc,_1]', + 'Add new parent [lc,_1]' => 'Ajouter un nouveau [lc,_1] parent', 'Add new' => 'Créer', - 'Save this [_1] (s)' => 'Enregistrer cette [_1] (s)', - 'Preview this [_1] (v)' => 'Pré visualiser ce [_1] (v)', - 'Delete this [_1] (v)' => 'Effacer ce [_1] (v)', - 'Share this [_1]' => 'Partager cette [_1]', + 'Save this [lc,_1] (s)' => 'Enregistrer cette [lc,_1] (s)', + 'Preview this [lc,_1] (v)' => 'Pré visualiser ce [lc,_1] (v)', + 'Share this [lc,_1]' => 'Partager cette [lc,_1]', 'View published [_1]' => 'Voir la [_1] publié', '&laquo; Previous' => '&laquo; Précédent', 'Next &raquo;' => 'Suivant &raquo;', @@ -2712,10 +2711,10 @@ use vars qw( @ISA %Lexicon ); '(comma-delimited list)' => '(liste délimitée par virgule)', '(space-delimited list)' => '(liste délimitée par espace)', '(delimited by \'[_1]\')' => '(délimitée par \'[_1]\')', - 'Change [_1]' => 'Modifier le [_1]', - 'Add [_1]' => 'Ajouter une [_1]', + 'Change [lc,_1]' => 'Modifier le [lc,_1]', + 'Add [lc,_1]' => 'Ajouter une [lc,_1]', 'Unpublished' => 'Non publié', - 'You must configure blog before you can publish this [_1].' => 'Vous devez configurer votre blog avant de pouvoir publier ce [_1].', + 'You must configure this blog before you can publish this [lc,_1].' => 'Vous devez configurer votre blog avant de pouvoir publier ce [lc,_1].', 'Select entry date' => 'Choisir la date de la note', 'Unlock this entry&rsquo;s output filename for editing' => 'Déverrouiller le nom de fichier de la note pour le modifier', 'Warning: If you set the basename manually, it may conflict with another entry.' => 'ATTENTION : Editer le nom de base manuellement peut créer des conflits avec d\'autres notes.', @@ -3025,13 +3024,13 @@ use vars qw( @ISA %Lexicon ); 'System Permissions' => 'Autorisations système', 'Options' => 'Options', 'Create personal blog for user' => 'Créer le blog personnel de l\'utilisateur', - 'Create [_1] (s)' => 'Créer [_1] (s)', + 'Create [lc,_1] (s)' => 'Créer [lc,_1] (s)', '_USAGE_PASSWORD_RESET' => 'Ci-dessous, vous pouvez ré-initialiser le mot de passe pour cet utilisateur. Si vous faites cela un mot de passe généré aléatoirement sera créé et envoyé par e-mail à : [_1].', 'Initiate Password Recovery' => 'Récupérer le mot de passe', ## tmpl/cms/edit_comment.tmpl 'The comment has been approved.' => 'Ce commentaire a été approuvé.', - 'Delete this [_1] (x)' => 'Effacer cet [_1] (x)', + 'Delete this [lc,_1] (x)' => 'Effacer cet [lc,_1] (x)', 'Previous Comment' => 'Commentaire précédent', 'Next Comment' => 'Commentaire suivant', 'Manage Comments' => 'Gérer les commentaires', @@ -3234,12 +3233,12 @@ use vars qw( @ISA %Lexicon ); 'Cancel (c)' => 'Annuler (c)', ## tmpl/cms/list_folder.tmpl - 'Your [_1] changes and additions have been made.' => 'Les modifications ont été enregistrées.', - 'You have successfully deleted the selected [_1].' => 'Vous avez supprimé avec succès les [_1] sélectionné(e)s.', - 'Create top level [_1]' => 'Créer un(e) [_1] à la racine', + 'Your [lc,_1] changes and additions have been made.' => 'Les modifications ont été enregistrées.', + 'You have successfully deleted the selected [lc,_1].' => 'Vous avez supprimé avec succès les [lc,_1] sélectionné(e)s.', + 'Create top level [lc,_1]' => 'Créer un(e) [lc,_1] à la racine', 'New Parent [_1]' => 'Nouveau [_1] parent', 'Top Level' => 'Niveau racine', - 'Move [_1]' => 'Déplacer [_1]', + 'Move [lc,_1]' => 'Déplacer [lc,_1]', 'Move' => 'Déplacer', '[quant,_1,page,pages]' => '[quant,_1,page,pages]', @@ -3412,7 +3411,7 @@ use vars qw( @ISA %Lexicon ); '[quant,_1,result,results] found' => '[quant,_1,résultat trouvé,résultats trouvés]', ## tmpl/cms/preview_strip.tmpl - 'You are previewing the [_1] titled &ldquo;[_2]&rdquo;' => 'Vous pré-visualisez la [_1] titrée &ldquo;[_2]&rdquo;', + 'You are previewing the [lc,_1] titled &ldquo;[_2]&rdquo;' => 'Vous pré-visualisez la [lc,_1] titrée &ldquo;[_2]&rdquo;', ## tmpl/cms/edit_ping.tmpl 'The TrackBack has been approved.' => 'Le trackback a été approuvé.', @@ -4052,9 +4051,9 @@ use vars qw( @ISA %Lexicon ); ## addons/Enterprise.pack/tmpl/include/group_table.tmpl 'group' => 'groupe', 'groups' => 'Groupes', - 'Enable selected [_1] (e)' => 'Activer [_1] sélectionné (e)', - 'Disable selected [_1] (d)' => 'Désactiver [_1] sélectionné (d)', - 'Remove selected [_1] (d)' => 'Supprimer [_1] sélectionné (d)', + 'Enable selected [lc,_1] (e)' => 'Activer [lc,_1] sélectionné (e)', + 'Disable selected [lc,_1] (d)' => 'Désactiver [lc,_1] sélectionné (d)', + 'Remove selected [lc,_1] (d)' => 'Supprimer [lc,_1] sélectionné (d)', 'Only show enabled groups' => 'Afficher uniquement les groupes activés', 'Only show disabled groups' => 'Afficher uniquement les groupes désactivés', lib/MT/L10N/fr.pm @@ -1,9 +1,11 @@ -# Copyright 2003-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ package MT::L10N::ja; + use strict; use MT::L10N; use MT::L10N::en_us; @@ -126,8 +128,8 @@ use vars qw( @ISA %Lexicon ); 'Return to the <a href="[_1]">original entry</a>.' => '<a href="[_1]">元のブログ記事</a>に戻る', ## default_templates/notify-entry.mtml - 'A new [_3] entitled \'[_1]\' has been published to [_2].' => '新しい[_3]「[_1]」を[_2]で公開しました。', - 'View [_1]:' => '[_1]を見る', + 'A new [lc,_3] entitled \'[_1]\' has been published to [_2].' => '新しい[_3]「[_1]」を[_2]で公開しました。', + 'View [lc,_1]:' => '[_1]を見る', '[_1] Title: [_2]' => 'タイトル: [_2]', 'Publish Date: [_1]' => '日付: [_1]', 'Message from Sender:' => 'メッセージ: ', @@ -239,7 +241,7 @@ use vars qw( @ISA %Lexicon ); ## default_templates/recover-password.mtml '_USAGE_FORGOT_PASSWORD_1' => 'パスワードを再設定しました。新しいパスワードを通知します。', - '_USAGE_FORGOT_PASSWORD_2' => '新しいパスワードを使ってMovable Typeにログインし、すぐにパスワードを変更してください。', + '_USAGE_FORGOT_PASSWORD_2' => '以下のURLから、新しいパスワードを使ってMovable Typeにログインし、すぐにパスワードを変更してください。', 'Mail Footer' => 'メールフッター', ## default_templates/javascript.mtml @@ -739,7 +741,7 @@ use vars qw( @ISA %Lexicon ); 'Settings' => '設定', 'Edit Comment' => 'コメントの編集', 'Authenticated Commenters' => '認証されているコメント投稿者', - 'Commenter Details' => 'コメントの詳細', + 'Commenter Details' => 'コメント投稿者の詳細', 'New Entry' => '新しいブログ記事', 'New Page' => '新しいウェブページ', 'Create template requires type' => 'テンプレートを作成するためのtypeパラメータが指定されていません。', @@ -1895,14 +1897,14 @@ use vars qw( @ISA %Lexicon ); 'comment' => 'コメント', 'comments' => 'コメント', 'to publish' => '公開', - 'Publish selected [_1] (a)' => '選択された[_1]を公開する (a)', - 'Delete selected [_1] (x)' => '[_1]を削除する(x)', - 'Report selected [_1] as Spam (j)' => '選択された[_1]をスパムとして報告する (j)', + 'Publish selected [lc,_1] (a)' => '選択された[_1]を公開する (a)', + 'Delete selected [lc,_1] (x)' => '[_1]を削除する(x)', + 'Report selected [lc,_1] as Spam (j)' => '選択された[_1]をスパムとして報告する (j)', 'Spam' => 'スパム', - 'Report selected [_1] as Not Spam and Publish (j)' => '選択された[_1]をスパムから戻して公開する (j)', + 'Report selected [lc,_1] as Not Spam and Publish (j)' => '選択された[_1]をスパムから戻して公開する (j)', 'Not Spam' => 'スパム解除', 'Are you sure you want to remove all comments reported as spam?' => 'スパムコメントをすべて削除しますか?', - 'Deletes all [_1] reported as Spam' => 'スパムとして報告された[_1]をすべて削除', + 'Deletes all [lc,_1] reported as Spam' => 'スパムとして報告された[_1]をすべて削除', 'Empty' => 'すべて削除', 'Ban This IP' => 'このIPを禁止', 'Status' => '公開状態', @@ -1914,8 +1916,7 @@ use vars qw( @ISA %Lexicon ); 'Only show pending comments' => '保留中のコメントだけを表示', 'Pending' => '保留中', 'Edit this comment' => 'このコメントを編集', - '(1 reply)' => '(返信数 1)', - '([_1] replies)' => '(返信数 [_1])', + '([quant,_1,reply,replies])' => '(返信数 [_1])', 'Reply' => '返信', 'Trusted' => '承認済み', 'Blocked' => '禁止中', @@ -1923,7 +1924,7 @@ use vars qw( @ISA %Lexicon ); 'Edit this [_1] commenter' => 'このコメント投稿者([_1])を編集', 'Search for comments by this commenter' => 'このコメント投稿者のコメントを検索', 'Anonymous' => '匿名', - 'View this [_1]' => '[_1]を表示する', + 'View this [lc,_1]' => '[_1]を表示する', 'Search for all comments from this IP address' => 'このIPアドレスからのすべてのコメントを検索', ## tmpl/cms/include/copyright.tmpl @@ -2049,9 +2050,9 @@ use vars qw( @ISA %Lexicon ); 'View the [_1] for this TrackBack' => 'トラックバックされた[_1]を見る', ## tmpl/cms/include/entry_table.tmpl - 'Save these [_1] (s)' => 'これらの[_1]を保存する(s)', + 'Save these [lc,_1] (s)' => 'これらの[_1]を保存する(s)', 'to republish' => '再構築', - 'Republish selected [_1] (r)' => '選択された[_1]を再構築する (r)', + 'Republish selected [lc,_1] (r)' => '選択された[_1]を再構築する (r)', 'Republish' => '再構築', 'page' => 'ウェブページ', 'Last Modified' => '最終更新', @@ -2059,12 +2060,12 @@ use vars qw( @ISA %Lexicon ); 'Unpublished (Draft)' => '未公開(原稿)', 'Unpublished (Review)' => '未公開(承認待ち)', 'Scheduled' => '日時指定', - 'Only show unpublished [_1]' => '下書きの[_1]だけを表示', - 'Only show published [_1]' => '公開された[_1]だけを表示', - 'Only show [_1] for review' => 'レビュー中の[_1]だけを表示', - 'Only show scheduled [_1]' => '日時指定された[_1]だけを表示', - 'Edit [_1]' => '[_1]の編集', - 'View [_1]' => '[_1]を見る', + 'Only show unpublished [lc,_1]' => '下書きの[_1]だけを表示', + 'Only show published [lc,_1]' => '公開された[_1]だけを表示', + 'Only show [lc,_1] for review' => 'レビュー中の[_1]だけを表示', + 'Only show scheduled [lc,_1]' => '日時指定された[_1]だけを表示', + 'Edit [lc,_1]' => '[_1]の編集', + 'View [lc,_1]' => '[_1]を見る', ## tmpl/cms/include/login_mt.tmpl @@ -2476,7 +2477,7 @@ use vars qw( @ISA %Lexicon ); 'Save (s)' => '保存', 'Save and Publish this template (r)' => 'このテンプレートを保存して再構築 (r)', 'Save &amp; Publish' => '保存と再構築', - 'You have unsaved changes to your [_1] that will be lost.' => '保存されていない[_1]への変更は失われます。', + 'You have unsaved changes to your [lc,_1] that will be lost.' => '保存されていない[_1]への変更は失われます。', 'You must set the Template Name.' => 'テンプレート名を設定してください。', 'You must set the template Output File.' => 'テンプレートの出力ファイル名を設定してください。', 'Please wait...' => 'お待ちください...', @@ -2516,7 +2517,7 @@ use vars qw( @ISA %Lexicon ); 'Commenting' => 'コメント投稿', 'Duplicate Roles' => '同じ権限のロール', 'These roles have the same privileges as this role' => 'このロールと同じ権限を設定されたロール', - 'Save changes to this [_1] (s)' => '[_1]への変更を保存 (s)', + 'Save changes to this [lc,_1] (s)' => '[_1]への変更を保存 (s)', ## tmpl/cms/cfg_plugin.tmpl 'System Plugin Settings' => 'システムプラグイン設定', @@ -2606,13 +2607,13 @@ use vars qw( @ISA %Lexicon ); 'Comments from [_1]' => '[_1]からのコメント', 'commenter' => 'コメント投稿者', 'commenters' => 'コメント投稿者', - 'Trust [_1] (t)' => '[_1]を承認 (t)', + 'Trust [lc,_1] (t)' => '[_1]を承認 (t)', 'Trust' => '承認', - 'Untrust [_1] (t)' => '[_1]の承認を解除', + 'Untrust [lc,_1] (t)' => '[_1]の承認を解除', 'Untrust' => '承認を解除', - 'Ban [_1] (b)' => '[_1]を禁止 (b)', + 'Ban [lc,_1] (b)' => '[_1]を禁止 (b)', 'Ban' => '禁止', - 'Unban [_1] (b)' => '[_1]の禁止を解除 (b)', + 'Unban [lc,_1] (b)' => '[_1]の禁止を解除 (b)', 'Unban' => '禁止を解除', 'The Name of the commenter' => 'コメント投稿者の名前', 'View all comments with this name' => 'この名前のすべてのコメントを見る', @@ -2636,7 +2637,7 @@ use vars qw( @ISA %Lexicon ); 'All [_1]' => 'すべての[_1]', 'change' => '絞り込み', '[_1] where [_2] is [_3]' => '[_2]が[_3]の[_1]', - 'Show only [_1] where' => '表示:[_1]', + 'Show only [lc,_1] where' => '表示:[_1]', 'status' => 'ステータス', 'tag (exact match)' => 'タグ（完全一致）', 'tag (fuzzy match)' => 'タグ（あいまい検索）', @@ -2726,7 +2727,7 @@ use vars qw( @ISA %Lexicon ); 'folder' => 'フォルダ', 'folders' => 'フォルダ', 'categories' => 'カテゴリ', - 'Create [_1]' => '[_1]を作成', + 'Create [lc,_1]' => '[_1]を作成', 'Your [_1] has been saved.' => '[_1]を保存しました。', 'One or more errors occurred when sending update pings or TrackBacks.' => '更新通知かトラックバック送信でひとつ以上のエラーが発生しました。', '_USAGE_VIEW_LOG' => 'エラーの場合は、<a href="[_1]">ログ</a>をチェックしてください。', @@ -2754,13 +2755,12 @@ use vars qw( @ISA %Lexicon ); 'Publish Date' => '公開日', 'Make primary' => 'メインカテゴリにする', 'Add sub category' => 'サブカテゴリを追加', - 'Add [_1] name' => '[_1]の名前を追加', - 'Add new parent [_1]' => '新しいトップレベルカテゴリ[_1]を追加', + 'Add [lc,_1] name' => '[_1]の名前を追加', + 'Add new parent [lc,_1]' => '新しいトップレベルカテゴリ[_1]を追加', 'Add new' => '新規追加', - 'Save this [_1] (s)' => 'この[_1]を保存(s)', - 'Preview this [_1] (v)' => 'この[_1]をプレビュー(v)', - 'Delete this [_1] (v)' => 'この[_1]を削除(v)', - 'Share this [_1]' => 'この[_1]を共有', + 'Save this [lc,_1] (s)' => 'この[_1]を保存(s)', + 'Preview this [lc,_1] (v)' => 'この[_1]をプレビュー(v)', + 'Share this [lc,_1]' => 'この[_1]を共有', 'View published [_1]' => '公開された[_1]を表示', '&laquo; Previous' => '&laquo; 前', 'Next &raquo;' => '次 &raquo;', @@ -2770,10 +2770,10 @@ use vars qw( @ISA %Lexicon ); '(comma-delimited list)' => '（カンマ区切りリスト）', '(space-delimited list)' => '（スペース区切りリスト）', '(delimited by \'[_1]\')' => '（[_1]で区切る）', - 'Change [_1]' => '[_1]を変更', - 'Add [_1]' => '[_1]を追加', + 'Change [lc,_1]' => '[_1]を変更', + 'Add [lc,_1]' => '[_1]を追加', 'Unpublished' => '下書き', - 'You must configure blog before you can publish this [_1].' => '[_1]を公開する前にブログの設定を行ってください。', + 'You must configure this blog before you can publish this [lc,_1].' => '[_1]を公開する前にブログの設定を行ってください。', 'Select entry date' => '作成日を選択', 'Unlock this entry&rsquo;s output filename for editing' => '出力ファイル名を編集するにはロックを解除してください。', 'Warning: If you set the basename manually, it may conflict with another entry.' => '警告: 出力ファイル名を手動で設定すると、他のブログ記事と衝突を起こす可能性があります。', @@ -3087,13 +3087,13 @@ use vars qw( @ISA %Lexicon ); 'System Permissions' => 'システム権限', 'Options' => 'オプション', 'Create personal blog for user' => '個人用のブログを作成する', - 'Create [_1] (s)' => '[_1]の作成 (s)', + 'Create [lc,_1] (s)' => '[_1]の作成 (s)', '_USAGE_PASSWORD_RESET' => 'ユーザーのパスワードを再設定できます。パスワードがランダムに生成され、[_1]にメールで送信されます。', 'Initiate Password Recovery' => 'パスワードの再設定', ## tmpl/cms/edit_comment.tmpl 'The comment has been approved.' => 'コメントを公開しました。', - 'Delete this [_1] (x)' => 'この[_1]を削除(x)', + 'Delete this [lc,_1] (x)' => 'この[_1]を削除(x)', 'Previous Comment' => '前のコメント', 'Next Comment' => '次のコメント', 'Manage Comments' => 'コメントの管理', @@ -3191,7 +3191,7 @@ use vars qw( @ISA %Lexicon ); 'Check this and files backed up from newer versions can be restored to this system. NOTE: Ignoring Schema Version can damage Movable Type permanently.' => 'チェックすると現在のシステムより新しいシステムからバックアップされたデータをこのシステムに復元できます。注意: バージョンの衝突を無視すると、Movable Typeのシステムに回復不可能なダメージを与える可能性があります。', 'Ignore schema version conflicts' => 'バージョンの衝突を無視する', 'Check this and existing global templates will be overwritten from the backup file.' => 'チェックすると既存のグローバルテンプレートはバックアップに含まれているもので上書きされます。', - 'Overwrite global templates.' => 'グローバルテンプレートを上書き', + 'Overwrite global templates.' => 'グローバルテンプレートを上書きする', 'Restore (r)' => '復元', ## tmpl/cms/cfg_archives.tmpl @@ -3296,12 +3296,12 @@ use vars qw( @ISA %Lexicon ); 'Cancel (c)' => '取り消し', ## tmpl/cms/list_folder.tmpl - 'Your [_1] changes and additions have been made.' => '[_1]の変更と追加を行いました。', - 'You have successfully deleted the selected [_1].' => '[_1]を削除しました。', - 'Create top level [_1]' => 'トップレベル[_1]を作成', + 'Your [lc,_1] changes and additions have been made.' => '[_1]の変更と追加を行いました。', + 'You have successfully deleted the selected [lc,_1].' => '[_1]を削除しました。', + 'Create top level [lc,_1]' => 'トップレベル[_1]を作成', 'New Parent [_1]' => '新しいトップレベルの[_1]', 'Top Level' => 'ルート', - 'Move [_1]' => '[_1]を移動', + 'Move [lc,_1]' => '[_1]を移動', 'Move' => '移動', '[quant,_1,page,pages]' => '[quant,_1,件,件]', @@ -3469,7 +3469,7 @@ use vars qw( @ISA %Lexicon ); '[quant,_1,result,results] found' => '[quant,_1,件,件]見つかりました。', ## tmpl/cms/preview_strip.tmpl - 'You are previewing the [_1] titled &ldquo;[_2]&rdquo;' => '[_1] &ldquo;[_2]&rdquo;のプレビュー', + 'You are previewing the [lc,_1] titled &ldquo;[_2]&rdquo;' => '[_1] &ldquo;[_2]&rdquo;のプレビュー', ## tmpl/cms/edit_ping.tmpl 'The TrackBack has been approved.' => 'トラックバックを公開しました。', lib/MT/L10N/ja.pm @@ -1,9 +1,11 @@ -# Copyright 2003-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ package MT::L10N::nl; + use strict; use MT::L10N; use MT::L10N::en_us; @@ -53,8 +55,8 @@ use vars qw( @ISA %Lexicon ); ## php/lib/function.mtauthordisplayname.php ## default_templates/notify-entry.mtml - 'A new [_3] entitled \'[_1]\' has been published to [_2].' => 'Een [_3] getiteld \'[_1]\' is gepubliceerd op [_2].', - 'View [_1]:' => '[_1] bekijken:', + 'A new [lc,_3] entitled \'[_1]\' has been published to [_2].' => 'Een [lc,_3] getiteld \'[_1]\' is gepubliceerd op [_2].', + 'View [lc,_1]:' => '[lc,_1] bekijken:', '[_1] Title: [_2]' => '[_1] titel: [_2]', 'Publish Date: [_1]' => 'Publicatiedatum: [_1]', 'Message from Sender:' => 'Boodschap van afzender:', @@ -1838,14 +1840,14 @@ use vars qw( @ISA %Lexicon ); 'comment' => 'reactie', 'comments' => 'reacties', 'to publish' => 'om te publiceren', - 'Publish selected [_1] (a)' => 'Publiceer geselecteerde [_1] (a)', - 'Delete selected [_1] (x)' => 'Geselecteerde [_1] verwijderen (x)', - 'Report selected [_1] as Spam (j)' => 'Geselecteerde [_1] rapporteren als spam (j)', + 'Publish selected [lc,_1] (a)' => 'Publiceer geselecteerde [lc,_1] (a)', + 'Delete selected [lc,_1] (x)' => 'Geselecteerde [lc,_1] verwijderen (x)', + 'Report selected [lc,_1] as Spam (j)' => 'Geselecteerde [lc,_1] rapporteren als spam (j)', 'Spam' => 'Spam', - 'Report selected [_1] as Not Spam and Publish (j)' => 'Geselecteerde [_1] rapporteren als niet-spam en publiceren (j)', + 'Report selected [lc,_1] as Not Spam and Publish (j)' => 'Geselecteerde [lc,_1] rapporteren als niet-spam en publiceren (j)', 'Not Spam' => 'Geen spam', 'Are you sure you want to remove all comments reported as spam?' => 'Bent u zeker dat u alle reacties die als spam gemarkeerd zijn wenst te verwijderen?', - 'Deletes all [_1] reported as Spam' => 'Verwijdert alle [_1] gerapporteerd als spam', + 'Deletes all [lc,_1] reported as Spam' => 'Verwijdert alle [lc,_1] gerapporteerd als spam', 'Empty' => 'Leeg', 'Ban This IP' => 'Dit IP-adres verbannen', 'Status' => 'Status', @@ -1857,8 +1859,7 @@ use vars qw( @ISA %Lexicon ); 'Only show pending comments' => 'Enkel hangende reacties tonen', 'Pending' => 'In afwachting', 'Edit this comment' => 'Deze reactie bewerken', - '(1 reply)' => '(1 antwoord)', - '([_1] replies)' => '([_1] antwoorden)', + '([quant,_1,reply,replies])' => '([quant,_1,antwoord,antwoorden])', 'Reply' => 'Antwoorden', 'Trusted' => 'Vertrouwde', 'Blocked' => 'Geblokkeerd', @@ -1866,7 +1867,7 @@ use vars qw( @ISA %Lexicon ); 'Edit this [_1] commenter' => '[_1] reageerder bewerken', 'Search for comments by this commenter' => 'Zoek naar reacties door deze reageerder', 'Anonymous' => 'Anonieme', - 'View this [_1]' => '[_1] bekijken', + 'View this [lc,_1]' => '[lc,_1] bekijken', 'Search for all comments from this IP address' => 'Zoek naar alle reacties van dit IP adres', ## tmpl/cms/include/member_table.tmpl @@ -1983,9 +1984,9 @@ use vars qw( @ISA %Lexicon ); 'View the [_1] for this TrackBack' => 'De [_1] bekijken voor deze TrackBack', ## tmpl/cms/include/entry_table.tmpl - 'Save these [_1] (s)' => 'Sla deze [_1] op (s)', + 'Save these [lc,_1] (s)' => 'Sla deze [lc,_1] op (s)', 'to republish' => 'om opnieuw te publiceren', - 'Republish selected [_1] (r)' => 'Herpubliceer geselecteerde [_1] (r)', + 'Republish selected [lc,_1] (r)' => 'Herpubliceer geselecteerde [lc,_1] (r)', 'Republish' => 'Herpubliceren', 'page' => 'pagina', 'Last Modified' => 'Laatst aangepast', @@ -1993,12 +1994,12 @@ use vars qw( @ISA %Lexicon ); 'Unpublished (Draft)' => 'Niet gepubliceerd (klad)', 'Unpublished (Review)' => 'Niet gepubliceerd (na te kijken)', 'Scheduled' => 'Gepland', - 'Only show unpublished [_1]' => 'Enkel niet gepubliceerde [_1] tonen', - 'Only show published [_1]' => 'Enkel gepubliceerde [_1] tonen', - 'Only show [_1] for review' => 'Enkel [_1] tonen om te beoordelen', - 'Only show scheduled [_1]' => 'Enkel geplande [_1] tonen', - 'Edit [_1]' => '[_1] bewerken', - 'View [_1]' => 'Toon [_1]', + 'Only show unpublished [lc,_1]' => 'Enkel niet gepubliceerde [lc,_1] tonen', + 'Only show published [lc,_1]' => 'Enkel gepubliceerde [_1] tonen', + 'Only show [lc,_1] for review' => 'Enkel [lc,_1] tonen om te beoordelen', + 'Only show scheduled [lc,_1]' => 'Enkel geplande [lc,_1] tonen', + 'Edit [lc,_1]' => '[lc,_1] bewerken', + 'View [lc,_1]' => 'Toon [lc,_1]', ## tmpl/cms/include/login_mt.tmpl @@ -2414,7 +2415,7 @@ use vars qw( @ISA %Lexicon ); 'Commenting' => 'Reageren', 'Duplicate Roles' => 'Dubbele rollen', 'These roles have the same privileges as this role' => 'Deze rollen hebben dezelfde rechten als deze rol', - 'Save changes to this [_1] (s)' => 'Wijzigingen aan deze [_1] opslaan (s)', + 'Save changes to this [lc,_1] (s)' => 'Wijzigingen aan deze [lc,_1] opslaan (s)', ## tmpl/cms/cfg_plugin.tmpl 'System Plugin Settings' => 'Systeeminstellingen plugins', @@ -2483,7 +2484,7 @@ use vars qw( @ISA %Lexicon ); 'Save (s)' => 'Opslaan (s)', 'Save and Publish this template (r)' => 'Dit sjabloon opslaan en publiceren (r)', 'Save &amp; Publish' => 'Opslaan &amp; publiceren', - 'You have unsaved changes to your [_1] that will be lost.' => 'Er zijn niet opgeslagen wijzigingen aan uw [_1] die verloren zullen gaan', + 'You have unsaved changes to your [lc,_1] that will be lost.' => 'Er zijn niet opgeslagen wijzigingen aan uw [lc,_1] die verloren zullen gaan', 'You must set the Template Name.' => 'U moet de naam van het sjabloon instellen', 'You must set the template Output File.' => 'U moet het uitvoerbestand van het sjabloon instellen.', 'Please wait...' => 'Even wachten...', @@ -2551,7 +2552,7 @@ use vars qw( @ISA %Lexicon ); 'All [_1]' => 'Alle [_1]', 'change' => 'wijzig', '[_1] where [_2] is [_3]' => '[_1] waar [_2] gelijk is aan [_3]', - 'Show only [_1] where' => 'Toon enkel [_1] waar', + 'Show only [lc,_1] where' => 'Toon enkel [lc,_1] waar', 'status' => 'status', 'tag (exact match)' => 'tag (exacte overeenkomst)', 'tag (fuzzy match)' => 'tag (fuzzy overeenkomst)', @@ -2570,13 +2571,13 @@ use vars qw( @ISA %Lexicon ); 'Comments from [_1]' => 'Reacties van [_1]', 'commenter' => 'reageerder', 'commenters' => 'reageerders', - 'Trust [_1] (t)' => 'Vertrouw [_1] (t)', + 'Trust [lc,_1] (t)' => 'Vertrouw [lc,_1] (t)', 'Trust' => 'Vertrouw', - 'Untrust [_1] (t)' => 'Wantrouw [_1] (t)', + 'Untrust [lc,_1] (t)' => 'Wantrouw [lc,_1] (t)', 'Untrust' => 'Wantrouw', - 'Ban [_1] (b)' => 'Verban [_1] (b)', + 'Ban [lc,_1] (b)' => 'Verban [lc,_1] (b)', 'Ban' => 'Verban', - 'Unban [_1] (b)' => 'Ontban [_1] (b)', + 'Unban [lc,_1] (b)' => 'Ontban [lc,_1] (b)', 'Unban' => 'Ontban', 'The Name of the commenter' => 'Naam van de reageerder', 'View all comments with this name' => 'Alle reacties met deze naam bekijken', @@ -2666,7 +2667,7 @@ use vars qw( @ISA %Lexicon ); 'folder' => 'map', 'folders' => 'mappen', 'categories' => 'categorieën', - 'Create [_1]' => '[_1] aanmaken', + 'Create [lc,_1]' => '[lc,_1] aanmaken', 'Your [_1] has been saved.' => 'Uw [_1] is opgeslagen.', 'One or more errors occurred when sending update pings or TrackBacks.' => 'Eén of meer problemen deden zich voor bij het versturen van update pings of TrackBacks.', '_USAGE_VIEW_LOG' => 'Controleer het <a href=\"[_1]\">Activiteitenlog</a> op deze fout.', @@ -2694,13 +2695,12 @@ use vars qw( @ISA %Lexicon ); 'Publish Date' => 'Datum publicatie', 'Make primary' => 'Maak dit een hoofdcategorie', 'Add sub category' => 'Subcategorie toevoegen', - 'Add [_1] name' => 'Voeg [_1] naam toe', - 'Add new parent [_1]' => 'Voeg nieuwe hoofd[_1] toe', + 'Add [lc,_1] name' => 'Voeg [lc,_1] naam toe', + 'Add new parent [lc,_1]' => 'Voeg nieuwe hoofd[lc,_1] toe', 'Add new' => 'Nieuw toevogen', - 'Save this [_1] (s)' => '[_1] bewaren (s)', - 'Preview this [_1] (v)' => '[_1] voorbeeld (v)', - 'Delete this [_1] (v)' => '[_1] verwijderen (v)', - 'Share this [_1]' => '[_1] delen', + 'Save this [lc,_1] (s)' => '[lc,_1] bewaren (s)', + 'Preview this [lc,_1] (v)' => '[lc,_1] voorbeeld (v)', + 'Share this [lc,_1]' => '[lc,_1] delen', 'View published [_1]' => '[_1] bekijken', '&laquo; Previous' => '&laquo; Vorige', 'Next &raquo;' => 'Volgende &raquo;', @@ -2710,10 +2710,10 @@ use vars qw( @ISA %Lexicon ); '(comma-delimited list)' => '(lijst gescheiden met komma\'s)', '(space-delimited list)' => '(lijst gescheiden met spaties)', '(delimited by \'[_1]\')' => '(gescheiden door \'[_1]\')', - 'Change [_1]' => 'Wijzig [_1]', - 'Add [_1]' => '[_1] toevoegen', + 'Change [lc,_1]' => 'Wijzig [_1]', + 'Add [lc,_1]' => '[_1] toevoegen', 'Unpublished' => 'Ongepubliceerd', - 'You must configure blog before you can publish this [_1].' => 'U moet uw blog configureren voor u deze [_1] kunt publiceren.', + 'You must configure this blog before you can publish this [lc,_1].' => 'U moet uw blog configureren voor u deze [lc,_1] kunt publiceren.', 'Select entry date' => 'Selecteer berichtdatum', 'Unlock this entry&rsquo;s output filename for editing' => 'Maak het mogelijk om de uitvoerbestandsnaam te wijzigen', 'Warning: If you set the basename manually, it may conflict with another entry.' => 'Waarschuwing: de basisnaam van het bericht met de hand aanpassen kan een conflict met een ander bericht veroorzaken.', @@ -3023,13 +3023,13 @@ use vars qw( @ISA %Lexicon ); 'System Permissions' => 'Systeempermissies', 'Options' => 'Opties', 'Create personal blog for user' => 'Persoonlijke blog aanmaken voor gebruiker', - 'Create [_1] (s)' => '[_1] aanmaken (s)', + 'Create [lc,_1] (s)' => '[lc,_1] aanmaken (s)', '_USAGE_PASSWORD_RESET' => 'Hieronder kunt u een nieuw wachtwoord laten instellen voor deze gebruiker. Als u ervoor kiest om dit te doen, zal een willekeurig gegenereerd wachtwoord worden aangemaakt en rechtstreeks naar volgend e-mail adres worden verstuurd: [_1].', 'Initiate Password Recovery' => 'Procedure starten om wachtwoord terug te halen', ## tmpl/cms/edit_comment.tmpl 'The comment has been approved.' => 'De reactie is goedgekeurd.', - 'Delete this [_1] (x)' => 'Verwijder [_1] (x)', + 'Delete this [lc,_1] (x)' => 'Verwijder [lc,_1] (x)', 'Previous Comment' => 'Vorige reactie', 'Next Comment' => 'Volgende reactie', 'Manage Comments' => 'Reacties beheren', @@ -3232,12 +3232,12 @@ use vars qw( @ISA %Lexicon ); 'Cancel (c)' => 'Annuleer (c)', ## tmpl/cms/list_folder.tmpl - 'Your [_1] changes and additions have been made.' => 'De wijzigingen en toevoegingen aan uw [_1] zijn uitgevoerd.', - 'You have successfully deleted the selected [_1].' => 'U heeft met succes de geselecteerde [_1] verwijderd.', - 'Create top level [_1]' => 'Maak een nieuwe [_1] aan op topniveau', + 'Your [lc,_1] changes and additions have been made.' => 'De wijzigingen en toevoegingen aan uw [lc,_1] zijn uitgevoerd.', + 'You have successfully deleted the selected [lc,_1].' => 'U heeft met succes de geselecteerde [_1] verwijderd.', + 'Create top level [lc,_1]' => 'Maak een nieuwe [lc,_1] aan op topniveau', 'New Parent [_1]' => 'Nieuwe ouder-[_1]', 'Top Level' => 'Topniveau', - 'Move [_1]' => '[_1] verplaatsen', + 'Move [lc,_1]' => '[lc,_1] verplaatsen', 'Move' => 'Verplaatsen', '[quant,_1,page,pages]' => '[quant,_1,pagina,pagina\'s]', @@ -3410,7 +3410,7 @@ use vars qw( @ISA %Lexicon ); '[quant,_1,result,results] found' => '[quant,_1,resultaat,resultaten] found', ## tmpl/cms/preview_strip.tmpl - 'You are previewing the [_1] titled &ldquo;[_2]&rdquo;' => 'U bekijkt een voorbeeld van een [_1] met de titel &ldquo;[_2]&rdquo;', + 'You are previewing the [lc,_1] titled &ldquo;[_2]&rdquo;' => 'U bekijkt een voorbeeld van een [lc,_1] met de titel &ldquo;[_2]&rdquo;', ## tmpl/cms/edit_ping.tmpl 'The TrackBack has been approved.' => 'De TrackBack is goedgekeurd.', @@ -4050,9 +4050,9 @@ use vars qw( @ISA %Lexicon ); ## addons/Enterprise.pack/tmpl/include/group_table.tmpl 'group' => 'groep', 'groups' => 'groepen', - 'Enable selected [_1] (e)' => 'Activeer geselecteerde [_1] (e)', - 'Disable selected [_1] (d)' => 'Deactiveer geselecteerde [_1] (d)', - 'Remove selected [_1] (d)' => 'Verwijder geselecteerde [_1] (d)', + 'Enable selected [lc,_1] (e)' => 'Activeer geselecteerde [lc,_1] (e)', + 'Disable selected [lc,_1] (d)' => 'Deactiveer geselecteerde [lc,_1] (d)', + 'Remove selected [lc,_1] (d)' => 'Verwijder geselecteerde [lc,_1] (d)', 'Only show enabled groups' => 'Enkel actieve groepen tonen', 'Only show disabled groups' => 'Enkel niet-actieve groepen tonen', @@ -4581,923 +4581,10 @@ use vars qw( @ISA %Lexicon ); 'Maintain your blog\'s widget content using a handy drag and drop interface.' => 'Beheer de widget-inhoud van uw weblog via een handige klik-en-sleep interface.', 'Widgets' => 'Widgets', -## php/lib/archive_lib.php - -## php/lib/function.mtremotesigninlink.php - -## php/lib/function.mtproductname.php - -## php/lib/captcha_lib.php - -## php/lib/block.mtassets.php - -## php/lib/block.mtentries.php - -## php/lib/MTUtil.php - -## php/lib/function.mtauthordisplayname.php - -## default_templates/notify-entry.mtml - -## lib/MT/Asset/Video.pm - -## lib/MT/Asset/Audio.pm - -## lib/MT/Asset/Image.pm - -## lib/MT/Util/Archive/Tgz.pm - -## lib/MT/Util/Archive/Zip.pm - -## search_templates/default.tmpl - -## tmpl/wizard/optional.tmpl - -## addons/Community.pack/lib/MT/App/Community.pm - -## php/lib/archive_lib.php - -## php/lib/function.mtremotesigninlink.php - -## php/lib/function.mtproductname.php - -## php/lib/captcha_lib.php - -## php/lib/block.mtassets.php - -## php/lib/block.mtentries.php - -## php/lib/MTUtil.php - -## php/lib/function.mtauthordisplayname.php - -## default_templates/notify-entry.mtml - -## default_templates/main_index.mtml - -## default_templates/page.mtml - -## default_templates/entry_summary.mtml - -## default_templates/comment_response.mtml - -## default_templates/commenter_notify.mtml - -## default_templates/footer-email.mtml - -## default_templates/entry_detail.mtml - -## default_templates/verify-subscribe.mtml - -## default_templates/new-ping.mtml - -## default_templates/comment_detail.mtml - -## default_templates/comment_form.mtml - -## default_templates/comment_throttle.mtml - -## default_templates/new-comment.mtml - -## default_templates/entry_listing.mtml - -## default_templates/footer.mtml - -## default_templates/tags.mtml - -## default_templates/entry_metadata.mtml - -## default_templates/entry.mtml - -## default_templates/recover-password.mtml - -## default_templates/javascript.mtml - -## default_templates/rss.mtml - -## default_templates/archive_index.mtml - -## default_templates/trackbacks.mtml - -## default_templates/categories.mtml - -## default_templates/comments.mtml - -## default_templates/search_results.mtml - -## default_templates/sidebar_2col.mtml - -## default_templates/sidebar_3col.mtml - -## default_templates/dynamic_error.mtml - -## default_templates/comment_preview.mtml - -## default_templates/commenter_confirm.mtml - -## lib/MT/Asset/Video.pm - -## lib/MT/Asset/Audio.pm - -## lib/MT/Asset/Image.pm - -## lib/MT/Util/Archive/Tgz.pm - -## lib/MT/Util/Archive/Zip.pm - -## lib/MT/Util/Archive.pm - -## lib/MT/Util/Captcha.pm - -## lib/MT/Plugin/JunkFilter.pm - -## lib/MT/Auth/TypeKey.pm - -## lib/MT/Auth/OpenID.pm - -## lib/MT/Auth/MT.pm - -## lib/MT/TheSchwartz/Error.pm - -## lib/MT/TheSchwartz/FuncMap.pm - -## lib/MT/TheSchwartz/Job.pm - -## lib/MT/TheSchwartz/ExitStatus.pm - -## lib/MT/ObjectDriver/Driver/DBD/SQLite.pm - -## lib/MT/Compat/v3.pm - -## lib/MT/FileMgr/FTP.pm - -## lib/MT/FileMgr/DAV.pm - -## lib/MT/FileMgr/Local.pm - -## lib/MT/FileMgr/SFTP.pm - -## lib/MT/BackupRestore/ManifestFileHandler.pm - -## lib/MT/BackupRestore/BackupFileHandler.pm - -## lib/MT/Template/Context.pm - -## lib/MT/Template/ContextHandlers.pm - -## lib/MT/App/NotifyList.pm - -## lib/MT/App/Comments.pm - -## lib/MT/App/Search.pm - -## lib/MT/App/Trackback.pm - -## lib/MT/App/Upgrader.pm - -## lib/MT/App/Wizard.pm - -## lib/MT/App/Viewer.pm - -## lib/MT/App/CMS.pm - '' => '', # Translate - New - -## lib/MT/App/ActivityFeeds.pm - -## lib/MT/BasicAuthor.pm - -## lib/MT/Placement.pm - -## lib/MT/TaskMgr.pm - -## lib/MT/Page.pm - -## lib/MT/Bootstrap.pm - -## lib/MT/Category.pm - -## lib/MT/Asset.pm - -## lib/MT/Image.pm - -## lib/MT/Session.pm - -## lib/MT/Trackback.pm - -## lib/MT/Notification.pm - -## lib/MT/Upgrade.pm - -## lib/MT/Core.pm - -## lib/MT/ObjectTag.pm - -## lib/MT/Author.pm - -## lib/MT/XMLRPC.pm - -## lib/MT/ObjectAsset.pm - -## lib/MT/BackupRestore.pm - -## lib/MT/TemplateMap.pm - -## lib/MT/ConfigMgr.pm - -## lib/MT/Association.pm - -## lib/MT/Blog.pm - -## lib/MT/TBPing.pm - -## lib/MT/Builder.pm - -## lib/MT/ObjectScore.pm - -## lib/MT/Import.pm - -## lib/MT/Folder.pm - -## lib/MT/Tag.pm - -## lib/MT/App.pm - -## lib/MT/Log.pm - -## lib/MT/IPBanList.pm - -## lib/MT/AtomServer.pm - -## lib/MT/PluginData.pm - -## lib/MT/Plugin.pm - -## lib/MT/Role.pm - -## lib/MT/Entry.pm - -## lib/MT/Config.pm - -## lib/MT/Template.pm - -## lib/MT/ImportExport.pm - -## lib/MT/JunkFilter.pm - -## lib/MT/Util.pm - -## lib/MT/Mail.pm - -## lib/MT/Permission.pm - -## lib/MT/Scorable.pm - -## lib/MT/XMLRPCServer.pm - -## lib/MT/WeblogPublisher.pm - -## lib/MT/Auth.pm - -## lib/MT/Comment.pm - -## lib/MT/Component.pm - -## lib/MT/DefaultTemplates.pm - -## lib/MT.pm.pre - -## mt-static/js/dialog.js - -## mt-static/js/assetdetail.js - -## mt-static/mt.js - -## search_templates/default.tmpl - -## search_templates/results_feed.tmpl - -## search_templates/comments.tmpl - -## search_templates/results_feed_rss2.tmpl - -## tmpl/wizard/optional.tmpl - -## tmpl/wizard/complete.tmpl - -## tmpl/wizard/cfg_dir.tmpl - -## tmpl/wizard/start.tmpl - -## tmpl/wizard/packages.tmpl - -## tmpl/wizard/configure.tmpl - -## tmpl/wizard/blog.tmpl - -## tmpl/cms/include/list_associations/page_title.tmpl - -## tmpl/cms/include/copyright.tmpl - -## tmpl/cms/include/comment_table.tmpl - -## tmpl/cms/include/member_table.tmpl - -## tmpl/cms/include/feed_link.tmpl - -## tmpl/cms/include/overview-left-nav.tmpl - -## tmpl/cms/include/asset_table.tmpl - -## tmpl/cms/include/import_start.tmpl - -## tmpl/cms/include/log_table.tmpl - -## tmpl/cms/include/pagination.tmpl - -## tmpl/cms/include/backup_end.tmpl - -## tmpl/cms/include/cfg_content_nav.tmpl - -## tmpl/cms/include/notification_table.tmpl - -## tmpl/cms/include/footer.tmpl - -## tmpl/cms/include/tools_content_nav.tmpl - -## tmpl/cms/include/commenter_table.tmpl - -## tmpl/cms/include/ping_table.tmpl - -## tmpl/cms/include/entry_table.tmpl - -## tmpl/cms/include/login_mt.tmpl - -## tmpl/cms/include/author_table.tmpl - -## tmpl/cms/include/calendar.tmpl - -## tmpl/cms/include/itemset_action_widget.tmpl - -## tmpl/cms/include/anonymous_comment.tmpl - -## tmpl/cms/include/display_options.tmpl - -## tmpl/cms/include/backup_start.tmpl - -## tmpl/cms/include/chromeless_footer.tmpl - -## tmpl/cms/include/template_table.tmpl - -## tmpl/cms/include/listing_panel.tmpl - -## tmpl/cms/include/header.tmpl - -## tmpl/cms/include/archetype_editor.tmpl - -## tmpl/cms/include/blog_table.tmpl - -## tmpl/cms/include/blog-left-nav.tmpl - -## tmpl/cms/include/users_content_nav.tmpl - -## tmpl/cms/include/import_end.tmpl - -## tmpl/cms/include/archive_maps.tmpl - -## tmpl/cms/include/cfg_system_content_nav.tmpl - -## tmpl/cms/dialog/recover.tmpl - -## tmpl/cms/dialog/restore_end.tmpl - -## tmpl/cms/dialog/asset_replace.tmpl - -## tmpl/cms/dialog/asset_list.tmpl - -## tmpl/cms/dialog/comment_reply.tmpl - -## tmpl/cms/dialog/asset_upload.tmpl - -## tmpl/cms/dialog/restore_upload.tmpl - -## tmpl/cms/dialog/entry_notify.tmpl - -## tmpl/cms/dialog/asset_options.tmpl - -## tmpl/cms/dialog/adjust_sitepath.tmpl - -## tmpl/cms/dialog/asset_options_image.tmpl - -## tmpl/cms/dialog/create_association.tmpl - -## tmpl/cms/dialog/restore_start.tmpl - -## tmpl/cms/widget/new_user.tmpl - -## tmpl/cms/widget/blog_stats_recent_entries.tmpl - -## tmpl/cms/widget/mt_news.tmpl - -## tmpl/cms/widget/custom_message.tmpl - -## tmpl/cms/widget/mt_shortcuts.tmpl - -## tmpl/cms/widget/new_version.tmpl - -## tmpl/cms/widget/this_is_you.tmpl - -## tmpl/cms/widget/new_install.tmpl - -## tmpl/cms/widget/blog_stats.tmpl - -## tmpl/cms/widget/blog_stats_entry.tmpl - -## tmpl/cms/widget/blog_stats_tag_cloud.tmpl - -## tmpl/cms/widget/blog_stats_comment.tmpl - -## tmpl/cms/popup/rebuilt.tmpl - -## tmpl/cms/popup/pinged_urls.tmpl - -## tmpl/cms/popup/rebuild_confirm.tmpl - -## tmpl/cms/edit_role.tmpl - -## tmpl/cms/cfg_plugin.tmpl - -## tmpl/cms/list_blog.tmpl - -## tmpl/cms/edit_template.tmpl - -## tmpl/cms/dashboard.tmpl - -## tmpl/cms/cfg_trackbacks.tmpl - -## tmpl/cms/list_entry.tmpl - -## tmpl/cms/edit_commenter.tmpl - -## tmpl/cms/cfg_system_general.tmpl - -## tmpl/cms/list_member.tmpl - -## tmpl/cms/cfg_comments.tmpl - -## tmpl/cms/backup.tmpl - -## tmpl/cms/edit_entry.tmpl - -## tmpl/cms/view_log.tmpl - -## tmpl/cms/setup_initial_blog.tmpl - -## tmpl/cms/cfg_spam.tmpl - -## tmpl/cms/edit_folder.tmpl - -## tmpl/cms/list_notification.tmpl - -## tmpl/cms/export.tmpl - -## tmpl/cms/edit_category.tmpl - -## tmpl/cms/list_banlist.tmpl - -## tmpl/cms/list_ping.tmpl - -## tmpl/cms/error.tmpl - -## tmpl/cms/list_role.tmpl - -## tmpl/cms/list_comment.tmpl - -## tmpl/cms/cfg_web_services.tmpl - -## tmpl/cms/list_template.tmpl - -## tmpl/cms/list_tag.tmpl - -## tmpl/cms/install.tmpl - -## tmpl/cms/cfg_system_feedback.tmpl - -## tmpl/cms/edit_author.tmpl - -## tmpl/cms/edit_comment.tmpl - -## tmpl/cms/restore_end.tmpl - -## tmpl/cms/list_asset.tmpl - -## tmpl/cms/import.tmpl - -## tmpl/cms/upgrade_runner.tmpl - -## tmpl/cms/system_check.tmpl - -## tmpl/cms/restore.tmpl - -## tmpl/cms/cfg_archives.tmpl - -## tmpl/cms/rebuilding.tmpl - -## tmpl/cms/upgrade.tmpl - -## tmpl/cms/edit_blog.tmpl - -## tmpl/cms/pinging.tmpl - -## tmpl/cms/cfg_prefs.tmpl - -## tmpl/cms/restore_start.tmpl - -## tmpl/cms/preview_entry.tmpl - -## tmpl/cms/list_folder.tmpl - -## tmpl/cms/list_association.tmpl - -## tmpl/cms/login.tmpl - -## tmpl/cms/list_category.tmpl - -## tmpl/cms/cfg_entry.tmpl - -## tmpl/cms/cfg_system_users.tmpl - -## tmpl/cms/recover_password_result.tmpl - -## tmpl/cms/cfg_registration.tmpl - -## tmpl/cms/list_author.tmpl - -## tmpl/cms/import_others.tmpl - -## tmpl/cms/search_replace.tmpl - -## tmpl/cms/preview_strip.tmpl - -## tmpl/cms/edit_ping.tmpl - -## tmpl/comment/register.tmpl - -## tmpl/comment/signup.tmpl - -## tmpl/comment/login.tmpl - -## tmpl/comment/error.tmpl - -## tmpl/comment/signup_thanks.tmpl - -## tmpl/comment/profile.tmpl - -## tmpl/feeds/feed_entry.tmpl - -## tmpl/feeds/feed_comment.tmpl - -## tmpl/feeds/login.tmpl - -## tmpl/feeds/error.tmpl - -## tmpl/feeds/feed_page.tmpl - -## tmpl/feeds/feed_ping.tmpl - -## tmpl/error.tmpl - -## addons/Community.pack/lib/MT/App/Community.pm - -## addons/Community.pack/lib/MT/Community/Tags.pm - -## addons/Community.pack/lib/MT/Community/CMS.pm - -## addons/Community.pack/php/function.mtentryrecommendvotelink.php - -## addons/Community.pack/tmpl/widget/blog_stats_registration.mtml - -## addons/Community.pack/tmpl/widget/most_popular_entries.mtml - -## addons/Community.pack/tmpl/widget/recent_submissions.mtml - -## addons/Community.pack/tmpl/widget/recent_favorites.mtml - -## addons/Community.pack/tmpl/cfg_community_prefs.tmpl - -## addons/Community.pack/templates/global/register_form.mtml - -## addons/Community.pack/templates/global/simple_footer.mtml - -## addons/Community.pack/templates/global/profile_error.mtml - -## addons/Community.pack/templates/global/profile_feed_rss.mtml - -## addons/Community.pack/templates/global/userpic.mtml - -## addons/Community.pack/templates/global/new_entry_email.mtml - -## addons/Community.pack/templates/global/password_reset_form.mtml - -## addons/Community.pack/templates/global/profile_edit_form.mtml - -## addons/Community.pack/templates/global/header.mtml - -## addons/Community.pack/templates/global/profile_view.mtml - -## addons/Community.pack/templates/global/login_form.mtml - -## addons/Community.pack/templates/global/register_confirmation.mtml - -## addons/Community.pack/templates/global/user_navigation.mtml - -## addons/Community.pack/templates/global/footer.mtml - -## addons/Community.pack/templates/global/navigation.mtml - -## addons/Community.pack/templates/global/login_form_module.mtml - -## addons/Community.pack/templates/global/email_verification_email.mtml - -## addons/Community.pack/templates/global/register_notification_email.mtml - -## addons/Community.pack/templates/global/search.mtml - -## addons/Community.pack/templates/blog/rss.mtml - -## addons/Community.pack/templates/blog/archive_index.mtml - -## addons/Community.pack/templates/blog/trackbacks.mtml - -## addons/Community.pack/templates/blog/main_index.mtml - -## addons/Community.pack/templates/blog/page.mtml - -## addons/Community.pack/templates/blog/content_nav.mtml - -## addons/Community.pack/templates/blog/entry_summary.mtml - -## addons/Community.pack/templates/blog/entry_response.mtml - -## addons/Community.pack/templates/blog/comment_response.mtml - -## addons/Community.pack/templates/blog/entry_detail.mtml - -## addons/Community.pack/templates/blog/entry_form.mtml - -## addons/Community.pack/templates/blog/entry_create.mtml - -## addons/Community.pack/templates/blog/comment_detail.mtml - -## addons/Community.pack/templates/blog/comments.mtml - -## addons/Community.pack/templates/blog/comment_form.mtml - -## addons/Community.pack/templates/blog/categories.mtml - -## addons/Community.pack/templates/blog/search_results.mtml - -## addons/Community.pack/templates/blog/sidebar_2col.mtml - -## addons/Community.pack/templates/blog/sidebar_3col.mtml - -## addons/Community.pack/templates/blog/entry_listing.mtml - -## addons/Community.pack/templates/blog/dynamic_error.mtml - -## addons/Community.pack/templates/blog/tags.mtml - -## addons/Community.pack/templates/blog/entry_metadata.mtml - -## addons/Community.pack/templates/blog/entry.mtml - -## addons/Community.pack/templates/blog/comment_preview.mtml - -## addons/Community.pack/templates/blog/javascript.mtml - -## addons/Community.pack/templates/forum/main_index.mtml - -## addons/Community.pack/templates/forum/page.mtml - -## addons/Community.pack/templates/forum/entry_summary.mtml - -## addons/Community.pack/templates/forum/content_nav.mtml - -## addons/Community.pack/templates/forum/entry_response.mtml - -## addons/Community.pack/templates/forum/comment_response.mtml - -## addons/Community.pack/templates/forum/content_header.mtml - -## addons/Community.pack/templates/forum/entry_detail.mtml - -## addons/Community.pack/templates/forum/entry_form.mtml - -## addons/Community.pack/templates/forum/comment_detail.mtml - -## addons/Community.pack/templates/forum/entry_create.mtml - -## addons/Community.pack/templates/forum/comment_form.mtml - -## addons/Community.pack/templates/forum/entry_listing.mtml - -## addons/Community.pack/templates/forum/entry_metadata.mtml - -## addons/Community.pack/templates/forum/entry.mtml - -## addons/Community.pack/templates/forum/javascript.mtml - -## addons/Community.pack/templates/forum/rss.mtml - -## addons/Community.pack/templates/forum/entry_table.mtml - -## addons/Community.pack/templates/forum/archive_index.mtml - -## addons/Community.pack/templates/forum/category_groups.mtml - -## addons/Community.pack/templates/forum/comments.mtml - -## addons/Community.pack/templates/forum/search_results.mtml - -## addons/Community.pack/templates/forum/dynamic_error.mtml - -## addons/Community.pack/templates/forum/entry_popular.mtml - -## addons/Community.pack/templates/forum/comment_preview.mtml - -## addons/Community.pack/config.yaml - -## addons/Commercial.pack/lib/CustomFields/App/CMS.pm - -## addons/Commercial.pack/lib/CustomFields/Template/ContextHandlers.pm - -## addons/Commercial.pack/lib/CustomFields/Util.pm - -## addons/Commercial.pack/lib/CustomFields/Field.pm - -## addons/Commercial.pack/tmpl/date-picker.tmpl - -## addons/Commercial.pack/tmpl/edit_field.tmpl - -## addons/Commercial.pack/tmpl/reorder_fields.tmpl - -## addons/Commercial.pack/tmpl/list_field.tmpl - -## addons/Commercial.pack/tmpl/asset-chooser.tmpl - -## addons/Commercial.pack/config.yaml - -## addons/Enterprise.pack/lib/MT/Enterprise/Upgrade.pm - -## addons/Enterprise.pack/lib/MT/Enterprise/Wizard.pm - -## addons/Enterprise.pack/lib/MT/Enterprise/BulkCreation.pm - -## addons/Enterprise.pack/lib/MT/Enterprise/CMS.pm - ## addons/Enterprise.pack/lib/MT/Auth/LDAP.pm "Failed login attempt by user \'[_1]\'. A user with that\nusername already exists in the system with a different UUID." => "Mislukte aanmeldpoging door gebruiker \'[_1]\'. Er bestaat al een gebruiker met die gebruikersnaam in het systeem met een andere UUID", "Filter used to search for groups: [_1]\nSearch base: [_2]" => "Filter gebruikt om naar groepen te zoeken: [_1]\nZoekbasis: [_2]", -## addons/Enterprise.pack/lib/MT/ObjectDriver/Driver/DBD/MSSQLServer.pm - -## addons/Enterprise.pack/lib/MT/ObjectDriver/Driver/DBD/UMSSQLServer.pm - -## addons/Enterprise.pack/lib/MT/Group.pm - -## addons/Enterprise.pack/lib/MT/LDAP.pm - -## addons/Enterprise.pack/tmpl/dialog/select_groups.tmpl - -## addons/Enterprise.pack/tmpl/include/list_associations/page_title.group.tmpl - -## addons/Enterprise.pack/tmpl/include/users_content_nav.tmpl - -## addons/Enterprise.pack/tmpl/include/group_table.tmpl - -## addons/Enterprise.pack/tmpl/list_group.tmpl - -## addons/Enterprise.pack/tmpl/create_author_bulk_end.tmpl - -## addons/Enterprise.pack/tmpl/list_group_member.tmpl - -## addons/Enterprise.pack/tmpl/author_bulk.tmpl - -## addons/Enterprise.pack/tmpl/cfg_ldap.tmpl - -## addons/Enterprise.pack/tmpl/create_author_bulk_start.tmpl - -## addons/Enterprise.pack/tmpl/edit_group.tmpl - -## addons/Enterprise.pack/app-wizard.yaml - -## addons/Enterprise.pack/app-cms.yaml - -## addons/Enterprise.pack/config.yaml - -## plugins/feeds-app-lite/lib/MT/Feeds/Lite.pm - -## plugins/feeds-app-lite/lib/MT/Feeds/Tags.pm - -## plugins/feeds-app-lite/tmpl/config.tmpl - -## plugins/feeds-app-lite/tmpl/msg.tmpl - -## plugins/feeds-app-lite/tmpl/start.tmpl - -## plugins/feeds-app-lite/tmpl/select.tmpl - -## plugins/feeds-app-lite/mt-feeds.pl - -## plugins/Cloner/cloner.pl - -## plugins/Markdown/SmartyPants.pl - -## plugins/Markdown/Markdown.pl - -## plugins/WXRImporter/lib/WXRImporter/Import.pm - -## plugins/WXRImporter/lib/WXRImporter/WXRHandler.pm - -## plugins/WXRImporter/tmpl/options.tmpl - -## plugins/WXRImporter/WXRImporter.pl - -## plugins/StyleCatcher/lib/StyleCatcher/CMS.pm - -## plugins/StyleCatcher/tmpl/view.tmpl - -## plugins/StyleCatcher/stylecatcher.pl - -## plugins/TemplateRefresh/tmpl/results.tmpl - -## plugins/TemplateRefresh/TemplateRefresh.pl - -## plugins/spamlookup/lib/spamlookup.pm - -## plugins/spamlookup/tmpl/url_config.tmpl - -## plugins/spamlookup/tmpl/lookup_config.tmpl - -## plugins/spamlookup/tmpl/word_config.tmpl - -## plugins/spamlookup/spamlookup_words.pl - -## plugins/spamlookup/spamlookup.pl - -## plugins/spamlookup/spamlookup_urls.pl - -## plugins/MultiBlog/lib/MultiBlog/Tags.pm - -## plugins/MultiBlog/lib/MultiBlog.pm - -## plugins/MultiBlog/tmpl/dialog_create_trigger.tmpl - -## plugins/MultiBlog/tmpl/blog_config.tmpl - -## plugins/MultiBlog/tmpl/system_config.tmpl - -## plugins/MultiBlog/multiblog.pl - -## plugins/Textile/textile2.pl - -## plugins/WidgetManager/lib/WidgetManager/Plugin.pm - -## plugins/WidgetManager/lib/WidgetManager/CMS.pm - -## plugins/WidgetManager/default_widgets/search.tmpl - -## plugins/WidgetManager/default_widgets/subscribe_to_feed.tmpl - -## plugins/WidgetManager/default_widgets/tag_cloud_module.tmpl - -## plugins/WidgetManager/default_widgets/monthly_archive_dropdown.tmpl - -## plugins/WidgetManager/default_widgets/recent_posts.tmpl - -## plugins/WidgetManager/default_widgets/category_archive_list.tmpl - -## plugins/WidgetManager/default_widgets/calendar.tmpl - -## plugins/WidgetManager/default_widgets/recent_comments.tmpl - -## plugins/WidgetManager/default_widgets/technorati_search.tmpl - -## plugins/WidgetManager/default_widgets/monthly_archive_list.tmpl - -## plugins/WidgetManager/default_widgets/signin.tmpl - -## plugins/WidgetManager/default_widgets/widgets.cfg - -## plugins/WidgetManager/default_widgets/creative_commons.tmpl - -## plugins/WidgetManager/default_widgets/powered_by.tmpl - -## plugins/WidgetManager/tmpl/edit.tmpl - -## plugins/WidgetManager/tmpl/list.tmpl - -## plugins/WidgetManager/WidgetManager.pl - ); ## New words: 174 lib/MT/L10N/nl.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Log.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Mail.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -13,9 +13,11 @@ sub new { if (my @servers = $cfg->MemcachedServers) { require Cache::Memcached; + my $ns = $cfg->MemcachedNamespace; return bless { memcached => Cache::Memcached->new({ servers => \@servers, + ( $ns ? ( namespace => $ns ) : () ), debug => 0, }) }, $class; lib/MT/Memcached.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Notification.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -194,14 +194,17 @@ sub install_properties { # Special handling for 'Taggable' objects; automatic saving # and removal of tags. - if ($class->isa('MT::Taggable')) { - # synchronize tags if necessary - $class->add_trigger( post_save => \&post_save_tags ); - $class->add_trigger( pre_remove => \&pre_remove_tags ); + my @isa; + { + no strict 'refs'; + @isa = @{ $class . '::ISA' }; } - - if ($class->isa('MT::Scorable')) { - $class->add_trigger( post_remove => \&post_remove_score ); + foreach my $isa_pkg ( @isa ) { + next unless $isa_pkg =~ /able$/; + next if $isa_pkg eq $class; + if ($isa_pkg->can('install_properties')) { + $isa_pkg->install_properties($class); + } } # install legacy date translation @@ -218,29 +221,6 @@ sub install_properties { return $props; } -# post_save trigger for MT::Taggable objects to synchronize tags upon save. -sub post_save_tags { - my $class = shift; - my ($obj) = @_; - $obj->save_tags; -} - -sub pre_remove_tags { - my $class = shift; - my ($obj) = @_; - $obj->remove_tags if ref $obj; -} - -sub post_remove_score { - my $class = shift; - my ($obj) = @_; - require MT::ObjectScore; - MT::ObjectScore->remove({ - object_ds => $obj->datasource, - object_id => $obj->id, - }); -} - # A post-load trigger for classed objects sub post_load_rebless_object { my $obj = shift; @@ -508,6 +488,83 @@ sub translate_audited_fields { return; } +sub nextprev { + my $obj = shift; + my $class = ref($obj); + my %param = @_; + my ($direction, $terms, $args, $by_field) + = @param{qw( direction terms args by )}; + return undef unless ($direction eq 'next' || $direction eq 'previous'); + my $next = $direction eq 'next'; + + if (!$by_field) { + return if !$class->properties->{audit}; + $by_field = 'created_on'; + } + + # Selecting the adjacent object can be tricky since timestamps + # are not necessarily unique for entries. If we find that the + # next/previous object has a matching timestamp, keep selecting entries + # to select all entries with the same timestamp, then compare them using + # id as a secondary sort column. + + my ($id, $ts) = ($obj->id, $obj->$by_field()); + local @$args{qw( sort direction range_incl )} + = ($by_field, $next ? 'ascend' : 'descend', { $by_field => 1 }); + my $iter = $class->load_iter({ + $by_field => ($next ? [ $ts, undef ] : [ undef, $ts ]), + %{$terms} + }, $args); + + # This selection should always succeed, but handle situation if + # it fails by returning undef. + return unless $iter; + + # The 'same' array will hold any entries that have matching + # timestamps; we will then sort those by id to find the correct + # adjacent object. + my @same; + while (my $e = $iter->()) { + # Don't consider the object that is 'current' + next if $e->id == $id; + my $e_ts = $e->$by_field(); + if ($e_ts eq $ts) { + # An object with the same timestamp should only be + # considered if the id is in the scope we're looking for + # (greater than for the 'next' object; less than for + # the 'previous' object). + push @same, $e + if $next && $e->id > $id or !$next && $e->id < $id; + } else { + # We found an object with a timestamp different than + # the 'current' object. + if (!@same) { + push @same, $e; + # We should check to see if this new timestamped object also + # has entries adjacent to _it_ that have the same timestamp. + while (my $e = $iter->()) { + push(@same, $e), next if $e->$by_field() eq $e_ts; + $iter->('finish'), last; + } + } else { + $iter->('finish'); + } + return $e unless @same; + last; + } + } + if (@same) { + # If we only have 1 element in @same, return that. + return $same[0] if @same == 1; + # Sort remaining elements in @same by id. + @same = sort { $a->id <=> $b->id } @same; + # Return front of list (smallest id) if selecting 'next' + # object. Return tail of list (largest id) if selection 'previous'. + return $same[$next ? 0 : $#same]; + } + return; +} + ## Drivers. # Note: Removed methods: set_driver @@ -817,7 +874,9 @@ sub set_by_key { # the content to cache if caching is enabled. Thus, we must ensure any # metadata is serialized prior to caching. sub column_values { - if ($_[0]->properties->{meta_column}) { + my $props = $_[0]->properties; + if ($props->{meta_column} + && $_[0]->{changed_cols}{$props->{meta_column}}) { $_[0]->pre_save_serialize_metadata; } return $_[0]->SUPER::column_values(@_); @@ -849,6 +908,12 @@ sub column_def { return $def; } +sub index_defs { + my $obj = shift; + my $props = $obj->properties; + $props->{indexes}; +} + sub column_defs { my $obj = shift; my $props = $obj->properties; lib/MT/Object.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/ObjectAsset.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -13,6 +13,7 @@ use DBI qw(:sql_types); # Must be implemented! sub column_defs; +sub index_defs {} sub can_add_column { 0 } sub can_alter_column { 0 } @@ -40,7 +41,7 @@ sub add_column { push @stmts, $ddl->index_column_sql(@_); return @stmts; } - + sub alter_column { my $ddl = shift; return $ddl->alter_column_sql(@_); @@ -51,6 +52,11 @@ sub drop_column { return $ddl->drop_column_sql(@_); } +sub index_column { + my $ddl = shift; + return $ddl->drop_index_sql(@_), $ddl->index_column_sql(@_); +} + sub fix_class { my $ddl = shift; my ($class) = @_; @@ -184,6 +190,25 @@ sub drop_table_sql { return "DROP TABLE $table_name"; } +sub drop_index_sql { + my $ddl = shift; + my ($class, $key) = @_; + my $table_name = $class->table_name; + + my $props = $class->properties; + my $indexes = $props->{indexes}; + return q() unless exists($indexes->{$key}); + + if (ref $indexes->{$key} eq 'HASH') { + my $idx_info = $indexes->{$key}; + if ($idx_info->{unique} && $ddl->can_add_constraint) { + return "ALTER TABLE $table_name DROP CONSTRAINT ${table_name}_$key"; + } + } + + return "DROP INDEX ${table_name}_$key ON $table_name"; +} + sub create_table_as_sql { my $ddl = shift; my ($class) = @_; @@ -236,30 +261,7 @@ sub index_table_sql { my $pk = $props->{primary_key}; foreach my $name (keys %$indexes) { next if $pk && $name eq $pk; - if (!ref($indexes->{$name})) { - # Simple, single column index - push @stmts, "CREATE INDEX ${table_name}_$name ON $table_name (${field_prefix}_$name)"; - } - elsif (ref $indexes->{$name} eq 'HASH') { - my $idx_info = $indexes->{$name}; - my $column_list = $idx_info->{columns} || [ $name ]; - my $columns = ''; - foreach my $col (@$column_list) { - $columns .= ',' unless $columns eq ''; - $columns .= $field_prefix . '_' . $col; - } - if ($columns) { - if ($idx_info->{unique} && $ddl->can_add_constraint) { - push @stmts, "ALTER TABLE $table_name ADD CONSTRAINT ${table_name}_$name UNIQUE ($columns)"; - } - else { - push @stmts, "CREATE INDEX ${table_name}_$name ON $table_name ($columns)"; - } - } - else { - die "Invalid definition of unique index for class $class: no columns were identified"; - } - } + push @stmts, $ddl->index_column_sql($class, $name); } } lib/MT/ObjectDriver/DDL.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -14,6 +14,85 @@ sub can_add_column { 1 } sub can_drop_column { 1 } sub can_alter_column { 0 } +sub index_defs { + my $ddl = shift; + my ($class) = @_; + my $driver = $class->driver; + my $dbh = $driver->r_handle; + my $field_prefix = $class->datasource; + my $table_name = $class->table_name; + my $sth = $dbh->prepare(<<SQL) +SELECT cidx.relname as index_name, idx.indisunique, idx.indisprimary, idx.indnatts, idx.indkey, am.amname +FROM pg_index idx +INNER JOIN pg_class cidx ON idx.indexrelid = cidx.oid +INNER JOIN pg_class ctbl ON idx.indrelid = ctbl.oid +INNER JOIN pg_am am ON cidx.relam = am.oid +WHERE ctbl.relname = '$table_name' +SQL + or return undef; + $sth->execute or return undef; + + my $defs = {}; + while (my $row = $sth->fetchrow_hashref) { + next if 1 == $row->{'indisprimary'}; + + my $key = $row->{'index_name'}; + next unless $key =~ m/^(mt_)?\Q$field_prefix\E_/; + $key = 'mt_' . $key unless $key =~ m/^mt_/; + + my $type = $row->{'amname'}; + # ignore fulltext or other unrecognized indexes for now + next unless $type eq 'btree'; + + my $is_unique = $row->{'indisunique'}; + $key =~ s/^mt_\Q$field_prefix\E_//; + + my $indkeys = $row->{'indkey'}; + $indkeys =~ s/\s+/,/g; + + my $sth_att = $dbh->prepare(<<ATTSQL) +SELECT attnum, attname +FROM pg_attribute att +INNER JOIN pg_class ctbl ON att.attrelid = ctbl.oid +WHERE att.attnum IN ($indkeys) +AND ctbl.relname = '$table_name' +ATTSQL + or next; + $sth_att->execute or next; + my $row_att = $sth_att->fetchall_hashref('attnum'); + $sth_att->finish; + + my $cols; + if ( 1 == $row->{'indnatts'} ) { + # $indkeys have column's attnum + my $col = $row_att->{$indkeys}->{'attname'}; + $col =~ s/^\Q$field_prefix\E_//; + $cols = [ $col ]; + } + else { + my @cols; + for my $indkey ( split ',', $indkeys ) { + my $col = $row_att->{$indkey}->{'attname'}; + $col =~ s/^\Q$field_prefix\E_//; + push @cols, $col; + } + $cols = \@cols; + } + if ( $is_unique ) { + $defs->{$key} = { 'unique' => 1, 'columns' => $cols }; + } + else { + if ((@$cols == 1) && ($key eq $cols->[0])) { + $defs->{$key} = 1; + } else { + $defs->{$key} = { 'columns' => $cols }; + } + } + } + $sth->finish; + return $defs; +} + sub column_defs { my $ddl = shift; my ($class) = @_; lib/MT/ObjectDriver/DDL/Pg.pm @@ -1,9 +1,85 @@ +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + package MT::ObjectDriver::DDL::SQLite; use strict; use warnings; use base qw( MT::ObjectDriver::DDL ); +sub index_defs { + my $ddl = shift; + my ($class) = @_; + my $driver = $class->driver; + my $dbh = $driver->r_handle; + my $field_prefix = $class->datasource; + my $table_name = $class->table_name; + my $sth = $dbh->prepare(<<SQL) +SELECT name, sql +FROM sqlite_master +WHERE type = "index" +AND tbl_name="$table_name" +SQL + or return undef; + $sth->execute or return undef; + + my $defs = {}; + while (my $row = $sth->fetchrow_hashref) { + my $key = $row->{'name'}; + next unless $key =~ m/^(mt_)?\Q$field_prefix\E_/; + next if $key =~ m/(.+autoindex)/; + my $sql = $row->{'sql'} + or next; + + $key =~ s/^mt_\Q$field_prefix\E_//; + my $cols = []; + my $is_unique = 0; + my $idx_columns; + if ( $sql =~ m/CREATE( UNIQUE)? INDEX (?:.+?) ON $table_name \((.+?)\)/i ) { + $is_unique = $1 ? 'unique' eq lc($1) : 0; + $idx_columns = $2; + for my $col ( split ',', $idx_columns ) { + $col =~ s/^\Q$field_prefix\E_//; + push @$cols, $col; + } + } + unless ( $is_unique ) { + # Check constraints to identify unique index + my $sth_tbl = $dbh->prepare(<<TBLSQL); +SELECT name, sql FROM sqlite_master +WHERE type = "table" AND name = "$table_name" +TBLSQL + $sth_tbl->execute or next; + my $rows_tbl = $sth_tbl->fetchall_hashref('name'); + $sth_tbl->finish; + my $sql_tbl = $rows_tbl->{$table_name}->{'sql'} + or next; + my $idx_name = $row->{'name'}; + if ( $sql_tbl =~ m/CONSTRAINT\s+$idx_name\s+UNIQUE\s+\(\s*$idx_columns\s*\)/im ) { + $is_unique = 1; + } + } + + if ( $is_unique ) { + $defs->{$key} = { 'unique' => 1, 'columns' => $cols }; + } + else { + if ((@$cols == 1) && ($key eq $cols->[0])) { + $defs->{$key} = 1; + } else { + $defs->{$key} = { 'columns' => $cols }; + } + } + + } + $sth->finish; + + return $defs; +} + sub column_defs { my $ddl = shift; my ($class) = @_; @@ -120,4 +196,16 @@ sub unique_constraint_sql { return q(); } +sub drop_index_sql { + my $ddl = shift; + my ($class, $key) = @_; + my $table_name = $class->table_name; + + my $props = $class->properties; + my $indexes = $props->{indexes}; + return q() unless exists($indexes->{$key}); + + return "DROP INDEX ${table_name}_$key"; +} + 1; lib/MT/ObjectDriver/DDL/SQLite.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -14,6 +14,62 @@ sub can_add_column { 1 } sub can_drop_column { 1 } sub can_alter_column { 1 } +sub index_defs { + my $ddl = shift; + my ($class) = @_; + my $driver = $class->driver; + my $dbh = $driver->r_handle; + my $field_prefix = $class->datasource; + my $table_name = $class->table_name; + my $sth = $dbh->prepare('SHOW INDEX FROM ' . $table_name) + or return undef; + $sth->execute or return undef; + + my $bags = {}; + my $unique = {}; + while (my $row = $sth->fetchrow_hashref) { + my $key = $row->{'Key_name'}; + next unless $key =~ m/^(mt_)?\Q$field_prefix\E_/; + $key = 'mt_' . $key unless $key =~ m/^mt_/; + + my $type = $row->{'Index_type'}; + + # ignore fulltext or other unrecognized indexes for now + next unless $type eq 'BTREE'; + + my $seq = $row->{'Seq_in_index'}; + my $col = $row->{'Column_name'}; + my $non_unique = $row->{'Non_unique'}; + my $null = $row->{'Null'}; + $key =~ s/^mt_\Q$field_prefix\E_//; + $col =~ s/^\Q$field_prefix\E_//; + $unique->{$key} = 1 unless $non_unique; + my $idx_bag = $bags->{$key} ||= []; + $idx_bag->[$seq - 1] = $col; + } + $sth->finish; + if (!%$bags) { + return undef; + } + + my $defs = {}; + foreach my $key (keys %$bags) { + my $cols = $bags->{$key}; + if ($unique->{$key}) { + $defs->{$key} = { columns => $cols, unique => 1 }; + } + else { + if ((@$cols == 1) && ($key eq $cols->[0])) { + $defs->{$key} = 1; + } else { + $defs->{$key} = { columns => $cols }; + } + } + } + + return $defs; +} + sub column_defs { my $ddl = shift; my ($class) = @_; lib/MT/ObjectDriver/DDL/mysql.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/ObjectDriver/Driver/DBD/Legacy.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/ObjectDriver/Driver/DBD/Pg.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/ObjectDriver/Driver/DBD/SQLite.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/ObjectDriver/Driver/DBD/mysql.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -194,7 +194,12 @@ sub _select_aggregate { } ## Convert $terms and $args like we would for a search. - my $terms = $orig_terms ? { %$orig_terms } : undef; + my $terms; + if (ref($orig_terms) eq 'HASH') { + $terms = { %$orig_terms }; + } elsif (ref($orig_terms) eq 'ARRAY') { + $terms = [ @$orig_terms ]; + } my $args = $orig_args ? { %$orig_args } : undef; $class->call_trigger('pre_search', $terms, $args); @@ -324,10 +329,19 @@ sub prepare_statement { $stmt->from([ $tbl ]); if (defined($terms)) { - for my $col (keys %$terms) { - my $db_col = $dbd->db_column_name($tbl, $col); - $stmt->add_where($db_col, $terms->{$col}); + $stmt->column_mutator(sub { + my ($col) = @_; + return $dbd->db_column_name($tbl, $col); + }); + if (ref $terms eq 'ARRAY') { + $stmt->add_complex_where($terms); + } + else { + for my $col (keys %$terms) { + $stmt->add_where(join('.', $tbl, $col), $terms->{$col}); + } } + $stmt->column_mutator(undef); } ## Set statement's ORDER clause if any. lib/MT/ObjectDriver/Driver/DBI.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -127,7 +127,6 @@ sub as_sql { } $stmt->select($old_sel) if $old_sel; - return $sql; } @@ -135,75 +134,156 @@ sub _mk_term { my $stmt = shift; my ($col, $val) = @_; - ## Rearrange the value into an inclusive range. - my $range_incl = $stmt->range_incl; - my $range = $stmt->range; $col =~ s/ \A [\w\.]+? \. //x; - ## We may recurse, so let us empty range inclusions in our scope. - local $range_incl->{$col} = $range_incl->{$col}; - local $range->{$col} = $range->{$col}; - if($range_incl->{$col} || $range->{$col}) { - my ($lt, $gt) = $range_incl->{$col} ? ('<=', '>=') : ('<', '>'); - my @vals; - - my ($first_val, $last_val) = @$val; - ## Ignore first value if it's zero (right-bounded range, eg [0, 20050101000000] ) - if($first_val) { - push @vals, { op => $gt, value => $first_val }; - } - ## Ignore last value if it's not defined (left-bounded range, eg [20050101000000] ) - if(defined $last_val) { - push @vals, { op => $lt, value => $last_val }; - } - if(2 == scalar @vals) { - $val = [ '-and', @vals ]; - } else { - ($val) = @vals; - } - ## Because the new value is an arrayref, we're about to get - ## called recursively with each of those hashrefs inside it. - ## So ignore that we're using an inclusive range within this - ## call's scope. - undef ($range_incl->{$col} ? $range_incl->{$col} : $range->{$col}); + ## Any last-minute property -> field name manipulation + if (my $m = $stmt->column_mutator) { + $col = $m->($col); } - ## Translate dates from app to database format. - if($stmt->date_columns->{$col}) { - my $realval = $val; - if(ref($val) eq 'HASH') { - $val->{value} = ts2db($val->{value}); - } elsif(!ref($val)) { - $val = ts2db($val); + if (ref $val eq 'HASH') { + if (!exists $val->{op}) { + # hash-style value, containing hints on operation + if (exists $val->{like}) { + $val = { op => 'LIKE', value => $val->{like} }; + } + elsif (exists $val->{not_null}) { + $val = \'is not null'; + } + elsif (exists $val->{not}) { + my $v = $val->{not}; + if ('ARRAY' eq ref($v)) { + my $v = 'NOT IN (' . join(',', @$v) . ')'; + $val = \$v; + } elsif (ref $v) { + die "Unsupported value in 'not' column"; + } else { + $val = { value => $v, + op => '!=' }; + } + } + elsif (exists $val->{between}) { + my $low = @{$val->{between}}[0]; + my $high = @{$val->{between}}[1]; + if($stmt->date_columns->{$col}) { + $low = ts2db($low); + $high = ts2db($high); + } + $val = [ '-and', { op => '>=', value => $low }, + { op => '<=', value => $high } ]; + } + elsif (exists $val->{'>='}) { + $val = { op => '>=', value => $val->{'>='} }; + } + elsif (exists $val->{'>'}) { + $val = { op => '>', value => $val->{'>'} }; + } + elsif (exists $val->{'<='}) { + $val = { op => '<=', value => $val->{'<='} }; + } + elsif (exists $val->{'<'}) { + $val = { op => '<', value => $val->{'<'} }; + } + elsif (exists $val->{'!='}) { + $val = { op => '!=', value => $val->{'!='} }; + } } - } - if($stmt->not->{$col}) { - if ('ARRAY' eq ref($val)) { - my $v = 'NOT IN (' . join(',', @$val) . ')'; - $val = \$v; - } elsif (ref $val) { - die "Unsupported value in 'not' column"; - } else { - $val = { value => $val, - op => '!=', }; + ## Translate dates from app to database format. + if(($stmt->date_columns->{$col}) && (ref($val) eq 'HASH')) { + my $v = $val->{value}; + if (ref($v) eq 'ARRAY') { + $v->[$_] = ts2db($v->[$_]) for @$v; + } + else { + $val->{value} = ts2db($v); + } } } + else { + ## Rearrange the value into an inclusive range. + my $range_incl = $stmt->range_incl; + my $range = $stmt->range; + + ## We may recurse, so let us empty range inclusions in our scope. + local $range_incl->{$col} = $range_incl->{$col}; + local $range->{$col} = $range->{$col}; + if ($range_incl->{$col} || $range->{$col}) { + my ($lt, $gt) = $range_incl->{$col} ? ('<=', '>=') : ('<', '>'); + my @vals; + + my ($first_val, $last_val) = @$val; + if ($stmt->date_columns->{$col}) { + $first_val = ts2db($first_val) if defined $first_val; + $last_val = ts2db($last_val) if defined $last_val; + } + + ## Ignore first value if it's undef (right-bounded range, eg [undef, 20050101000000] ) + if (defined $first_val) { + push @vals, { op => $gt, value => $first_val }; + } + ## Ignore last value if it's defined (left-bounded range, eg [20050101000000] ) + if (defined $last_val) { + push @vals, { op => $lt, value => $last_val }; + } + if (2 == scalar @vals) { + $val = [ '-and', @vals ]; + } + else { + ($val) = @vals; + } + + ## Because the new value is an arrayref, we're about to get + ## called recursively with each of those hashrefs inside it. + ## So ignore that we're using an inclusive range within this + ## call's scope. + undef ($range_incl->{$col} ? $range_incl->{$col} : $range->{$col}); + } - if($stmt->null->{$col}) { - $val = \'is null'; - } + ## Translate dates from app to database format. + if ($stmt->date_columns->{$col}) { + if (ref($val) eq 'HASH') { + my $v = $val->{value}; + if (ref($v) eq 'ARRAY') { + $v->[$_] = ts2db($v->[$_]) for @$v; + } + else { + $val->{value} = ts2db($v); + } + } elsif (!ref($val)) { + $val = ts2db($val); + } + } - if($stmt->not_null->{$col}) { - $val = \'is not null'; - } + if ($stmt->not->{$col}) { + if ('ARRAY' eq ref($val)) { + my $v = 'NOT IN (' . join(',', @$val) . ')'; + $val = \$v; + } + elsif (ref $val) { + die "Unsupported value in 'not' column"; + } + else { + $val = { value => $val, + op => '!=', }; + } + } + + if ($stmt->null->{$col}) { + $val = \'is null'; + } - if($stmt->like->{$col}) { - if(ref($val) eq 'HASH') { - $val->{op} = 'LIKE'; - } elsif(!ref($val)) { - $val = { op => 'LIKE', - value => $val, }; + if ($stmt->not_null->{$col}) { + $val = \'is not null'; + } + + if ($stmt->like->{$col}) { + if (ref($val) eq 'HASH') { + $val->{op} = 'LIKE'; + } elsif (!ref($val)) { + $val = { op => 'LIKE', + value => $val, }; + } } } @@ -211,8 +291,11 @@ sub _mk_term { if(my $transformed_column = $stmt->transform->{$col}) { $col = $transformed_column; } - - return $stmt->SUPER::_mk_term($col, $val); + + ## Prevent D::OD from re-mutating, since we've done it here + local $stmt->{column_mutator} = undef; + + $stmt->SUPER::_mk_term($col, $val); } sub make_subselect { lib/MT/ObjectDriver/SQL.pm @@ -1,3 +1,9 @@ +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + package MT::ObjectDriver::SQL::Pg; use strict; lib/MT/ObjectDriver/SQL/Pg.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/ObjectDriver/SQL/SQLite.pm @@ -1,3 +1,9 @@ +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + package MT::ObjectDriver::SQL::mysql; use strict; lib/MT/ObjectDriver/SQL/mysql.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/ObjectDriverFactory.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/ObjectScore.pm @@ -1,3 +1,9 @@ +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + package MT::ObjectTag; use strict; lib/MT/ObjectTag.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Page.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Permission.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Placement.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -38,7 +38,15 @@ sub plugin_link { &MT::Component::_getset(shift, 'plugin_link', @_) } sub config_link { &MT::Component::_getset(shift, 'config_link', @_) } sub doc_link { &MT::Component::_getset(shift, 'doc_link', @_) } sub description { &MT::Component::_getset_translate(shift, 'description', @_) } -sub settings { &MT::Component::_getset(shift, 'settings', @_) } +sub settings { + my $plugin = shift; + my $s = &MT::Component::_getset($plugin, 'settings', @_); + unless (ref($s) eq 'MT::PluginSettings') { + $s = MT::PluginSettings->new($s); + &MT::Component::_getset($plugin, 'settings', $s); + } + return $s; +} sub icon { &MT::Component::_getset(shift, 'icon', @_) } # Plugin-specific: configuration settings and data @@ -87,7 +95,11 @@ sub config_template { } else { $scope = 'system'; } - if (my $tmpl = $plugin->{"${scope}_config_template"} || $plugin->{'config_template'}) { + my $r = $plugin->registry; + if (my $tmpl = $r->{"${scope}_config_template"} || + $r->{"config_template"} || + $plugin->{"${scope}_config_template"} || + $plugin->{'config_template'}) { return $tmpl->($plugin, @_) if ref $tmpl eq 'CODE'; if ($tmpl =~ /\s/) { return $tmpl; @@ -106,7 +118,7 @@ sub config_vars { if (my $s = $plugin->settings) { foreach my $setting (@$s) { my ($name, $param) = @$setting; - next if $scope && $param->{Scope} && $param->{Scope} ne $scope; + next if $scope && $param->{scope} && $param->{scope} ne $scope; push @settings, $name; } } @@ -202,6 +214,22 @@ sub new { my $pkg = shift; my ($self) = @_; $self ||= []; + if (ref $self eq 'HASH') { + # convert a hash-style setting structure into what PluginSettings + # expects + my $settings = []; + foreach my $key (keys %$self) { + if (defined $self->{$key}) { + push @$settings, [ $key, $self->{$key} ]; + } + else { + push @$settings, [ $key ]; + } + } + @$settings = sort { ( $a->[1] ? $a->[1]->{order} || 0 : 0 ) + <=> ( $b->[1] ? $b->[1]->{order} || 0 : 0 ) } @$settings; + $self = $settings; + } # Lowercase all settings keys foreach my $setting (@$self) { my ($name, $param) = @$setting; @@ -406,63 +434,6 @@ modes and their handlers. For example: } } -=item * app_action_links - -Used to register plugin action links that are displayed on various pages -within the MT::App::CMS application. The format for this key is: - - app_action_links => { - 'MT::App::CMS' => { # application the action applies to - 'type' => { - link => 'myplugin.cgi', - link_text => 'Configure MyPlugin' - } - } - } - -This is an alternative to using C<MT-E<gt>add_plugin_action>. - -=item * app_itemset_actions - -Used to register plugin itemset action links that are displayed on various -listings within the MT::App::CMS application. The format for this key is: - - app_itemset_actions => { - 'MT::App::CMS' => { # application the action applies to - $type => { - key => 'unique_action_name', - label => 'Uppercase text', - code => \&itemset_handler - } - } - } - -Where C<$type> should be an MT item such as 'entry', 'asset', 'ping', -etc. - -Please see the full documentation of these C<type> options in the -L<MT::App::CMS> add_itemset_action section. - -In the event that you need to register multiple actions for a single type, -you can use the alternate format: - - app_itemset_actions => { - 'MT::App::CMS' => [ # application the action applies to - { type => 'type', - key => 'unique_action_name', - label => 'Uppercase text', - code => \&itemset_handler_upper - }, - { type => 'type', - key => 'unique_action_name2', - label => 'Lowercase text', - code => \&itemset_handler_lower - } - ] - } - -This is an alternative to using C<MT::App::CMS-E<gt>add_itemset_action>. - =item * callbacks Used to register object or application callbacks with the callback lib/MT/Plugin.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Plugin/JunkFilter.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Plugin/L10N.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/PluginData.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Promise.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Request.pm @@ -1,5 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.movabletype.org. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Role.pm @@ -1,16 +1,11 @@ -# --------------------------------------------------------------------------- -# This software is provided as-is. -# You may use it for commercial or personal use. -# If you distribute it, please keep this notice intact. -# -# Original Copyright (c) 2002 Brad Choate -# --------------------------------------------------------------------------- -# Modifications and integration Copyright 2002-2007 Six Apart. -# This code cannot be redistributed without permission from www.sixapart.com. -# For more information, consult your Movable Type license. +# Movable Type (r) Open Source (C) 2002-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ +# Original Copyright (c) 2002 Brad Choate + package MT::Sanitize; use strict; lib/MT/Sanitize.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -14,6 +14,22 @@ use MT::Memcached; use constant SCORE_CACHE_TIME => 7 * 24 * 60 * 60; ## 1 week +sub install_properties { + my $pkg = shift; + my ($class) = @_; + $class->add_trigger( post_remove => \&post_remove_score ); +} + +sub post_remove_score { + my $class = shift; + my ($obj) = @_; + require MT::ObjectScore; + MT::ObjectScore->remove({ + object_ds => $obj->datasource, + object_id => $obj->id, + }); +} + sub get_score { my $obj = shift; my ( $namespace, $user ) = @_; lib/MT/Scorable.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Serialize.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Session.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/TBPing.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -293,6 +293,28 @@ package MT::Taggable; use constant TAG_CACHE_TIME => 7 * 24 * 60 * 60; ## 1 week +sub install_properties { + my $pkg = shift; + my ($class) = @_; + + # synchronize tags if necessary + $class->add_trigger( post_save => \&post_save_tags ); + $class->add_trigger( pre_remove => \&pre_remove_tags ); +} + +# post_save trigger for MT::Taggable objects to synchronize tags upon save. +sub post_save_tags { + my $class = shift; + my ($obj) = @_; + $obj->save_tags; +} + +sub pre_remove_tags { + my $class = shift; + my ($obj) = @_; + $obj->remove_tags if ref $obj; +} + sub tag_cache_key { my $obj = shift; return undef unless $obj->id; @@ -439,6 +461,7 @@ sub remove_tags { my @et = MT::ObjectTag->load({ object_id => $obj->id, object_datasource => $obj->datasource }); $_->remove for @et; + $obj->{__tags} = []; delete $obj->{__save_tags}; MT::Tag->clear_cache(datasource => $obj->datasource, ($obj->blog_id ? (blog_id => $obj->blog_id) : ())) if @et; lib/MT/Tag.pm @@ -1,3 +1,9 @@ +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + package MT::Task; use strict; lib/MT/Task.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/TaskMgr.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Template.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -276,6 +276,19 @@ sub set_blog_load_context { || $attr->{include_blogs} || $attr->{exclude_blogs}; + if (defined($blog_ids) && ($blog_ids =~ m/-/)) { + my @list = split /\s*,\s*/, $blog_ids; + my @ids; + foreach my $id (@list) { + if ($id =~ m/^(\d+)-(\d+)$/) { + push @ids, $_ for $1..$2; + } else { + push @ids, $id; + } + } + $blog_ids = join ",", @ids; + } + # If no blog IDs specified, use the current blog if ( ! $blog_ids ) { $terms->{$col} = $blog_id if $col eq 'blog_id'; lib/MT/Template/Context.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -88,6 +88,8 @@ sub core_tags { 'IfBlog?' => \&_hdlr_blog_id, 'IfAuthor?' => \&_hdlr_if_author, + 'AuthorHasEntry?' => \&_hdlr_author_has_entry, + 'AuthorHasPage?' => \&_hdlr_author_has_page, Authors => \&_hdlr_authors, Blogs => \&_hdlr_blogs, @@ -692,12 +694,12 @@ sub _fltr_regex_replace { return $str unless ref($val) eq 'ARRAY'; my $patt = $val->[0]; my $replace = $val->[1]; - if ($patt =~ m!^(/)(.+?)\1([A-Za-z\s]+)?$!) { + if ($patt =~ m!^(/)(.+)\1([A-Za-z]+)?$!) { $patt = $2; my $global; if (my $opt = $3) { $global = 1 if $opt =~ m/g/; - $opt =~ s/[ge\s]+//g; + $opt =~ s/[ge]+//g; $patt = "(?$opt)" . $patt; } my $re = eval { qr/$patt/ }; @@ -1104,10 +1106,8 @@ sub _hdlr_app_page_actions { <mtapp:widget id="page_actions" label="<__trans phrase="Actions">"> - <mt:loop name="page_actions"> - <mt:if name="__first__"> <ul> - </mt:if> + <mt:loop name="page_actions"> <mt:if name="page"> <li class="icon-left icon<mt:unless name="core">-plugin</mt:unless>-action"><a href="<mt:var name="page" escape="html"><mt:if name="page_has_params">&amp;</mt:if>from=$from<mt:if name="id">&amp;id=<mt:var name="id"></mt:if><mt:if name="blog_id">&amp;blog_id=<mt:var name="blog_id"></mt:if>$mt&amp;return_args=<mt:var name="return_args" escape="url">"<mt:if name="continue_prompt"> onclick="return confirm('<mt:var name="continue_prompt" escape="js">');"</mt:if>><mt:var name="label"></a></li> <mt:else><mt:if name="link"> @@ -1115,10 +1115,8 @@ sub _hdlr_app_page_actions { </mt:if><mt:if name="dialog"> <li class="icon-left icon<mt:unless name="core">-plugin</mt:unless>-action"><a href="javascript:void(0)" onclick="<mt:if name="continue_prompt">if(!confirm('<mt:var name="continue_prompt" escape="js">'))return false;</mt:if>return openDialog(false, '<mt:var name="dialog">', '<mt:if name="dialog_args"><mt:var name="dialog_args" escape="url">&amp;</mt:if>from=$from<mt:if name="id">&amp;id=<mt:var name="id"></mt:if><mt:if name="blog_id">&amp;blog_id=<mt:var name="blog_id"></mt:if>$mt&amp;return_args=<mt:var name="return_args" escape="url">')"><mt:var name="label"></a></li> </mt:if></mt:if> - <mt:if name="__last__"> - </ul> - </mt:if> </mt:loop> + </ul> </mtapp:widget> EOT } @@ -1241,11 +1239,13 @@ sub _hdlr_app_setting { return $ctx->build(<<"EOT"); <div id="$id-field" class="field$req_class $label_class pkg $class"$indent_css> - <div class="field-header"> - <label id="$id-label" for="$id">$label$req</label> - </div> - <div class="field-content $content_class"> - $insides$hint$warning + <div class="field-inner"> + <div class="field-header"> + <label id="$id-label" for="$id">$label$req</label> + </div> + <div class="field-content $content_class"> + $insides$hint$warning + </div> </div> </div> EOT @@ -1299,13 +1299,33 @@ sub _hdlr_if { my $var = $args->{name} || $args->{var}; my $value; if (defined $var) { + # pick off any {...} or [...] from the name. + my ($index, $key); + if ($var =~ m/^(.+)([\[\{])(.+)[\]\}]$/) { + $var = $1; + my $br = $2; + my $ref = $3; + if ($ref =~ m/^\$(.+)/) { + $ref = $ctx->var($1); + } + $br eq '[' ? $index = $ref : $key = $ref; + } else { + $index = $args->{index} if exists $args->{index}; + $key = $args->{key} if exists $args->{key}; + } + $value = $ctx->var($var); if (ref($value)) { if (UNIVERSAL::isa($value, 'MT::Template')) { + local $value->{context} = $ctx; $value = $value->output(); } elsif (UNIVERSAL::isa($value, 'MT::Template::Tokens')) { local $ctx->{__stash}{tokens} = $value; $value = _hdlr_pass_tokens(@_) or return; + } elsif (ref($value) eq 'ARRAY') { + $value = $value->[$index] if defined $index; + } elsif (ref($value) eq 'HASH') { + $value = $value->{$key} if defined $key; } } } @@ -1324,6 +1344,13 @@ sub _hdlr_if { } } + if ( my $op = $args->{op} ) { + my $rvalue = $args->{'value'}; + if ( $op && (defined $value) && !ref($value) ) { + $value = _math_operation($ctx, $op, $value, $rvalue); + } + } + my $numeric = qr/^[-]?\d+(\.\d+)?$/; no warnings; if (exists $args->{eq}) { @@ -1432,7 +1459,41 @@ sub _hdlr_loop { my ($ctx, $args, $cond) = @_; my $name = $args->{name} || $args->{var}; my $var = $ctx->var($name); - return '' unless $var && (ref($var) eq 'ARRAY') && (scalar @$var); + return '' unless $var + && ( (ref($var) eq 'ARRAY') && (scalar @$var) ) + || ( (ref($var) eq 'HASH') && (scalar(keys %$var)) ); + + my $hash_var; + if ( 'HASH' eq ref($var) ) { + $hash_var = $var; + my @keys = keys %$var; + $var = \@keys; + } + if (my $sort = $args->{sort_by}) { + $sort = lc $sort; + if ($sort =~ m/\bkey\b/) { + @$var = sort {$a cmp $b} @$var; + } elsif ($sort =~ m/\bvalue\b/) { + no warnings; + if ($sort =~ m/\bnumeric\b/) { + no warnings; + if (defined $hash_var) { + @$var = sort {$hash_var->{$a} <=> $hash_var->{$b}} @$var; + } else { + @$var = sort {$a <=> $b} @$var; + } + } else { + if (defined $hash_var) { + @$var = sort {$hash_var->{$a} cmp $hash_var->{$b}} @$var; + } else { + @$var = sort {$a cmp $b} @$var; + } + } + } + if ($sort =~ m/\breverse\b/) { + @$var = reverse @$var; + } + } my $builder = $ctx->stash('builder'); my $tokens = $ctx->stash('tokens'); @@ -1453,6 +1514,8 @@ sub _hdlr_loop { } else { if (ref($item) eq 'HASH') { @names = keys %$item; + } elsif ( $hash_var ) { + @names = ( '__key__', '__value__' ); } else { @names = '__value__'; } @@ -1464,6 +1527,9 @@ sub _hdlr_loop { $vars->{lc($_)} = $item->column($_) for @names; } elsif (ref($item) eq 'HASH') { $vars->{lc($_)} = $item->{$_} for @names; + } elsif ( $hash_var ) { + $vars->{'__key__'} = $item; + $vars->{'__value__'} = $hash_var->{$item}; } else { $vars->{'__value__'} = $item; } @@ -1478,24 +1544,125 @@ sub _hdlr_loop { sub _hdlr_get_var { my ($ctx, $args, $cond) = @_; - if (exists $args->{value}) { + if ( exists( $args->{value} ) + && !exists( $args->{op} ) ) { return &_hdlr_set_var(@_); } - my $value = $ctx->var($args->{name} || $args->{var}); - if (ref($value) eq 'CODE') { # handle coderefs - $value = $value->(@_); + my $name = $args->{name} || $args->{var}; + return $ctx->error(MT->translate( + "You used a [_1] tag without a valid name attribute.", "<MT" . $ctx->stash('tag') . ">" )) + unless defined $name; + + my ($func, $key, $index, $value); + if ($name =~ m/^(\w+)\((.+)\)$/) { + $func = $1; + $name = $2; + } else { + $func = $args->{function} if exists $args->{function}; } - if (ref($value)) { - if (UNIVERSAL::isa($value, 'MT::Template')) { - local $args->{name} = undef; - local $args->{var} = undef; - $value = $value->output($args); - } elsif (UNIVERSAL::isa($value, 'MT::Template::Tokens')) { - local $ctx->{__stash}{tokens} = $value; - local $args->{name} = undef; - local $args->{var} = undef; - $ctx->var($_, $args->{$_}) for keys %{$args || {}}; - $value = _hdlr_pass_tokens(@_) or return; + + # pick off any {...} or [...] from the name. + if ($name =~ m/^(.+)([\[\{])(.+)[\]\}]$/) { + $name = $1; + my $br = $2; + my $ref = $3; + if ($ref =~ m/^\$(.+)/) { + $ref = $ctx->var($1); + $ref = chr(0) unless defined $ref; + } + $br eq '[' ? $index = $ref : $key = $ref; + } else { + $index = $args->{index} if exists $args->{index}; + $key = $args->{key} if exists $args->{key}; + } + + if ($name =~ m/^$/) { + $name = $ctx->var($name); + } + + if (defined $name) { + $value = $ctx->var($name); + if (ref($value) eq 'CODE') { # handle coderefs + $value = $value->(@_); + } + if (ref($value)) { + if (UNIVERSAL::isa($value, 'MT::Template')) { + local $args->{name} = undef; + local $args->{var} = undef; + local $value->{context} = $ctx; + $value = $value->output($args); + } elsif (UNIVERSAL::isa($value, 'MT::Template::Tokens')) { + local $ctx->{__stash}{tokens} = $value; + local $args->{name} = undef; + local $args->{var} = undef; + $ctx->var($_, $args->{$_}) for keys %{$args || {}}; + $value = _hdlr_pass_tokens(@_) or return; + } elsif (ref($value) eq 'ARRAY') { + if ( defined $index ) { + if ($index =~ /^\d+$/) { + $value = $value->[ $index ]; + } else { + $value = undef; # fall through to any 'default' + } + } + elsif ( defined $func ) { + $func = lc $func; + if ( 'pop' eq $func ) { + $value = @$value ? pop @$value : undef; + } + elsif ( 'shift' eq $func ) { + $value = @$value ? shift @$value : undef; + } + elsif ( 'count' eq $func ) { + $value = scalar @$value; + } + else { + return $ctx->error( + MT->translate("'[_1]' is not a valid function for an array.", $func) + ); + } + } + else { + unless ($args->{to_json}) { + my $glue = exists $args->{glue} ? $args->{glue} : ""; + $value = join $glue, @$value; + } + } + } elsif ( ref($value) eq 'HASH' ) { + if ( defined $key ) { + if ( defined $func ) { + if ( 'delete' eq lc($func) ) { + $value = delete $value->{$key}; + } else { + return $ctx->error( + MT->translate("'[_1]' is not a valid function for a hash.", $func) + ); + } + } else { + if ($key ne chr(0)) { + $value = $value->{$key}; + } else { + $value = undef; + } + } + } + elsif ( defined $func ) { + if ( 'count' eq lc($func) ) { + $value = scalar( keys %$value ); + } + else { + return $ctx->error( + MT->translate("'[_1]' is not a valid function for a hash.", $func) + ); + } + } + } + } + if ( my $op = $args->{op} ) { + my $rvalue = $args->{'value'}; + if ( $op && (defined $value) && !ref($value) ) { + $value = _math_operation($ctx, $op, $value, $rvalue); + } } } if ((!defined $value) || ($value eq '')) { @@ -1503,12 +1670,10 @@ sub _hdlr_get_var { $value = $args->{default}; } } + if (ref($value) && $args->{to_json}) { require JSON; return JSON::objToJson($value); - } elsif (ref($value) eq 'ARRAY') { - my $glue = exists $args->{glue} ? $args->{glue} : ""; - $value = join $glue, @$value; } return defined $value ? $value : ""; } @@ -1526,9 +1691,8 @@ sub _hdlr_entry_if_tagged { my ($ctx, $args, $cond) = @_; my $entry = $ctx->stash('entry'); return 0 unless $entry; - if (exists $args->{tag}) { - my $tag = defined $args->{tag} ? $args->{tag} : ''; - return 0 unless $tag ne ''; + my $tag = defined $args->{name} ? $args->{name} : (defined $args->{tag} ? $args->{tag} : ''); + if ($tag ne '') { $entry->has_tag($tag); } else { my @tags = $entry->tags; @@ -1818,6 +1982,10 @@ sub _hdlr_tag_rank { $ctx->stash('tag_entry_count', $count); } + if ($count - $min + 1 == 0) { + return 0; + } + my $level = int(log($count - $min + 1) * $factor); $max_level - $level; } @@ -2104,10 +2272,22 @@ sub _hdlr_include { my $tmpl = MT->instance->load_tmpl($app_file); if ($tmpl) { $tmpl->name($app_file); + + my $tmpl_file = $app_file; + if ($tmpl_file) { + $tmpl_file = File::Basename::basename($tmpl_file); + $tmpl_file =~ s/\.tmpl$//; + $tmpl_file = '.' . $tmpl_file; + } + my $mt = MT->instance; + $mt->run_callbacks('template_param' . $tmpl_file, $mt, $tmpl->param, $tmpl); + # propagate our context local $tmpl->{context} = $ctx; my $out = $tmpl->output(); return $ctx->error($tmpl->errstr) unless defined $out; + + $mt->run_callbacks('template_output' . $tmpl_file, $mt, \$out, $tmpl->param, $tmpl); return $out; } else { return defined $arg->{default} ? $arg->{default} : ''; @@ -2119,7 +2299,7 @@ sub _hdlr_include { sub _hdlr_file_template { my ($ctx, $args, $cond) = @_; - my $at = $ctx->{archive_type} || $ctx->{current_archive_type}; + my $at = $ctx->{current_archive_type} || $ctx->{archive_type}; $at = 'Category' if $ctx->{inside_mt_categories}; my $format = $args->{format}; unless ($format) { @@ -2328,30 +2508,139 @@ sub _hdlr_set_var { my($ctx, $args) = @_; my $tag = lc $ctx->stash('tag'); my $name = $args->{name} || $args->{var}; + return $ctx->error(MT->translate( - "You used a [_1] tag without any arguments.", "<MT$tag>" )) + "You used a [_1] tag without a valid name attribute.", "<MT$tag>" )) unless defined $name; + + my ($func, $key, $index, $value); + if ($name =~ m/^(\w+)\((.+)\)$/) { + $func = $1; + $name = $2; + } else { + $func = $args->{function} if exists $args->{function}; + } + + # pick off any {...} or [...] from the name. + if ($name =~ m/^(.+)([\[\{])(.+)[\]\}]$/) { + $name = $1; + my $br = $2; + my $ref = $3; + if ($ref =~ m/^\$(.+)/) { + $ref = $ctx->var($1); + $ref = chr(0) unless defined $ref; + } + $br eq '[' ? $index = $ref : $key = $ref; + } else { + $index = $args->{index} if exists $args->{index}; + $key = $args->{key} if exists $args->{key}; + } + + if ($name =~ m/^$/) { + $name = $ctx->var($name); + return $ctx->error(MT->translate( + "You used a [_1] tag without a valid name attribute.", "<MT$tag>" )) + unless defined $name; + } + my $val; + my $data = $ctx->var($name); if (($tag eq 'setvar') || ($tag eq 'var')) { $val = defined $args->{value} ? $args->{value} : ''; } elsif ($tag eq 'setvarblock') { - $val = _hdlr_pass_tokens(@_); - return unless defined($val); + my $vars = $ctx->{__stash}{vars}; + { + # local $ctx->{__stash}{vars}; + # my %local_vars = map { $_ => $vars->{$_} } keys %$vars; + # $ctx->{__stash}{vars} = \%local_vars; + $val = _hdlr_pass_tokens(@_); + return unless defined($val); + # $data = {} unless defined($data); + # if ( 'HASH' eq ref($data) ) { + # while ( my ($inner_key, $inner_value) = each %local_vars ) { + # if ( !exists($vars->{$inner_key}) + # || ( $vars->{$inner_key} ne $inner_value ) ) + # { + # $data->{$inner_key} = $inner_value; + # } + # } + # } + } } elsif ($tag eq 'setvartemplate') { $val = $ctx->stash('tokens'); return unless defined($val); $val = bless $val, 'MT::Template::Tokens'; } + + my $existing = $ctx->var($name); + $existing = '' unless defined $existing; + if ( 'HASH' eq ref($existing) ) { + $existing = $existing->{ $key }; + } + elsif ( 'ARRAY' eq ref($existing) ) { + $existing = ( defined $index && ( $index =~ /^\d+$/ ) ) + ? $existing->[ $index ] + : undef; + } + if ($args->{prepend}) { - my $existing = $ctx->var($name); - $existing = '' unless defined $existing; $val = $val . $existing; - } elsif ($args->{append}) { - my $existing = $ctx->var($name); - $existing = '' unless defined $existing; + } + elsif ($args->{append}) { $val = $existing . $val; } - $ctx->var($name, $val); + elsif ( $existing && ( my $op = $args->{op} ) ) { + $val = _math_operation($ctx, $op, $existing, $val); + } + + if ( defined $key ) { + $data ||= {}; + return $ctx->error( MT->translate("'[_1]' is not a hash.", $name) ) + unless 'HASH' eq ref($data); + + if ( ( defined $func ) + && ( 'delete' eq lc( $func ) ) ) { + delete $data->{ $key }; + } + else { + $data->{ $key } = $val; + } + } + elsif ( defined $index ) { + $data ||= []; + return $ctx->error( MT->translate("'[_1]' is not an array.", $name) ) + unless 'ARRAY' eq ref($data); + return $ctx->error( MT->translate("Invalid index.") ) + unless $index =~ /^\d+$/; + $data->[ $index ] = $val; + } + elsif ( defined $func ) { + if ( 'undef' eq lc( $func ) ) { + $data = undef; + } + else { + $data ||= []; + return $ctx->error( MT->translate("'[_1]' is not an array.", $name) ) + unless 'ARRAY' eq ref($data); + if ( 'push' eq lc( $func ) ) { + push @$data, $val; + } + elsif ( 'unshift' eq lc( $func ) ) { + $data ||= []; + unshift @$data, $val; + } + else { + return $ctx->error( + MT->translate("'[_1]' is not a valid function.", $func) + ); + } + } + } + else { + $data = $val; + } + + $ctx->var($name, $data); return ''; } @@ -2483,6 +2772,36 @@ sub _hdlr_if_author { return $_[0]->stash('author') ? 1 : 0; } +sub _hdlr_author_has_entry { + my ($ctx) = @_; + my $author = $ctx->stash('author') + or return $ctx->_no_author_error( $ctx->stash('tag') ); + + my %terms; + $terms{blog_id} = $ctx->stash('blog_id'); + $terms{author_id} = $author->id; + $terms{class} = 'entry'; + $terms{status} = MT::Entry::RELEASE(); + + my $class = MT->model('entry'); + $class->count( \%terms ); +} + +sub _hdlr_author_has_page { + my ($ctx) = @_; + my $author = $ctx->stash('author') + or return $ctx->_no_author_error( $ctx->stash('tag') ); + + my %terms; + $terms{blog_id} = $ctx->stash('blog_id'); + $terms{author_id} = $author->id; + $terms{class} = 'page'; + $terms{status} = MT::Entry::RELEASE(); + + my $class = MT->model('page'); + $class->count( \%terms ); +} + sub _hdlr_authors { my($ctx, $args, $cond) = @_; my $blog_id = $ctx->stash('blog_id'); @@ -3091,7 +3410,7 @@ sub _hdlr_entries { my $entry = @$entries[0]; $entries = undef if $entry->class ne $class_type; - foreach my $args_key ('category', 'categories', 'tag', 'tags', 'author', 'id', 'days', 'recently_commented_on', 'include_subcategories') { + foreach my $args_key ('category', 'categories', 'tag', 'tags', 'author', 'id', 'days', 'recently_commented_on', 'include_subcategories', 'include_blogs', 'exclude_blogs', 'blog_ids') { if (exists($args->{$args_key})) { $entries = undef; last; @@ -3207,7 +3526,7 @@ sub _hdlr_entries { } } # Adds a tag filter to the filters list. - if (my $tag_arg = $args->{tag} || $args->{tags}) { + if (my $tag_arg = $args->{tags} || $args->{tag}) { require MT::Tag; require MT::ObjectTag; @@ -3240,7 +3559,7 @@ sub _hdlr_entries { } push @filters, sub { $cexpr->($_[0]->id, \%map) }; } else { - return $ctx->error(MT->translate("You have an error in your 'tag' attribute: [_1]", $args->{tag} || $args->{tags})); + return $ctx->error(MT->translate("You have an error in your 'tag' attribute: [_1]", $args->{tags} || $args->{tag})); } } @@ -3992,7 +4311,7 @@ sub _hdlr_entry_tb_data { my $path = _hdlr_cgi_path($ctx); $path .= $cfg->TrackbackScript . '/' . $tb->id; my $url; - if (my $at = $_[0]->{archive_type} || $_[0]->{current_archive_type}) { + if (my $at = $_[0]->{current_archive_type} || $_[0]->{archive_type}) { $url = $e->archive_url($at); $url .= '#' . sprintf("%06d", $e->id) unless $at eq 'Individual'; @@ -4286,7 +4605,8 @@ sub _hdlr_date { $blog = MT->model('blog')->load($blog_id) if $blog_id; } - my $lang = $args->{language} || ($blog && $blog->language); + my $lang = $args->{language} || $_[0]->var('local_lang_id') + || ($blog && $blog->language); if ($args->{utc}) { my($y, $mo, $d, $h, $m, $s) = $ts =~ /(\d\d\d\d)[^\d]?(\d\d)[^\d]?(\d\d)[^\d]?(\d\d)[^\d]?(\d\d)[^\d]?(\d\d)/; $mo--; @@ -4713,10 +5033,7 @@ sub _hdlr_comment_author_identity { my $static_path = _hdlr_static_path($ctx); my $logo = $cmntr->auth_icon_url; unless ($logo) { - my $blog = MT::Blog->load($ctx->stash('blog_id')); - my $root_url = MT->config->PublishCommenterIcon - ? $blog->site_url() - : $static_path . "images"; + my $root_url = $static_path . "images"; $root_url =~ s|/$||; $logo = "$root_url/nav-commenters.gif"; } @@ -5251,7 +5568,7 @@ sub _hdlr_archive_set { my $old_at = $blog->archive_type_preferred(); foreach my $type (@at) { $blog->archive_type_preferred($type); - local $ctx->{archive_type} = $type; + local $ctx->{current_archive_type} = $type; defined(my $out = $builder->build($ctx, $tokens, $cond)) or return $ctx->error( $builder->errstr ); $res .= $out; @@ -5359,10 +5676,6 @@ sub _hdlr_archives { sub _hdlr_archive_title { my($ctx, $args) = @_; - ## Since this tag can be called from inside <MTCategories>, - ## we need a way to map this tag to <$MTCategoryLabel$>. - return _hdlr_category_label(@_) if $ctx->{inside_mt_categories}; - my $at = $ctx->{current_archive_type} || $ctx->{archive_type}; return _hdlr_category_label(@_) if $at eq 'Category'; @@ -5421,15 +5734,15 @@ sub _hdlr_archive_date_end { sub _hdlr_archive_type { my ($ctx, $args, $cond) = @_; - my $at = $ctx->{archive_type} || $ctx->{current_archive_type}; + my $at = $ctx->{current_archive_type} || $ctx->{archive_type}; $at = 'Category' if $ctx->{inside_mt_categories}; defined $at ? $at : ''; } sub _hdlr_archive_label { my ($ctx, $args, $cond) = @_; - - my $at = $ctx->{archive_type} || $ctx->{current_archive_type}; + + my $at = $ctx->{current_archive_type} || $ctx->{archive_type}; $at = 'Category' if $ctx->{inside_mt_categories}; return q() unless defined $at; my $archiver = MT->publisher->archiver($at); @@ -5443,7 +5756,7 @@ sub _hdlr_archive_label { sub _hdlr_archive_file { my ($ctx, $args, $cond) = @_; - my $at = $ctx->{archive_type} || $ctx->{current_archive_type}; + my $at = $ctx->{current_archive_type} || $ctx->{archive_type}; $at = 'Category' if $ctx->{inside_mt_categories}; my $archiver = MT->publisher->archiver($at); my $f; @@ -5471,9 +5784,7 @@ sub _hdlr_archive_file { sub _hdlr_archive_link { my($ctx, $args) = @_; - ## Since this tag can be called from inside <MTCategories>, - ## we need a way to map this tag to <$MTCategoryArchiveLink$>. - return _hdlr_category_archive(@_) if $ctx->{inside_mt_categories}; + my $at = $args->{type} || $args->{archive_type}; return _hdlr_category_archive(@_) if ($at && ('Category' eq $at)) || @@ -5828,23 +6139,15 @@ sub _hdlr_category_archive { or return $_[0]->error(MT->translate( "You used an [_1] tag outside of the proper context.", '<$MTCategoryArchiveLink$>' )); - my $curr_at = $_[0]->{archive_type} || $_[0]->{current_archive_type} || 'Category'; - my $blog = $_[0]->stash('blog'); - my $at = $blog->archive_type; - my @at = split /,/, $at; - my $cat_based = 0; - foreach my $type (@at) { - my $archiver = MT->publisher->archiver($type); - next unless defined $archiver; - if ($archiver->category_based) { - $cat_based = 1; - last; - } - } - return '' unless $cat_based; + my $curr_at = $_[0]->{current_archive_type} || $_[0]->{archive_type} || 'Category'; + my $archiver = MT->publisher->archiver($curr_at); + return '' unless defined $archiver; + return '' unless $archiver->category_based; + my @entries = MT::Entry->load({ status => MT::Entry::RELEASE() }, { join => [ 'MT::Placement', 'entry_id', { category_id => $cat->id }, { unqiue => 1 } ] } ); my $entry = $entries[0] if @entries; + my $blog = $_[0]->stash('blog'); my $arch = $blog->archive_url; $arch .= '/' unless $arch =~ m!/$!; $arch = $arch . archive_file_for($entry, $blog, 'Category', $cat); @@ -6745,8 +7048,10 @@ sub _hdlr_is_ancestor { my $iter = MT::Category->load_iter({ blog_id => $blog_id, label => $args->{'child'} }) || undef; while (my $child = $iter->()) { - my $ret = $cat->is_ancestor($child); - return 1 if $ret; + if ($cat->is_ancestor($child)) { + $iter->('finish'); + return 1; + } } 0; @@ -6765,8 +7070,10 @@ sub _hdlr_is_descendant { my $iter = MT::Category->load_iter({ blog_id => $blog_id, label => $args->{'parent'} }); while (my $parent = $iter->()) { - my $ret = $cat->is_descendant($parent); - return 1 if $ret; + if ($cat->is_descendant($parent)) { + $iter->('finish'); + return 1; + } } 0; @@ -6972,7 +7279,7 @@ sub _hdlr_assets { } # Adds a tag filter to the filters list. - if (my $tag_arg = $args->{tag} || $args->{tags}) { + if (my $tag_arg = $args->{tags} || $args->{tag}) { require MT::Tag; require MT::ObjectTag; @@ -6998,7 +7305,7 @@ sub _hdlr_assets { } push @filters, sub { $cexpr->($_[0]->id, \%map) }; } else { - return $ctx->error(MT->translate("You have an error in your 'tag' attribute: [_1]", $args->{tag} || $args->{tags})); + return $ctx->error(MT->translate("You have an error in your 'tag' attribute: [_1]", $args->{tags} || $args->{tag})); } } @@ -7096,6 +7403,7 @@ sub _hdlr_assets { $args{direction} = $args->{sort_order} || 'descend' if exists($args{sort}); $no_resort = 1 unless $args->{sort_by}; + $args{limit} = $args->{limit} if $args->{limit}; } $args{offset} = $args->{offset} if $args->{offset}; @assets = MT::Asset->load(\%terms, \%args); @@ -7107,6 +7415,7 @@ sub _hdlr_assets { } else { $args{direction} = $args->{sort_order} || 'descend'; $no_resort = 1 unless $args->{sort_by}; + $args->{lastn} = $args->{limit} if $args->{limit}; } my $iter = MT::Asset->load_iter(\%terms, \%args); my $i = 0; my $j = 0; @@ -7134,7 +7443,7 @@ sub _hdlr_assets { if (@filters) { my $i = 0; my $j = 0; my $off = $args->{offset} || 0; - my $n = $args->{lastn}; + my $n = $args->{lastn} || $args->{limit}; ASSET2: foreach my $e (@$assets) { for (@filters) { next ASSET2 unless $_->($e); @@ -7155,7 +7464,7 @@ sub _hdlr_assets { } else { @assets = @$assets; } - if (my $last = $args->{lastn}) { + if (my $last = $args->{lastn} || $args->{limit}) { if (scalar @assets > $last) { @assets = @assets[0..$last-1]; } @@ -7491,9 +7800,8 @@ sub _hdlr_asset_if_tagged { my $a = $_[0]->stash('asset') or return $_[0]->_no_asset_error('MTAssetIfTagged'); - if (exists $args->{tag}) { - my $tag = defined $args->{tag} ? $args->{tag} : ''; - return 0 unless $tag ne ''; + my $tag = defined $args->{name} ? $args->{name} : ( defined $args->{tag} ? $args->{tag} : '' ); + if ($tag ne '') { $a->has_tag($tag); } else { my @tags = $a->tags; @@ -7554,8 +7862,8 @@ sub _hdlr_pages { } # remove current_timestamp; - $ctx->{current_timestamp} = undef; - $ctx->{current_timestamp_end} =undef; + local $ctx->{current_timestamp}; + local $ctx->{current_timestamp_end}; require MT::Page; $args->{class_type} = MT::Page->properties->{class_type}; @@ -8148,4 +8456,42 @@ sub _hdlr_section { return $out; } +sub _math_operation { + my ($ctx, $op, $lvalue, $rvalue) = @_; + return $lvalue + unless ( $lvalue =~ m/^\-?[\d\.]+$/ ) + && ( ( defined($rvalue) && ( $rvalue =~ m/^\-?[\d\.]+$/ ) ) + || ( ( $op eq 'inc' ) || ( $op eq 'dec' ) || ( $op eq '++' ) || ( $op eq '--' ) ) + ); + if ( ( '+' eq $op ) || ( 'add' eq $op ) ) { + return $lvalue + $rvalue; + } + elsif ( ( '++' eq $op ) || ( 'inc' eq $op ) ) { + return $lvalue + 1; + } + elsif ( ( '-' eq $op ) || ( 'sub' eq $op ) ) { + return $lvalue - $rvalue; + } + elsif ( ( '--' eq $op ) || ( 'dec' eq $op ) ) { + return $lvalue - 1; + } + elsif ( ( '*' eq $op ) || ( 'mul' eq $op ) ) { + return $lvalue * $rvalue; + } + elsif ( ( '/' eq $op ) || ( 'div' eq $op ) ) { + return $ctx->error( MT->translate('Division by zero.') ) + if $rvalue == 0; + return $lvalue / $rvalue; + } + elsif ( ( '%' eq $op ) || ( 'mod' eq $op ) ) { + # Perl % is integer only + $lvalue = int($lvalue); + $rvalue = int($rvalue); + return $ctx->error( MT->translate('Division by zero.') ) + if $rvalue == 0; + return $lvalue % $rvalue; + } + return $lvalue; +} + 1; lib/MT/Template/ContextHandlers.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/TemplateMap.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -81,6 +81,25 @@ sub mt_schwartz_init { TheSchwartz::Job->properties->{datasource} = 'ts_job'; TheSchwartz::Error->properties->{datasource} = 'ts_error'; TheSchwartz::ExitStatus->properties->{datasource} = 'ts_exitstatus'; + + my $job_set_exit_status = \&TheSchwartz::Job::set_exit_status; + my $job_add_failure = \&TheSchwartz::Job::add_failure; + + my $driver = MT::Object->driver; + no warnings 'redefine'; + *TheSchwartz::Job::set_exit_status = sub { + $driver->Disabled(1); + my $res = $job_set_exit_status->(@_); + $driver->Disabled(0); + return $res; + }; + *TheSchwartz::Job::add_failure = sub { + $driver->Disabled(1); + my $res = $job_add_failure->(@_); + $driver->Disabled(0); + return $res; + }; + return $initialized = 1; } lib/MT/TheSchwartz.pm @@ -1,3 +1,7 @@ +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# # $Id$ package MT::TheSchwartz::Error; lib/MT/TheSchwartz/Error.pm @@ -1,3 +1,7 @@ +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# # $Id$ package MT::TheSchwartz::ExitStatus; lib/MT/TheSchwartz/ExitStatus.pm @@ -1,3 +1,7 @@ +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# # $Id$ package MT::TheSchwartz::FuncMap; lib/MT/TheSchwartz/FuncMap.pm @@ -1,3 +1,7 @@ +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# # $Id$ package MT::TheSchwartz::Job; lib/MT/TheSchwartz/Job.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Trackback.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -44,6 +44,10 @@ sub BEGIN { code => sub { shift->core_column_action('alter', @_) }, priority => 3, }, + 'core_index_column' => { + code => sub { shift->core_column_action('index', @_) }, + priority => 3.5, + }, 'core_seed_database' => { code => \&seed_database, priority => 4, @@ -1222,6 +1226,8 @@ sub check_type { if $result->{alter}; $self->add_step('core_drop_column', type => $type) if $result->{drop}; + $self->add_step('core_index_column', type => $type) + if $result->{index}; } } 1; @@ -1239,6 +1245,9 @@ sub type_diff { my $ddl = $class->driver->dbd->ddl_class; my $db_defs = $ddl->column_defs($class); + my $class_idx_defs = $class->index_defs; + my $db_idx_defs = $ddl->index_defs($class); + # now, compare $defs and $db_defs; # here are the scenarios # 1. we find something in $defs that isn't in $db_defs @@ -1259,7 +1268,7 @@ sub type_diff { # we're only scanning defined columns; we don't care about # columns that are unique to the table. - my (@cols_to_add, @cols_to_alter, @cols_to_drop); + my (@cols_to_add, @cols_to_alter, @cols_to_drop, @cols_to_index); if (!$fix_class) { my @def_cols = keys %$defs; @@ -1296,14 +1305,59 @@ sub type_diff { } } } + + foreach my $key (keys %$class_idx_defs) { + my $db_idx_def = $db_idx_defs->{$key}; + if (!$db_idx_def) { + push @cols_to_index, $key; + next; + } + # if there is a mismatch in definition, add it to index + my $class_idx_def = $class_idx_defs->{$key}; + if (ref($class_idx_def)) { + if (!ref $db_idx_def) { + push @cols_to_index, $key; + } + else { + my $db_cols; + if (exists $db_idx_def->{columns}) { + $db_cols = join ',', @{ $db_idx_def->{columns} }; + } + else { + $db_cols = $key; + } + my $class_cols; + if (exists $class_idx_def->{columns}) { + $class_cols = join ',', @{ $class_idx_def->{columns} }; + } + else { + $class_cols = $key; + } + if ($db_cols ne $class_cols) { + push @cols_to_index, $key; + } + else { + if (($db_idx_def->{unique} || 0) != ($class_idx_def->{unique} || 0)) { + push @cols_to_index, $key; + } + } + } + } + else { + if (ref $db_idx_def) { + push @cols_to_index, $key; + } + } + } } - if ($fix_class || @cols_to_add || @cols_to_alter || @cols_to_drop) { + if ($fix_class || @cols_to_add || @cols_to_alter || @cols_to_drop || @cols_to_index) { my %param; $param{drop} = \@cols_to_drop if @cols_to_drop; $param{add} = \@cols_to_add if @cols_to_add; $param{alter} = \@cols_to_alter if @cols_to_alter; $param{fix} = $fix_class; + $param{index} = \@cols_to_index if @cols_to_index; if ((@cols_to_add && !$ddl->can_add_column) || (@cols_to_alter && !$ddl->can_alter_column) || (@cols_to_drop && !$ddl->can_drop_column)) { @@ -1671,6 +1725,8 @@ sub post_alter_column { 1 } sub pre_drop_column { 1 } sub post_drop_column { 1 } sub pre_add_column { 1 } +sub pre_index_column { 1 } +sub post_index_column { 1 } sub pre_schema_upgrade { 1 } # issued last, after all table creation... @@ -1838,6 +1894,7 @@ sub core_fix_type { my $alter = $result->{alter}; my $add = $result->{add}; my $drop = $result->{drop}; + my $index = $result->{index}; my $driver = $class->driver; my $ddl = $driver->dbd->ddl_class; @@ -1848,11 +1905,13 @@ sub core_fix_type { push @stmts, sub { $self->pre_add_column($class, $add) } if $add; push @stmts, sub { $self->pre_alter_column($class, $alter) } if $alter; push @stmts, sub { $self->pre_drop_column($class, $drop) } if $drop; + push @stmts, sub { $self->pre_index_column($class, $index) } if $index; push @stmts, $ddl->fix_class($class); push @stmts, sub { $self->post_create_table($class) }; push @stmts, sub { $self->post_add_column($class, $add) } if $add; push @stmts, sub { $self->post_alter_column($class, $alter) } if $alter; push @stmts, sub { $self->post_drop_column($class, $drop) } if $drop; + push @stmts, sub { $self->post_index_column($class, $index) } if $index; push @stmts, $ddl->upgrade_end($class); push @stmts, sub { $self->post_upgrade_class($class) }; $self->run_statements($class, @stmts); @@ -1881,7 +1940,7 @@ sub core_column_action { push @stmts, sub { $self->pre_upgrade_class($class) }; push @stmts, $ddl->upgrade_begin($class); push @stmts, sub { $self->$pre_method($class, $columns) }; - push @stmts, $ddl->$method($class, $_->{name}) foreach @$columns; + push @stmts, $ddl->$method($class, $_) foreach @$columns; push @stmts, sub { $self->$post_method($class, $columns) }; push @stmts, $ddl->upgrade_end($class); push @stmts, sub { $self->post_upgrade_class($class) }; @@ -1909,7 +1968,8 @@ sub run_statements { my $err; $dbh->do($stmt) or $err = $dbh->errstr; if ($err) { - # ignore drop errors; the table/sequence didn't exist + # ignore drop errors; the table/sequence + # didn't exist if ($stmt !~ m/^drop /i) { die "failed to execute statement $stmt: $err"; } lib/MT/Upgrade.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -18,7 +18,7 @@ our @EXPORT_OK = qw( start_end_day start_end_week start_end_month start_end_year archive_file_for format_ts dirify remove_html days_in wday_from_ts encode_js get_entry spam_protect is_valid_email encode_php encode_url decode_url encode_xml - decode_xml is_valid_url discover_tb convert_high_ascii + decode_xml is_valid_url is_url discover_tb convert_high_ascii mark_odd_rows dsa_verify perl_sha1_digest relative_date perl_sha1_digest_hex dec2bin bin2dec xliterate_utf8 start_background_task launch_background_tasks substr_wref @@ -440,6 +440,9 @@ sub encode_js { my($str) = @_; return '' unless defined $str; $str =~ s!\\!\\\\!g; + $str =~ s!>!\\>!g; + $str =~ s!<!\\<!g; + $str =~ s!(s)(cript)!$1\\$2!gi; $str =~ s!</!<\\/!g; # </ is supposed to be the end of Javascript (</script in most UA) $str =~ s!(['"])!\\$1!g; $str =~ s!\n!\\n!g; @@ -872,9 +875,9 @@ sub make_unique_basename { my $i = 1; my $base_copy = $base; - my $class = ref $entry; + my $class = ref $entry; while ($class->count({ blog_id => $blog->id, - basename => $base })) { + basename => $base })) { $base = $base_copy . '_' . $i++; } $base; @@ -900,7 +903,7 @@ sub make_unique_category_basename { my $cat_class = ref $cat; while ($cat_class->count({ blog_id => $cat->blog_id, - basename => $base })) { + basename => $base })) { $base = $base_copy . '_' . $i++; } $base; @@ -979,6 +982,12 @@ sub is_valid_url { } } +sub is_url { + my($url) = @_; + + return $url =~ /s?https?:\/\/[-_.!~*'()a-zA-Z0-9;\/?:\@&=+\$,%#]+/; +} + sub discover_tb { my($url, $find_all, $contents) = @_; my $c = ''; @@ -1764,6 +1773,80 @@ sub caturl { return $url; } +sub get_newsbox_html { + my ($newsbox_url, $kind, $cached_only) = @_; + + return unless $newsbox_url; + return unless is_url($newsbox_url); + return unless $kind && (length($kind) == 2); + $cached_only ||= 0; + + my $NEWSCACHE_TIMEOUT = 60 * 60 * 24; + my $sess_class = MT->model('session'); + my ($news_object) = (""); + my $retries = 0; + $news_object = $sess_class->load( { id => $kind } ); + my $refresh_news; + if ( $news_object + && ( $news_object->start() < ( time - $NEWSCACHE_TIMEOUT ) ) ) + { + $refresh_news = 1; + } + my $last_available_news = MT::I18N::encode_text( $news_object->data(), 'utf-8', undef ) + if $news_object; + return $last_available_news unless $refresh_news || !$news_object; + return q() if $cached_only; + + # don't block the dashboard for more than 10 seconds to fetch + # the news feed... + my $ua = MT->new_ua( { timeout => 10 } ); + return $last_available_news unless $ua; + + my $req = new HTTP::Request( GET => $newsbox_url ); + my $resp = $ua->request($req); + my $result = $resp->content(); + if ( !$resp->is_success() || !$result ) { + # failure; either timeout or worse + # if news_object is available, bump up it's expiration + # so we don't attempt to hit the server again + # for an hour + if (! $news_object ) { + $news_object = MT::Session->new; + $news_object->set_values( + { + id => $kind, + kind => $kind, + data => '' + } + ); + $last_available_news = ''; + $refresh_news = 1; + } + if (defined($last_available_news) && $refresh_news) { + $news_object->start( ( time - $NEWSCACHE_TIMEOUT ) + 60 * 60 ); + $news_object->save; + } + return $last_available_news; + } + require MT::Sanitize; + + # allowed html + my $spec = 'a href,* style class id,ul,li,div,span,br'; + $result = MT::Sanitize->sanitize( $result, $spec ); + $news_object = MT::Session->new(); + $news_object->set_values( + { + id => $kind, + kind => $kind, + start => time(), + data => $result + } + ); + $news_object->save(); + $result = MT::I18N::encode_text( $result, 'utf-8', undef ); + return $result; +} + ## FIXME # This method is to supplement CGI.pm's lack of read method. # Some XML parsers (XML::SAX::ExpatXS and XML::LibXML to name a few) @@ -1946,6 +2029,12 @@ Verifies that sig is a DSA signature of $msg (or $dgst) produced using the private half of the public key given in $key. Requires Math::BigInt but doesn't call for any non-perl libraries. +=head2 get_newsbox_html($newsbox_url, $kind) + +Retrieves newsbox content from the specified URL. Content retrieved is +cached in MT::Session for 24 hours under the key specified in I<$kind>. +Content will be sanitized based on pre-defined rules. + =head1 AUTHOR & COPYRIGHTS Please see the I<MT> manpage for author, copyright, and license information. lib/MT/Util.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Util/Archive.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Util/Archive/Tgz.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Util/Archive/Zip.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/Util/Captcha.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -90,6 +90,7 @@ sub core_archive_types { module_yearly_archives => 1, main_template => 1, archive_template => 1, + archive_listing => 1, archive_class => "datebased-yearly-archive", }, ), @@ -115,9 +116,9 @@ sub core_archive_types { template_params => { datebased_only_archive => 1, datebased_monthly_archive => 1, - module_monthly_archives => 1, main_template => 1, archive_template => 1, + archive_listing => 1, archive_class => "datebased-monthly-archive", }, ), @@ -146,6 +147,7 @@ sub core_archive_types { datebased_weekly_archive => 1, main_template => 1, archive_template => 1, + archive_listing => 1, archive_class => "datebased-weekly-archive", }, ), @@ -221,9 +223,6 @@ sub core_archive_types { entry_template => 1, feedback_template => 1, archive_class => "entry-archive", - - # module_recent_posts => 0, - # module_monthly_archives => 0, }, ), 'Page' => ArchiveType( @@ -309,6 +308,7 @@ sub core_archive_types { datebased_daily_archive => 1, main_template => 1, archive_template => 1, + archive_listing => 1, }, ), 'Category' => ArchiveType( @@ -338,7 +338,7 @@ sub core_archive_types { category_archive => 1, main_template => 1, archive_template => 1, - module_category_archives => 1, + archive_listing => 1, 'module_category-monthly_archives' => 1, }, ), @@ -367,10 +367,10 @@ sub core_archive_types { template_params => { archive_class => "author-archive", 'module_author-monthly_archives' => 1, - module_author_archives => 1, main_template => 1, author_archive => 1, archive_template => 1, + archive_listing => 1, }, ), 'Author-Yearly' => ArchiveType( @@ -403,6 +403,7 @@ sub core_archive_types { author_yearly_archive => 1, main_template => 1, archive_template => 1, + archive_listing => 1, }, ), 'Author-Monthly' => ArchiveType( @@ -434,9 +435,9 @@ sub core_archive_types { archive_class => "author-monthly-archive", author_monthly_archive => 1, 'module_author-monthly_archives' => 1, - module_author_archives => 1, main_template => 1, archive_template => 1, + archive_listing => 1, }, ), 'Author-Weekly' => ArchiveType( @@ -469,6 +470,7 @@ sub core_archive_types { author_weekly_archive => 1, main_template => 1, archive_template => 1, + archive_listing => 1, }, ), 'Author-Daily' => ArchiveType( @@ -501,6 +503,7 @@ sub core_archive_types { author_daily_archive => 1, main_template => 1, archive_template => 1, + archive_listing => 1, }, ), 'Category-Yearly' => ArchiveType( @@ -533,6 +536,7 @@ sub core_archive_types { category_yearly_archive => 1, main_template => 1, archive_template => 1, + archive_listing => 1, }, ), 'Category-Monthly' => ArchiveType( @@ -564,9 +568,9 @@ sub core_archive_types { archive_class => "category-monthly-archive", category_monthly_archive => 1, 'module_category-monthly_archives' => 1, - module_category_archives => 1, main_template => 1, archive_template => 1, + archive_listing => 1, }, ), 'Category-Daily' => ArchiveType( @@ -599,6 +603,7 @@ sub core_archive_types { category_daily_archive => 1, main_template => 1, archive_template => 1, + archive_listing => 1, }, ), 'Category-Weekly' => ArchiveType( @@ -633,6 +638,7 @@ sub core_archive_types { category_weekly_archive => 1, main_template => 1, archive_template => 1, + archive_listing => 1, }, ) }; @@ -785,9 +791,6 @@ sub rebuild { unless ( $param{NoIndexes} ) { $mt->rebuild_indexes( Blog => $blog ) or return; } - if ( $mt->{PublishCommenterIcon} ) { - $mt->make_commenter_icon($blog); - } 1; } @@ -877,41 +880,6 @@ sub rebuild_authors { 1; } -sub make_commenter_icon { - my $mt = shift; - my $blog = shift; - if ( !UNIVERSAL::isa( $blog, 'MT::Blog' ) ) { $blog = shift; } - my $identity_link_image = $blog->site_path . "/nav-commenters.gif"; - unless ( -f $identity_link_image ) { - my $fmgr = $blog->file_mgr; - unless ( $fmgr->exists( $blog->site_path ) ) { - $fmgr->mkpath( $blog->site_path ) - or return MT->trans_error( "Error making path '[_1]': [_2]", - $blog->site_path, $fmgr->errstr ); - } - my $nav_commenters_gif = - ( q{47494638396116000f00910200504d4b} - . q{ffffffffffff00000021f90401000002} - . q{002c0000000016000f0000022c948fa9} - . q{19e0bf2208b482a866a51723bd75dee1} - . q{70e2f83586837ed773a22fd4ba6cede2} - . q{241c8f7ceff9e95005003b} ); - $nav_commenters_gif = pack( "H*", $nav_commenters_gif ); - eval { - if ( open( TARGET, ">$identity_link_image" ) ) - { - print TARGET $nav_commenters_gif; - close TARGET; - } - else { - MT::log( "Couldn't write authenticated commenter icon to " - . $identity_link_image ); - die; - } - }; - } -} - # rebuild_entry # # $mt->rebuild_entry(Entry => $entry_id, @@ -1902,7 +1870,12 @@ sub publish_future_posts { require MT::Util; my $mt = MT->instance; my $total_changed = 0; - for my $blog ( MT::Blog->load ) { + my @blogs = MT::Blog->load(undef, { + join => MT::Entry->join_on('blog_id', { + status => MT::Entry::FUTURE(), + }, { unique => 1 }) + }); + foreach my $blog (@blogs) { my @ts = MT::Util::offset_time_list( time, $blog ); my $now = sprintf "%04d%02d%02d%02d%02d%02d", $ts[5] + 1900, $ts[4] + 1, @ts[ 3, 2, 1, 0 ]; @@ -2028,7 +2001,14 @@ sub remove_entry_archive_file { die MT->translate( $blog->errstr() ); return $mt->error( MT->translate( $blog->errstr() ) ); } + + # Run callbacks + MT->run_callbacks( 'pre_delete_archive_file', $file, $at, $entry); + $fmgr->delete($file); + + # Run callbacks + MT->run_callbacks( 'post_delete_archive_file', $file, $at, $entry); } 1; } @@ -2453,7 +2433,7 @@ sub category_group_iter { return sub { while ( my $c = $iter->() ) { - my $args = [ + my @arguments = ( { blog_id => $blog_id, status => MT::Entry::RELEASE() @@ -2463,8 +2443,8 @@ sub category_group_iter { 'MT::Placement', 'entry_id', { category_id => $c->id } ] } - ]; - my $count = MT::Entry->count( undef, $args ); + ); + my $count = MT::Entry->count( @arguments ); next unless $count || $args->{show_empty}; return ( $count, category => $c ); } @@ -4756,10 +4736,6 @@ The default is C<0> (do not rebuild such templates). Call L<MT/translate>. -=head2 $mt->make_commenter_icon - -Make sure there is a C<nav-commenters.gif> file under the blog I<site_path>. - =head2 $mt->remove_entry_archive_file(%param) Delete the archive files for an entry based on the following lib/MT/WeblogPublisher.pm @@ -1,12 +1,18 @@ +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + package MT::Worker::Publish; use strict; use base qw( TheSchwartz::Worker ); use TheSchwartz::Job; +use Time::HiRes qw(gettimeofday tv_interval); use MT::FileInfo; - sub work { my $class = shift; my TheSchwartz::Job $job = shift; @@ -25,60 +31,84 @@ sub work { } } + my $sync = MT->config('SyncTarget'); + my $throttles = $mt->{throttle} || {}; - MT::TheSchwartz->debug("Publishing: " . scalar(@jobs) . " files..."); + MT::TheSchwartz->debug($mt->translate("Publishing: [quant,_1,file]...", scalar(@jobs))); + + my $start = [gettimeofday]; + my $rebuilt = 0; foreach $job (@jobs) { my $fi_id = $job->uniqkey; my $fi = MT::FileInfo->load($fi_id); - if ($fi) { - # Important: prevents requeuing! - $fi->{from_queue} = 1; - - my $mtime = (stat($fi->file_path))[9]; - - my $throttle = $throttles->{$fi->template_id} - || $throttles->{lc $fi->archive_type}; - - # think about-- throttle by archive type or by template - if ($throttle) { - if (-f $fi->file_path) { - my $time = time; - if ($time - $mtime < $throttle) { - # ignore rebuilding this file now; not enough - # time has elapsed for rebuilding this file... - $job->failed("Not ready to rebuild file " . $fi->file_path . " based on throttle rules."); - next; - } + # FileInfo record missing? Strange, but ignore and continue. + unless ($fi) { + $job->completed(); + next; + } + + # Important: prevents requeuing! + $fi->{from_queue} = 1; + + my $mtime = (stat($fi->file_path))[9]; + + my $throttle = $throttles->{$fi->template_id} + || $throttles->{lc $fi->archive_type}; + + # think about-- throttle by archive type or by template + if ($throttle) { + if (-f $fi->file_path) { + my $time = time; + if ($time - $mtime < $throttle) { + # ignore rebuilding this file now; not enough + # time has elapsed for rebuilding this file... + $job->failed("Not ready to publish file " . $fi->file_path . " based on throttle rules."); + next; } } + } - ## MT::TheSchwartz->debug("Publishing: " . RebuildQueue::Daemon::_summary($fi)); - my $res = $mt->publisher->rebuild_from_fileinfo($fi); - if ($res) { - if ( MT->config('SyncTarget') ) { - my $sync_job = TheSchwartz::Job->new(); - $sync_job->funcname('MT::Worker::Sync'); - $sync_job->uniqkey($fi_id); - $sync_job->coalesce($job->coalesce) if $job->coalesce; - $sync_job->priority($job->priority) if $job->priority; - $job->replace_with($sync_job); - } else { - $job->completed(); - } + ## MT::TheSchwartz->debug("Publishing: " . RebuildQueue::Daemon::_summary($fi)); + MT::TheSchwartz->debug("Publishing file " . $fi->file_path . "..."); + my $res = $mt->publisher->rebuild_from_fileinfo($fi); + if (defined $res) { + if ( $sync ) { + my $sync_job = TheSchwartz::Job->new(); + $sync_job->funcname('MT::Worker::Sync'); + $sync_job->uniqkey($fi_id); + $sync_job->coalesce($job->coalesce) if $job->coalesce; + $sync_job->priority($job->priority) if $job->priority; + $job->replace_with($sync_job); } else { - my $error = $mt->publisher->errstr; - $job->permanent_failure("Error during build: " . $error); + $job->completed(); } + $rebuilt++; } else { - $job->completed(); + my $error = $mt->publisher->errstr; + my $errmsg = $mt->translate("Error rebuilding file [_1]" . $fi->file_path . ": " . $error); + MT::TheSchwartz->debug($errmsg); + $job->permanent_failure($errmsg); + require MT::Log; + $mt->log({ + ($fi->blog_id ? ( blog_id => $fi->blog_id ) : () ), + message => $errmsg, + metadata => $errmsg . ":\n" . $error, + category => "publish", + level => MT::Log::ERROR(), + }); } } + + if ($rebuilt) { + MT::TheSchwartz->debug($mt->translate("-- set complete ([quant,_1,file] in [_2] seconds)", $rebuilt, sprintf("%0.02f", tv_interval($start)))); + } + } sub grab_for { 60 } -sub max_retries { 100000 } +sub max_retries { 0 } sub retry_delay { 60 } 1; lib/MT/Worker/Publish.pm @@ -1,3 +1,9 @@ +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + package MT::Worker::Sync; use strict; @@ -15,6 +21,7 @@ sub work { # Build this my $mt = MT->instance; + my $rsync_cmd = MT->config("RsyncPath") || "rsync"; my $rsync_opt = $mt->config('RsyncOptions') || ''; my @targets = $mt->config('SyncTarget'); @@ -46,8 +53,8 @@ sub work { } } else { if (!$fi) { - MT::TheSchwartz->debug("Warning: couldn't locate fileinfo record id " . $fi_id); - $job->permanent_failure("FileInfo record " . $fi_id . " not found."); + # Don't know where the FileInfo record went. Oh well. + $job->completed(); } else { unless (-f $fi->file_path) { MT::TheSchwartz->debug("Warning: couldn't locate file: " . $fi->file_path); @@ -66,7 +73,7 @@ sub work { print FOUT join("\n", @files) . "\n"; close FOUT; foreach my $target (@targets) { - my $cmd = "rsync $rsync_opt --files-from=\"$file\" / \"$target\""; + my $cmd = "$rsync_cmd $rsync_opt --files-from=\"$file\" / \"$target\""; MT::TheSchwartz->debug("Syncing files to $target..."); my $start = [gettimeofday]; my $res = system $cmd; @@ -74,9 +81,17 @@ sub work { if ($exit != 0) { # TBD: notification to administrator # At the very least, log to MT activity log. - MT::TheSchwartz->debug("Error during rsync of files in $file..."); - MT::TheSchwartz->debug("Command: $cmd"); - MT::TheSchwartz->debug($res); + my $errmsg = "Error during rsync of files in $file:\n" + . "Command (exit code $res): $cmd"; + MT::TheSchwartz->debug($errmsg); + require MT::Log; + $mt->log({ + message => $errmsg, + metadata => $errmsg . "\nFiles affected:\n\t" . join("\n\t", @files), + category => "sync", + level => MT::Log::ERROR(), + }); + $_->failed("Error during rsync") foreach @jobs; return; } else { @@ -94,7 +109,7 @@ sub work { } sub grab_for { 60 } -sub max_retries { 10000 } +sub max_retries { 10 } sub retry_delay { 60 } 1; lib/MT/Worker/Sync.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/XMLRPC.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -19,6 +19,7 @@ sub mt_new { #$main::server->serializer->encoding($mt->config('PublishCharset')); # we need to be UTF-8 here no matter which PublishCharset $main::server->serializer->encoding('UTF-8'); + $mt->run_callbacks('init_app', $mt, {App => 'xmlrpc'}); $mt; } @@ -160,20 +161,141 @@ sub _publish { 1; } -sub newPost { +sub _apply_basename { my $class = shift; - my($appkey, $blog_id, $user, $pass, $item, $publish); - if ($class eq 'blogger') { - ($appkey, $blog_id, $user, $pass, my($content), $publish) = @_; - $item->{description} = $content; - } else { - ($blog_id, $user, $pass, $item, $publish) = @_; + my ($entry, $item, $param) = @_; + + my $basename = $item->{mt_basename} || $item->{wp_slug}; + if ($param->{page} && $item->{permaLink}) { + local $entry->{column_values}->{basename} = '##s##'; + my $real_url = $entry->archive_url(); + my ($pre, $post) = split /##s##/, $real_url, 2; + + my $req_url = $item->{permaLink}; + if ($req_url =~ m{ \A \Q$pre\E (.*) \Q$post\E \z }xms) { + my $req_base = $1; + my @folders = split /\//, $req_base; + $basename = pop @folders; + $param->{__permaLink_folders} = \@folders; + } + else { + die _fault(MT->translate("Requested permalink '[_1]' is not available for this page", + $req_url)); + } + } + + if (defined $basename) { + # Ensure this basename is unique. + my $entry_class = ref $entry; + my $basename_uses = $entry_class->count({ + blog_id => $entry->blog_id, + basename => $basename, + ($entry->id ? ( id => { op => '!=', value => $entry->id } ) : ()), + }); + if ($basename_uses) { + $basename = MT::Util::make_unique_basename($entry); + } + + $entry->basename($basename); + } + + 1; +} + +sub _save_placements { + my $class = shift; + my ($entry, $item, $param) = @_; + + my @categories; + + if ($param->{page}) { + if (my $folders = $param->{__permaLink_folders}) { + my $parent_id = 0; + my $folder; + require MT::Folder; + for my $basename (@$folders) { + $folder = MT::Folder->load({ + blog_id => $entry->blog_id, + parent => $parent_id, + basename => $basename, + }); + + if (!$folder) { + # Autovivify the folder tree. + $folder = MT::Folder->new; + $folder->blog_id($entry->blog_id); + $folder->parent($parent_id); + $folder->basename($basename); + $folder->label($basename); + $folder->save + or die _fault(MT->translate("Saving folder failed: [_1]", + $folder->errstr)); + } + + $parent_id = $folder->id; + } + @categories = ($folder) if $folder; + } + } + elsif (my $cats = $item->{categories}) { + my $cat_class = MT->model('category'); + # The spec says to ignore invalid category names. + @categories = grep { defined } $cat_class->search({ + blog_id => $entry->blog_id, + label => $cats, + }); } + + require MT::Placement; + my $is_primary_placement = 1; + CATEGORY: for my $category (@categories) { + my $place; + if ($is_primary_placement) { + $place = MT::Placement->load({ + entry_id => $entry->id, + is_primary => 1, + }); + } + if (!$place) { + $place = MT::Placement->new; + $place->blog_id($entry->blog_id); + $place->entry_id($entry->id); + $place->is_primary($is_primary_placement ? 1 : 0); + } + $place->category_id($category->id); + $place->save + or die _fault(MT->translate("Saving placement failed: [_1]", + $place->errstr)); + + if ($is_primary_placement) { + # Delete all the secondary placements, so each of the remaining + # iterations of the loop make a brand new placement. + my @old_places = MT::Placement->load({ + entry_id => $entry->id, + is_primary => 0, + }); + for my $place (@old_places) { + $place->remove; + } + } + + $is_primary_placement = 0; + } + + 1; +} + +sub _new_entry { + my $class = shift; + my %param = @_; + my($blog_id, $user, $pass, $item, $publish) = + @param{qw( blog_id user pass item publish )}; + my $obj_type = $param{page} ? 'page' : 'entry'; die _fault(MT->translate("No blog_id")) unless $blog_id; my $mt = MT::XMLRPCServer::Util::mt_new(); ## Will die if MT->new fails. no_utf8($blog_id, values %$item); for my $f (qw( title description mt_text_more - mt_excerpt mt_keywords mt_tags mt_basename )) { + mt_excerpt mt_keywords mt_tags mt_basename wp_slug )) { next unless defined $item->{$f}; my $enc = $mt->{cfg}->PublishCharset; $item->{$f} = encode_text($item->{$f}, 'utf-8', $enc); @@ -188,8 +310,7 @@ sub newPost { my($author, $perms) = $class->_login($user, $pass, $blog_id); die _fault(MT->translate("Invalid login")) unless $author; die _fault(MT->translate("No publishing privileges")) unless $perms && $perms->can_post; - require MT::Entry; - my $entry = MT::Entry->new; + my $entry = MT->model($obj_type)->new; my $orig_entry = $entry->clone; $entry->blog_id($blog_id); $entry->author_id($author->id); @@ -210,7 +331,9 @@ sub newPost { $entry->allow_comments($item->{mt_allow_comments}) if exists $item->{mt_allow_comments}; $entry->title($item->{title} || first_n_text($item->{description}, const('LENGTH_ENTRY_TITLE_FROM_TEXT'))); - $entry->basename($item->{mt_basename}) if $item->{mt_basename}; + + $class->_apply_basename($entry, $item, \%param); + $entry->text($item->{description}); for my $field (qw( allow_pings )) { my $val = $item->{"mt_$field"}; @@ -244,12 +367,14 @@ sub newPost { } $entry->discover_tb_from_entry(); - MT->run_callbacks('api_pre_save.entry', $mt, $entry, $orig_entry) + MT->run_callbacks("api_pre_save.$obj_type", $mt, $entry, $orig_entry) || die MT::XMLRPCServer::_fault(MT->translate("PreSave failed [_1]", MT->errstr)); $entry->save; - MT->run_callbacks('api_post_save.entry', $mt, $entry, $orig_entry); + $class->_save_placements($entry, $item, \%param); + + MT->run_callbacks("api_post_save.$obj_type", $mt, $entry, $orig_entry); require MT::Log; $mt->log({ @@ -267,20 +392,37 @@ sub newPost { SOAP::Data->type(string => $entry->id); } -sub editPost { +sub newPost { my $class = shift; - my($appkey, $entry_id, $user, $pass, $item, $publish); + my($appkey, $blog_id, $user, $pass, $item, $publish); if ($class eq 'blogger') { - ($appkey, $entry_id, $user, $pass, my($content), $publish) = @_; + ($appkey, $blog_id, $user, $pass, my($content), $publish) = @_; $item->{description} = $content; } else { - ($entry_id, $user, $pass, $item, $publish) = @_; + ($blog_id, $user, $pass, $item, $publish) = @_; } + $class->_new_entry( blog_id => $blog_id, user => $user, pass => $pass, + item => $item, publish => $publish ); +} + +sub newPage { + my $class = shift; + my ($blog_id, $user, $pass, $item, $publish) = @_; + $class->_new_entry( blog_id => $blog_id, user => $user, pass => $pass, + item => $item, publish => $publish, page => 1 ); +} + +sub _edit_entry { + my $class = shift; + my %param = @_; + my ($blog_id, $entry_id, $user, $pass, $item, $publish) = + @param{qw( blog_id entry_id user pass item publish )}; + my $obj_type = $param{page} ? 'page' : 'entry'; die _fault(MT->translate("No entry_id")) unless $entry_id; my $mt = MT::XMLRPCServer::Util::mt_new(); ## Will die if MT->new fails. no_utf8(values %$item); for my $f (qw( title description mt_text_more - mt_excerpt mt_keywords mt_tags mt_basename )) { + mt_excerpt mt_keywords mt_tags mt_basename wp_slug )) { next unless defined $item->{$f}; my $enc = $mt->config('PublishCharset'); $item->{$f} = encode_text($item->{$f}, 'utf-8', $enc); @@ -289,9 +431,11 @@ sub editPost { $item->{$f} =~ s!&apos;!'!g; #' } } - require MT::Entry; - my $entry = MT::Entry->load($entry_id) + my $entry = MT->model($obj_type)->load($entry_id) or die _fault(MT->translate("Invalid entry ID '[_1]'", $entry_id)); + if ($blog_id && $blog_id != $entry->blog_id) { + die _fault(MT->translate("Invalid entry ID '[_1]'", $entry_id)); + } my($author, $perms) = $class->_login($user, $pass, $entry->blog_id); die _fault(MT->translate("Invalid login")) unless $author; die _fault(MT->translate("Not privileged to edit entry")) @@ -299,7 +443,9 @@ sub editPost { my $orig_entry = $entry->clone; $entry->status(MT::Entry::RELEASE()) if $publish; $entry->title($item->{title}) if $item->{title}; - $entry->basename($item->{mt_basename}) if defined $item->{mt_basename}; + + $class->_apply_basename($entry, $item, \%param); + $entry->text($item->{description}); $entry->convert_breaks($item->{mt_convert_breaks}) if exists $item->{mt_convert_breaks}; @@ -336,6 +482,8 @@ sub editPost { $entry->save; + $class->_save_placements($entry, $item, \%param); + MT->run_callbacks('api_post_save.entry', $mt, $entry, $orig_entry); require MT::Log; @@ -353,6 +501,28 @@ sub editPost { SOAP::Data->type(boolean => 1); } +sub editPost { + my $class = shift; + my($entry_id, $user, $pass, $item, $publish); + if ($class eq 'blogger') { + (my($appkey), $entry_id, $user, $pass, my($content), $publish) = @_; + $item->{description} = $content; + } + else { + ($entry_id, $user, $pass, $item, $publish) = @_; + } + $class->_edit_entry( entry_id => $entry_id, user => $user, pass => $pass, + item => $item, publish => $publish ); +} + +sub editPage { + my $class = shift; + my($blog_id, $entry_id, $user, $pass, $item, $publish) = @_; + $class->_edit_entry( blog_id => $blog_id, entry_id => $entry_id, + user => $user, pass => $pass, item => $item, publish => $publish, + page => 1 ); +} + sub getUsersBlogs { my $class; if (UNIVERSAL::isa($_[0] => __PACKAGE__)) { @@ -400,22 +570,19 @@ sub getUserInfo { url => SOAP::Data->type(string => $author->url) }; } -sub getRecentPosts { +sub _get_entries { my $class = shift; - my($blog_id, $user, $pass, $num, $titles_only); - if ($class eq 'blogger') { - (my($appkey), $blog_id, $user, $pass, $num, $titles_only) = @_; - } else { - ($blog_id, $user, $pass, $num, $titles_only) = @_; - } + my %param = @_; + my($blog_id, $user, $pass, $num, $titles_only) = + @param{qw( blog_id user pass num titles_only )}; + my $obj_type = $param{page} ? 'page' : 'entry'; my $mt = MT::XMLRPCServer::Util::mt_new(); ## Will die if MT->new fails. my($author, $perms) = $class->_login($user, $pass, $blog_id); die _fault(MT->translate("Invalid login")) unless $author; die _fault(MT->translate("No publishing privileges")) unless $perms && $perms->can_post; require MT::Blog; my $blog = MT::Blog->load($blog_id); - require MT::Entry; - my $iter = MT::Entry->load_iter({ blog_id => $blog_id }, + my $iter = MT->model($obj_type)->load_iter({ blog_id => $blog_id }, { 'sort' => 'authored_on', direction => 'descend', limit => $num }); @@ -424,8 +591,9 @@ sub getRecentPosts { my $co = sprintf "%04d%02d%02dT%02d:%02d:%02d", unpack 'A4A2A2A2A2A2', $entry->authored_on; my $row = { dateCreated => SOAP::Data->type(dateTime => $co), - userid => SOAP::Data->type(string => $entry->author_id), - postid => SOAP::Data->type(string => $entry->id), }; + userid => SOAP::Data->type(string => $entry->author_id) }; + $row->{ $param{page} ? 'page_id' : 'postid' } = + SOAP::Data->type(string => $entry->id); if ($class eq 'blogger') { $row->{content} = SOAP::Data->type(string => encode_text($entry->text, undef, 'utf-8')); } else { @@ -453,21 +621,41 @@ sub getRecentPosts { \@res; } +sub getRecentPosts { + my $class = shift; + my ($blog_id, $user, $pass, $num); + if ($class eq 'blogger') { + (my($appkey), $blog_id, $user, $pass, $num) = @_; + } + else { + ($blog_id, $user, $pass, $num) = @_; + } + $class->_get_entries( blog_id => $blog_id, user => $user, + pass => $pass, num => $num ); +} + sub getRecentPostTitles { - getRecentPosts(@_, 1); + my $class = shift; + my ($blog_id, $user, $pass, $num) = @_; + $class->_get_entries( blog_id => $blog_id, user => $user, + pass => $pass, num => $num, titles_only => 1 ); } -sub deletePost { - my $class; - if (UNIVERSAL::isa($_[0] => __PACKAGE__)) { - $class = shift; - } else { - $class = __PACKAGE__; - } - my($appkey, $entry_id, $user, $pass, $publish) = @_; +sub getPages { + my $class = shift; + my ($blog_id, $user, $pass) = @_; + $class->_get_entries( blog_id => $blog_id, user => $user, + pass => $pass, page => 1 ); +} + +sub _delete_entry { + my $class = shift; + my %param = @_; + my ($blog_id, $entry_id, $user, $pass, $publish) = + @param{qw( blog_id entry_id user pass publish )}; my $mt = MT::XMLRPCServer::Util::mt_new(); ## Will die if MT->new fails. - require MT::Entry; - my $entry = MT::Entry->load($entry_id) + my $obj_type = $param{page} ? 'page' : 'entry'; + my $entry = MT->model($obj_type)->load($entry_id) or die _fault(MT->translate("Invalid entry ID '[_1]'", $entry_id)); my($author, $perms) = $class->_login($user, $pass, $entry->blog_id); die _fault(MT->translate("Invalid login")) unless $author; @@ -480,8 +668,7 @@ sub deletePost { level => MT::Log::INFO(), class => 'system', category => 'delete' - }); - + }); if ($publish) { $class->_publish($mt, $entry, 1) or die _fault($class->errstr); @@ -489,13 +676,37 @@ sub deletePost { SOAP::Data->type(boolean => 1); } -sub getPost { +sub deletePost { + my $class; + if (UNIVERSAL::isa($_[0] => __PACKAGE__)) { + $class = shift; + } else { + $class = __PACKAGE__; + } + my($appkey, $entry_id, $user, $pass, $publish) = @_; + $class->_delete_entry( entry_id => $entry_id, user => $user, + pass => $pass, publish => $publish ); +} + +sub deletePage { my $class = shift; - my($entry_id, $user, $pass) = @_; + my ($blog_id, $user, $pass, $entry_id) = @_; + $class->_delete_entry( blog_id => $blog_id, entry_id => $entry_id, + user => $user, pass => $pass, publish => 1, page => 1 ); +} + +sub _get_entry { + my $class = shift; + my %param = @_; + my($blog_id, $entry_id, $user, $pass) = + @param{qw( blog_id entry_id user pass )}; + my $obj_type = $param{page} ? 'page' : 'entry'; my $mt = MT::XMLRPCServer::Util::mt_new(); ## Will die if MT->new fails. - require MT::Entry; - my $entry = MT::Entry->load($entry_id) + my $entry = MT->model($obj_type)->load($entry_id) or die _fault(MT->translate("Invalid entry ID '[_1]'", $entry_id)); + if ($blog_id && $blog_id != $entry->blog_id) { + die _fault(MT->translate("Invalid entry ID '[_1]'", $entry_id)); + } my($author, $perms) = $class->_login($user, $pass, $entry->blog_id); die _fault(MT->translate("Invalid login")) unless $author; die _fault(MT->translate("Not privileged to get entry")) @@ -508,15 +719,29 @@ sub getPost { require MT::Tag; my $delim = chr($author->entry_prefs->{tag_delim}); my $tags = MT::Tag->join($delim, $entry->tags); + + my $cats = []; + my $cat_data = $entry->__load_category_data(); + if (scalar @$cat_data) { + my ($first_cat) = grep { $_->[1] } @$cat_data; + my @cat_ids = grep { !$_->[1] } @$cat_data; + unshift @cat_ids, $first_cat if $first_cat; + $cats = MT->model('category')->lookup_multi( + [ map { $_->[0] } @cat_ids ]); + } + + my $basename = SOAP::Data->type(string => encode_text($entry->basename, undef, 'utf-8')); { dateCreated => SOAP::Data->type(dateTime => $co), userid => SOAP::Data->type(string => $entry->author_id), - postid => SOAP::Data->type(string => $entry->id), + ($param{page} ? 'page_id' : 'postid') => SOAP::Data->type(string => $entry->id), description => SOAP::Data->type(string => encode_text($entry->text, undef, 'utf-8')), title => SOAP::Data->type(string => encode_text($entry->title, undef, 'utf-8')), - mt_basename => SOAP::Data->type(string => encode_text($entry->basename, undef, 'utf-8')), + mt_basename => $basename, + wp_slug => $basename, link => SOAP::Data->type(string => $link), permaLink => SOAP::Data->type(string => $link), + categories => [ map { SOAP::Data->type(string => $_->label) } @$cats ], mt_allow_comments => SOAP::Data->type(int => $entry->allow_comments), mt_allow_pings => SOAP::Data->type(int => $entry->allow_pings), mt_convert_breaks => SOAP::Data->type(string => $entry->convert_breaks), @@ -527,6 +752,19 @@ sub getPost { } } +sub getPost { + my $class = shift; + my($entry_id, $user, $pass) = @_; + $class->_get_entry( entry_id => $entry_id, user => $user, pass => $pass ); +} + +sub getPage { + my $class = shift; + my ($blog_id, $entry_id, $user, $pass) = @_; + $class->_get_entry( blog_id => $blog_id, entry_id => $entry_id, + user => $user, pass => $pass, page => 1 ); +} + sub supportedMethods { [ 'blogger.newPost', 'blogger.editPost', 'blogger.getRecentPosts', 'blogger.getUsersBlogs', 'blogger.getUserInfo', 'blogger.deletePost', @@ -534,6 +772,8 @@ sub supportedMethods { 'metaWeblog.getRecentPosts', 'metaWeblog.newMediaObject', 'metaWeblog.getCategories', 'metaWeblog.deletePost', 'metaWeblog.getUsersBlogs', + 'wp.newPage', 'wp.getPages', 'wp.getPage', 'wp.editPage', + 'wp.deletePage', # not yet supported: metaWeblog.getTemplate, metaWeblog.setTemplate 'mt.getCategoryList', 'mt.setPostCategories', 'mt.getPostCategories', 'mt.getTrackbackPings', 'mt.supportedTextFilters', @@ -931,6 +1171,9 @@ BEGIN { @metaWeblog::ISA = qw( MT::XMLRPCServer ); } package mt; BEGIN { @mt::ISA = qw( MT::XMLRPCServer ); } +package wp; +BEGIN { @wp::ISA = qw( MT::XMLRPCServer ); } + 1; __END__ lib/MT/XMLRPCServer.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more details, consult -# your Movable Type license for details. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ lib/MT/default-templates.pl @@ -1,8 +1,8 @@ #!/usr/bin/perl -w -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ mt-add-notify.cgi @@ -1,8 +1,8 @@ #!/usr/bin/perl -w -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ mt-atom.cgi @@ -1,8 +1,8 @@ #!/usr/bin/perl -w -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -353,7 +353,7 @@ my $ver = $^V ? join('.', unpack 'C*', $^V) : $]; my $perl_ver_check = ''; if ($] < 5.006001) { # our minimal requirement for support $perl_ver_check = <<EOT; -<p class="warning"><MT_TRANS phrase="The version of Perl installed on your server ([_1]) is lower than the minimum supported version ([_2]). While Movable Type may run, it is an <strong>untested and unsupported</strong> environment. We <strong>strongly recommend</strong> upgrading to at least Perl [_2]." params="$ver%%5.6.1"></p> +<p class="warning"><MT_TRANS phrase="The version of Perl installed on your server ([_1]) is lower than the minimum supported version ([_2]). Please upgrade to at least Perl [_2]." params="$ver%%5.6.1"></p> EOT } my $config_check = ''; @@ -494,20 +494,16 @@ MSG } else { if ($data) { $dbi_is_okay = 1 if $mod eq 'DBI'; - if ($mod eq 'DB_File') { - $got_one_data = 1; - } elsif ($mod ne 'DBI') { - if ($mod eq 'DBD::mysql') { - if ($DBD::mysql::VERSION == 3.0000) { - print trans_templ(qq{<p class="warning"><MT_TRANS phrase="The DBD::mysql version you have installed is known to be incompatible with Movable Type. Please install the current release available from CPAN."></p>}); - } - } - if (!$dbi_is_okay) { - print trans_templ(qq{<p class="warning"><MT_TRANS phrase="The $mod is installed properly, but requires an updated DBI module. Please see note above regarding the DBI module requirements."></p>}); - } else { - $got_one_data = 1; + if ($mod eq 'DBD::mysql') { + if ($DBD::mysql::VERSION == 3.0000) { + print trans_templ(qq{<p class="warning"><MT_TRANS phrase="The DBD::mysql version you have installed is known to be incompatible with Movable Type. Please install the current release available from CPAN."></p>}); } } + if (!$dbi_is_okay) { + print trans_templ(qq{<p class="warning"><MT_TRANS phrase="The $mod is installed properly, but requires an updated DBI module. Please see note above regarding the DBI module requirements."></p>}); + } else { + $got_one_data = 1; + } } print trans_templ(qq{<p class="installed"><MT_TRANS phrase="Your server has [_1] installed (version [_2])." params="$mod%%} . $mod->VERSION . qq{"></p>\n\n}); } mt-check.cgi.pre @@ -1,8 +1,8 @@ #!/usr/bin/perl -w -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ mt-comments.cgi @@ -1,8 +1,8 @@ #!/usr/bin/perl -w -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2005-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ mt-feed.cgi @@ -1,10 +1,8 @@ #!/usr/bin/perl -w -# Original copyright 2001-2002 Jay Allen. -# Modifications and integration Copyright 2001-2007 Six Apart. -# Copyright 2001-2006 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ mt-search.cgi @@ -24,7 +24,7 @@ em { a:link, a:visited { - color: #61889b; + color: #33789c; } a:hover, @@ -219,7 +219,7 @@ fieldset { } .input-hint { - color:#999999; + color:#999; } .msg a.close-me { @@ -323,7 +323,7 @@ table.show-admin td { margin: 0; } .chromeless-wide #footer .inner { - border-top: 1px solid #CCC; + border-top: 1px solid #ccc; padding-top: 10px; margin: 0 18px; } @@ -450,10 +450,10 @@ table.show-admin td { .actions-bar .plugin-actions a:link, .actions-bar .plugin-actions a:visited, .actions-bar .plugin-actions button { - color: #306a86 !important; - border: 1px solid #93b2bf; - border-top-color: #c2cacd; - border-left-color: #c2cacd; + color: #33789c !important; + border: 1px solid #85afc4; + border-top-color: #cddee7; + border-left-color: #cddee7; padding: 1px 2px; background: #999 url('../images/buttons/button-list.gif') repeat-x 50% 50%; margin: 0 5px 0 0; @@ -464,7 +464,7 @@ table.show-admin td { .system .listing .actions-bar .actions button, .system .actions-bar .plugin-actions a, .system .actions-bar .plugin-actions button { - color: #7b8a35 !important; + color: #7f8833 !important; border-color: #a2a48d; border-top-color: #c9ccb0; border-left-color: #c9ccb0; @@ -496,7 +496,7 @@ table.show-admin td { .actions-bar .plugin-actions a:hover, .actions-bar .plugin-actions a:active, .actions-bar .plugin-actions button:hover { - color: #306a86 !important; + color: #33789c !important; background-position: 50% 30%; } .system .buttons a:hover, @@ -508,7 +508,7 @@ table.show-admin td { .system .actions-bar .plugin-actions a:hover, .system .actions-bar .plugin-actions a:active, .system .actions-bar .plugin-actions button:hover { - color: #7b8a35 !important; + color: #7f8833 !important; } /* Actions Bar Chromeless ---------------------------------------------------------------------------------- */ @@ -530,9 +530,9 @@ table.show-admin td { .upgrade .upgrade-process { overflow: auto; margin: 10px 0; - border: 1px solid #CCC; + border: 1px solid #ccc; padding: 10px; - background-color: #F7F7F7; + background-color: #fafafa; height: 200px; } mt-static/css/chromeless.css @@ -7,10 +7,6 @@ ul.main-nav-list ul a { float: left !important; } -.object-nav { - margin-top: 1em; -} - .system_check { width: 736px; /* scrollbars are wider in IE */ } @@ -89,7 +85,8 @@ button.big-button { /* In IE, the header block is actually placed at the bottom of the document but above the modal dialog iframe; this allows the pulldown menus to display above all other elements on the screen */ -.main-screen #content { + +.main-screen #content-header { margin-top: 120px; } .main-screen #header { @@ -98,3 +95,9 @@ button.big-button { left: 0px; width: 100%; } + +#editor .editor-header .tab { + position: relative; + top: 1px; + margin-bottom: 0; +} mt-static/css/hacks/ie.css @@ -9,7 +9,7 @@ body { a:link, a:visited { - color: #61889b; + color: #33789c; } a:hover, @@ -24,7 +24,7 @@ a:active { .system a:hover, .system a:active { - color: #61889b; + color: #33789c; } strong { @@ -81,30 +81,28 @@ textarea { select, textarea { -/* border: 1px solid #5694b6;*/ -/* background-color: #fafbfd;*/ } .inline-nav { white-space: nowrap; - color: #afb0b2; + color: #aaa; } .inline-nav li { /* TODO - use Vox inline list styling */ display: inline; - border-right: 1px solid #afb0b2; + border-right: 1px solid #aaa; padding: 0 7px; } fieldset { - margin-bottom: 2em; + margin-bottom: 1em; } fieldset + .actions-bar { - margin-top: -2em; +/* margin-top: -2em;*/ } iframe { - border: 1px solid #C5D3E0; + border: 1px solid #cddee7; } .system iframe { border-color: #C1C790; @@ -123,11 +121,10 @@ iframe { font-size: 11px; } -/* Page ------------------------------------------------------------ */ +/* Screen ------------------------------------------------------------ */ .main-screen { text-align: center; -/* height: 100%;*/ } #container { @@ -135,6 +132,7 @@ iframe { } .main-screen #header-inner, +.main-screen #content-header-inner, .main-screen #content-inner, .main-screen #footer-inner { margin-left: auto; @@ -150,7 +148,7 @@ iframe { position: relative; } -.popup-screen #container { +#container.popup-screen { margin: 10px; } @@ -226,7 +224,7 @@ iframe { white-space: nowrap; } #utility-nav #user a { - color: #FFF; + color: #fff; margin-left: 25px; padding-right: 0; padding-left: 0; @@ -242,7 +240,7 @@ iframe { #utility-nav li li span { /* disabled items */ display: block; padding: 2px 10px; - color: #888; + color: #777; } #system-menu a.nav-menu-link { @@ -314,7 +312,7 @@ iframe { } #selector-nav-list ul ul span { - color: #888; + color: #777; background-color: #575757; } @@ -354,7 +352,7 @@ iframe { } #selector-nav li.show-nav li a { margin: 0 5px; - color: #6d7800; + color: #606900; border-top: 1px solid #fff; background: #f3f4de; } @@ -510,17 +508,17 @@ li#config-menu { } #blog-nav a { - color: #3d7993; + color: #33789c; font-size: 13px; } #blog-nav a:hover { - color: #e9f0f4; + color: #ebf2f5; } #blog-nav li.show-nav a { background-color: #575757; - color: #e9f0f4; + color: #ebf2f5; } #blog-nav li.show-nav li a { color: #c2e3f3; @@ -531,13 +529,13 @@ li#config-menu { } #blog-nav li.show-nav li span { - color: #888; + color: #777; background-color: #575757; border-top: 1px solid #424242; } .system #blog-nav a { - color: #6d7800; + color: #606900; } .system #blog-nav a:hover { @@ -648,13 +646,56 @@ li#config-menu { position: absolute; left: 180px; white-space: nowrap; + color: #fff; +} +#modal-search .search-reset:hover { + color: #fff; + text-decoration: underline; +} + +.display-options-link { + float: right; +} + +#content-header-inner { + position: relative; +} + +.object-nav { + text-align: center; + position: absolute; + right: 240px; + top: 27px; +} +.edit-entry .object-nav, +.edit-asset .object-nav { + right: 340px; +} + +.object-nav li { + display: inline; +} + + + +/* Content Header ---------------------------------------------------------------------------------- */ + +#content-header { + background: #E7F0F6; +} +.system #content-header { + background: #EAF3D8; +} + +#content-header-inner { + padding-top: 18px; } /* Footer ---------------------------------------------------------------------------------- */ #footer { - border-top: 1px solid #c5d3e0; + border-top: 1px solid #cddee7; padding-top: 10px; background: url('../images/footer-bg.jpg') repeat-x; } @@ -670,13 +711,13 @@ li#config-menu { #footer .inline-nav { margin-left: -10px; white-space: nowrap; - color: #afb0b2; + color: #aaa; } #footer .inline-nav li { display: inline; border: 0; - border-left: 1px solid #afb0b2; + border-left: 1px solid #aaa; padding: 0 7px; } @@ -691,12 +732,99 @@ li#config-menu { /* Content ------------------------------------------------------------ */ .main-screen #content { - background: url('../images/content-bg.jpg') repeat-x; - padding: 18px 0; + background: url('../images/content.jpg') repeat-x; min-height: 400px; } .system #content { - background-image: url('../images/content-bg-system.jpg'); + background-image: url('../images/content-system.jpg'); +} + +#main-content-inner { + margin: 8px 10px 0; +} +#dashboard #main-content-inner { + margin-right: 0; +} +#edit-entry #main-content-inner, +#edit-page #main-content-inner { + margin-top: 10px; +} +.listing-screen #main-content-inner { + margin: 0; +} + +.main-screen #content-inner, +#dashboard #content-inner { + padding-top: 5px; + margin-bottom: 20px; + background: url('../images/content-inner.gif') no-repeat center 0; +} +.main-screen .listing-screen #content-inner, +#dashboard .listing-screen #content-inner { + background-image: url('../images/content-inner-listing.gif'); +} +.system .main-screen #content-inner, +#dashboard.system #content-inner { + background-image: url('../images/content-inner-system.gif'); +} +.system .listing-screen #content-inner, +#dashboard.system .listing-screen #content-inner { + background-image: url('../images/content-inner-listing-system.gif'); +} + +.content-nav #content-inner { + background: url('../images/content-inner-tw.gif') no-repeat 175px 0; +} +.listing-screen .content-nav #content-inner { + background-image: url('../images/content-inner-tw-listing.gif'); +} +.system .content-nav #content-inner { + background-image: url('../images/content-inner-tw-system.gif'); +} +.system .listing-screen .content-nav #content-inner { + background-image: url('../images/content-inner-tw-listing-system.gif'); +} + +.related-content #content-inner { + background: url('../images/content-inner-twt.gif') no-repeat 175px 0; +} +.listing-screen .related-content #content-inner { + background-image: url('../images/content-inner-twt-listing.gif'); +} +.system .related-content #content-inner { + background-image: url('../images/content-inner-twt-system.gif'); +} +.system .listing-screen .related-content #content-inner { + background-image: url('../images/content-inner-twt-listing-system.gif'); +} + +.related-content-without-content-nav #content-inner { + background: url('../images/content-inner-wt.gif') no-repeat center 0; +} +.listing-screen .related-content-without-content-nav #content-inner { + background-image: url('../images/content-inner-wt-listing.gif'); +} +.system .related-content-without-content-nav #content-inner { + background-image: url('../images/content-inner-wt-system.gif'); +} +.system .listing-screen .related-content-without-content-nav #content-inner { + background-image: url('../images/content-inner-wt-listing-system.gif'); +} + + +#edit-entry #content-inner, +#edit-page #content-inner, +#edit-asset #content-inner { + background-image: url('../images/content-inner-wm.gif'); +} + +#list-blog #main-content, +#list-group #main-content, +#list-widget-set #main-content, +#list-associations #main-content, +#list-author #main-content, +#list-role #main-content { + padding-top: 5px; } .content-nav #content-nav, @@ -705,23 +833,16 @@ li#config-menu { .related-content #related-content { float: left; } -.content-nav #content-header { - float: right; -} .content-nav #content-nav { - width: 130px; + width: 140px; padding-bottom: 100px; /* taller than content-header */ } -.content-nav #content-header, + .content-nav #main-content { width: 760px; - padding-left: 29px; - border-left: 1px solid #c5d3e0; -} -.system .content-nav #content-header, -.system .content-nav #main-content { - border-left: 1px solid #c1c790; + padding-left: 20px; +/* border-left: 1px solid #cddee7;*/ } .related-content #main-content { @@ -730,18 +851,25 @@ li#config-menu { .related-content-without-content-nav #main-content { width: 700px; } +.edit-entry .related-content-without-content-nav #main-content, +.edit-asset .related-content-without-content-nav #main-content { + width: 600px; +} .related-content #related-content { width: 220px; } +.edit-entry .related-content #related-content, +.edit-asset .related-content #related-content { + width: 320px; +} .main-screen #main-content { min-height: 300px; } .dashboard #main-content { - margin-top: 15px; - margin-left: 15px; - width: 567px; + margin-top: 8px; + width: 587px; } .dashboard #related-content { margin-top: 15px; @@ -749,12 +877,24 @@ li#config-menu { } .main-screen #content-header h2 { - margin: 0 0 20px; + margin: 0 0 10px; padding: 0; font-size: 24px; font-weight: normal; line-height: 1; } +.content-nav #content-header h2, +.content-nav .action-link-list { + margin-left: 140px; + padding-left: 20px; +} +.content-nav .msg { + margin-left: 160px; +} +.content-nav .msg-info { + margin-left: 0px; +} + /* Tabs ---------------------------------------------------------------------------------- */ @@ -798,7 +938,8 @@ li#config-menu { /* Content Nav ---------------------------------------------------------------------------------- */ #content-nav { - margin: 1.5em 0 0; + position: relative; + top: -38px; } #content-nav ul li { @@ -823,7 +964,7 @@ li#config-menu { font-weight: bold; } .system #content-nav ul li.active a { - background: url('../images/content-nav-arrow-system.gif') no-repeat right center; + background-image: url('../images/content-nav-arrow-system.gif'); } /* Related Content ---------------------------------------------------------------------------------- */ @@ -832,12 +973,8 @@ li#config-menu { margin-left: 20px; } -.widget { - background: #fff; -} - .widget-label { - padding: 4px 10px; + padding: 4px 0; } .widget-content-inner { padding: 7px 10px 10px; @@ -865,38 +1002,120 @@ li#config-menu { } .widget-header { - background: #fff url(../images/widget/related-content-header-bg.gif) repeat-x left bottom; - border: 1px solid #e7eff3; - border-width: 1px 0; + margin: 0 10px; + border-bottom: 1px solid #e7eff3; } -.widget:first-child .widget-header { - border-top: none; +#dashboard .widget-header { + margin: 0; } -.widget:first-child .widget-header-inner { - background: url(../images/widget/related-content-tl.gif) no-repeat left top; +/* Status Widget */ + +.stats-widget .widget-header { + display: none; } -.widget:first-child .widget-label { - background: url(../images/widget/related-content-tr.gif) no-repeat right top; +.stats-widget .object-status { + background: #000 url('../images/status-widget-bar-top.gif') no-repeat; + text-align: right; } -/* Display Options Widget */ +.stats-widget .object-status ul { + background: transparent url('../images/status-widget-bar-bottom.gif') no-repeat center bottom; + padding: 3px 8px 0; + margin-bottom: 0; +} -#display-options-widget .widget-header a { - background: url(../images/spinner-right.gif) no-repeat left center; - padding-left: 11px; +.stats-widget .object-status li { + display: inline; } -#display-options-widget.active .widget-header a { - background-image: url(../images/spinner-bottom.gif); + +.stats-widget .object-status-detail { + float: left; } -#display-options-widget .widget-content { - display: none; +.stats-widget .view-entry-link { + background: transparent url('../images/divider.gif') no-repeat left center; + padding: 0 10px; } -#display-options-widget.active .widget-content { - display: block; +.stats-widget .object-status, +.stats-widget .object-status a, +.stats-widget .object-status a:hover { + color: #fff; +} + + +.object-stats { + clear: both; +} + +.comments-link a, +.pings-link a { + padding-left: 20px; + background-position: left center; + background-repeat: no-repeat; +} + +.comments-link a { + background-image: url('../images/nav_icons/color/comments.gif'); +} + +.pings-link a { + background-image: url('../images/nav_icons/color/trackbacks.gif'); +} + +.stats-widget .object-stats li { + padding: 3px 5px; + border-bottom: 1px dashed #cddee7; +} + +#manage-link { + margin: 0 10px; + border: 1px solid #cddee7; + border-width: 0 1px; + padding: 0 10px; + white-space: nowrap; +} + +.object-nav span { + color: #666; +} +#previous-link a, +#previous-link span { + padding-left: 14px; + background: transparent url('../images/arrow-left-gray.gif') no-repeat left center; +} +#previous-link a { + background-image: url('../images/arrow-left-blue.gif'); +} +#previous-link a:hover { + background-image: url('../images/arrow-left-green.gif'); +} +#next-link a, +#next-link span { + padding-right: 14px; + background: transparent url('../images/arrow-right-gray.gif') no-repeat right center; +} +#next-link a { + background-image: url('../images/arrow-right-blue.gif'); +} +#next-link a:hover { + background-image: url('../images/arrow-right-green.gif'); +} + + +/* Display Options Widget */ + +#display-options-widget { + position: absolute; + z-index: 99998; + left: -1000px; + top: -1000px; + text-align: left; + background-color: #fff; + border: 1px solid #cddee7; + width: 180px; } #entryfield-options li .cb, @@ -908,6 +1127,8 @@ li#config-menu { margin-bottom: .25em; } +/* Quickfilters widget */ + #quickfilters .widget-content-inner { padding-left: 0; } @@ -941,6 +1162,10 @@ li#config-menu { padding-top: 0; } +.dashboard .widget-label { + padding: 4px 10px; +} + .dashboard .user-pic { float: left; width: 50px; @@ -1010,7 +1235,7 @@ li#config-menu { } .dashboard .blog_stats-widget .widget-content { - border-left: 1px solid #f5f7f9; + border-left: 1px solid #f3f6f9; } .dashboard .blog_stats-widget .widget-footer { @@ -1118,7 +1343,7 @@ li#config-menu { color: #000; } .dashboard .entry h4 a:hover { - color: #61889b; + color: #33789c; } .dashboard .entry-odd { @@ -1313,15 +1538,6 @@ li#config-menu { margin-bottom: .75em; } -/* Dashboard ---------------------------------------------------------------------------------- */ - -#dashboard #content-inner { - background: url(../images/dashboard-bg.gif) no-repeat center 38px; -} -#dashboard.system #content-inner { - background-image: url(../images/dashboard-bg-system.gif); -} - /* Forms ---------------------------------------------------------------------------------- */ .full-width { @@ -1371,12 +1587,13 @@ textarea.tall { fieldset h3 { margin-top: 0; + margin-bottom: 1em; + border-bottom: 1px solid #cddee7; + padding-bottom: .25em; } .field { - margin-bottom: .75em; - border-bottom: 1px solid #c5d3e0; - padding-bottom: .75em; + margin-bottom: 1.5em; } .system .field { border-color: #C1C790; @@ -1386,6 +1603,7 @@ fieldset h3 { display: block; font-weight: bold; margin-top: 2px; + color: #777; } .field-left-label .field-header { @@ -1444,7 +1662,7 @@ fieldset h3 { .textarea-wrapper { border: 1px solid #ccc; - background-color: #FFF; + background-color: #fff; padding: 0 4px; } @@ -1463,20 +1681,43 @@ fieldset h3 { .actions-bar-top, .actions-bar-bottom { display: none; -} +} +.listing-screen .actions-bar-top, +.listing-screen .actions-bar-bottom { + background-color: #f3f6f9; +} .show-actions-bar-top .actions-bar-top { display: block; } .show-actions-bar-bottom .actions-bar-bottom { display: block; } + +.actions-bar-top { + padding-bottom: .5em; + border-bottom: 1px solid #cddee7; +} +.actions-bar-bottom { + padding-top: .5em; + border-top: 1px solid #cddee7; +} +.system .actions-bar { + border-color: #c1c1c1; +} + +.edit-entry .actions-bar-top, +.edit-entry .actions-bar-bottom { + padding: 0; + border: none; +} + .search-replace .actions-bar-top, .search-replace .actions-bar-bottom { display: block; } .edit-entry .actions-bar-bottom { margin-bottom: .75em; -} +} .settings-actions-bar .actions-bar-inner { margin-left: 130px; @@ -1612,10 +1853,10 @@ button.primary-button:hover { .actions-bar .plugin-actions a:link, .actions-bar .plugin-actions a:visited, .actions-bar .plugin-actions button { - color: #306a86 !important; - border: 1px solid #93b2bf; - border-top-color: #c2cacd; - border-left-color: #c2cacd; + color: #33789c !important; + border: 1px solid #85afc4; + border-top-color: #cddee7; + border-left-color: #cddee7; padding: 1px 2px; background: #999 url('../images/buttons/button-list.gif') repeat-x 50% 50%; margin: 0 5px 0 0; @@ -1626,7 +1867,7 @@ button.primary-button:hover { .system .listing .actions-bar .actions button, .system .actions-bar .plugin-actions a, .system .actions-bar .plugin-actions button { - color: #7b8a35 !important; + color: #7f8833 !important; border-color: #a2a48d; border-top-color: #c9ccb0; border-left-color: #c9ccb0; @@ -1658,7 +1899,7 @@ button.primary-button:hover { .actions-bar .plugin-actions a:hover, .actions-bar .plugin-actions a:active, .actions-bar .plugin-actions button:hover { - color: #306a86 !important; + color: #33789c !important; background-position: 50% 30%; } .system .buttons a:hover, @@ -1670,7 +1911,7 @@ button.primary-button:hover { .system .actions-bar .plugin-actions a:hover, .system .actions-bar .plugin-actions a:active, .system .actions-bar .plugin-actions button:hover { - color: #7b8a35 !important; + color: #7f8833 !important; } .listing .delete { @@ -1740,23 +1981,11 @@ optgroup option { /* Listing ---------------------------------------------------------------------------------- */ -.listing { - border: 1px solid #c5d3e0; -} -.system .listing { - border-color: #c1c1c1; -} -.dialog .listing { - border: none; -} - .listing table { width: 100%; margin: 0; border: 0; padding: 0; - border: 1px solid #c5d3e0; - border-width: 1px 0; } .system .listing table { border-color: #c1c1c1; @@ -1795,8 +2024,8 @@ optgroup option { } .listing th { - border-bottom-color: #c5d3e0; - border-left: 1px solid #cfdae5; + border-bottom-color: #cddee7; + border-left: 1px solid #cddee7; padding-left: 5px; color: #333; font-weight: bold; @@ -1953,7 +2182,7 @@ optgroup option { .detail-inner { margin-top: -4px; margin-left: 4px; - border-left: 1px solid #c5d3e0; + border-left: 1px solid #cddee7; padding-left: 10px; } @@ -2002,7 +2231,71 @@ optgroup option { /* list asset */ -.asset-preview { +.asset-listing-table .as-file-size { + white-space: nowrap; +} + +#asset-listing-table .asset-thumb { + height: 75px; + width: 75px; + border: 2px solid #CCC; + background: #EEE url(../images/asset/file.gif) no-repeat center center; +} +#asset-listing-table .asset-thumb { background-image: url(../images/asset/file.gif); } +#asset-listing-table .asset-type-image .asset-thumb { background-image: url(../images/asset/image.gif); } +#asset-listing-table .asset-type-audio .asset-thumb { background-image: url(../images/asset/audio.gif); } +#asset-listing-table .asset-type-video .asset-thumb { background-image: url(../images/asset/video.gif); } + +#asset-listing-table .status-missing .asset-thumb { background-image: url(../images/asset/file-warning.gif); } +#asset-listing-table .status-missing .asset-type-image .asset-thumb { background-image: url(../images/asset/image-warning.gif); } +#asset-listing-table .status-missing .asset-type-audio .asset-thumb { background-image: url(../images/asset/audio-warning.gif); } +#asset-listing-table .status-missing .asset-type-video .asset-thumb { background-image: url(../images/asset/video-warning.gif); } + +#asset-listing-table .asset-thumbnail .asset-thumb { + position: relative; + height: 79px; + width: 79px; + background: #000; + border: none; +} + +#asset-listing-table .asset-no-thumbnail .asset-thumb a { + display: block; + height: 75px; +} +#asset-listing-table .asset-thumb a span { + display: none; +} + +#asset-listing-table .status-missing .as-asset-type { + background: url(../images/status_icons/warning.gif) no-repeat left center; + padding-left: 15px; +} + +.asset-image { + background-image: url(../images/asset-image.gif); +} + +#asset-listing-table .asset-thumb-innner { + margin: 2px; +} + +.asset-listing-table .as-file-status .asset-preview-link { + position: absolute; + bottom: 0; + right: 0; + width: 18px; + height: 18px; + background: transparent url(../images/preview.gif) no-repeat; +} +.asset-listing-table .as-file-status .asset-preview-link a:hover { + text-decoration: none; +} +.asset-listing-table .as-file-status .asset-preview-link span { + display: none; +} + +.listing .asset-preview { display: none; position: relative; top: -45px; @@ -2011,25 +2304,25 @@ optgroup option { .dialog .asset-preview { position: absolute; top: 1px; - left: 238px; - width: 370px; + left: 348px; + width: 260px; height: 302px; border: 1px solid #D7E3F5; border-width: 0 1px 1px; background-color: #000; } -.asset-preview-inner { +.listing .asset-preview-inner { position: absolute; background-color: #000; padding: 10px; - width: 350px; + width: 260px; z-index: 5; overflow: hidden; } .dialog .asset-preview-inner { position: static; - width: 350px; + width: 260px; } .listing tbody tr td .asset-preview, @@ -2037,15 +2330,15 @@ optgroup option { color: #fff; } -.asset-preview .asset-preview-inner a:link, -.asset-preview .asset-preview-inner a:visited, -.asset-preview .asset-preview-inner a:hover, -.asset-preview .asset-preview-inner a:active { - color: #61889b; +.listing .asset-preview .asset-preview-inner a:link, +.listing .asset-preview .asset-preview-inner a:visited, +.listing .asset-preview .asset-preview-inner a:hover, +.listing .asset-preview .asset-preview-inner a:active { + color: #33789c; text-decoration: none; } -.asset-preview .close-preview-link { +.listing .asset-preview .close-preview-link { position: absolute; top: 0; right: 0; @@ -2057,17 +2350,26 @@ optgroup option { color: #999; text-decoration: none; } -.asset-preview .close-preview-link span { +.listing .asset-preview .close-preview-link span { display: none; } -.asset-preview-title { +.listing .asset-preview-image { + overflow: hidden; + margin-bottom: 5px; +} + +.listing .asset-preview-title { overflow: hidden; color: #c2e3f3; line-height: 1.3; font-size: 16px; font-weight: bold; } +.dialog .listing .asset-preview-title { + white-space: nowrap; + display: none; +} .asset-icon { height: 146px; @@ -2122,7 +2424,7 @@ optgroup option { .log-listing-table .detail-inner { border-left: 1px solid #ccc; padding-left: 10px; - color: #444; + color: #424242; width: 650px; max-height: 200px; overflow: scroll; @@ -2216,16 +2518,9 @@ optgroup option { /* filter */ .listing-filter { - background: #000 url(../images/listing/filter-tl.gif) no-repeat left top; color: #fff; -} -.listing-filter-inner { - background: url(../images/listing/filter-tr.gif) no-repeat right top; padding: 5px 10px; } -.listing-filter-inner-empty { - padding: 3px; -} #filter-mode-all, #filter-mode-only { @@ -2303,15 +2598,6 @@ optgroup option { margin-left: 90px; } -.edit-entry #entry-nav .inline-nav { - margin-bottom: 5px; -} - -.edit-entry #entry-nav #next-link, -.edit-entry #entry-nav .view-entry-link { - border-right: none; -} - .edit-entry #title-field, .edit-entry #entry-body-field { border-bottom: none; @@ -2323,7 +2609,7 @@ optgroup option { } .edit-entry #title-field #title { - width: 691px; + width: 561px; padding: 2px 2px 1px; font-size: 18px; font-weight:bold; @@ -2331,31 +2617,35 @@ optgroup option { #editor { clear: both; - background: #ccc; } #editor .editor-header .tab { float: left; - width: 100px; - margin: 4px 0 0 4px; - margin-bottom: -1px; /*use value of -1 for IE6 if necessary when final editor installed*/ - padding: 2px 0; - border-bottom-width: 0; - background-color: #b3b3b3; + margin: 4px 4px -1px 0; + padding: 4px 10px; + background-color: #f3f3f3; font-weight: bold; text-align: center; + text-transform: uppercase; + font-size: 11px; } #editor .editor-header .selected-tab { - background-color: #f3f3f3; + border: 1px solid #b8b8b8; + border-bottom-width: 0; } #editor .editor-header .tab a { - color: #fff; + color: #777; +} + +#editor .editor-header .tab a:hover { + color: #33789c; } -#editor .editor-header .selected-tab a { - color: #293a43; +#editor .editor-header .selected-tab a, +#editor .editor-header .selected-tab a:hover { + color: #000; } #field-convert_breaks { @@ -2373,12 +2663,6 @@ optgroup option { #editor-content { border-bottom: 1px solid #fff; /* hack - safari */ - margin-bottom: 1em; -} - -.edit-entry fieldset { - border-top: 2px solid #c5d3e0; - padding: 0 10px; } .edit-entry .main-content .field { @@ -2386,24 +2670,7 @@ optgroup option { } .edit-entry fieldset h3 { - font-weight: normal; - text-transform: uppercase; - background: #fff; - display: inline; - position: relative; - bottom: .85em; - padding: 0 5px; - font-size: 13px; -} - -#publishing-field, -#feedback-field { - float: left; - width: 315px; -} - -#publishing-field { - margin-right: 30px; + display: none; } #sent-tb { @@ -2417,7 +2684,7 @@ optgroup option { #basename-field .field-content input { border: 1px solid #ccc; - background-color: #FFF; + background-color: #fff; } #basename-field .field-content input, @@ -2452,9 +2719,11 @@ optgroup option { float: left; } -.entry-date, +.entry-date { + width: 43%; +} .entry-time { - width: 80px; + width: 33%; } .date-picker { @@ -2489,7 +2758,7 @@ optgroup option { #tags_completion .complete-highlight { color: #fff; - background-color: #8faebe; + background-color: #85afc4; } .edit-entry .button-actions { float: left; } @@ -2497,7 +2766,7 @@ optgroup option { .edit-entry .main-content .actions-bar { clear: both; - border-top: 1px solid #c5d3e0; + border-top: 1px solid #cddee7; padding-top: 10px; } @@ -2508,10 +2777,6 @@ optgroup option { .edit-entry .actions-bar-bottom { margin-top: .75em; } -.create-new .actions-bar-bottom { -/* border: none;*/ -/* padding-top: 0;*/ -} .edit-entry .create-new .actions-bar-top { border-width: 0; @@ -2526,6 +2791,11 @@ optgroup option { line-height: 2; } +.edit-entry .field { + border-bottom: 0; + padding-bottom: 0; +} + /* Preview Entry ---------------------------------------------------------------------------------- */ @@ -2570,7 +2840,7 @@ body.preview-screen { } .edit-template #title-field #title { - width: 691px; + width: 671px; padding: 2px 2px 1px; font-size: 18px; font-weight:bold; @@ -2583,6 +2853,10 @@ body.preview-screen { background: #f3f3f3; } +.edit-template .listing { + border: 1px solid #cddee7; +} + .edit-template .actions-bar-top { margin-bottom: .75em; } @@ -2624,6 +2898,99 @@ body.preview-screen { display: none; } +/* Edit Asset ---------------------------------------------------------------------------------- */ + +.edit-asset #main-content .asset-preview { + float: right; + width: 260px; + text-align: center; +} + +.edit-asset #main-content .asset-thumb { + height: 256px; + width: 256px; + border: 2px solid #CCC; + background: #EEE url(../images/asset/file.gif) no-repeat center center; +} +.edit-asset #main-content .asset-thumb { background-image: url(../images/asset/file.gif); } +.edit-asset #main-content .asset-type-image .asset-thumb { background-image: url(../images/asset/image.gif); } +.edit-asset #main-content .asset-type-audio .asset-thumb { background-image: url(../images/asset/audio.gif); } +.edit-asset #main-content .asset-type-video .asset-thumb { background-image: url(../images/asset/video.gif); } + +.edit-asset #main-content .status-missing .asset-thumb { background-image: url(../images/asset/file-warning.gif); } +.edit-asset #main-content .status-missing .asset-type-image .asset-thumb { background-image: url(../images/asset/image-warning.gif); } +.edit-asset #main-content .status-missing .asset-type-audio .asset-thumb { background-image: url(../images/asset/audio-warning.gif); } +.edit-asset #main-content .status-missing .asset-type-video .asset-thumb { background-image: url(../images/asset/video-warning.gif); } + +.edit-asset #main-content .asset-thumbnail .asset-thumb { + float: right; + height: 260px; + width: 260px; + margin-bottom: .75em; + background: #000; + border: none; +} +.edit-asset #main-content .asset-thumb-inner { + height: 240px; + margin: 10px; + overflow: hidden; +} + +.edit-asset #main-content .asset-thumb span { + display: none; +} +.edit-asset #main-content .asset-thumb .asset-missing-msg { + display: inline; + background: url(../images/status_icons/warning.gif) no-repeat left center; + padding-left: 15px; +} + +.edit-asset #main-content .asset-thumb-metadata { + margin-top: .75em; +} + + +.edit-asset #main-content .asset-metadata { + float: left; + width: 300px; +} + +.edit-asset #related-content .asset { + clear: left; + margin-bottom: 8px; + border-bottom: 1px dashed #cddee7; + padding-bottom: 4px; +} + +.edit-asset #related-content .asset * { + font-size: 11px; +} + +.edit-asset #related-content .asset-preview { + float: left; + margin: 3px 10px 10px 0; + border: 2px solid #000; + width: 79px; + background-color: #000; + text-align: center; +} + +.edit-asset #related-content .asset .asset-metadata { + margin-left: 94px; +/* overflow: hidden;*/ +} + +.edit-asset #url-field .field-content { + overflow: hidden; +} + +.asset-embed input { + width: 240px; +} + +.edit-asset .actions-bar { + clear: both; +} /* Edit Role ---------------------------------------------------------------------------------- */ @@ -2635,7 +3002,7 @@ body.preview-screen { #permission-list .field { margin-top: 1em; padding-bottom: .5em; - border-bottom: 1px solid #8faebe; + border-bottom: 1px solid #85afc4; } /* Tools ---------------------------------------------------------------------------------- */ @@ -2656,7 +3023,7 @@ body.preview-screen { .search-replace .tabs { height: 22px; margin: 10px 0; - border-bottom: 1px solid #c5d3e0; + border-bottom: 1px solid #cddee7; width: 100%; } @@ -2675,7 +3042,7 @@ body.preview-screen { } .search-replace .tabs .yah { - background: #CEDCF0 url(../images/tab-bg-yah.gif) repeat-x; + background: #cddee7 url(../images/tab-bg-yah.gif) repeat-x; } .search-replace .tabs .yah a { @@ -2684,7 +3051,7 @@ body.preview-screen { .search-replace .search-bar { margin: -10px 0 10px 0; - border-bottom: 1px solid #c5d3e0; + border-bottom: 1px solid #cddee7; padding: 15px 0 15px 150px; font-size: 11px; background-color: #fff; @@ -2767,7 +3134,7 @@ body.preview-screen { .search-replace .advanced-options { margin: -10px 0 10px 0; - border-bottom: 1px solid #CEDCF0; + border-bottom: 1px solid #cddee7; padding: 10px 0 5px 0; text-align: left; background-color: #fff; @@ -2833,7 +3200,7 @@ body.preview-screen { top: 2em; left: 0; width: 300px; - border: 1px solid #c6d4e0; + border: 1px solid #cddee7; background-color: #f3f6f9; z-index: 6; } @@ -2868,7 +3235,7 @@ body.preview-screen { } .category-selector-list { - border: 1px solid #c6d4e0; + border: 1px solid #cddee7; background: #fff; height: 200px; overflow: scroll; @@ -2972,14 +3339,9 @@ body.preview-screen { display: none; } -.add-new-category-link { - float: right; - padding-left: 11px; - background: url(../images/status_icons/create.gif) no-repeat left center; -} - +.add-new-category-link, .change-folder-link { - float: left; + float: right; padding-left: 11px; background: url(../images/status_icons/create.gif) no-repeat left center; } @@ -3003,10 +3365,28 @@ body.preview-screen { background-position: right center; } -.icon-right-wide { padding-right: 15px; } -.icon-left-wide { padding-left: 15px; } -.icon-right-xwide { padding-right: 20px; } -.icon-left-xwide { padding-left: 20px; } +.icon-left-wide { + padding-left: 15px; + background-repeat: no-repeat; + background-position: left center; +} +.icon-right-wide { + padding-right: 15px; + background-repeat: no-repeat; + background-position: right center; +} + +.icon-left-xwide { + padding-left: 20px; + background-repeat: no-repeat; + background-position: left center; +} +.icon-right-xwide { + padding-right: 20px; + background-repeat: no-repeat; + background-position: right center; +} + .icon-batch { background-image: url('../images/status_icons/batch.gif'); } .icon-feed { background-image: url('../images/status_icons/feed.gif'); } @@ -3027,13 +3407,23 @@ body.preview-screen { .icon-draft { background-image: url('../images/status_icons/draft.gif'); } .icon-future { background-image: url('../images/status_icons/future.gif'); } .icon-pending { background-image: url('../images/status_icons/warning.gif'); } +.icon-share { background-image: url('../images/status_icons/share.gif');} + +.edit-entry .stats-widget .icon-success { background-image: url('../images/status_icons/success-k.gif'); } +.edit-entry .stats-widget .icon-view { background-image: url('../images/status_icons/view-k.gif'); } +.edit-entry .stats-widget .icon-draft { background-image: url('../images/status_icons/draft-k.gif'); } +.edit-entry .stats-widget .icon-future { background-image: url('../images/status_icons/future-k.gif'); } +.edit-entry .stats-widget .icon-pending { background-image: url('../images/status_icons/warning-k.gif'); } .icon-plugins { background-image: url('../images/nav_icons/color/plugins.gif'); } .icon-search { background-image: url('../images/nav_icons/color/search.gif'); } .icon-trackbacks { background-image: url('../images/nav_icons/color/trackbacks.gif'); } +.icon-comments { background-image: url('../images/nav_icons/color/comments.gif'); } .icon-log { background-image: url('../images/nav_icons/color/log.gif'); } .icon-import { background-image: url('../images/nav_icons/color/import.gif'); } .icon-settings { background-image: url('../images/nav_icons/color/settings.gif'); } +.icon-entry { background-image: url('../images/nav_icons/color/entry.gif'); } +.icon-page { background-image: url('../images/nav_icons/color/page.gif'); } .icon-user { background-image: url('../images/nav_icons/color/user.gif'); } .icon-group { background-image: url('../images/nav_icons/color/group.gif'); } @@ -3069,21 +3459,25 @@ body.preview-screen { background-position: right center; } -.icon-mini-comments { background-image: url('../images/nav_icons/mini/comments.gif'); } -.icon-mini-docs { background-image: url('../images/nav_icons/mini/docs.gif'); } .icon-mini-view-site { background-image: url('../images/nav_icons/mini/view-site.gif'); } -.icon-mini-templates { background-image: url('../images/nav_icons/mini/templates.gif'); } .icon-mini-settings { background-image: url('../images/nav_icons/mini/settings.gif'); } .icon-mini-delete { background-image: url('../images/nav_icons/mini/delete.gif'); } -.icon-mini-trackbacks { background-image: url('../images/nav_icons/mini/trackbacks.gif'); } .icon-mini-rebuild { background-image: url('../images/nav_icons/mini/rebuild.gif'); } .icon-mini-dashboard { background-image: url('../images/nav_icons/mini/dashboard.gif'); } -.icon-mini-new-entry { background-image: url('../images/nav_icons/mini/entry-new.gif'); } -.icon-mini-new-page { background-image: url('../images/nav_icons/mini/page-new.gif'); } -.icon-mini-new-asset { background-image: url('../images/nav_icons/mini/asset-new.gif'); } + +.icon-mini-templates { background-image: url('../images/nav_icons/mini/templates.gif'); } +.icon-mini-comments { background-image: url('../images/nav_icons/mini/comments.gif'); } +.icon-mini-docs { background-image: url('../images/nav_icons/mini/docs.gif'); } +.icon-mini-trackbacks { background-image: url('../images/nav_icons/mini/trackbacks.gif'); } + .icon-mini-entries { background-image: url('../images/nav_icons/mini/entries.gif'); } +.icon-mini-new-entry { background-image: url('../images/nav_icons/mini/entry-new.gif'); } + .icon-mini-pages { background-image: url('../images/nav_icons/mini/pages.gif'); } +.icon-mini-new-page { background-image: url('../images/nav_icons/mini/page-new.gif'); } + .icon-mini-assets { background-image: url('../images/nav_icons/mini/assets.png'); } +.icon-mini-new-asset { background-image: url('../images/nav_icons/mini/asset-new.gif'); } .icon-mini-delete span { display: none; } @@ -3165,7 +3559,7 @@ body.preview-screen { } .resizer { - background: #C5C5C5 url(../images/resize.png) no-repeat scroll center 4px; + background: #c5c5c5 url(../images/resize.png) no-repeat scroll center 4px; -moz-user-select: none; bottom: 0; left: 0; @@ -3207,7 +3601,7 @@ body.preview-screen { body.dialog { margin: 20px 25px 25px; - background: url('../images/content-bg.jpg') repeat-x; + background: url('../images/content.jpg') repeat-x; } .dialog #container { @@ -3281,7 +3675,7 @@ body.dialog { } #new_entry_prefs { - border: 1px solid #c5d3e0; + border: 1px solid #cddee7; background-color: #f3f6f9; padding: 10px; position: relative; @@ -3362,7 +3756,7 @@ body.dialog { .dialog .selected-items .items a:link, .dialog .selected-items .items a:visited { text-decoration: none; - color: #26566e; + color: #33789c; padding-left: 4px; padding-right: 4px; } @@ -3371,20 +3765,20 @@ body.dialog { .dialog .selected-items .items a:hover { cursor: pointer; text-decoration: none; - color: #FFF; - background-color: #8faebe; + color: #fff; + background-color: #85afc4; padding-left: 4px; padding-right: 4px; } .dialog .selected-items .items a:link .remove, .dialog .selected-items .items a:visited .remove { - color: #FFF; + color: #fff; } .dialog .selected-items .items a:hover .remove, .dialog .selected-items .items a:active .remove { - color: #26566e; + color: #33789c; } /* Search Bar */ @@ -3392,11 +3786,21 @@ body.dialog { .dialog .listing-filter { height: 30px; overflow: hidden; + background: #000 url(../images/listing/filter-tl.gif) no-repeat left top; + color: #fff; + padding: 0; } .dialog .listing-filter-inner { - padding: 0 10px; + background: url(../images/listing/filter-tr.gif) no-repeat right top; + padding: 5px 10px; +} +.dialog .listing-filter-inner-empty { + padding: 3px; } + + + .dialog .listing-filter input { font-size: 11px; } @@ -3407,7 +3811,7 @@ body.dialog { overflow: auto; overflow-x: hidden; overflow-y: auto; - border: 1px solid #c5d3e0; + border: 1px solid #cddee7; border-width: 0 1px 1px; font-size: 11px; } @@ -3421,7 +3825,7 @@ body.dialog { overflow: auto; overflow-x: hidden; overflow-y: auto; - border: 1px solid #c5d3e0; + border: 1px solid #cddee7; border-width: 0 1px 1px; } @@ -3430,7 +3834,7 @@ body.dialog { } .insert-asset-dialog .condensed .list-data-wrapper-modal { - width: 238px; + width: 348px; border-width: 0 1px 1px; } @@ -3537,7 +3941,7 @@ body.dialog { .edit-comment .comment-status-unapproved, .edit-ping .ping-status-unapproved, .edit-author .user-status-pending { - background: #ffff87; + background: #ff9; } .edit-comment .comment-status-spam, @@ -3646,6 +4050,12 @@ body.dialog { text-decoration: none; } +#allow_pings-field, +#allow_comments-field { + background-color: #f3f6f9; + padding: 1em 0; + +} /* Plugin Settings ---------------------------------------------------------------------------------- */ @@ -3744,14 +4154,14 @@ body.dialog { background-position: 10px center; } #list-plugins .plugin-tabs-list li.selected-tab a { - border-bottom: 3px solid #c5d3e0; + border-bottom: 3px solid #cddee7; } #list-plugins.system .plugin-tabs-list li.selected-tab a { border-bottom-color: #c1c790; } #list-plugins .plugin-tabs-content { - border: 1px solid #c5d3e0; + border: 1px solid #cddee7; border-width: 1px 0 0; /* background: #f3f6f9;*/ padding: 10px 10px; @@ -3778,7 +4188,7 @@ body.dialog { .edit-author ul.inline-list li { float: left; white-space: nowrap; - margin-right: 30px; + width: 175px; } @@ -3813,9 +4223,9 @@ body.dialog { .import-process { overflow: auto; margin: 0 0 10px; - border: 1px solid #c5d3e0; + border: 1px solid #cddee7; padding: 10px; - background-color: #F7F7F7; + background-color: #fafafa; height: 258px; width: 738px; } @@ -3842,7 +4252,7 @@ body.dialog { .restore-confirm-publishing-config .restore-publishing-paths { overflow: auto; height: 353px; - border: 1px solid #c5d3e0; + border: 1px solid #cddee7; padding: 10px 20px; } @@ -3850,31 +4260,31 @@ body.dialog { .calendar { background:white none repeat scroll 0%; - border:1px solid #999999; + border:1px solid #999; padding:6px; position:absolute; width:160px; } .calendar-content { - border:1px solid #3399CC; + border:1px solid #33789c; } .calendar-month { - background-color:#3399CC; + background-color:#33789c; padding:2px 8px; text-align:center; } .calendar-month a { - color:#FFFFFF; + color:#fff; font-size:12px; line-height: 0.8; text-decoration:none; } .calendar-month h1 { - color:#FFFFFF; + color:#fff; font-size:10px; font-weight:bold; margin:0pt; @@ -3886,9 +4296,9 @@ body.dialog { .calendar-week li, .calendar-days li { -moz-user-select:none; - background-color:#F2F7FB; - border:1px solid #FFFFFF; - color:#333333; + background-color:#f3f6f9; + border:1px solid #fff; + color:#333; float:left; font-size:11px; text-align:center; @@ -3896,25 +4306,25 @@ body.dialog { } .calendar-days li { - background-color:#FFFFFF; + background-color:#fff; } .calendar-days li.today { - border-color:#3399CC; + border-color:#33789c; } .calendar-days li.future { - color:#CCCCCC; + color:#ccc; cursor:default; padding:1px 0pt; } .calendar-days li.selected { - border-color:#000000; + border-color:#000; } .calendar-days li a { - color:#333333; + color:#333; display:block; padding:1px; text-decoration:none; @@ -4011,7 +4421,7 @@ body.dialog { .codepress-toolbar a.command-toggle-codepress-on, .codepress-toolbar a.command-toggle-codepress-on:hover { margin-right: 0; - border-right: 1px solid #b2b2b2; + border-right: 1px solid #999; background-position: 0 0; } @@ -4025,3 +4435,32 @@ body.dialog { .setting-advanced { display: none; } + +/* Beta icon and message ------------------------------------------------------------------------------------- */ + +#brand { + padding-right: 45px; + background: transparent url(../images/beta_icons/beta_icon.png) right center no-repeat; +} + +.system #brand { + background-image: url(../images/beta_icons/beta_icon_system.png); +} + +#msg-beta { + border-top: 1px solid #CDDEE7; + background-color: #ff9; +} + +#msg-beta-inner { + width: 875px; + padding: 0.8em 0 0.8em 45px; + margin: 0 auto; + background: transparent url(../images/beta_icons/beta_icon.png) left center no-repeat; + text-align: left; +} + +.system #msg-beta-inner { + background-image: url(../images/beta_icons/beta_icon_system.png); +} + mt-static/css/structure.css @@ -1,4 +1,10 @@ - +/* +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ +*/ App.singletonConstructor = MT.App = new Class( MT.App, { @@ -295,6 +301,12 @@ MT.App.Editor.Iframe = new Class( Editor.Iframe, { } }, + eventKeyUp: function( event ) { + /* safari always makes this event. ignore for language input method */ + if ( this.isWebKit ) { + return false; + } + }, extendedExecCommand: function( command, userInterface, argument ) { switch( command ) { mt-static/js/archetype_editor.js @@ -1,3 +1,11 @@ +/* +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ +*/ + /* for showing, hiding, and displaying asset details */ /* assign to an element when using a modal dialog, ie: @@ -117,7 +125,7 @@ function waitForLoad(id) { function showPage(id) { /* display popup panel showing details of selected asset */ - detailRowClass.className = 'selected'; + DOM.addClassName( detailRowClass, 'selected' ); var detail = getByID("asset-" + id + "-preview"); var detail_inner = getByID("asset-" + id + "-preview-inner"); var asset = assets[id]; @@ -132,8 +140,8 @@ function showPage(id) { var close = trans('Close'); var close_link = "<a href=\"javascript:void(0)\" onclick=\"toggleAssetDetails('" + id + "'); notOpened('" + id + "');\" class=\"close-preview-link\"><span>" + close + "</span>&nbsp;</a>"; var preview; - if (asset.thumbnail_url) { - preview = "<img src=\"" + asset.thumbnail_url + "\" class=\"preview\" />"; + if (asset.preview_url) { + preview = "<img src=\"" + asset.preview_url + "\" class=\"preview\" />"; } else { ext = asset.ext; var icons = ("doc,eps,fla,gif,jpg,mp3,mpg,pdf,png,ppt,psd,txt,xls,zip"); mt-static/js/assetdetail.js @@ -1,3 +1,11 @@ +/* +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ +*/ + /* requires js/common/Core.js to be loaded first */ Dialog = {}; mt-static/js/dialog.js @@ -1,4 +1,10 @@ - +/* +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ +*/ App.singletonConstructor = MT.App = new Class( MT.App, { @@ -148,7 +154,7 @@ MT.App = new Class( MT.App, { }, - setEditorIframeHTML: function( html ) { + setEditorIframeHTML: function() { this.editor.setHTML( this.editorInput[ app.currentEditor ].value ); this.editor.setMode( "iframe" ); this.editor.iframe.focus(); mt-static/js/edit.js @@ -15,7 +15,7 @@ function FlashTag(src, width, height) this.src = src; this.width = width; this.height = height; - this.version = '7,0,14,0'; + this.version = '8,0,0,0'; this.id = null; this.bgcolor = 'ffffff'; this.flashVars = null; mt-static/js/flash/FlashTag.js @@ -1,8 +1,9 @@ /* -Copyright 2003 Six Apart. This code cannot be redistributed without -permission from www.sixapart.com. - -$Id$ +# Movable Type (r) Open Source (C) 2003-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ */ mt-static/js/tc.js @@ -1,8 +1,9 @@ /* -Copyright 2004 Six Apart. This code cannot be redistributed without -permission from www.sixapart.com. - -$Id$ +# Movable Type (r) Open Source (C) 2004-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ */ mt-static/js/tc/alert.js @@ -1,8 +1,9 @@ /* -Copyright 2004 Six Apart. This code cannot be redistributed without -permission from www.sixapart.com. - -$Id$ +# Movable Type (r) Open Source (C) 2004-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ */ /* mt-static/js/tc/autocomplete.js @@ -1,8 +1,9 @@ /* -Copyright 2003 Six Apart. This code cannot be redistributed without -permission from www.sixapart.com. - -$Id$ +# Movable Type (r) Open Source (C) 2003-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ */ mt-static/js/tc/benchmark.js @@ -1,8 +1,9 @@ /* -Copyright 2003-2007 Six Apart. This code cannot be redistributed without -permission from www.sixapart.com. - -$Id$ +# Movable Type (r) Open Source (C) 2003-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ */ @@ -67,8 +68,12 @@ TC.Client.call = function( param ) param['error']( c, c.responseText, param ); else alert( 'Error: [' + c.status + '] ' + c.responseText ); - } else if( param['load'] ) - param['load']( c, c.responseText, param ); + } else if( param['load'] ) { + if ( c.responseText.charAt(0) == '/' ) + param['load']( c, c.responseText.substr( 2, ( c.responseText.length - 4 ) ), param ); + else + param['load']( c, c.responseText, param ); + } } }; var contents = null; mt-static/js/tc/client.js @@ -1,8 +1,9 @@ /* -Copyright 2003 Six Apart. This code cannot be redistributed without -permission from www.sixapart.com. - -$Id$ +# Movable Type (r) Open Source (C) 2003-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ */ mt-static/js/tc/colorpicker.js @@ -1,8 +1,9 @@ /* -Copyright 2003 Six Apart. This code cannot be redistributed without -permission from www.sixapart.com. - -$Id$ +# Movable Type (r) Open Source (C) 2003-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ */ mt-static/js/tc/cookie.js @@ -1,8 +1,9 @@ /* -Copyright 2003 Six Apart. This code cannot be redistributed without -permission from www.sixapart.com. - -$Id$ +# Movable Type (r) Open Source (C) 2003-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ */ mt-static/js/tc/focus.js @@ -1,8 +1,9 @@ /* -Copyright 2003 Six Apart. This code cannot be redistributed without -permission from www.sixapart.com. - -$Id$ +# Movable Type (r) Open Source (C) 2003-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ */ mt-static/js/tc/frankencode.js @@ -1,8 +1,9 @@ /* -Copyright 2003 Six Apart. This code cannot be redistributed without -permission from www.sixapart.com. - -$Id$ +# Movable Type (r) Open Source (C) 2003-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ */ mt-static/js/tc/gestalt.js @@ -1,8 +1,9 @@ /* -Copyright 2003 Six Apart. This code cannot be redistributed without -permission from www.sixapart.com. - -$Id$ +# Movable Type (r) Open Source (C) 2003-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ */ mt-static/js/tc/mixer.js @@ -1,8 +1,9 @@ /* -Copyright 2003 Six Apart. This code cannot be redistributed without -permission from www.sixapart.com. - -$Id$ +# Movable Type (r) Open Source (C) 2003-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ */ mt-static/js/tc/mixer/display.js @@ -1,8 +1,9 @@ /* -Copyright 2003 Six Apart. This code cannot be redistributed without -permission from www.sixapart.com. - -$Id$ +# Movable Type (r) Open Source (C) 2003-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ */ mt-static/js/tc/mixer/tagmatch.js @@ -1,8 +1,9 @@ /* -Copyright 2003 Six Apart. This code cannot be redistributed without -permission from www.sixapart.com. - -$Id$ +# Movable Type (r) Open Source (C) 2003-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ */ mt-static/js/tc/preview.js @@ -1,8 +1,9 @@ /* -Copyright 2003 Six Apart. This code cannot be redistributed without -permission from www.sixapart.com. - -$Id$ +# Movable Type (r) Open Source (C) 2003-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ */ mt-static/js/tc/spellcheck.js @@ -1,8 +1,9 @@ /* -Copyright 2003-2007 Six Apart. This code cannot be redistributed without -permission from www.sixapart.com. - -$Id$ +# Movable Type (r) Open Source (C) 2003-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ */ mt-static/js/tc/tableselect.js @@ -1,8 +1,9 @@ /* -Copyright 2004 Six Apart. This code cannot be redistributed without -permission from www.sixapart.com. - -$Id$ +# Movable Type (r) Open Source (C) 2004-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ */ /* mt-static/js/tc/tagcomplete.js @@ -1,8 +1,9 @@ /* -Copyright 2003 Six Apart. This code cannot be redistributed without -permission from www.sixapart.com. - -$Id$ +# Movable Type (r) Open Source (C) 2003-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ */ mt-static/js/tc/window.js @@ -1,8 +1,9 @@ /* -Copyright 2003 Six Apart. This code cannot be redistributed without -permission from www.sixapart.com. - -$Id$ +# Movable Type (r) Open Source (C) 2003-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ */ mt-static/js/tc/wordselect.js @@ -1,9 +1,9 @@ /* -Copyright 2001-2007 Six Apart. This code cannot be redistributed without -permission from www.sixapart.com. For more information, consult your -Movable Type license. - -$Id$ +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ */ var pager; @@ -189,7 +189,7 @@ function updateWidget(id) { var args = DOM.getFormData( f ); args['json'] = '1'; TC.Client.call({ - 'load': function(c) { updatedWidget(id, c); }, + 'load': function(c, responseText) { updatedWidget(id, responseText); }, 'error': function() { showMsg("Error updating widget.", "widget-updated", "alert"); }, 'method': 'POST', 'uri': ScriptURI, @@ -198,11 +198,11 @@ function updateWidget(id) { return false; } -function updatedWidget(id, c) { +function updatedWidget(id, responseText) { var el = TC.elementOrId(id); var result; try { - result = eval('(' + c.responseText + ')'); + result = eval('(' + responseText + ')'); } catch(e) { showMsg("Error updating widget.", "widget-updated", "alert"); return; @@ -1315,7 +1315,8 @@ MT.App = new Class( App, { initComponents: function() { arguments.callee.applySuper( this, arguments ); - + this.openFlyouts = []; + this.setDelegate( "navMenu", new this.constructor.NavMenu() ); this.initFormElements(); @@ -1461,8 +1462,23 @@ MT.App = new Class( App, { }, + closeFlyouts: function( target ) { + var flyout; + var es = Array.fromPseudo( this.openFlyouts ); + for ( var i = 0, len = es.length; i < len; i++ ) { + if ( ( flyout = DOM.getElement( es[ i ] ) ) ) { + if ( DOM.hasAncestor( target, flyout ) ) + continue; + DOM.addClassName( flyout, "hidden" ); + this.openFlyouts.remove( es[ i ] ); + } + } + }, + + eventClick: function( event ) { var command = this.getMouseEventCommand( event ); + switch( command ) { case "openSelectBlog": @@ -1486,7 +1502,31 @@ MT.App = new Class( App, { this.cpeList.forEach( function( cpe ) { cpe.toggleOff( true ); } ); break; + case "openFlyout": + var name = event.commandElement.getAttribute( "mt:flyout" ); + var el = DOM.getElement( name ); + if ( !defined( el ) ) + return; + + this.closeFlyouts( event.target ); + + DOM.removeClassName( el, "hidden" ); + this.targetElement = event.target; + this.applyAutolayouts( el ); + this.targetElement = null; + + this.openFlyouts.add( name ); + + break; + + case "closeFlyout": + this.closeFlyouts(); + + break; + default: + this.closeFlyouts( event.target ); + var form = DOM.getFirstAncestorByTagName( event.target, "form", true ); if ( !form ) return; @@ -2332,12 +2372,13 @@ MT.App.CodePress = new Class( Object, { if ( !this.editor ) return; log('setting autosave data on: '+this.textarea.name); - data[ this.textarea.name ] = this.editor.getCode(); + data[ this.textarea.name ] = this.getCode(); }, getCode: function() { - return this.textarea.disabled ? this.editor.getCode() : this.textarea.value; + var code = this.textarea.disabled ? this.editor.getCode() : this.textarea.value; + return document.all ? code.replace( /\r$/, '' ) : code; }, @@ -2490,7 +2531,7 @@ function showDropDown() { function setBarPosition(radio) { var mode = radio.value ? radio.value.toLowerCase() : radio; - var c = TC.elementOrId('container'); + var c = TC.elementOrId('container-inner'); var s = "show-actions-bar-"; if (mode == 'bottom') { TC.removeClassName(c, s + "top"); @@ -2503,3 +2544,8 @@ function setBarPosition(radio) { TC.removeClassName(c, s + "bottom"); } } + +function selectAll(id) { + DOM.getElement( id ).focus(); + DOM.getElement( id ).select(); +} mt-static/mt.js @@ -285,13 +285,13 @@ h2 position: absolute; left: 0; top: 0; - width: 160px; + width: 150px; } #templates-wrapper { position: absolute; - left: 170px; + left: 161px; top: 0; width: 440px; height: 450px; @@ -300,7 +300,7 @@ h2 #details-wrapper { position: absolute; - left: 618px; + left: 600px; top: 0; width: 300px; } mt-static/plugins/StyleCatcher/templates.css @@ -428,12 +428,12 @@ ul { list-style: disc outside; } margin-bottom: 5px; } -.widget-cloud .widget-list { +.widget-tag-cloud .widget-list { margin-right: 0; margin-left: 0; } -.widget-cloud .widget-list-item { +.widget-tag-cloud .widget-list-item { display: inline; margin: 0 5px 0 0; padding: 0; @@ -441,23 +441,23 @@ ul { list-style: disc outside; } background: none; } -.widget-cloud .rank-1 { font-size: 1.75em; } -.widget-cloud .rank-2 { font-size: 1.75em; } -.widget-cloud .rank-3 { font-size: 1.625em; } -.widget-cloud .rank-4 { font-size: 1.5em; } -.widget-cloud .rank-5 { font-size: 1.375em; } -.widget-cloud .rank-6 { font-size: 1.25em; } -.widget-cloud .rank-7 { font-size: 1.125em; } -.widget-cloud .rank-8 { font-size: 1em; } -.widget-cloud .rank-9 { font-size: 0.95em; } -.widget-cloud .rank-10 { font-size: 0.9em; } +.widget-tag-cloud .rank-1 { font-size: 1.75em; } +.widget-tag-cloud .rank-2 { font-size: 1.75em; } +.widget-tag-cloud .rank-3 { font-size: 1.625em; } +.widget-tag-cloud .rank-4 { font-size: 1.5em; } +.widget-tag-cloud .rank-5 { font-size: 1.375em; } +.widget-tag-cloud .rank-6 { font-size: 1.25em; } +.widget-tag-cloud .rank-7 { font-size: 1.125em; } +.widget-tag-cloud .rank-8 { font-size: 1em; } +.widget-tag-cloud .rank-9 { font-size: 0.95em; } +.widget-tag-cloud .rank-10 { font-size: 0.9em; } #footer .widget-content { margin-top: 0; margin-bottom: 0; } -.widget-assets .widget-content .widget-list { +.widget-recent-assets .widget-content .widget-list { overflow: auto; margin-right: 0; } @@ -481,3 +481,10 @@ ul { list-style: disc outside; } .input-default { background-color: #9AAEC2; } + +@media print { + * { + position: static ! important; + overflow: visible ! important; + } +} mt-static/themes-base/blog.css @@ -1,8 +1,8 @@ #!/usr/bin/perl -w -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ mt-tb.cgi @@ -1,8 +1,8 @@ #!/usr/bin/perl -w -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ mt-testbg.cgi @@ -1,8 +1,8 @@ #!/usr/bin/perl -w -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ mt-upgrade.cgi @@ -1,8 +1,8 @@ #!/usr/bin/perl -w -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ mt-view.cgi @@ -1,8 +1,8 @@ #!/usr/bin/perl -w - -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. + +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ mt-wizard.cgi @@ -1,8 +1,8 @@ #!/usr/bin/perl -w -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -34,6 +34,6 @@ use vars qw($server); ## the soap->action local $SIG{__WARN__} = sub { }; $server = XMLRPC::Transport::HTTP::CGI->new; - $server->dispatch_to('blogger', 'metaWeblog', 'mt'); + $server->dispatch_to('blogger', 'metaWeblog', 'mt', 'wp'); $server->handle; } mt-xmlrpc.cgi @@ -1,8 +1,8 @@ #!/usr/bin/perl -w - -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. + +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ mt.cgi @@ -1,4 +1,9 @@ <?php +# Movable Type (r) (C) 2001-2007 Six Apart, Ltd. All Rights Reserved. +# This code cannot be redistributed without permission from www.sixapart.com. +# For more information, consult your Movable Type license. +# +# $Id$ // ================================================================== // Author: Justin Vincent (justin@visunet.ie) @@ -47,14 +52,14 @@ function db($dbuser, $dbpassword, $dbname, $dbhost) { - $this->dbh = @mssql_connect($dbhost, $dbuser, $dbpassword); - - if ( ! $this->dbh ) { - $this->print_error("<ol><b>Error establishing a database connection!</b><li>Are you sure you have the correct user/password?<li>Are you sure that you have typed the correct hostname?<li>Are you sure that the database server is running?</ol>"); - } - - - $this->select($dbname); + $this->dbh = @mssql_connect($dbhost, $dbuser, $dbpassword); + + if ( ! $this->dbh ) { + $this->print_error("<ol><b>Error establishing a database connection!</b><li>Are you sure you have the correct user/password?<li>Are you sure that you have typed the correct hostname?<li>Are you sure that the database server is running?</ol>"); + } + + + $this->select("[$dbname]"); } @@ -63,29 +68,32 @@ function select($db) { - mssql_select_db ($db); + if ( FALSE == mssql_select_db ($db) ) { + $this->print_error("<ol><b>Error establishing a database connection!</b><li>Are you sure you have the correct user/password?<li>Are you sure that you have typed the correct hostname?<li>Are you sure that the database server is running?</ol>"); + die; + } } // ==================================================================== // Format a string correctly for safe insert under all PHP conditions - function escape($str) - { - + function escape($str) + { + // This deals with quote escaping $str = str_replace("'","''",str_replace("\'","'",$str)); - + // These values need to be escaped for ms sql - $escape = array ( "\n"=>"\\\\012","\r"=>"\\\\015"); - + $escape = array ( "\n"=>"\\\\012","\r"=>"\\\\015"); + // Firstly unescape foreach ( $escape as $match => $replace ) { $str = str_replace($match,$replace,$str); } - + return $str; - + } // ================================================================== @@ -167,16 +175,16 @@ $this->last_query = $query; // Perform the query via std mssql_query function.. - $this->result = @mssql_query($query, $this->dbh); + $this->result = @mssql_query($query, $this->dbh); $this->num_queries++; - - // Unfortunately, PHP fuctions for MS SQL currently don't offer a decent way - // to retrieve errors from MS SQL - // Make sure not to run a query between the actual query and this one ! - - $get_errorcode = "SELECT @@ERROR as errorcode"; - $error_res = @mssql_query($get_errorcode, $this->dbh); - $errorcode = @mssql_result($error_res, 0, "errorcode"); + + // Unfortunately, PHP fuctions for MS SQL currently don't offer a decent way + // to retrieve errors from MS SQL + // Make sure not to run a query between the actual query and this one ! + + $get_errorcode = "SELECT @@ERROR as errorcode"; + $error_res = @mssql_query($get_errorcode, $this->dbh); + $errorcode = @mssql_result($error_res, 0, "errorcode"); // If there was an insert, delete or update see how many rows were affected // (Also, If there there was an insert take note of the last OID @@ -194,21 +202,21 @@ if ( $word == "insert" || $word == "replace" ) { $get_last_ident = "SELECT @@IDENTITY as id"; - $last_res = @mssql_query($get_last_ident, $this->dbh); + $last_res = @mssql_query($get_last_ident, $this->dbh); $this->insert_id = @mssql_result($last_res, 0, "id"); // If insert id then return it - true evaluation - return $this->insert_id; + return $this->insert_id; } // Set to false if there was no insert id $this->result = false; } } - - - if ($errorcode <> 0) { - // there is an error + + + if ($errorcode <> 0) { + // there is an error $this->print_error(); } else @@ -240,8 +248,8 @@ // Log number of rows the query returned $this->num_rows = $i; - - //} + + //} @mssql_free_result($this->result); @@ -558,8 +566,8 @@ } - -// automatically create a new $db object + +// automatically create a new $db object #$db = new db(EZSQL_DB_USER, EZSQL_DB_PASSWORD, EZSQL_DB_NAME, EZSQL_DB_HOST); php/extlib/ezsql/ezsql_mssqlserver.php @@ -1,4 +1,9 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ // ================================================================== // Author: Justin Vincent (justin@visunet.ie) php/extlib/ezsql/ezsql_mysql.php @@ -1,4 +1,9 @@ <?php +# Movable Type (r) (C) 2001-2007 Six Apart, Ltd. All Rights Reserved. +# This code cannot be redistributed without permission from www.sixapart.com. +# For more information, consult your Movable Type license. +# +# $Id$ // ================================================================== // Author: Justin Vincent (justin@visunet.ie) php/extlib/ezsql/ezsql_oracle.php @@ -1,4 +1,9 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ // ================================================================== // Author: Justin Vincent (justin@visunet.ie) php/extlib/ezsql/ezsql_postgres.php @@ -1,4 +1,9 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ // ================================================================== // Author: Justin Vincent (justin@visunet.ie) php/extlib/ezsql/ezsql_sqlite.php @@ -1,7 +1,7 @@ <?php -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ php/lib/MTSerialize.php @@ -1,7 +1,7 @@ <?php -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -797,6 +797,10 @@ function decode_xml($str) { function encode_js($str) { if (!isset($str)) return ''; $str = preg_replace('!\\\\!', '\\\\', $str); + $str = preg_replace('!>!', '\\>', $str); + $str = preg_replace('!<!', '\\<', $str); + $str = preg_replace('!(s)(cript)!i', '$1\\\\$2', $str); + $str = preg_replace('!</!', '<\\/', $str); # </ is supposed to be the end of Javascript (</script in most UA) $str = preg_replace('!\'!', '\\\'', $str); $str = preg_replace('!"!', '\\"', $str); $str = preg_replace('!\n!', '\\n', $str); @@ -817,6 +821,17 @@ function gmtime($ts = null) { return $tsa; } +function is_hash($array) { + if ( is_array($array) ) { + if ( array_keys($array) === range(0, count($array) - 1) ) { + // 0,1,2,3... must be an array + return false; + } + return true; + } + return false; +} + function offset_time_list($ts, $blog = null, $dir = null) { return gmtime(offset_time($ts, $blog, $dir)); } @@ -1498,4 +1513,44 @@ function create_rating_expr_function($expr, $filter, $namespace, $datasource = ' } return $fn; } + +function _math_operation($op, $lvalue, $rvalue) { + if (!preg_match('/^\-?[\d\.]+$/', $lvalue)) + return; + if ( isset($rvalue) && !preg_match('/^\-?[\d\.]+$/', $rvalue)) + return; + if ( !isset($rvalue) + && $op != 'inc' && $op != 'dec' && $op != '++' && $op != '--' ) + return; + if ( ( '+' == $op ) || ( 'add' == $op ) ) { + return $lvalue + $rvalue; + } + elseif ( ( '++' == $op ) || ( 'inc' == $op ) ) { + return $lvalue + 1; + } + elseif ( ( '-' == $op ) || ( 'sub' == $op ) ) { + return $lvalue - $rvalue; + } + elseif ( ( '--' == $op ) || ( 'dec' == $op ) ) { + return $lvalue - 1; + } + elseif ( ( '*' == $op ) || ( 'mul' == $op ) ) { + return $lvalue * $rvalue; + } + elseif ( ( '/' == $op ) || ( 'div' == $op ) ) { + if ( $rvalue == 0 ) + return; + return $lvalue / $rvalue; + } + elseif ( ( '%' == $op ) || ( 'mod' == $op ) ) { + // to be in line with perl equivalent + $lvalue = floor($lvalue); + $rvalue = floor($rvalue); + if ( $rvalue == 0 ) + return; + return $lvalue % $rvalue; + } + return; +} + ?> php/lib/MTUtil.php @@ -1,7 +1,7 @@ <?php -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -26,6 +26,8 @@ class MTViewer extends Smarty { 'mthassubfolders' => 1, 'mthasparentfolders' => 1, 'mthasparentfolder' => 1, + 'mtauthorhasentry' => 1, + 'mtauthorhaspage' => 1, ); var $sanitized = array( 'mtcommentauthor' => 1, php/lib/MTViewer.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once("MTUtil.php"); // Create default archivers @@ -369,7 +375,6 @@ class MonthlyArchiver extends DateBasedArchiver { $vars['datebased_only_archive'] = 1; $vars['datebased_monthly_archive'] = 1; $vars['archive_class'] = 'datebased-monthly-archive'; - $vars['module_monthly_archives'] = 1; } } @@ -626,7 +631,6 @@ class AuthorBasedArchiver extends BaseArchiver { $vars['main_template'] = 1; $vars['author_archive'] = 1; $vars['archive_class'] = 'author-archive'; - $vars['module_author_archives'] = 1; $vars['module_author-monthly_archives'] = 1; } } @@ -989,7 +993,6 @@ class MonthlyAuthorBasedArchiver extends DateBasedAuthorArchiver { $vars['author_monthly_archive'] = 1; $vars['archive_class'] = 'author-monthly-archive'; $vars['module_author-monthly_archives'] = 1; - $vars['module_author_archives'] = 1; } } @@ -1580,7 +1583,6 @@ class MonthlyCategoryArchiver extends DateBasedCategoryArchiver { $vars['archive_class'] = 'category-monthlyl-archive'; $vars['category-monthly_archive'] = 1; $vars['module_category-monthly_archives'] = 1; - $vars['module_category_archives'] = 1; } } php/lib/archive_lib.php @@ -1,7 +1,7 @@ <?php require_once "archive_lib.php"; function smarty_block_mtarchivelist($args, $content, &$ctx, &$repeat) { - $localvars = array('current_archive_type', 'current_timestamp', 'current_timestamp_end', 'entries', 'archive_count', '_archive_list_num', '_archive_list_results','entry','ArchiveListHeader', 'ArchiveListFooter', 'inside_archive_list'); + $localvars = array('current_archive_type', 'current_timestamp', 'current_timestamp_end', 'entries', 'archive_count', '_archive_list_num', '_archive_list_results','entry','ArchiveListHeader', 'ArchiveListFooter', 'inside_archive_list'); global $_archivers; if (!isset($content)) { require_once("archive_lib.php"); @@ -56,7 +56,6 @@ function smarty_block_mtarchivelist($args, $content, &$ctx, &$repeat) { $ctx->restore($localvars); return $content; } - if ($i < count($archive_list_results)) { $grp = $archive_list_results[$i]; $_archivers[$at]->prepare_list($ctx, $grp); php/lib/block.mtarchivelist.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtarchivelistfooter($args, $content, &$ctx, &$repeat) { if (!isset($content)) { return $ctx->_hdlr_if($args, $content, $ctx, $repeat, 'ArchiveListFooter'); php/lib/block.mtarchivelistfooter.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtarchivelistheader($args, $content, &$ctx, &$repeat) { if (!isset($content)) { return $ctx->_hdlr_if($args, $content, $ctx, $repeat, 'ArchiveListHeader'); php/lib/block.mtarchivelistheader.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once("archive_lib.php"); function smarty_block_mtarchivenext($args, $content, &$ctx, &$repeat) { return _hdlr_archive_prev_next($args, $content, $ctx, $repeat, 'archivenext'); php/lib/block.mtarchivenext.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once("archive_lib.php"); function smarty_block_mtarchiveprevious($args, $content, &$ctx, &$repeat) { return _hdlr_archive_prev_next($args, $content, $ctx, $repeat, 'archiveprevious'); php/lib/block.mtarchiveprevious.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtarchives($args, $content, &$ctx, &$repeat) { $localvars = array('current_archive_type', 'archive_types', 'archive_type_index', 'old_preferred_archive_type'); if (!isset($content)) { php/lib/block.mtarchives.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtasset($args, $content, &$ctx, &$repeat) { if (!isset($content)) { $asset = $ctx->mt->db->fetch_assets($args); php/lib/block.mtasset.php @@ -1,10 +1,17 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtassetiftagged($args, $content, &$ctx, &$repeat) { if (!isset($content)) { $asset = $ctx->stash('asset'); if ($asset) { $asset_id = $asset['asset_id']; - $tag = $args['tag']; + $tag = $args['name']; + $tag or $tag = $args['tag']; $targs = array('asset_id' => $asset_id); if ($tag && (substr($tag,0,1) == '@')) { $targs['include_private'] = 1; php/lib/block.mtassetiftagged.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtassetisfirstinrow($args, $content, &$ctx, &$repeat) { if (!isset($content)) { return $ctx->_hdlr_if($args, $content, $ctx, $repeat, $ctx->stash('asset_first_in_row')); php/lib/block.mtassetisfirstinrow.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtassetislastinrow($args, $content, &$ctx, &$repeat) { if (!isset($content)) { return $ctx->_hdlr_if($args, $content, $ctx, $repeat, $ctx->stash('asset_last_in_row')); php/lib/block.mtassetislastinrow.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtassets($args, $content, &$ctx, &$repeat) { $localvars = array('_assets', 'asset', 'asset_first_in_row', 'asset_last_in_row'); $counter = 0; php/lib/block.mtassets.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtassetsfooter($args, $content, &$ctx, &$repeat) { if (!isset($content)) { $assets = $ctx->stash('_assets'); php/lib/block.mtassetsfooter.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtassetsheader($args, $content, &$ctx, &$repeat) { if (!isset($content)) { $counter = $ctx->stash('_assets_counter'); php/lib/block.mtassetsheader.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtassettags($args, $content, &$ctx, &$repeat) { $localvars = array('_tags', 'Tag', '_tags_counter', 'tag_min_count', 'tag_max_count','all_tag_count'); if (!isset($content)) { php/lib/block.mtassettags.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtauthornext($args, $content, &$ctx, &$repeat) { static $_next_cache = array(); if (!isset($content)) { php/lib/block.mtauthornext.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtauthorprevious($args, $content, &$ctx, &$repeat) { static $_prev_cache = array(); if (!isset($content)) { php/lib/block.mtauthorprevious.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtauthors($args, $content, &$ctx, &$repeat) { $localvars = array('authors', 'authors_counter', 'blog_id'); if (!isset($content)) { php/lib/block.mtauthors.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtauthoruserpicasset($args, $content, &$ctx, &$repeat) { $author = $ctx->stash('author'); if (!$author) { php/lib/block.mtauthoruserpicasset.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtblogifcclicense($args, $content, &$ctx, &$repeat) { // status: complete // parameters: none php/lib/block.mtblogifcclicense.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtblogifcommentsopen($args, $content, &$ctx, &$repeat) { // status: complete // parameters: none php/lib/block.mtblogifcommentsopen.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtblogs($args, $content, &$ctx, &$repeat) { if (!isset($content)) { $ctx->localize(array('_blogs', '_blogs_counter', 'blog', 'blog_id')); php/lib/block.mtblogs.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once("MTUtil.php"); function smarty_block_mtcalendar($args, $content, &$ctx, &$repeat) { php/lib/block.mtcalendar.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtcalendarifblank($args, $content, &$ctx, &$repeat) { return $ctx->_hdlr_if($args, $content, $ctx, $repeat, 'CalendarIfBlank'); } php/lib/block.mtcalendarifblank.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtcalendarifentries($args, $content, &$ctx, &$repeat) { return $ctx->_hdlr_if($args, $content, $ctx, $repeat, 'CalendarIfEntries'); } php/lib/block.mtcalendarifentries.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtcalendarifnoentries($args, $content, &$ctx, &$repeat) { return $ctx->_hdlr_if($args, $content, $ctx, $repeat, 'CalendarIfNoEntries'); } php/lib/block.mtcalendarifnoentries.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtcalendariftoday($args, $content, &$ctx, &$repeat) { return $ctx->_hdlr_if($args, $content, $ctx, $repeat, 'CalendarIfToday'); } php/lib/block.mtcalendariftoday.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtcalendarweekfooter($args, $content, &$ctx, &$repeat) { return $ctx->_hdlr_if($args, $content, $ctx, $repeat, 'CalendarWeekFooter'); } php/lib/block.mtcalendarweekfooter.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtcalendarweekheader($args, $content, &$ctx, &$repeat) { return $ctx->_hdlr_if($args, $content, $ctx, $repeat, 'CalendarWeekHeader'); } php/lib/block.mtcalendarweekheader.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtcategories($args, $content, &$ctx, &$repeat) { // status: incomplete // parameters: show_empty php/lib/block.mtcategories.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtcategoryifallowpings($args, $content, &$ctx, &$repeat) { if (!isset($content)) { $entry = $ctx->stash('category'); php/lib/block.mtcategoryifallowpings.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtcategorynext($args, $content, &$ctx, &$repeat) { $localvars = array('category', 'entries'); $tag = $ctx->this_tag(); php/lib/block.mtcategorynext.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once("block.mtcategorynext.php"); function smarty_block_mtcategoryprevious($args, $content, &$ctx, &$repeat) { return smarty_block_mtcategorynext($args, $content, $ctx, $repeat); php/lib/block.mtcategoryprevious.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtcommententry($args, $content, &$ctx, &$repeat) { $localvars = array('entry', 'current_timestamp', 'modification_timestamp'); if (!isset($content)) { php/lib/block.mtcommententry.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtcommenteriftrusted($args, $content, &$ctx, &$repeat) { if (!isset($content)) { $a = $ctx->stash('commenter'); php/lib/block.mtcommenteriftrusted.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtcommenteruserpicasset($args, $content, &$ctx, &$repeat) { $comment = $ctx->stash('comment'); if (!$comment) { php/lib/block.mtcommenteruserpicasset.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtcommentparent($args, $content, &$ctx, &$repeat) { $localvars = array('comment'); if (!isset($content)) { php/lib/block.mtcommentparent.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtcommentreplies($args, $content, &$ctx, &$repeat) { $localvars = array('comments', 'comment_order_num', 'comment','current_timestamp', 'commenter', 'blog', 'blog_id', '_comment_replies_tokens', 'conditional', 'else_content'); $token_fn = $ctx->stash('_comment_replies_tokens'); php/lib/block.mtcommentreplies.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtcomments($args, $content, &$ctx, &$repeat) { $localvars = array('comments', 'comment_order_num','comment','current_timestamp', 'commenter', 'blog', 'blog_id', 'conditional', 'else_content'); if (!isset($content)) { @@ -20,6 +26,7 @@ function smarty_block_mtcomments($args, $content, &$ctx, &$repeat) { if (!$comments) return $ctx->_hdlr_if($args, $content, $ctx, $repeat, 0); + $ctx->stash('conditional', $comments ? 1 : 0); if ($counter < count($comments)) { $blog_id = $ctx->stash('blog_id'); $comment = $comments[$counter]; php/lib/block.mtcomments.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtcommentsfooter($args, $content, &$ctx, &$repeat) { if (!isset($content)) { $comments = $ctx->stash('comments'); php/lib/block.mtcommentsfooter.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtcommentsheader($args, $content, &$ctx, &$repeat) { if (!isset($content)) { $counter = $ctx->stash('comment_order_num'); php/lib/block.mtcommentsheader.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtdatefooter($args, $content, &$ctx, &$repeat) { if (!isset($content)) { return $ctx->_hdlr_if($args, $content, $ctx, $repeat, 'DateFooter'); php/lib/block.mtdatefooter.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtdateheader($args, $content, &$ctx, &$repeat) { if (!isset($content)) { return $ctx->_hdlr_if($args, $content, $ctx, $repeat, 'DateHeader'); php/lib/block.mtdateheader.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtentries($args, $content, &$ctx, &$repeat) { $localvars = array('entry', '_entries_counter','entries','current_timestamp','modification_timestamp','_entries_lastn', 'current_timestamp_end', 'DateHeader', 'DateFooter', '_entries_glue', 'blog', 'blog_id', 'conditional', 'else_content'); if (isset($args['sort_by']) && $args['sort_by'] == 'score' && !isset($args['namespace'])) { php/lib/block.mtentries.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtentriesfooter($args, $content, &$ctx, &$repeat) { if (!isset($content)) { $entries =& $ctx->stash('entries'); php/lib/block.mtentriesfooter.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtentriesheader($args, $content, &$ctx, &$repeat) { if (!isset($content)) { return $ctx->_hdlr_if($args, $content, $ctx, $repeat, $ctx->stash('_entries_counter') == 1); php/lib/block.mtentriesheader.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtentrieswithsubcategories($args, $content, &$ctx, &$repeat) { $localvars = array('entries'); if (!isset($content)) { php/lib/block.mtentrieswithsubcategories.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtentryadditionalcategories($args, $content, &$ctx, &$repeat) { $localvars = array('_categories', 'category', '_categories_counter'); if (!isset($content)) { php/lib/block.mtentryadditionalcategories.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once("block.mtassets.php"); function smarty_block_mtentryassets($args, $content, &$ctx, &$repeat) { return smarty_block_mtassets($args, $content, $ctx, $repeat); php/lib/block.mtentryassets.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtentryauthoruserpicasset($args, $content, &$ctx, &$repeat) { $entry = $ctx->stash('entry'); if (!$entry) { php/lib/block.mtentryauthoruserpicasset.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtentrycategories($args, $content, &$ctx, &$repeat) { $localvars = array('_categories', 'category', '_categories_counter'); if (!isset($content)) { php/lib/block.mtentrycategories.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtentryifallowcomments($args, $content, &$ctx, &$repeat) { if (!isset($content)) { $entry = $ctx->stash('entry'); php/lib/block.mtentryifallowcomments.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtentryifallowpings($args, $content, &$ctx, &$repeat) { if (!isset($content)) { $entry = $ctx->stash('entry'); php/lib/block.mtentryifallowpings.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once("block.mtifcategory.php"); function smarty_block_mtentryifcategory($args, $content, &$ctx, &$repeat) { return smarty_block_mtifcategory($args, $content, $ctx, $repeat); php/lib/block.mtentryifcategory.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtentryifcommentsopen($args, $content, &$ctx, &$repeat) { if (!isset($content)) { $entry = $ctx->stash('entry'); php/lib/block.mtentryifcommentsopen.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtentryifextended($args, $content, &$ctx, &$repeat) { if (!isset($content)) { $entry = $ctx->stash('entry'); php/lib/block.mtentryifextended.php @@ -1,11 +1,18 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtentryiftagged($args, $content, &$ctx, &$repeat) { if (!isset($content)) { $entry = $ctx->stash('entry'); if ($entry) { $entry_id = $entry['entry_id']; $blog_id = $entry['entry_blog_id']; - $tag = $args['tag']; + $tag = $args['name']; + $tag or $tag = $args['tag']; $targs = array('entry_id' => $entry_id, 'blog_id' => $blog_id); if ($tag && (substr($tag,0,1) == '@')) { $targs['include_private'] = 1; php/lib/block.mtentryiftagged.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtentrynext($args, $content, &$ctx, &$repeat) { static $_next_cache = array(); if (!isset($content)) { php/lib/block.mtentrynext.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtentryprevious($args, $content, &$ctx, &$repeat) { static $_prev_cache = array(); if (!isset($content)) { php/lib/block.mtentryprevious.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtentrytags($args, $content, &$ctx, &$repeat) { $localvars = array('_tags', 'Tag', '_tags_counter', 'tag_min_count', 'tag_max_count','all_tag_count'); if (!isset($content)) { php/lib/block.mtentrytags.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtfolderfooter($args, $content, &$ctx, &$repeat) { if (!isset($content)) { $categories =& $ctx->stash('_categories'); php/lib/block.mtfolderfooter.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtfolderheader($args, $content, &$ctx, &$repeat) { if (!isset($content)) { $ctx->localize(array('conditional', 'else_content')); php/lib/block.mtfolderheader.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('block.mtcategorynext.php'); function smarty_block_mtfoldernext($args, $content, &$ctx, &$repeat) { $args['clas'] = 'folder'; php/lib/block.mtfoldernext.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once("block.mtcategorynext.php"); function smarty_block_mtfolderprevious($args, $content, &$ctx, &$repeat) { $args['class'] = 'folder'; php/lib/block.mtfolderprevious.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('block.mtcategories.php'); function smarty_block_mtfolders($args, $content, &$ctx, &$repeat) { // status: incomplete php/lib/block.mtfolders.php @@ -1,8 +1,15 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtfor($args, $content, &$ctx, &$repeat) { $localvars = array('__for_end', '__for_var'); if (!isset($content)) { + $ctx->localize($localvars); // first invocation; setup loop $start = array_key_exists('start', $args) ? $args['start'] php/lib/block.mtfor.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mthasnoparentcategory($args, $content, &$ctx, &$repeat) { if (!isset($content)) { require_once("MTUtil.php"); php/lib/block.mthasnoparentcategory.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once("block.mthassubcategories.php"); function smarty_block_mthasnosubcategories($args, $content, &$ctx, &$repeat) { if (!isset($content)) { php/lib/block.mthasnosubcategories.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mthasparentcategory($args, $content, &$ctx, &$repeat) { if (!isset($content)) { require_once("MTUtil.php"); php/lib/block.mthasparentcategory.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('block.mthasparentcategory.php'); function smarty_block_mthasparentfolder($args, $content, &$ctx, &$repeat) { $args['class'] = 'folder'; php/lib/block.mthasparentfolder.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mthassubcategories($args, $content, &$ctx, &$repeat) { if (!isset($content)) { $class = 'category'; php/lib/block.mthassubcategories.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('block.mthassubcategories.php'); function smarty_block_mthassubfolders($args, $content, &$ctx, &$repeat) { $args['class'] = 'folder'; php/lib/block.mthassubfolders.php @@ -1,11 +1,62 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtif($args, $content, &$ctx, &$repeat) { if (!isset($content)) { $result = 0; - if (isset($args['var'])) { - $val = $ctx->__stash['vars'][$args['var']]; - } elseif (isset($args['name'])) { - $val = $ctx->__stash['vars'][$args['name']]; + $name = isset($args['name']) + ? $args['name'] : $args['var']; + if (isset($name)) { + # pick off any {...} or [...] from the name. + if (preg_match('/^(.+)([\[\{])(.+)[\]\}]$/', $name, $matches)) { + $name = $matches[1]; + $br = $matches[2]; + $ref = $matches[3]; + if (preg_match('/^\\\\\$(.+)/', $ref, $ref_matches)) { + $ref = $vars[$ref_matches[1]]; + if (!isset($ref)) + $ref = chr(0); + } + $br == '[' ? $index = $ref : $key = $ref; + } else { + if (array_key_exists('index', $args)) + $index = $args['index']; + else if (array_key_exists('key', $args)) + $key = $args['key']; + } + if (preg_match('/^$/', $name)) { + $name = $vars[$name]; + if (!isset($name)) + return $ctx->error($ctx->mt->translate( + "You used a [_1] tag without a valid name attribute.", "<MT$tag>" )); + } + if (isset($name)) { + $value = $ctx->__stash['vars'][$name]; + if (is_hash($value)) { + if ( isset($key) ) { + if ($key != chr(0)) { + $val = $value[$key]; + } else { + unset($value); + } + } + } + elseif (is_array($value)) { + if ( isset($index) ) { + if (is_numeric($index)) { + $val = $value[ $index ]; + } else { + unset($value); # fall through to any 'default' + } + } + } + if (!isset($val)) + $val = $value; + } } elseif (isset($args['tag'])) { $tag = $args['tag']; $tag = preg_replace('/^mt:?/i', '', $tag); @@ -13,7 +64,8 @@ function smarty_block_mtif($args, $content, &$ctx, &$repeat) { unset($largs['tag']); $val = $ctx->tag($tag, $largs); } - if (preg_match('/^smarty_fun_[a-f0-9]+$/', $val)) { + if ( !is_array($value) + && preg_match('/^smarty_fun_[a-f0-9]+$/', $value) ) { if (function_exists($val)) { ob_start(); $val($ctx, array()); @@ -23,6 +75,15 @@ function smarty_block_mtif($args, $content, &$ctx, &$repeat) { $val = ''; } } + if ( array_key_exists('op', $args) ) { + $op = $args['op']; + $rvalue = $args['value']; + if ( $op && isset($value) && !is_array($value) ) { + $val = _math_operation($op, $val, $rvalue); + if (!isset($val)) { + return $ctx->error($ctx->mt->translate("[_1] [_2] [_3] is illegal.", $val, $op, $rvalue)); + }} + } if (array_key_exists('eq', $args)) { $val2 = $args['eq']; $result = $val == $val2 ? 1 : 0; php/lib/block.mtif.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtifallowcommenthtml($args, $content, &$ctx, &$repeat) { # status: complete if (!isset($content)) { php/lib/block.mtifallowcommenthtml.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtifarchivetype($args, $content, &$ctx, &$repeat) { # status: complete if (!isset($content)) { php/lib/block.mtifarchivetype.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtifarchivetypeenabled($args, $content, &$ctx, &$repeat) { # status: complete if (!isset($content)) { php/lib/block.mtifarchivetypeenabled.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtifauthor($args, $content, &$ctx, &$repeat) { if (!isset($content)) { $ok = $ctx->stash('author') ? 1 : 0; php/lib/block.mtifauthor.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtifblog($args, $content, &$ctx, &$repeat) { if (!isset($content)) { $ok = $ctx->stash('blog') ? 1 : 0; php/lib/block.mtifblog.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtifcategory($args, $content, &$ctx, &$repeat) { if (!isset($content)) { $e = $ctx->stash('entry'); php/lib/block.mtifcategory.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtifcommenterisauthor($args, $content, &$ctx, &$repeat) { # status: complete if (!isset($content)) { php/lib/block.mtifcommenterisauthor.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtifcommenterisentryauthor($args, $content, &$ctx, &$repeat) { # status: complete if (!isset($content)) { php/lib/block.mtifcommenterisentryauthor.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtifcommentertrusted($args, $content, &$ctx, &$repeat) { if (!isset($content)) { $a = $ctx->stash('commenter'); php/lib/block.mtifcommentertrusted.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtifcommentparent($args, $content, &$ctx, &$repeat) { if (!isset($content)) { $comment = $ctx->stash('comment'); php/lib/block.mtifcommentparent.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtifcommentreplies($args, $content, &$ctx, &$repeat) { if (!isset($content)) { $comment = $ctx->stash('comment'); php/lib/block.mtifcommentreplies.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtifcommentsaccepted($args, $content, &$ctx, &$repeat) { # status: complete if (!isset($content)) { php/lib/block.mtifcommentsaccepted.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtifcommentsactive($args, $content, &$ctx, &$repeat) { # status: complete if (!isset($content)) { php/lib/block.mtifcommentsactive.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtifcommentsallowed($args, $content, &$ctx, &$repeat) { # status: complete if (!isset($content)) { php/lib/block.mtifcommentsallowed.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtifcommentsmoderated($args, $content, &$ctx, &$repeat) { # status: complete if (!isset($content)) { php/lib/block.mtifcommentsmoderated.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtifdynamic($args, $content, &$ctx, &$repeat) { return $ctx->_hdlr_if($args, $content, $ctx, $repeat, 1); } php/lib/block.mtifdynamic.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('block.mtifcategory.php'); function smarty_block_mtiffolder($args, $content, &$ctx, &$repeat) { $args['class'] = 'folder'; php/lib/block.mtiffolder.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtifisancestor($args, $content, &$ctx, &$repeat) { $localvars = array('conditional', 'else_content'); if (!isset($content)) { php/lib/block.mtifisancestor.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtifisdescendant($args, $content, &$ctx, &$repeat) { $localvars = array('conditional', 'else_content'); if (!isset($content)) { php/lib/block.mtifisdescendant.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtifneedemail($args, $content, &$ctx, &$repeat) { # status: complete if (!isset($content)) { php/lib/block.mtifneedemail.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtifnonempty($args, $content, &$ctx, &$repeat) { // status: complete // parameters: tag php/lib/block.mtifnonempty.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtifnonzero($args, $content, &$ctx, &$repeat) { // status: complete // parameters: tag php/lib/block.mtifnonzero.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtifpingsaccepted($args, $content, &$ctx, &$repeat) { # status: complete if (!isset($content)) { php/lib/block.mtifpingsaccepted.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtifpingsactive($args, $content, &$ctx, &$repeat) { # status: complete if (!isset($content)) { php/lib/block.mtifpingsactive.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtifpingsallowed($args, $content, &$ctx, &$repeat) { # status: complete if (!isset($content)) { php/lib/block.mtifpingsallowed.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtifpingsmoderated($args, $content, &$ctx, &$repeat) { # status: complete if (!isset($content)) { php/lib/block.mtifpingsmoderated.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtifregistrationallowed($args, $content, &$ctx, &$repeat) { if (!isset($content)) { $blog = $ctx->stash('blog'); php/lib/block.mtifregistrationallowed.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtifregistrationnotrequired($args, $content, &$ctx, &$repeat) { if (!isset($content)) { $blog = $ctx->stash('blog'); php/lib/block.mtifregistrationnotrequired.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtifregistrationrequired($args, $content, &$ctx, &$repeat) { if (!isset($content)) { $blog = $ctx->stash('blog'); php/lib/block.mtifregistrationrequired.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtifrequirecommentemails($args, $content, &$ctx, &$repeat) { # status: complete if (!isset($content)) { php/lib/block.mtifrequirecommentemails.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtiftagsearch($args, $content, &$ctx, &$repeat) { return ''; } php/lib/block.mtiftagsearch.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtiftypekeytoken($args, $content, &$ctx, &$repeat) { // status: complete // parameters: none php/lib/block.mtiftypekeytoken.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtincludeblock($args, $content, &$ctx, &$repeat) { if (!isset($content)) { } else { php/lib/block.mtincludeblock.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtindexlist($args, $content, &$ctx, &$repeat) { $localvars = array('index_templates', 'index_templates_counter'); if (!isset($content)) { php/lib/block.mtindexlist.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once("block.mtassets.php"); function smarty_block_mtpageassets($args, $content, &$ctx, &$repeat) { return smarty_block_mtassets($args, $content, $ctx, $repeat); php/lib/block.mtpageassets.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('block.mtentrycategories.php'); function smarty_block_mtpagefolder($args, $content, &$ctx, &$repeat) { $args['class'] = 'folder'; php/lib/block.mtpagefolder.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('block.mtentryiftagged.php'); function smarty_block_mtpageiftagged($args, $content, &$ctx, &$repeat) { return smarty_block_mtentryiftagged($args, $content, $ctx, $repeat); php/lib/block.mtpageiftagged.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('block.mtentrynext.php'); function smarty_block_mtpagenext($args, $content, &$ctx, &$repeat) { $args['class'] = 'page'; php/lib/block.mtpagenext.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('block.mtentryprevious.php'); function smarty_block_mtpageprevious($args, $content, &$ctx, &$repeat) { $args['class'] = 'page'; php/lib/block.mtpageprevious.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('block.mtentries.php'); function smarty_block_mtpages($args, $content, &$ctx, &$repeat) { $args['class'] = 'page'; @@ -28,10 +34,13 @@ function smarty_block_mtpages($args, $content, &$ctx, &$repeat) { } } - $ctx->stash('current_timestamp', null); - $ctx->stash('current_timestamp_end', null); - $ctx->stash('current_archive_type', ''); + $localvars = array('current_timestamp', 'current_timestamp_end', 'current_archive_type'); + $ctx->localize($localvars); + + $out = smarty_block_mtentries($args, $content, $ctx, $repeat); + + $ctx->restore($localvars); - return smarty_block_mtentries($args, $content, $ctx, $repeat); + return $out; } ?> php/lib/block.mtpages.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('block.mtentriesfooter.php'); function smarty_block_mtpagesfooter($args, $content, &$ctx, &$repeat) { return smarty_block_mtentriesfooter($args, $content, $ctx, $repeat); php/lib/block.mtpagesfooter.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('block.mtentriesheader.php'); function smarty_block_mtpagesheader($args, $content, &$ctx, &$repeat) { return smarty_block_mtentriesheader($args, $content, $ctx, $repeat); php/lib/block.mtpagesheader.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('block.mtentrytags.php'); function smarty_block_mtpagetags($args, $content, &$ctx, &$repeat) { $args['class'] = 'page'; php/lib/block.mtpagetags.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function get_parent_categories(&$cat, &$ctx, &$list) { if ($cat['category_parent']) { $parent = $ctx->mt->db->fetch_category($cat['category_parent']); php/lib/block.mtparentcategories.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtparentcategory($args, $content, &$ctx, &$repeat) { if (!isset($content)) { $ctx->localize(array('category', 'conditional', 'else_content')); php/lib/block.mtparentcategory.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('block.mtparentcategory.php'); function smarty_block_mtparentfolder($args, $content, &$ctx, &$repeat) { $args['class'] = 'folder'; php/lib/block.mtparentfolder.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('block.mtparentcategories.php'); function smarty_block_mtparentfolders($args, $content, &$ctx, &$repeat) { $args['class'] = 'folder'; php/lib/block.mtparentfolders.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtpingentry($args, $content, &$ctx, &$repeat) { $localvars = array('entry', 'current_timestamp', 'modification_timestamp'); if (!isset($content)) { php/lib/block.mtpingentry.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtpings($args, $content, &$ctx, &$repeat) { $localvars = array('ping', '_pings', '_pings_counter', 'current_timestamp', 'blog_id', 'blog'); if (!isset($content)) { php/lib/block.mtpings.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtpingsfooter($args, $content, &$ctx, &$repeat) { if (!isset($content)) { $pings = $ctx->stash('_pings'); php/lib/block.mtpingsfooter.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtpingsheader($args, $content, &$ctx, &$repeat) { if (!isset($content)) { $counter = $ctx->stash('_pings_counter'); php/lib/block.mtpingsheader.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtpingssent($args, $content, &$ctx, &$repeat) { $localvars = array('_pinged_urls', '_ping_urls_counter', 'ping_sent_url'); if (!isset($content)) { php/lib/block.mtpingssent.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtsection($args, $content, &$ctx, &$repeat) { return $content; } php/lib/block.mtsection.php @@ -1,23 +1,132 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtsetvarblock($args, $content, &$ctx, &$repeat) { // parameters: name, value if (isset($content)) { $name = $args['name']; $name or $name = $args['var']; if (!$name) return ''; - $value = $content; + $vars =& $ctx->__stash['vars']; + + if (preg_match('/^(\w+)\((.+)\)$/', $name, $matches)) { + $func = $matches[1]; + $name = $matches[2]; + } else { + if (array_key_exists('function', $args)) + $func = $args['function']; + } + + # pick off any {...} or [...] from the name. + if (preg_match('/^(.+)([\[\{])(.+)[\]\}]$/', $name, $matches)) { + $name = $matches[1]; + $br = $matches[2]; + $ref = $matches[3]; + if (preg_match('/^\$(.+)/', $ref, $ref_matches)) { + $ref = $vars[$ref_matches[1]]; + if (!isset($ref)) + $ref = chr(0); + } + $br == '[' ? $index = $ref : $key = $ref; + } else { + if (array_key_exists('index', $args)) + $index = $args['index']; + else if (array_key_exists('key', $args)) + $key = $args['key']; + } + + if (preg_match('/^$/', $name)) { + $name = $vars[$name]; + if (!isset($name)) + return $ctx->error($ctx->mt->translate( + "You used a [_1] tag without a valid name attribute.", "<MT$tag>" )); + } + + $value = $content; + $existing = $vars[$name]; + + require_once("MTUtil.php"); + if (isset($key)) { + if (!isset($existing)) + $existing = array($key => $value); + elseif (is_hash($existing)) + $existing = $existing[$key]; + else + return $ctx->error( $ctx->mt->translate("'[_1]' is not a hash.", $name) ); + } + elseif (isset($index)) { + if (!isset($existing)) + $existing[$index] = $value; + elseif (is_array($existing)) { + if ( is_numeric($index) ) + $existing = $existing[$index]; + else + return $ctx->error( $ctx->mt->translate("Invalid index.") ); + } + else + return $ctx->error( $ctx->mt->translate("'[_1]' is not an array.", $name) ); + } + if (array_key_exists('append', $args) && $args['append']) { - $existing = is_array($vars) ? $vars[$name] : ''; - $value = $existing . $value; - } elseif (array_key_exists('prepend', $args) && $args['prepend']) { - $existing = is_array($vars) ? $vars[$name] : ''; - $value = $value . $existing; + $value = isset($existing) ? $existing . $value : $value; + } + elseif (array_key_exists('prepend', $args) && $args['prepend']) { + $value = isset($existing) ? $value . $existing : $value; + } + elseif ( isset($existing) && array_key_exists('op', $args) ) { + $op = $args['op']; + $value = _math_operation($op, $existing, $value); + if (!isset($value)) + return $ctx->error(); + } + + $data = $vars[$name]; + if ( isset($key) ) { + if ( ( isset($func) ) + && ( 'delete' == strtolower( $func ) ) ) { + unset($data[$key]); + } + else { + $data[$key] = $value; + } + } + elseif ( isset($index) ) { + $data[$index] = $value; + } + elseif ( isset($func) ) { + if ( 'undef' == strtolower( $func ) ) { + unset($data); + } + else { + if (isset($data) && !is_array($data)) + return $ctx->error( $ctx->mt->translate("'[_1]' is not an array.", $name) ); + if (!isset($data)) + $data = array(); + if ( 'push' == strtolower( $func ) ) { + array_push($data, $value); + } + elseif ( 'unshift' == strtolower( $func ) ) { + array_unshift($data, $value); + } + else { + return $ctx->error( + $ctx->mt->translate("'[_1]' is not a valid function.", $func) + ); + } + } + } + else { + $data = $value; } if (is_array($vars)) { - $vars[$name] = $value; + $vars[$name] = $data; } else { - $vars = array($name => $value); + $vars = array($name => $data); $ctx->__stash['vars'] =& $vars; } } php/lib/block.mtsetvarblock.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtsetvars($args, $content, &$ctx, &$repeat) { // parameters: name, value if (isset($content)) { php/lib/block.mtsetvars.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtsetvartemplate($args, $content, &$ctx, &$repeat) { // parameters: name, value if (!isset($content)) { php/lib/block.mtsetvartemplate.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtsubcatisfirst($args, $content, &$ctx, &$repeat) { if (!isset($content)) { return $ctx->_hdlr_if($args, $content, $ctx, $repeat, 'subCatIsFirst'); php/lib/block.mtsubcatisfirst.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtsubcatislast($args, $content, &$ctx, &$repeat) { if (!isset($content)) { return $ctx->_hdlr_if($args, $content, $ctx, $repeat, 'subCatIsLast'); php/lib/block.mtsubcatislast.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('block.mtsubcategories.php'); function smarty_block_mtsubfolders($args, $content, &$ctx, &$repeat) { $args['class'] = 'folder'; php/lib/block.mtsubfolders.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mttags($args, $content, &$ctx, &$repeat) { $localvars = array('_tags', 'Tag', '_tags_counter', 'tag_min_count', 'tag_max_count', 'all_tag_count', 'include_blogs', 'exclude_blogs', 'blog_ids'); if (!isset($content)) { php/lib/block.mttags.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mttoplevelcategories($args, $content, &$ctx, &$repeat) { if (!isset($content)) { $ctx->localize(array('category', 'archive_category')); php/lib/block.mttoplevelcategories.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('block.mttoplevelparent.php'); function smarty_block_mttoplevelfolder($args, $content, &$ctx, &$repeat) { $args['class'] = 'folder'; php/lib/block.mttoplevelfolder.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('block.mttoplevelcategories.php'); function smarty_block_mttoplevelfolders($args, $content, &$ctx, &$repeat) { $args['class'] = 'folder'; php/lib/block.mttoplevelfolders.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mttoplevelparent($args, $content, &$ctx, &$repeat) { if (!isset($content)) { $ctx->localize(array('category','conditional','else_content')); php/lib/block.mttoplevelparent.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_block_mtunless($args, $content, &$ctx, &$repeat) { if (!isset($content)) { $result = 0; php/lib/block.mtunless.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + global $_captcha_providers; $provider = new MTUtilCaptcha(); $_captcha_providers[$provider->get_key()] = $provider; php/lib/captcha_lib.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + global $_cc_Data; $_cc_Data = array( 'by' => array( php/lib/cc_lib.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + global $_commenter_auths; $provider = new OpenIDCommenterAuth(); $_commenter_auths[$provider->get_key()] = $provider; php/lib/commenter_auth_lib.php @@ -1,4 +1,9 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ /* create code for a function call */ function smarty_compiler_fun($tag_args, &$compiler) { php/lib/compiler.defun.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtadmincgipath($args, &$ctx) { // status: complete // parameters: none php/lib/function.mtadmincgipath.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtadminscript($args, &$ctx) { // status: complete // parameters: none php/lib/function.mtadminscript.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtarchivecategory($args, &$ctx) { if ($ctx->stash('inside_mt_categories')) { require_once("function.mtcategorylabel.php"); php/lib/function.mtarchivecategory.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtarchivecount($args, &$ctx) { if ($ctx->stash('inside_mt_categories')) { return $ctx->tag('MTCategoryCount', $args); php/lib/function.mtarchivecount.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtarchivedate($args, &$ctx) { return $ctx->_hdlr_date($args, $ctx); } php/lib/function.mtarchivedate.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtarchivedateend($args, &$ctx) { // status: complete $end = $ctx->stash('current_timestamp_end'); php/lib/function.mtarchivedateend.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtarchivefile($args, &$ctx) { $at = $ctx->stash('archive_type'); $at or $at = $ctx->stash('current_archive_type'); php/lib/function.mtarchivefile.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once("archive_lib.php"); function smarty_function_mtarchivelabel($args, &$ctx) { global $_archivers; php/lib/function.mtarchivelabel.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtarchivelink($args, &$ctx) { $blog = $ctx->stash('blog'); $at = $args['type']; php/lib/function.mtarchivelink.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once("archive_lib.php"); function smarty_function_mtarchivetitle($args, &$ctx) { global $_archivers; php/lib/function.mtarchivetitle.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtarchivetype($args, &$ctx) { $at = $ctx->stash('current_archive_type'); return $at; php/lib/function.mtarchivetype.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once("function.mtarchivelabel.php"); function smarty_function_mtarchivetypelabel($args, &$ctx) { return smarty_function_mtarchivelabel($args, $ctx); php/lib/function.mtarchivetypelabel.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtassetaddedby($args, &$ctx) { $asset = $ctx->stash('asset'); if (!$asset) return ''; php/lib/function.mtassetaddedby.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtassetcount($args, &$ctx) { $args['blog_id'] = $ctx->stash('blog_id'); $count = $ctx->mt->db->asset_count($args); php/lib/function.mtassetcount.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtassetdateadded($args, &$ctx) { $asset = $ctx->stash('asset'); if (!$asset) return ''; php/lib/function.mtassetdateadded.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtassetfileext($args, &$ctx) { $asset = $ctx->stash('asset'); if (!$asset) return ''; php/lib/function.mtassetfileext.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtassetfilename($args, &$ctx) { $asset = $ctx->stash('asset'); if (!$asset) return ''; php/lib/function.mtassetfilename.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtassetfilepath($args, &$ctx) { $asset = $ctx->stash('asset'); if (!$asset) return ''; php/lib/function.mtassetfilepath.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtassetid($args, &$ctx) { $asset = $ctx->stash('asset'); if (!$asset) return ''; php/lib/function.mtassetid.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtassetlabel($args, &$ctx) { $asset = $ctx->stash('asset'); if (!$asset) return ''; php/lib/function.mtassetlabel.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once("function.mtasseturl.php"); function smarty_function_mtassetlink($args, &$ctx) { $asset = $ctx->stash('asset'); php/lib/function.mtassetlink.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtassetmimetype($args, &$ctx) { $asset = $ctx->stash('asset'); if (!$asset) return ''; php/lib/function.mtassetmimetype.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once("function.mtassetfilepath.php"); function smarty_function_mtassetproperty($args, &$ctx) { $asset = $ctx->stash('asset'); php/lib/function.mtassetproperty.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('rating_lib.php'); function smarty_function_mtassetrank($args, &$ctx) { php/lib/function.mtassetrank.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('rating_lib.php'); function smarty_function_mtassetscore($args, &$ctx) { php/lib/function.mtassetscore.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('rating_lib.php'); function smarty_function_mtassetscoreavg($args, &$ctx) { php/lib/function.mtassetscoreavg.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('rating_lib.php'); function smarty_function_mtassetscorecount($args, &$ctx) { php/lib/function.mtassetscorecount.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('rating_lib.php'); function smarty_function_mtassetscorehigh($args, &$ctx) { php/lib/function.mtassetscorehigh.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('rating_lib.php'); function smarty_function_mtassetscorelow($args, &$ctx) { php/lib/function.mtassetscorelow.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once("function.mtasseturl.php"); function smarty_function_mtassetthumbnaillink($args, &$ctx) { $asset = $ctx->stash('asset'); @@ -27,7 +33,7 @@ function smarty_function_mtassetthumbnaillink($args, &$ctx) { $asset_url = smarty_function_mtasseturl($args, $ctx); - return sprintf("<a href=\"%s\"%s><img src=\"%s\" width=\"%d\" height=\"%d\"></a>", + return sprintf("<a href=\"%s\"%s><img src=\"%s\" width=\"%d\" height=\"%d\" alt=\"\" /></a>", $asset_url, $target, $thumb, php/lib/function.mtassetthumbnaillink.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtassetthumbnailurl($args, &$ctx) { $asset = $ctx->stash('asset'); if (!$asset) return ''; php/lib/function.mtassetthumbnailurl.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtassettype($args, &$ctx) { $asset = $ctx->stash('asset'); if (!$asset) return ''; php/lib/function.mtassettype.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtasseturl($args, &$ctx) { $asset = $ctx->stash('asset'); if (!$asset) return ''; php/lib/function.mtasseturl.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtatomscript($args, &$ctx) { // status: complete // parameters: none php/lib/function.mtatomscript.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtauthorauthiconurl($args, &$ctx) { $author = $ctx->stash('author'); if (!$author) { php/lib/function.mtauthorauthiconurl.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtauthorauthtype($args, &$ctx) { $author = $ctx->stash('author'); if (!$author) { php/lib/function.mtauthorauthtype.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtauthordisplayname($args, &$ctx) { // status: complete // parameters: none php/lib/function.mtauthordisplayname.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtauthoremail($args, &$ctx) { $author = $ctx->stash('author'); if (!$author) { php/lib/function.mtauthoremail.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtauthorid($args, &$ctx) { $author = $ctx->stash('author'); if (!$author) { php/lib/function.mtauthorid.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtauthorname($args, &$ctx) { $author = $ctx->stash('author'); if (!$author) { php/lib/function.mtauthorname.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('rating_lib.php'); function smarty_function_mtauthorrank($args, &$ctx) { php/lib/function.mtauthorrank.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('rating_lib.php'); function smarty_function_mtauthorscore($args, &$ctx) { php/lib/function.mtauthorscore.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('rating_lib.php'); function smarty_function_mtauthorscoreavg($args, &$ctx) { php/lib/function.mtauthorscoreavg.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('rating_lib.php'); function smarty_function_mtauthorscorecount($args, &$ctx) { php/lib/function.mtauthorscorecount.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('rating_lib.php'); function smarty_function_mtauthorscorehigh($args, &$ctx) { php/lib/function.mtauthorscorehigh.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('rating_lib.php'); function smarty_function_mtauthorscorelow($args, &$ctx) { php/lib/function.mtauthorscorelow.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtauthorurl($args, &$ctx) { $author = $ctx->stash('author'); if (!$author) { php/lib/function.mtauthorurl.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtauthoruserpic($args, &$ctx) { $author = $ctx->stash('author'); if (!$author) return ''; php/lib/function.mtauthoruserpic.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtauthoruserpicurl($args, &$ctx) { $author = $ctx->stash('author'); if (!$author) return ''; php/lib/function.mtauthoruserpicurl.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtblogarchiveurl($args, &$ctx) { // status: complete // parameters: none php/lib/function.mtblogarchiveurl.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtblogcategorycount($args, &$ctx) { // status: complete // parameters: none php/lib/function.mtblogcategorycount.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtblogcclicenseimage($args, &$ctx) { // status: complete // parameters: none php/lib/function.mtblogcclicenseimage.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtblogcclicenseurl($args, &$ctx) { $blog = $ctx->stash('blog'); $cc = $blog['blog_cc_license']; php/lib/function.mtblogcclicenseurl.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtblogcommentcount($args, &$ctx) { $args['blog_id'] = $ctx->stash('blog_id'); return $ctx->mt->db->blog_comment_count($args); php/lib/function.mtblogcommentcount.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtblogdescription($args, &$ctx) { // status: complete // parameters: none php/lib/function.mtblogdescription.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtblogentrycount($args, &$ctx) { // status: complete // parameters: none php/lib/function.mtblogentrycount.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtblogfileextension($args, &$ctx) { // status: complete // parameters: none php/lib/function.mtblogfileextension.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtbloghost($args, &$ctx) { // status: complete // parameters: exclude_port, signature php/lib/function.mtbloghost.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtblogid($args, &$ctx) { // status: complete // parameters: none php/lib/function.mtblogid.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtbloglanguage($args, &$ctx) { $real_lang = array('cz' => 'cs', 'dk' => 'da', 'jp' => 'ja', 'si' => 'sl'); $blog = $ctx->stash('blog'); php/lib/function.mtbloglanguage.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtblogname($args, &$ctx) { // status: complete // parameters: none php/lib/function.mtblogname.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('function.mtblogentrycount.php'); function smarty_function_mtblogpagecount($args, &$ctx) { // status: complete php/lib/function.mtblogpagecount.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtblogpingcount($args, &$ctx) { $args['blog_id'] = $ctx->stash('blog_id'); return $ctx->mt->db->blog_ping_count($args); php/lib/function.mtblogpingcount.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtblogrelativeurl($args, &$ctx) { // status: complete // parameters: none php/lib/function.mtblogrelativeurl.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtblogsitepath($args, &$ctx) { $blog = $ctx->stash('blog'); $path = $blog['blog_site_path']; php/lib/function.mtblogsitepath.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtblogtemplatesetid($args, &$ctx) { // status: complete // parameters: none php/lib/function.mtblogtemplatesetid.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtblogtimezone($args, &$ctx) { // status: complete // parameters: no_colon php/lib/function.mtblogtimezone.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtblogurl($args, &$ctx) { // status: complete // parameters: none php/lib/function.mtblogurl.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtbuildtemplateid($args, &$ctx) { return $ctx->stash('build_template_id'); } php/lib/function.mtbuildtemplateid.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcalendarcellnumber($args, &$ctx) { return $ctx->stash('CalendarCellNumber'); } php/lib/function.mtcalendarcellnumber.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcalendardate($args, &$ctx) { return $ctx->_hdlr_date($args, $ctx); } php/lib/function.mtcalendardate.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcalendarday($args, &$ctx) { return $ctx->stash('CalendarDay'); } php/lib/function.mtcalendarday.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('captcha_lib.php'); function smarty_function_mtcaptchafields($args, &$ctx) { // status: complete php/lib/function.mtcaptchafields.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcategoryarchivelink($args, &$ctx) { $category = $ctx->stash('category') or $ctx->stash('archive_category'); if (!$category) { php/lib/function.mtcategoryarchivelink.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcategorybasename($args, &$ctx) { $cat = $ctx->stash('category'); if (!$cat) return ''; php/lib/function.mtcategorybasename.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcategorycommentcount($args, &$ctx) { global $mt; $db =& $mt->db; php/lib/function.mtcategorycommentcount.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcategorycount($args, &$ctx) { $category = $ctx->stash('category'); return $category['category_count']; php/lib/function.mtcategorycount.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcategorydescription($args, &$ctx) { $cat = $ctx->stash('category'); if (!$cat) return ''; php/lib/function.mtcategorydescription.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcategoryid($args, &$ctx) { $cat = $ctx->stash('category'); if (!$cat) return ''; php/lib/function.mtcategoryid.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcategorylabel($args, &$ctx) { $cat = $ctx->stash('category'); if (!$cat) return ''; php/lib/function.mtcategorylabel.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcategorytrackbackcount($args, &$ctx) { $cat = $ctx->stash('category'); $cat_id = $cat['category_id']; php/lib/function.mtcategorytrackbackcount.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcategorytrackbacklink($args, &$ctx) { $cat = $ctx->stash('category'); if (!$cat) return ''; php/lib/function.mtcategorytrackbacklink.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcclicenserdf($args, &$ctx) { // status: complete // parameters: none php/lib/function.mtcclicenserdf.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcgihost($args, &$ctx) { // status: complete // parameters: none php/lib/function.mtcgihost.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcgipath($args, &$ctx) { // status: complete // parameters: none php/lib/function.mtcgipath.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcgirelativeurl($args, &$ctx) { // status: complete // parameters: none php/lib/function.mtcgirelativeurl.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcgiserverpath($args, &$ctx) { // status: complete // parameters: none php/lib/function.mtcgiserverpath.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcommentauthor($args, &$ctx) { $c = $ctx->stash('comment'); if (!$c) { php/lib/function.mtcommentauthor.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcommentauthoridentity($args, &$ctx) { $cmt = $ctx->stash('comment'); $cmntr = $ctx->stash('commenter'); @@ -20,12 +26,7 @@ function smarty_function_mtcommentauthoridentity($args, &$ctx) { require_once "commenter_auth_lib.php"; $logo = _auth_icon_url($static_path, $cmntr); if (!$logo) { - $blog = $ctx->stash('blog'); - if ($ctx->mt->config('PublishCommenterIcon')) { - $root_url = $blog['blog_site_url']; - } else { - $root_url = $static_path . 'images/'; - } + $root_url = $static_path . 'images/'; if (!preg_match('/\/$/', $root_url)) { $root_url .= '/'; } php/lib/function.mtcommentauthoridentity.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcommentauthorlink($args, &$ctx) { $comment = $ctx->stash('comment'); $name = $comment['comment_author']; php/lib/function.mtcommentauthorlink.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcommentbody($args, &$ctx) { $comment = $ctx->stash('comment'); $text = $comment['comment_text']; php/lib/function.mtcommentbody.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcommentdate($args, &$ctx) { $c = $ctx->stash('comment'); $args['ts'] = $c['comment_created_on']; php/lib/function.mtcommentdate.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcommentemail($args, &$ctx) { $comment = $ctx->stash('comment'); $email = $comment['comment_email']; php/lib/function.mtcommentemail.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcommententryid($args, &$ctx) { $comment = $ctx->stash('comment'); $id = $comment['comment_entry_id']; php/lib/function.mtcommententryid.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcommenterauthiconurl($args, &$ctx) { $a =& $ctx->stash('commenter'); if (!isset($a)) { php/lib/function.mtcommenterauthiconurl.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcommenterauthtype($args, &$ctx) { $a =& $ctx->stash('commenter'); return isset($a) ? $a['author_auth_type'] : ''; php/lib/function.mtcommenterauthtype.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcommenteremail($args, &$ctx) { $a =& $ctx->stash('commenter'); if (!isset($a)) return ''; php/lib/function.mtcommenteremail.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcommenterid($args, &$ctx) { $comment = $ctx->stash('comment'); if (!$comment) return ''; php/lib/function.mtcommenterid.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcommentername($args, &$ctx) { $a =& $ctx->stash('commenter'); return isset($a) ? $a['author_nickname'] : ''; php/lib/function.mtcommentername.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcommenternamethunk($args, &$ctx) { $blog = $ctx->stash('blog'); $archive_url = $ctx->tag('BlogArchiveURL'); php/lib/function.mtcommenternamethunk.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcommenterurl($args, &$ctx) { $comment = $ctx->stash('comment'); if (!$comment) return ''; php/lib/function.mtcommenterurl.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcommenterusername($args, &$ctx) { $a =& $ctx->stash('commenter'); return isset($a) ? $a['author_name'] : ''; php/lib/function.mtcommenterusername.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcommenteruserpic($args, &$ctx) { $comment = $ctx->stash('comment'); if (!$comment) { php/lib/function.mtcommenteruserpic.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcommenteruserpicurl($args, &$ctx) { $comment = $ctx->stash('comment'); if (!$comment) { php/lib/function.mtcommenteruserpicurl.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcommentfields($args, &$ctx) { return ""; } php/lib/function.mtcommentfields.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcommentid($args, &$ctx) { $comment = $ctx->stash('comment'); $id = $comment['comment_id']; php/lib/function.mtcommentid.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcommentip($args, &$ctx) { $comment = $ctx->stash('comment'); return $comment['comment_ip']; php/lib/function.mtcommentip.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcommentlink($args, &$ctx) { $args['no_anchor'] = 1; $entry_link = $ctx->tag('EntryPermaink', $args); php/lib/function.mtcommentlink.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcommentname($args, &$ctx) { $comment = $ctx->stash('comment'); return $comment['comment_author']; php/lib/function.mtcommentname.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcommentordernumber($args, &$ctx) { return $ctx->stash('comment_order_num'); } php/lib/function.mtcommentordernumber.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('rating_lib.php'); function smarty_function_mtcommentrank($args, &$ctx) { php/lib/function.mtcommentrank.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcommentrepliesrecurse($args, &$ctx) { $localvars = array('comments', 'comment_order_num', 'comment','current_timestamp', 'commenter', 'blog', 'blog_id'); $token_fn = $ctx->stash('_comment_replies_tokens'); php/lib/function.mtcommentrepliesrecurse.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('rating_lib.php'); function smarty_function_mtcommentscore($args, &$ctx) { php/lib/function.mtcommentscore.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('rating_lib.php'); function smarty_function_mtcommentscoreavg($args, &$ctx) { php/lib/function.mtcommentscoreavg.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('rating_lib.php'); function smarty_function_mtcommentscorecount($args, &$ctx) { php/lib/function.mtcommentscorecount.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('rating_lib.php'); function smarty_function_mtcommentscorehigh($args, &$ctx) { php/lib/function.mtcommentscorehigh.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('rating_lib.php'); function smarty_function_mtcommentscorelow($args, &$ctx) { php/lib/function.mtcommentscorelow.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcommentscript($args, &$ctx) { // status: complete // parameters: none php/lib/function.mtcommentscript.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtcommenturl($args, &$ctx) { $comment = $ctx->stash('comment'); return $comment['comment_url']; php/lib/function.mtcommenturl.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtconfigfile($args, &$ctx) { // status: complete // parameters: none php/lib/function.mtconfigfile.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtdate($args, &$ctx) { require_once("MTUtil.php"); $t = time(); php/lib/function.mtdate.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtdefaultlanguage($args, &$ctx) { return $ctx->mt->config('DefaultLanguage'); } php/lib/function.mtdefaultlanguage.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtentriescount($args, &$ctx) { if ($ctx->stash('inside_mt_categories')) { return $ctx->tag('MTCategoryCount', $args); php/lib/function.mtentriescount.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtentryatomid($args, &$ctx) { $entry = $ctx->stash('entry'); return $entry['entry_atom_id']; php/lib/function.mtentryatomid.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtentryauthor($args, &$ctx) { // status: complete // parameters: none php/lib/function.mtentryauthor.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtentryauthordisplayname($args, &$ctx) { // status: complete // parameters: none php/lib/function.mtentryauthordisplayname.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtentryauthorid($args, &$ctx) { // status: complete // parameters: none php/lib/function.mtentryauthorid.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtentryauthorlink($args, &$ctx) { $entry = $ctx->stash('entry'); if (!$entry) return ''; php/lib/function.mtentryauthorlink.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtentryauthornickname($args, &$ctx) { // status: complete // parameters: none php/lib/function.mtentryauthornickname.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtentryauthorurl($args, &$ctx) { $entry = $ctx->stash('entry'); return $entry['author_url']; php/lib/function.mtentryauthorurl.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtentryauthorusername($args, &$ctx) { // status: complete // parameters: none php/lib/function.mtentryauthorusername.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtentryauthoruserpic($args, &$ctx) { $entry = $ctx->stash('entry'); if (!$entry) { php/lib/function.mtentryauthoruserpic.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtentryauthoruserpicurl($args, &$ctx) { $entry = $ctx->stash('entry'); if (!$entry) return ''; php/lib/function.mtentryauthoruserpicurl.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtentrybasename($args, &$ctx) { $entry = $ctx->stash('entry'); if (!$entry) return ''; php/lib/function.mtentrybasename.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtentryblogdescription($args, &$ctx) { $entry = $ctx->stash('entry'); if ($entry['entry_blog_id']) { php/lib/function.mtentryblogdescription.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtentryblogid($args, &$ctx) { $entry = $ctx->stash('entry'); return (isset($args['pad']) && $args['pad']) ? sprintf("%06d", $entry['entry_blog_id']) : $entry['entry_blog_id']; php/lib/function.mtentryblogid.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtentryblogname($args, &$ctx) { $entry = $ctx->stash('entry'); if ($entry['entry_blog_id']) { php/lib/function.mtentryblogname.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtentryblogurl($args, &$ctx) { $entry = $ctx->stash('entry'); if ($entry['entry_blog_id']) { php/lib/function.mtentryblogurl.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtentrybody($args, &$ctx) { $entry = $ctx->stash('entry'); $text = $entry['entry_text']; php/lib/function.mtentrybody.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtentrycategory($args, &$ctx) { $entry = $ctx->stash('entry'); if ($entry['placement_category_id']) { php/lib/function.mtentrycategory.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtentryclass($args, &$ctx) { $entry = $ctx->stash('entry'); $class = $entry['entry_class']; php/lib/function.mtentryclass.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtentryclasslabel($args, &$ctx) { $entry = $ctx->stash('entry'); $class = $entry['entry_class']; php/lib/function.mtentryclasslabel.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtentrycommentcount($args, &$ctx) { $entry = $ctx->stash('entry'); $entry_id = $entry['entry_id']; php/lib/function.mtentrycommentcount.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtentrycreateddate($args, &$ctx) { $e = $ctx->stash('entry'); $args['ts'] = $e['entry_created_on']; php/lib/function.mtentrycreateddate.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtentrydate($args, &$ctx) { $e = $ctx->stash('entry'); $args['ts'] = $e['entry_authored_on']; php/lib/function.mtentrydate.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtentryexcerpt($args, &$ctx) { // todo: needs work $e = $ctx->stash('entry'); php/lib/function.mtentryexcerpt.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtentryflag($args, &$ctx) { $entry = $ctx->stash('entry'); $flag = 'entry_' . $args['flag']; php/lib/function.mtentryflag.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtentryid($args, &$ctx) { $entry = $ctx->stash('entry'); return (isset($args['pad']) && $args['pad']) ? sprintf("%06d", $entry['entry_id']) : $entry['entry_id']; php/lib/function.mtentryid.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtentrykeywords($args, &$ctx) { $entry = $ctx->stash('entry'); return $entry['entry_keywords']; php/lib/function.mtentrykeywords.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtentrylink($args, &$ctx) { $args['no_anchor'] = 1; $link = $ctx->tag('EntryPermalink', $args); php/lib/function.mtentrylink.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtentrymodifieddate($args, &$ctx) { $entry = $ctx->stash('entry'); $args['ts'] = $entry['entry_modified_on']; php/lib/function.mtentrymodifieddate.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtentrymore($args, &$ctx) { $entry = $ctx->stash('entry'); $text = $entry['entry_text_more']; php/lib/function.mtentrymore.php @@ -1,6 +1,14 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtentrypermalink($args, &$ctx) { $entry = $ctx->stash('entry'); + if (!$entry) + return ''; $blog = $ctx->stash('blog'); $at = $args['type']; $at or $at = $args['archive_type']; php/lib/function.mtentrypermalink.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('rating_lib.php'); function smarty_function_mtentryrank($args, &$ctx) { php/lib/function.mtentryrank.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('rating_lib.php'); function smarty_function_mtentryscore($args, &$ctx) { php/lib/function.mtentryscore.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('rating_lib.php'); function smarty_function_mtentryscoreavg($args, &$ctx) { php/lib/function.mtentryscoreavg.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('rating_lib.php'); function smarty_function_mtentryscorecount($args, &$ctx) { php/lib/function.mtentryscorecount.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('rating_lib.php'); function smarty_function_mtentryscorehigh($args, &$ctx) { php/lib/function.mtentryscorehigh.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('rating_lib.php'); function smarty_function_mtentryscorelow($args, &$ctx) { php/lib/function.mtentryscorelow.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + define('STATUS_HOLD', 1); define('STATUS_RELEASE', 2); define('STATUS_REVIEW', 3); php/lib/function.mtentrystatus.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtentrytitle($args, &$ctx) { $entry = $ctx->stash('entry'); $title = $entry['entry_title']; php/lib/function.mtentrytitle.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtentrytrackbackcount($args, &$ctx) { $entry = $ctx->stash('entry'); $entry_id = $entry['entry_id']; php/lib/function.mtentrytrackbackcount.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtentrytrackbackdata($args, &$ctx) { $e = $ctx->stash('entry'); if (!$e['trackback_id']) { php/lib/function.mtentrytrackbackdata.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtentrytrackbackid($args, &$ctx) { $entry = $ctx->stash('entry'); return $entry['trackback_id']; php/lib/function.mtentrytrackbackid.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtentrytrackbacklink($args, &$ctx) { $entry = $ctx->stash('entry'); if (!$entry) return ''; php/lib/function.mtentrytrackbacklink.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mterrorcode($args, &$ctx) { $err = $ctx->stash('error_code'); return empty($err) ? '' : $err; php/lib/function.mterrorcode.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mterrormessage($args, &$ctx) { // status: complete // parameters: none php/lib/function.mterrormessage.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtfeedbackscore($args, &$ctx) { $fb =& $ctx->stash('comment'); $score = ''; php/lib/function.mtfeedbackscore.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function _file_template_format($m) { static $f = array( 'a' => "<MTEntryAuthorNickname DIR>", php/lib/function.mtfiletemplate.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('function.mtcategorybasename.php'); function smarty_function_mtfolderbasename($args, &$ctx) { return smarty_function_mtcategorybasename($args, $ctx); php/lib/function.mtfolderbasename.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('function.mtcategorycount.php'); function smarty_function_mtfoldercount($args, &$ctx) { return smarty_function_mtcategorycount($args, $ctx); php/lib/function.mtfoldercount.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('function.mtcategorydescription.php'); function smarty_function_mtfolderdescription($args, &$ctx) { return smarty_function_mtcategorydescription($args, $ctx); php/lib/function.mtfolderdescription.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('function.mtcategoryid.php'); function smarty_function_mtfolderid($args, &$ctx) { return smarty_function_mtcategoryid($args, $ctx); php/lib/function.mtfolderid.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('function.mtcategorylabel.php'); function smarty_function_mtfolderlabel($args, &$ctx) { return smarty_function_mtcategorylabel($args, $ctx); php/lib/function.mtfolderlabel.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('function.mtsubcategorypath.php'); function smarty_function_mtfolderpath($args, &$ctx) { return smarty_function_mtsubcategorypath($args, $ctx); php/lib/function.mtfolderpath.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtgetvar($args, &$ctx) { require_once("function.mtvar.php"); return smarty_function_mtvar($args, $ctx); php/lib/function.mtgetvar.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mthttpcontenttype($args, &$ctx) { $ctx->stash('content_type', $args['type']); return ''; php/lib/function.mthttpcontenttype.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mthttperrorcode($args, &$ctx) { $err = $ctx->stash('http_error'); return empty($err) ? '' : $err; php/lib/function.mthttperrorcode.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtimageheight($args, &$ctx) { // todo: needs work return $ctx->stash('ImageHeight'); php/lib/function.mtimageheight.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtimageurl($args, &$ctx) { return $ctx->stash('ImageURL'); } php/lib/function.mtimageurl.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtimagewidth($args, &$ctx) { // todo: needs work return $ctx->stash('ImageWidth'); php/lib/function.mtimagewidth.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + global $restricted_include_filenames; $restricted_include_filenames = array('mt-config.cgi' => 1, 'passwd' => 1); php/lib/function.mtinclude.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtindexbasename($args, &$ctx) { $name = $ctx->mt->config('IndexBasename'); if (!isset($args['extension']) || !$args['extension']) return $name; php/lib/function.mtindexbasename.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtindexlink($args, &$ctx) { $tmpl = $ctx->stash('index_templates'); $counter = $ctx->stash('index_templates_counter'); php/lib/function.mtindexlink.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtindexname($args, &$ctx) { $tmpl = $ctx->stash('index_templates'); $counter = $ctx->stash('index_templates_counter'); php/lib/function.mtindexname.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtlink($args, &$ctx) { // status: incomplete // parameters: template, entry_id php/lib/function.mtlink.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtnotifyscript($args, &$ctx) { // status: complete // parameters: none php/lib/function.mtnotifyscript.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('function.mtentryauthordisplayname.php'); function smarty_function_mtpageauthordisplayname($args, &$ctx) { return smarty_function_mtentryauthordisplayname($args, $ctx); php/lib/function.mtpageauthordisplayname.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('function.mtentryauthoremail.php'); function smarty_function_mtpageauthoremail($args, &$ctx) { return smarty_function_mtentryauthoremail($args, $ctx); php/lib/function.mtpageauthoremail.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('function.mtentryauthorlink.php'); function smarty_function_mtpageauthorlink($args, &$ctx) { return smarty_function_mtentryauthorlink($args, $ctx); php/lib/function.mtpageauthorlink.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('function.mtentryauthorurl.php'); function smarty_function_mtpageauthorurl($args, &$ctx) { return smarty_function_mtentryauthorurl($args, $ctx); php/lib/function.mtpageauthorurl.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('function.mtentrybasename.php'); function smarty_function_mtpagebasename($args, &$ctx) { return smarty_function_mtentrybasename($args, $ctx); php/lib/function.mtpagebasename.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('function.mtentrybody.php'); function smarty_function_mtpagebody($args, &$ctx) { return smarty_function_mtentrybody($args, $ctx); php/lib/function.mtpagebody.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('function.mtentrydate.php'); function smarty_function_mtpagedate($args, &$ctx) { return smarty_function_mtentrydate($args, $ctx); php/lib/function.mtpagedate.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('function.mtentryexcerpt.php'); function smarty_function_mtpageexcerpt($args, &$ctx) { return smarty_function_mtentryexcerpt($args, $ctx); php/lib/function.mtpageexcerpt.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('function.mtentryid.php'); function smarty_function_mtpageid($args, &$ctx) { return smarty_function_mtentryid($args, $ctx); php/lib/function.mtpageid.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('function.mtentrykeywords.php'); function smarty_function_mtpagekeywords($args, &$ctx) { return smarty_function_mtentrykeywords($args, $ctx); php/lib/function.mtpagekeywords.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('function.mtentrymodifieddate.php'); function smarty_function_mtpagemodifieddate($args, &$ctx) { return smarty_function_mtentrymodifieddate($args, $ctx); php/lib/function.mtpagemodifieddate.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('function.mtentrymore.php'); function smarty_function_mtpagemore($args, &$ctx) { return smarty_function_mtentrymore($args, $ctx); php/lib/function.mtpagemore.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('function.mtentrypermalink.php'); function smarty_function_mtpagepermalink($args, &$ctx) { $entry = $ctx->stash('entry'); php/lib/function.mtpagepermalink.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('function.mtentrytitle.php'); function smarty_function_mtpagetitle($args, &$ctx) { return smarty_function_mtentrytitle($args, $ctx); php/lib/function.mtpagetitle.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtpingblogname($args, &$ctx) { $ping = $ctx->stash('ping'); return $ping['tbping_blog_name']; php/lib/function.mtpingblogname.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtpingdate($args, &$ctx) { $p = $ctx->stash('ping'); $args['ts'] = $p['tbping_created_on']; php/lib/function.mtpingdate.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtpingexcerpt($args, &$ctx) { $ping = $ctx->stash('ping'); return $ping['tbping_excerpt']; php/lib/function.mtpingexcerpt.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtpingid($args, &$ctx) { $ping = $ctx->stash('ping'); return $ping['tbping_id']; php/lib/function.mtpingid.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtpingip($args, &$ctx) { $ping = $ctx->stash('ping'); return $ping['tbping_ip']; php/lib/function.mtpingip.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('rating_lib.php'); function smarty_function_mtpingrank($args, &$ctx) { php/lib/function.mtpingrank.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('rating_lib.php'); function smarty_function_mtpingscore($args, &$ctx) { php/lib/function.mtpingscore.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('rating_lib.php'); function smarty_function_mtpingscoreavg($args, &$ctx) { php/lib/function.mtpingscoreavg.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('rating_lib.php'); function smarty_function_mtpingscorecount($args, &$ctx) { php/lib/function.mtpingscorecount.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('rating_lib.php'); function smarty_function_mtpingscorehigh($args, &$ctx) { php/lib/function.mtpingscorehigh.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('rating_lib.php'); function smarty_function_mtpingscorelow($args, &$ctx) { php/lib/function.mtpingscorelow.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtpingssenturl($args, &$ctx) { $url = $ctx->stash('ping_sent_url'); return $url; php/lib/function.mtpingssenturl.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtpingtitle($args, &$ctx) { $ping = $ctx->stash('ping'); return $ping['tbping_title']; php/lib/function.mtpingtitle.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtpingurl($args, &$ctx) { $ping = $ctx->stash('ping'); return $ping['tbping_source_url']; php/lib/function.mtpingurl.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtproductname($args, &$ctx) { $short_name = PRODUCT_NAME; if ($args['version']) { php/lib/function.mtproductname.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtpublishcharset($args, &$ctx) { // Status: complete // parameters: none php/lib/function.mtpublishcharset.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtremotesigninlink($args, &$ctx) { // status: complete // parameters: none php/lib/function.mtremotesigninlink.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtremotesignoutlink($args, &$ctx) { // status: complete // parameters: none php/lib/function.mtremotesignoutlink.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtsearchincludeblogs($args, &$ctx) { return ''; } php/lib/function.mtsearchincludeblogs.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtsearchscript($args, &$ctx) { // status: complete // parameters: none php/lib/function.mtsearchscript.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtsearchstring($args, &$ctx) { return ''; } php/lib/function.mtsearchstring.php @@ -1,23 +1,132 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtsetvar($args, &$ctx) { // status: complete // parameters: name, value $name = $args['name']; $name or $name = $args['var']; if (!$name) return ''; - $value = $args['value']; + $vars =& $ctx->__stash['vars']; + + if (preg_match('/^(\w+)\((.+)\)$/', $name, $matches)) { + $func = $matches[1]; + $name = $matches[2]; + } else { + if (array_key_exists('function', $args)) + $func = $args['function']; + } + + # pick off any {...} or [...] from the name. + if (preg_match('/^(.+)([\[\{])(.+)[\]\}]$/', $name, $matches)) { + $name = $matches[1]; + $br = $matches[2]; + $ref = $matches[3]; + if (preg_match('/^\$(.+)/', $ref, $ref_matches)) { + $ref = $vars[$ref_matches[1]]; + if (!isset($ref)) + $ref = chr(0); + } + $br == '[' ? $index = $ref : $key = $ref; + } else { + if (array_key_exists('index', $args)) + $index = $args['index']; + else if (array_key_exists('key', $args)) + $key = $args['key']; + } + + if (preg_match('/^$/', $name)) { + $name = $vars[$name]; + if (!isset($name)) + return $ctx->error($ctx->mt->translate( + "You used a [_1] tag without a valid name attribute.", "<MT$tag>" )); + } + + $value = $args['value']; + $existing = $vars[$name]; + + require_once("MTUtil.php"); + if (isset($key)) { + if (!isset($existing)) + $existing = array($key => $value); + elseif (is_hash($existing)) + $existing = $existing[$key]; + else + return $ctx->error( $ctx->mt->translate("'[_1]' is not a hash.", $name) ); + } + elseif (isset($index)) { + if (!isset($existing)) + $existing[$index] = $value; + elseif (is_array($existing)) { + if ( is_numeric($index) ) + $existing = $existing[$index]; + else + return $ctx->error( $ctx->mt->translate("Invalid index.") ); + } + else + return $ctx->error( $ctx->mt->translate("'[_1]' is not an array.", $name) ); + } + if (array_key_exists('append', $args) && $args['append']) { - $existing = is_array($vars) ? $vars[$name] : ''; - $value = $existing . $value; - } elseif (array_key_exists('prepend', $args) && $args['prepend']) { - $existing = is_array($vars) ? $vars[$name] : ''; - $value = $value . $existing; + $value = isset($existing) ? $existing . $value : $value; + } + elseif (array_key_exists('prepend', $args) && $args['prepend']) { + $value = isset($existing) ? $value . $existing : $value; + } + elseif ( isset($existing) && array_key_exists('op', $args) ) { + $op = $args['op']; + $value = _math_operation($op, $existing, $value); + if (!isset($value)) + return $ctx->error($ctx->mt->translate("[_1] [_2] [_3] is illegal.", $existing, $op, $value)); + } + + $data = $vars[$name]; + if ( isset($key) ) { + if ( ( isset($func) ) + && ( 'delete' == strtolower( $func ) ) ) { + unset($data[$key]); + } + else { + $data[$key] = $value; + } + } + elseif ( isset($index) ) { + $data[$index] = $value; + } + elseif ( isset($func) ) { + if ( 'undef' == strtolower( $func ) ) { + unset($data); + } + else { + if (isset($data) && !is_array($data)) + return $ctx->error( $ctx->mt->translate("'[_1]' is not an array.", $name) ); + if (!isset($data)) + $data = array(); + if ( 'push' == strtolower( $func ) ) { + array_push($data, $value); + } + elseif ( 'unshift' == strtolower( $func ) ) { + array_unshift($data, $value); + } + else { + return $ctx->error( + $ctx->mt->translate("'[_1]' is not a valid function.", $func) + ); + } + } + } + else { + $data = $value; } if (is_array($vars)) { - $vars[$name] = $value; + $vars[$name] = $data; } else { - $vars = array($name => $value); + $vars = array($name => $data); $ctx->__stash['vars'] =& $vars; } return ''; php/lib/function.mtsetvar.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtsignonurl($args, &$ctx) { // status: complete // parameters: none php/lib/function.mtsignonurl.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtstaticfilepath($args, &$ctx) { $path = $ctx->mt->config('StaticFilePath'); if (!$path) { php/lib/function.mtstaticfilepath.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtstaticwebpath($args, &$ctx) { $path = $ctx->mt->config('StaticWebPath'); if (!$path) { php/lib/function.mtstaticwebpath.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtsubcategorypath($args, &$ctx) { require_once("block.mtparentcategories.php"); require_once("function.mtcategorylabel.php"); php/lib/function.mtsubcategorypath.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtsubcatsrecurse($args, &$ctx) { $localvars = array('subCatsDepth', 'category', 'subCatIsFirst', 'subCatIsLast'); $fn = $ctx->stash('subCatTokens'); php/lib/function.mtsubcatsrecurse.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('function.mtsubcatsrecurse.php'); function smarty_function_mtsubfolderrecurse($args, &$ctx) { $args['class'] = 'folder'; php/lib/function.mtsubfolderrecurse.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mttagcount($args, &$ctx) { $tag = $ctx->stash('Tag'); if (!$tag) return ''; php/lib/function.mttagcount.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mttagid($args, &$ctx) { $tag = $ctx->stash('Tag'); if (!$tag) return ''; php/lib/function.mttagid.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once('function.mttagname.php'); function smarty_function_mttaglabel($args, &$ctx) { return smarty_function_mttagname($args, $ctx); php/lib/function.mttaglabel.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mttagname($args, &$ctx) { $tag = $ctx->stash('Tag'); if (!$tag) return ''; php/lib/function.mttagname.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mttagrank($args, &$ctx) { $blog_id = $ctx->stash('blog_id'); $max_level = $args['max']; php/lib/function.mttagrank.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mttagsearchlink($args, &$ctx) { $tag = $ctx->stash('Tag'); if (!$tag) return ''; php/lib/function.mttagsearchlink.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mttemplatecreatedon($args, &$ctx) { $args['ts'] = $ctx->stash('template_created_on'); return $ctx->_hdlr_date($args, $ctx); php/lib/function.mttemplatecreatedon.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mttemplatenote($args, &$ctx) { return ''; } php/lib/function.mttemplatenote.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mttrackbackscript($args, &$ctx) { // status: complete // parameters: none php/lib/function.mttrackbackscript.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mttypekeytoken($args, &$ctx) { // status: complete // parameters: none php/lib/function.mttypekeytoken.php @@ -1,11 +1,19 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtvar($args, &$ctx) { // status: complete // parameters: name - if (array_key_exists('value', $args)) { + if ( array_key_exists('value', $args) + && !array_key_exists('op', $args) ) { require_once("function.mtsetvar.php"); return smarty_function_mtsetvar($args, $ctx); } + require_once("MTUtil.php"); $vars =& $ctx->__stash['vars']; $value = ''; $name = $args['name']; @@ -22,9 +30,44 @@ function smarty_function_mtvar($args, &$ctx) { } } if (!$name) return ''; + + if (preg_match('/^(\w+)\((.+)\)$/', $name, $matches)) { + $func = $matches[1]; + $name = $matches[2]; + } else { + if (array_key_exists('function', $args)) + $func = $args['function']; + } + + # pick off any {...} or [...] from the name. + if (preg_match('/^(.+)([\[\{])(.+)[\]\}]$/', $name, $matches)) { + $name = $matches[1]; + $br = $matches[2]; + $ref = $matches[3]; + if (preg_match('/^\\\\\$(.+)/', $ref, $ref_matches)) { + $ref = $vars[$ref_matches[1]]; + if (!isset($ref)) + $ref = chr(0); + } + $br == '[' ? $index = $ref : $key = $ref; + } else { + if (array_key_exists('index', $args)) + $index = $args['index']; + else if (array_key_exists('key', $args)) + $key = $args['key']; + } + + if (preg_match('/^$/', $name)) { + $name = $vars[$name]; + if (!isset($name)) + return $ctx->error($ctx->mt->translate( + "You used a [_1] tag without a valid name attribute.", "<MT$tag>" )); + } + if (isset($vars[$name])) $value = $vars[$name]; - if (preg_match('/^smarty_fun_[a-f0-9]+$/', $value)) { + if ( !is_array($value) + && preg_match('/^smarty_fun_[a-f0-9]+$/', $value) ) { if (function_exists($value)) { ob_start(); $value($ctx, array()); @@ -35,7 +78,87 @@ function smarty_function_mtvar($args, &$ctx) { } } - if ($value == '') { + $return_val = $value; + if (isset($name)) { + if (is_hash($value)) { + if ( isset($key) ) { + if ( isset($func) ) { + if ( 'delete' == strtolower($func) ) { + $return_val = $value[$key]; + unset($value[$key]); + $vars[$name] = $value; + } else { + return $ctx->error( + $ctx->mt->translate("'[_1]' is not a valid function for a hash.", $func) + ); + } + } else { + if ($key != chr(0)) { + $return_val = $value[$key]; + } else { + unset($value); + } + } + } + elseif ( isset($func) ) { + if ( 'count' == strtolower($func) ) { + $return_val = count(array_keys($value)); + } + else { + return $ctx->error( + $ctx->mt->translate("'[_1]' is not a valid function for a hash.", $func) + ); + } + } + } + elseif (is_array($value)) { + if ( isset($index) ) { + if (is_numeric($index)) { + $return_val = $value[ $index ]; + } else { + unset($value); # fall through to any 'default' + } + } + elseif ( isset($func) ) { + $func = strtolower($func); + if ( 'pop' == $func ) { + $return_val = array_pop($value); + $vars[$name] = $value; + } + elseif ( 'shift' == $func ) { + $return_val = array_shift($value); + $vars[$name] = $value; + } + elseif ( 'count' == $func ) { + $return_val = count($value); + } + else { + return $ctx->error( + $ctx->mt->translate("'[_1]' is not a valid function for an array.", $func) + ); + } + } + else { + if (!array_key_exists('to_json', $args) && $args['to_json']) { + $glue = $args['glue']; + if (!isset($glue)) + $glue = ''; + $return_val = implode($glue, $value); + } + } + } + if ( array_key_exists('op', $args) ) { + $op = $args['op']; + $rvalue = $args['value']; + if ( $op && isset($value) && !is_array($value) ) { + $return_val = _math_operation($op, $value, $rvalue); + if (!isset($return_val)) { + return $ctx->error($ctx->mt->translate("[_1] [_2] [_3] is illegal.", $value, $op, $rvalue)); + }} + } + } + + if ($return_val == '') { if (isset($args['default'])) { $value = $args['default']; } @@ -43,21 +166,20 @@ function smarty_function_mtvar($args, &$ctx) { if (isset($args['escape'])) { $esc = strtolower($args['escape']); if ($esc == 'js') { - require_once("MTUtil.php"); - $value = encode_js($value); + $return_val = encode_js($return_val); } elseif ($esc == 'html') { if (version_compare(phpversion(), '4.3.0', '>=')) { global $mt; $charset = $mt->config('PublishCharset'); - $value = htmlentities($value, ENT_COMPAT, $charset); + $return_val = htmlentities($return_val, ENT_COMPAT, $charset); } else { - $value = htmlentities($value, ENT_COMPAT); + $return_val = htmlentities($return_val, ENT_COMPAT); } } elseif ($esc == 'url') { - $value = urlencode($text); - $value = preg_replace('/\+/', '%20', $text); + $return_val = urlencode($return_val); + $return_val = preg_replace('/\+/', '%20', $return_val); } } - return $value; + return $return_val; } ?> php/lib/function.mtvar.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtversion($args, &$ctx) { // status: complete // parameters: none php/lib/function.mtversion.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtxmlrpcscript($args, &$ctx) { // status: complete // parameters: none php/lib/function.mtxmlrpcscript.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + global $Lexicon_de; $Lexicon_de = array( ## php/lib/archive_lib.php @@ -42,7 +48,7 @@ $Lexicon_de = array( ## php/lib/function.mtentryclasslabel.php 'page' => 'erneut veröffentlichen', 'entry' => 'Eintrag', - 'Entry' => 'Eintrag', + 'Entry' => 'Eintrag' ); function translate_phrase($str, $params = null) { global $Lexicon, $Lexicon_de; php/lib/l10n_de.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + global $Lexicon; $Lexicon['Individual'] = 'Entry'; function translate_phrase($str, $params = null) { php/lib/l10n_en.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + global $Lexicon_es; $Lexicon_es = array( ## php/lib/archive_lib.php @@ -42,7 +48,7 @@ $Lexicon_es = array( ## php/lib/function.mtentryclasslabel.php 'page' => 'página', 'entry' => 'entrada', - 'Entry' => 'Entrada' + 'Entry' => 'Entrada', ); function translate_phrase($str, $params = null) { global $Lexicon, $Lexicon_es; php/lib/l10n_es.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + global $Lexicon_fr; $Lexicon_fr = array( ## php/lib/archive_lib.php php/lib/l10n_fr.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + global $Lexicon_ja; $Lexicon_ja = array( php/lib/l10n_ja.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + global $Lexicon_nl; $Lexicon_nl = array( ## php/lib/archive_lib.php @@ -36,6 +42,8 @@ $Lexicon_nl = array( ## php/lib/MTUtil.php 'userpic-[_1]-%wx%h%x' => 'gebruikersafbeelding-[_1]-%wx%h%x', + +## php/lib/function.mtauthordisplayname.php ); function translate_phrase($str, $params = null) { global $Lexicon, $Lexicon_nl; php/lib/l10n_nl.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_modifier_convert_breaks($text) { require_once("MTUtil.php"); return html_text_transform($text); php/lib/modifier.convert_breaks.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_modifier_decode_html($text) { require_once("MTUtil.php"); return decode_html($text); php/lib/modifier.decode_html.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_modifier_decode_xml($text) { require_once("MTUtil.php"); return decode_xml($text); php/lib/modifier.decode_xml.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_modifier_dirify($text, $attr = '1') { if ($attr == "0") return $text; require_once("MTUtil.php"); php/lib/modifier.dirify.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_modifier_encode_html($text) { if (version_compare(phpversion(), '4.3.0', '>=')) { global $mt; php/lib/modifier.encode_html.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_modifier_encode_js($text) { require_once("MTUtil.php"); return encode_js($text); php/lib/modifier.encode_js.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_modifier_encode_php($text, $type) { switch ($type) { case 'qq': php/lib/modifier.encode_php.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_modifier_encode_url($text) { $text = urlencode($text); $text = preg_replace('/\+/', '%20', $text); php/lib/modifier.encode_url.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_modifier_encode_xml($text) { require_once("MTUtil.php"); return encode_xml($text); php/lib/modifier.encode_xml.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_modifier_filters($text,$filters) { // status: complete $f = preg_split('/\s*,\s*/', $filters); php/lib/modifier.filters.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_modifier_lower_case($text) { return strtolower($text); } php/lib/modifier.lower_case.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_modifier_ltrim($text) { return ltrim($text); } php/lib/modifier.ltrim.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_modifier_nofollowfy($str, $arg = 1) { # manipulate hyperlinks in $str... if (!isset($str)) return $str; php/lib/modifier.nofollowfy.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_modifier_remove_html($text) { return strip_tags($text); } php/lib/modifier.remove_html.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_modifier_richtext($text) { return $text; } php/lib/modifier.richtext.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_modifier_rtrim($text) { return rtrim($text); } php/lib/modifier.rtrim.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_modifier_sanitize($text, $spec) { if ($spec == '1') { global $mt; php/lib/modifier.sanitize.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_modifier_space_pad($text, $len) { return sprintf("%".$len."s", $text); } php/lib/modifier.space_pad.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_modifier_spam_protect($text) { # defined in mt.php itself return spam_protect($text); php/lib/modifier.spam_protect.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_modifier_sprintf($text, $format) { return sprintf($format, $text); } php/lib/modifier.sprintf.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_modifier_strip_linefeeds($text) { return preg_replace('/[\r\n]/', '', $text); } php/lib/modifier.strip_linefeeds.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_modifier_trim($text) { return trim($text); } php/lib/modifier.trim.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_modifier_trim_to($text, $len) { $len = intval($len); require_once("MTUtil.php"); php/lib/modifier.trim_to.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_modifier_upper_case($text) { return strtoupper($text); } php/lib/modifier.upper_case.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_modifier_words($text, $words) { require_once("MTUtil.php"); return first_n_text($text, $words); php/lib/modifier.words.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_modifier_wrap_text($text, $words) { return wordwrap($text, $words - 1, "\n", true); } php/lib/modifier.wrap_text.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_modifier_zero_pad($text, $len) { return sprintf("%0".$len."s", $text); } php/lib/modifier.zero_pad.php @@ -1,7 +1,7 @@ <?php -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -1878,6 +1878,31 @@ class MTDatabaseBase extends ezsql { return $count; } + function author_entry_count($args) { + if ($sql = $this->include_exclude_blogs($args)) { + $blog_filter = 'and entry_blog_id ' . $sql; + } elseif (isset($args['blog_id'])) { + $blog_id = intval($args['blog_id']); + $blog_filter = 'and entry_blog_id = ' . $blog_id; + } + if (isset($args['author_id'])) { + $author_id = intval($args['author_id']); + $author_filter = " and entry_author_id = $author_id"; + } + if (isset($args['class'])) { + $class = $args['class']; + } + $count = $this->get_var(" + select count(*) + from mt_entry + where entry_status = 2 + and entry_class='$class' + $blog_filter + $author_filter + "); + return $count; + } + function &fetch_placements($args) { $category_id_list = $args['category_id']; $id_list = ''; @@ -1996,6 +2021,7 @@ class MTDatabaseBase extends ezsql { if ($entry_id) { $entry_filter = " and comment_entry_id = $entry_id"; + $entry_join = "join mt_entry on entry_id = comment_entry_id"; } else { $entry_join = "join mt_entry on entry_id = comment_entry_id and entry_status = 2"; } @@ -2012,6 +2038,8 @@ class MTDatabaseBase extends ezsql { $offset = 0; if (isset($args['lastn'])) $limit = $args['lastn']; + if (isset($args['limit'])) + $limit = $args['limit']; if (isset($args['offset'])) $limit = $args['offset']; if (count($filters)) { @@ -2022,7 +2050,8 @@ class MTDatabaseBase extends ezsql { $sql = " select $distinct - mt_comment.* + mt_comment.*, + mt_entry.* from mt_comment $entry_join $join_score @@ -2032,7 +2061,6 @@ class MTDatabaseBase extends ezsql { order by comment_created_on $order <LIMIT>"; $sql = $this->apply_limit_sql($sql, $limit, $offset); - # Fetch resultset $result = $this->query_start($sql); if (!$result) return null; @@ -2100,7 +2128,7 @@ class MTDatabaseBase extends ezsql { $asc_created_on = create_function('$a,$b', 'return strcmp($a["comment_created_on"], $b["comment_created_on"]);'); usort($comments, $asc_created_on); } - + return $comments; } @@ -2552,6 +2580,8 @@ class MTDatabaseBase extends ezsql { $offset = 0; if (isset($args['lastn'])) $limit = $args['lastn']; + if (isset($args['limit'])) + $limit = $args['limit']; if (isset($args['offset'])) $offset = $args['offset']; @@ -2819,19 +2849,36 @@ class MTDatabaseBase extends ezsql { function include_exclude_blogs(&$args) { - if (isset($args[blog_ids]) || isset($args[include_blogs])) { + if (isset($args['blog_ids']) || isset($args['include_blogs'])) { // The following are aliased - $args[blog_ids] and $args[include_blogs] = $args[blog_ids]; - $attr = $args[include_blogs]; - unset($args[blog_ids]); + $args['blog_ids'] and $args['include_blogs'] = $args['blog_ids']; + $attr = $args['include_blogs']; + unset($args['blog_ids']); $is_excluded = 0; - } elseif (isset($args[exclude_blogs])) { + } elseif (isset($args['exclude_blogs'])) { $attr = $args[exclude_blogs]; $is_excluded = 1; } else { return; } - $blog_ids = strtolower($blog_ids); + + if (preg_match('/-/', $attr)) { + # parse range blog ids out + $list = preg_split('/\s*,\s*/', $attr); + $attr = ''; + foreach ($list as $item) { + if (preg_match('/(\d+)-(\d+)/', $item, $matches)) { + for ($i = $matches[1]; $i <= $matches[2]; $i++) { + if ($attr != '') $attr .= ','; + $attr .= $i; + } + } else { + if ($attr != '') $attr .= ','; + $attr .= $item; + } + } + } + $blog_ids = preg_split('/\s*,\s*/', $attr, -1, PREG_SPLIT_NO_EMPTY); php/lib/mtdb_base.php @@ -1,7 +1,7 @@ <?php -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ php/lib/mtdb_mysql.php @@ -1,7 +1,7 @@ <?php -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ php/lib/mtdb_postgres.php @@ -1,7 +1,7 @@ <?php -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ php/lib/mtdb_sqlite.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + /* Movable Type template -> Smarty template <$MTVariable$> -> {Variable} php/lib/prefilter.mt_to_smarty.php @@ -1,4 +1,9 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ function get_score(&$ctx, $obj_id, $datasource, $namespace, $user_id) { $score = $ctx->mt->db->fetch_score($namespace, $obj_id, $user_id, $datasource); php/lib/rating_lib.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_resource_mt_source($tpl_name, &$tpl_source, &$ctx) { $blog_id = $ctx->stash('blog_id'); if (intval($tpl_name) > 0) { php/lib/resource.mt.php @@ -1,7 +1,7 @@ <?php -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2004-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -509,7 +509,6 @@ class MT { $vars['category_archive'] = 1; $vars['main_template'] = 1; $vars['archive_template'] = 1; - $vars['module_category_archives'] = 1; $vars['module_category-monthly_archives'] = 1; } } php/mt.php.pre @@ -1,9 +1,13 @@ -# Blog Cloner plugin for Movable Type -# Author: Brad Choate, Six Apart (http://www.sixapart.com) -# Released under the Artistic License +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ +# Blog Cloner plugin for Movable Type +# Author: Brad Choate, Six Apart (http://www.sixapart.com) +# Released under the Artistic and GPLv2 License + package MT::Plugin::Cloner; use strict; @@ -12,9 +16,9 @@ use base 'MT::Plugin'; our $VERSION = '2.0'; my $plugin = MT::Plugin::Cloner->new({ - name => "Weblog Cloner", + name => "Blog Cloner", version => $VERSION, - description => '<MT_TRANS phrase="Clones a weblog and all of its contents.">', + description => '<MT_TRANS phrase="Clones a blog and all of its contents.">', author_name => "Six Apart, Ltd.", author_link => 'http://www.sixapart.com/', registry => { plugins/Cloner/cloner.pl @@ -1,11 +1,11 @@ -# Copyright 2006-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. -# -# Original Copyright (c) 2004-2006 David Raynes +# Movable Type (r) Open Source (C) 2006-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ +# Original Copyright (c) 2004-2006 David Raynes + package MultiBlog; use strict; @@ -101,7 +101,7 @@ sub post_entry_save { } require MT::Entry; - if ( $entry->status == MT::Entry::RELEASE() ) { + if ( ( $entry->status || 0 ) == MT::Entry::RELEASE() ) { while ( my ( $id, $a ) = each( %{ $d->{'entry_pub'} } ) ) { next if $id == $blog_id; perform_mb_action( $app, $id, $_ ) foreach keys %$a; @@ -168,7 +168,7 @@ sub filter_blogs_from_args { } # Make sure include_blogs/exclude_blogs is valid elsif (($incl || $excl) ne 'all' - and ($incl || $excl) !~ /^\d+(,\d+)*$/) { + and ($incl || $excl) !~ /^\d+([,-]\d+)*$/) { $err = $plugin->translate('The value for the include_blogs/exclude_blogs attributes must be one or more blog IDs, separated by commas.'); } return $ctx->error($err) if $err; @@ -180,7 +180,20 @@ sub filter_blogs_from_args { } else { ($attr, $val) = ('exclude_blogs', $excl); } - @blogs = split(',', $val); + + if ($val =~ m/-/) { + my @list = split /\s*,\s*/, $val; + foreach my $id (@list) { + if ($id =~ m/^(\d+)-(\d+)$/) { + push @blogs, $_ for $1..$2; + } else { + push @blogs, $id; + } + } + } + else { + @blogs = split(/\s*,\s*/, $val); + } # Filter the blogs using the MultiBlog access controls ($attr, @blogs) = filter_blogs($plugin, $ctx, $attr, @blogs); plugins/MultiBlog/lib/MultiBlog.pm @@ -1,5 +1,13 @@ -package MultiBlog::L10N; +# Movable Type (r) Open Source (C) 2006-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# # $Id$ + +# Original Copyright (c) 2004-2006 David Raynes + +package MultiBlog::L10N; + use strict; use base 'MT::Plugin::L10N'; plugins/MultiBlog/lib/MultiBlog/L10N.pm @@ -1,5 +1,13 @@ -package MultiBlog::L10N::en_us; +# Movable Type (r) Open Source (C) 2006-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# # $Id$ + +# Original Copyright (c) 2004-2006 David Raynes + +package MultiBlog::L10N::en_us; + use strict; use base 'MultiBlog::L10N'; plugins/MultiBlog/lib/MultiBlog/L10N/en_us.pm @@ -1,5 +1,13 @@ -package MultiBlog::L10N::ja; +# Movable Type (r) Open Source (C) 2006-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# # $Id$ + +# Original Copyright (c) 2004-2006 David Raynes + +package MultiBlog::L10N::ja; + use strict; use base 'MultiBlog::L10N::en_us'; use vars qw( %Lexicon ); plugins/MultiBlog/lib/MultiBlog/L10N/ja.pm @@ -1,11 +1,11 @@ -# Copyright 2006-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. -# -# Original Copyright (c) 2004-2006 David Raynes +# Movable Type (r) Open Source (C) 2006-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ +# Original Copyright (c) 2004-2006 David Raynes + package MultiBlog::Tags; use strict; plugins/MultiBlog/lib/MultiBlog/Tags.pm @@ -1,11 +1,11 @@ -# Copyright 2006-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. -# -# Original Copyright (c) 2004-2006 David Raynes +# Movable Type (r) Open Source (C) 2006-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ +# Original Copyright (c) 2004-2006 David Raynes + package MT::Plugin::MultiBlog; use strict; plugins/MultiBlog/multiblog.pl @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + if (MULTIBLOG_ENABLED) { function smarty_block_mtmultiblog($args, $content, &$ctx, &$repeat) { plugins/MultiBlog/php/block.mtmultiblog.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + if (MULTIBLOG_ENABLED) { function smarty_block_mtmultiblogiflocalblog($args, $content, &$ctx, &$repeat) { if (!isset($content)) { plugins/MultiBlog/php/block.mtmultiblogiflocalblog.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + if (MULTIBLOG_ENABLED) { function smarty_block_mtmultibloglocalblog($args, $content, &$ctx, &$repeat) { $localvars = array('local_blog_id', 'blog_id', 'blog'); plugins/MultiBlog/php/block.mtmultibloglocalblog.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + if (MULTIBLOG_ENABLED) { function smarty_block_mtotherblog($args, $content, &$ctx, &$repeat) { $localvars = array('local_blog_id', 'blog_id', 'blog'); plugins/MultiBlog/php/block.mtotherblog.php @@ -1,4 +1,8 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# # $Id$ global $mt; @@ -174,7 +178,7 @@ function multiblog_filter_blogs_from_args(&$ctx, &$args) { # Make sure include_blogs/exclude_blogs is valid if (($incl or $excl) != 'all' - and !preg_match('/^\d+(,\d+)*$/', $incl or $excl)) { + and !preg_match('/^\d+([,-]\d+)*$/', $incl or $excl)) { return false; } @@ -182,7 +186,20 @@ function multiblog_filter_blogs_from_args(&$ctx, &$args) { $blogs = array(); $attr = $incl ? 'include_blogs' : 'exclude_blogs'; $val = $incl ? $incl : $excl; - $blogs = preg_split('/,/', $val); + if (preg_match('/-/', $val)) { + # parse range blog ids out + $list = preg_split('/\s*,\s*/', $val); + foreach ($list as $item) { + if (preg_match('/(\d+)-(\d+)/', $item, $matches)) { + for ($i = $matches[1]; $i <= $matches[2]; $i++) + $blogs[] = $i; + } else { + $blogs[] = $item; + } + } + } else { + $blogs = preg_split('/\s*,\s*/', $val); + } # Filter the blogs using the MultiBlog access controls list($attr, $blogs) = multiblog_filter_blogs($ctx, $attr, $blogs); plugins/MultiBlog/php/init.MultiBlog.php @@ -1,5 +1,5 @@ <mt:unless name="json"> -<$mt:setvar name="screen_type" value="dialog-screen dialog-4"$> +<$mt:setvar name="screen_type" value="dialog-screen"$> <mt:setvarblock name="page_title"><__trans phrase="Create MultiBlog Trigger"></mt:setvarblock> <mt:setvarblock name="html_head" append="1"> <script type="text/javascript" src="<mt:var name="static_uri">js/tc/client.js"></script> plugins/MultiBlog/tmpl/dialog_create_trigger.tmpl @@ -1,5 +1,6 @@ -# Copyright 2005-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. +# Movable Type (r) Open Source (C) 2005-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ @@ -40,11 +41,16 @@ sub listify { sub view { my $app = shift; my $blog_id = $app->param('blog_id'); - return $app->errtrans("Invalid request") unless $blog_id; + $app->return_to_dashboard( redirect => 1 ) unless $blog_id; my $blog = MT::Blog->load($blog_id); return $app->errtrans("Invalid request") unless $blog; + my $static_path = $app->static_file_path; + if (! -d $static_path ) { + return $app->errtrans("Your mt-static directory could not be found. Please configure 'StaticFilePath' to continue."); + } + my $themeroot = File::Spec->catdir( $app->static_file_path, 'support', 'themes' ); my $webthemeroot = $app->static_path . 'support/themes'; @@ -150,8 +156,13 @@ sub apply { return $app->json_error($app->translate("Invalid request")) unless $blog_id && $url && $tmpl; + my $static_path = $app->static_file_path; + if (! -d $static_path ) { + return $app->json_error($app->translate("Your mt-static directory could not be found. Please configure 'StaticFilePath' to continue.")); + } + my $themeroot = - File::Spec->catdir( $app->static_file_path, 'support', 'themes' ); + File::Spec->catdir( $static_path, 'support', 'themes' ); my $webthemeroot = $app->static_path . 'support/themes/'; my $mtthemeroot = $app->static_path . 'themes/'; my $mtthemebase = $app->static_path . 'themes-base/'; plugins/StyleCatcher/lib/StyleCatcher/CMS.pm @@ -1,6 +1,6 @@ -# Copyright 2001-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. For more information, consult your -# Movable Type license. +# Movable Type (r) Open Source (C) 2005-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ plugins/StyleCatcher/lib/StyleCatcher/L10N.pm @@ -1,3 +1,9 @@ +# Movable Type (r) Open Source (C) 2005-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + package StyleCatcher::L10N::de; use strict; plugins/StyleCatcher/lib/StyleCatcher/L10N/de.pm @@ -1,3 +1,9 @@ +# Movable Type (r) Open Source (C) 2005-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + package StyleCatcher::L10N::en_us; use strict; plugins/StyleCatcher/lib/StyleCatcher/L10N/en_us.pm @@ -1,3 +1,9 @@ +# Movable Type (r) Open Source (C) 2005-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + package StyleCatcher::L10N::es; use strict; plugins/StyleCatcher/lib/StyleCatcher/L10N/es.pm @@ -1,3 +1,9 @@ +# Movable Type (r) Open Source (C) 2005-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + package StyleCatcher::L10N::fr; use strict; plugins/StyleCatcher/lib/StyleCatcher/L10N/fr.pm @@ -1,3 +1,9 @@ +# Movable Type (r) Open Source (C) 2005-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + package StyleCatcher::L10N::ja; use strict; plugins/StyleCatcher/lib/StyleCatcher/L10N/ja.pm @@ -1,3 +1,9 @@ +# Movable Type (r) Open Source (C) 2005-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + package StyleCatcher::L10N::nl; use strict; plugins/StyleCatcher/lib/StyleCatcher/L10N/nl.pm @@ -1,5 +1,6 @@ -# Copyright 2005-2007 Six Apart. This code cannot be redistributed without -# permission from www.sixapart.com. +# Movable Type (r) Open Source (C) 2005-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ plugins/StyleCatcher/stylecatcher.pl @@ -1,9 +1,13 @@ -# WXRImporter plugin for Movable Type -# Author: Six Apart (http://www.sixapart.com) -# Released under the Artistic License +# Movable Type (r) Open Source (C) 2006-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ +# WXRImporter plugin for Movable Type +# Author: Six Apart (http://www.sixapart.com) +# Released under the Artistic and GPLv2 License + package MT::Plugin::WXRImporter; use strict; @@ -11,7 +15,7 @@ use base qw( MT::Plugin ); my $plugin = new MT::Plugin::WXRImporter({ name => "WXR Importer", - version => '1.0', + version => '1.1', description => '<MT_TRANS phrase="Import WordPress exported RSS into MT.">', author_name => "Six Apart, Ltd.", author_link => "http://www.sixapart.com/", @@ -27,11 +31,17 @@ sub init_registry { label => 'WordPress eXtended RSS (WXR)', type => 'WXRImporter::Import', handler => 'WXRImporter::Import::import_contents', - options => [ 'wp_path', 'mt_site_path', 'mt_extra_path' ], + options => [ 'wp_path', 'mt_site_path', 'mt_extra_path', 'wp_download' ], options_template => 'options.tmpl', options_param => 'WXRImporter::Import::get_param', }, }, + task_workers => { + 'wxr_importer' => { + label => "Download WP attachments via HTTP.", + class => 'WXRImporter::Worker::Downloader', + }, + }, }); } plugins/WXRImporter/WXRImporter.pl @@ -1,194 +1,201 @@ -# WXRImporter plugin for Movable Type -# Author: Six Apart (http://www.sixapart.com) -# Released under the Artistic License -# -# $Id$ - -package WXRImporter::Import; -use strict; - -use base qw(MT::ErrorHandler); - -sub import_contents { - my $class = shift; - my %param = @_; - my $iter = $param{Iter}; - my $blog = $param{Blog} or return $class->error(MT->translate("No Blog")); - my $cb = $param{Callback} || sub { }; - my $encoding = $param{Encoding}; - - my($root_path, $root_url, $relative_path); - if (my $p = delete $param{'mt_site_path'}) { - $root_path = $root_url = '%r'; - } else { - $root_path = $root_url = '%a'; - } - - if ($root_path && $root_url) { - $relative_path = delete $param{'mt_extra_path'}; - my $path = $root_path; - if ($relative_path) { - if ($relative_path =~ m!\.\.|\0|\|!) { - return $class->error(MT->translate( - "Invalid extra path '[_1]'", $relative_path)); - } - $path = File::Spec->catdir($path, $relative_path); - } - - ## $path should be local path to file now (we don't create/upload files nor mkpath) - - my $url = $path; - $url =~ s!\\!/!g; - - $param{'mt_path'} = $path; - $param{'mt_url'} = $url; - } - - if (exists $param{ImportAs}) { - } elsif (exists $param{ParentAuthor}) { - require MT::Auth; - return $class->error(MT->translate( - "You need to provide a password if you are going to " . - "create new users for each user listed in your blog.")) - if MT::Auth->password_exists && !(exists $param{NewAuthorPassword}); - } else { - return $class->error(MT->translate( - "Need either ImportAs or ParentAuthor")); - } - $cb->("\n"); - my $import_result = eval { - while (my $stream = $iter->()) { - my $result = eval { - $class->start_import($stream, %param); - }; - $cb->($@) unless $result; - } - $class->errstr ? undef : 1; - }; - $import_result; -} - -sub start_import { - my $self = shift; - my ($stream, %param) = @_; - - if (ref($stream) eq 'Fh') { - $stream = WXRImporter::Stream->new($stream); - } - - require XML::SAX; - require WXRImporter::WXRHandler; - my $handler = WXRImporter::WXRHandler->new( - callback => $param{Callback}, - blog => $param{Blog}, - def_cat_id => $param{DefaultCategoryID}, - convert_breaks => $param{ConvertBreaks}, - (exists $param{ImportAs}) ? - ( author => $param{ImportAs} ) : - ( parent => $param{ParentAuthor} ), - pass => $param{NewAuthorPassword}, - wp_path => $param{wp_path}, - mt_path => $param{mt_path}, - mt_url => $param{mt_url}, - ); - - require MT::Util; - my $parser = MT::Util::sax_parser(); - $param{Callback}->(ref($parser) . "\n") if MT::ConfigMgr->instance->DebugMode; - $parser->{Handler} = $handler; - my $e; - eval { $parser->parse_file($stream); }; - $e = $@ if $@; - if ($e) { - $param{Callback}->($e); - return $self->error($e); - } - 1; -} - -sub get_param { - my $class = shift; - my ($blog_id) = @_; - - my $blog = MT::Blog->load($blog_id) or return $class->error(MT->translate('No Blog')); - - my $param = { blog_id => $blog_id }; - my $label_path; - if ($blog->column('archive_path')) { - $param->{enable_archive_paths} = 1; - $label_path = MT->translate('Archive Root'); - } else { - $label_path = MT->translate('Site Root'); - } - $param->{missing_paths} = - ((defined $blog->site_path || defined $blog->archive_path) - && (-d $blog->site_path || -d $blog->archive_path)) ? 0 : 1; - $param; -} - -# This package will be removed once WordPress fixes issues -# which it generates non-well formed XML (therefore it's -# not even XML at all). See: -# http://trac.wordpress.org/ticket/4242 -# http://trac.wordpress.org/ticket/4452 -package WXRImporter::Stream; - -use Symbol; - -use vars qw( $fh ); -sub new { - my $class = shift; - my $this = bless Symbol::gensym(), $class; - tie *$this, $this; - $fh = $_[0]; - return $this; -} - -sub read { - my $this = shift; - my $res = read($fh, $_[0], $_[1], $_[2] || 0); - my $string = $_[0]; - $string = _encode_wp_comment($string); - $_[0] = $string; - $res; -} - -sub binmode { - my $this = shift; - binmode $fh; -} - -sub eof { - my $this = shift; - eof $fh; -} - -sub close { - my $this = shift; - close $fh; -} - -*READ = \&read; -*BINMODE = \&binmode; -*EOF = \&eof; -*CLOSE = \&close; - -sub TIEHANDLE { - return $_[0] if ref($_[0]); - my $class = shift; - my $this = bless Symbol::gensym(), $class; - $fh = $_[0]; - return $this; -} - -sub _encode_wp_comment { - my ($str) = @_; - - use HTML::Entities::Numbered; - $str = name2hex_xml($str); - return $str; -} - -1; - -__END__ +# WXRImporter plugin for Movable Type +# Author: Six Apart (http://www.sixapart.com) +# Released under the Artistic License +# +# $Id$ + +package WXRImporter::Import; +use strict; + +use base qw(MT::ErrorHandler); + +sub import_contents { + my $class = shift; + my %param = @_; + my $iter = $param{Iter}; + my $blog = $param{Blog} or return $class->error(MT->translate("No Blog")); + my $cb = $param{Callback} || sub { }; + my $encoding = $param{Encoding}; + + my($root_path, $root_url, $relative_path); + if (my $p = delete $param{'mt_site_path'}) { + $root_path = $root_url = '%r'; + } else { + $root_path = $root_url = '%a'; + } + + if ($root_path && $root_url) { + $relative_path = delete $param{'mt_extra_path'}; + my $path = $root_path; + if ($relative_path) { + if ($relative_path =~ m!\.\.|\0|\|!) { + return $class->error(MT->translate( + "Invalid extra path '[_1]'", $relative_path)); + } + $path = File::Spec->catdir($path, $relative_path); + } + + ## $path should be local path to file now (we don't create/upload files nor mkpath) + + my $url = $path; + $url =~ s!\\!/!g; + + $param{'mt_path'} = $path; + $param{'mt_url'} = $url; + } + + if (exists $param{ImportAs}) { + } elsif (exists $param{ParentAuthor}) { + require MT::Auth; + return $class->error(MT->translate( + "You need to provide a password if you are going to " . + "create new users for each user listed in your blog.")) + if MT::Auth->password_exists && !(exists $param{NewAuthorPassword}); + } else { + return $class->error(MT->translate( + "Need either ImportAs or ParentAuthor")); + } + $cb->("\n"); + my $import_result = eval { + while (my $stream = $iter->()) { + my $result = eval { + $class->start_import($stream, %param); + }; + $cb->($@) unless $result; + } + $class->errstr ? undef : 1; + }; + $import_result; +} + +sub start_import { + my $self = shift; + my ($stream, %param) = @_; + + #if (ref($stream) eq 'Fh') { + # $stream = WXRImporter::Stream->new($stream); + #} + + my $xml = do { local $/ = undef; <$stream>} || ''; + $xml =~ s{<wp:comment_content>(?:<!\[CDATA\[)?(.*?)(?:\]\]>)?</wp:comment_content>} + {<wp:comment_content><![CDATA[$1]]></wp:comment_content>}sg; + use HTML::Entities::Numbered; + $xml = HTML::Entities::Numbered::name2hex_xml($xml); + + require WXRImporter::WXRHandler; + my $handler = WXRImporter::WXRHandler->new( + callback => $param{Callback}, + blog => $param{Blog}, + def_cat_id => $param{DefaultCategoryID}, + convert_breaks => $param{ConvertBreaks}, + (exists $param{ImportAs}) ? + ( author => $param{ImportAs} ) : + ( parent => $param{ParentAuthor} ), + pass => $param{NewAuthorPassword}, + wp_path => $param{wp_path}, + mt_path => $param{mt_path}, + mt_url => $param{mt_url}, + wp_download => $param{wp_download}, + ); + + require MT::Util; + my $parser = MT::Util::sax_parser(); + $param{Callback}->(ref($parser) . "\n") if MT::ConfigMgr->instance->DebugMode; + $parser->{Handler} = $handler; + my $e; + eval { $parser->parse_string($xml); }; + #eval { $parser->parse_file($stream); }; + $e = $@ if $@; + if ($e) { + $param{Callback}->($e); + return $self->error($e); + } + 1; +} + +sub get_param { + my $class = shift; + my ($blog_id) = @_; + + my $blog = MT::Blog->load($blog_id) or return $class->error(MT->translate('No Blog')); + + my $param = { blog_id => $blog_id }; + my $label_path; + if ($blog->column('archive_path')) { + $param->{enable_archive_paths} = 1; + $label_path = MT->translate('Archive Root'); + } else { + $label_path = MT->translate('Site Root'); + } + $param->{missing_paths} = + ((defined $blog->site_path || defined $blog->archive_path) + && (-d $blog->site_path || -d $blog->archive_path)) ? 0 : 1; + $param; +} + +## This package will be removed once WordPress fixes issues +## which it generates non-well formed XML (therefore it's +## not even XML at all). See: +## http://trac.wordpress.org/ticket/4242 +## http://trac.wordpress.org/ticket/4452 +#package WXRImporter::Stream; +# +#use Symbol; +# +#use vars qw( $fh ); +#sub new { +# my $class = shift; +# my $this = bless Symbol::gensym(), $class; +# tie *$this, $this; +# $fh = $_[0]; +# return $this; +#} +# +#sub read { +# my $this = shift; +# my $res = read($fh, $_[0], $_[1], $_[2] || 0); +# my $string = $_[0]; +# $string = _encode_wp_comment($string); +# $_[0] = $string; +# $res; +#} +# +#sub binmode { +# my $this = shift; +# binmode $fh; +#} +# +#sub eof { +# my $this = shift; +# eof $fh; +#} +# +#sub close { +# my $this = shift; +# close $fh; +#} +# +#*READ = \&read; +#*BINMODE = \&binmode; +#*EOF = \&eof; +#*CLOSE = \&close; +# +#sub TIEHANDLE { +# return $_[0] if ref($_[0]); +# my $class = shift; +# my $this = bless Symbol::gensym(), $class; +# $fh = $_[0]; +# return $this; +#} +# +#sub _encode_wp_comment { +# my ($str) = @_; +# +# use HTML::Entities::Numbered; +# $str = name2hex_xml($str); +# return $str; +#} + +1; + +__END__ plugins/WXRImporter/lib/WXRImporter/Import.pm @@ -28,10 +28,7 @@ sub start_document { my $data = shift; $self->{start} = 1; - - my $limit = $self->{blog}->basename_limit || 30; - $limit = 15 if $limit < 15; $limit = 250 if $limit > 250; - $self->{basename_limit} = $limit; + $self->{basename_limit} = 255; # max length of the column 1; } @@ -386,11 +383,27 @@ sub _create_asset { my $mt_url = $self->{'mt_url'}; my $url = $asset_values->{'url'}; + my $old_url = $url; if ($mt_url) { $url =~ s/^.*$wp_path(.+)$/$mt_url$1/i; } $asset_values->{'url'} = $url; + require MT::Asset; + + # Check dupe + if ( MT::Asset->count( + { + blog_id => $asset_values->{blog_id}, + label => $asset_values->{label}, + file_path => $asset_values->{file_path}, + } + )) + { + $cb->(MT->translate("Duplicate asset ('[_1]') found. Skipping.", $asset_values->{label})); + $cb->("\n"); + return 1; + } require File::Basename; my $local_basename = File::Basename::basename($path); my $ext = (File::Basename::fileparse($path, qr/[A-Za-z]+$/))[2]; @@ -398,9 +411,8 @@ sub _create_asset { $asset_values->{'file_name'} = $local_basename; $asset_values->{'file_ext'} = $ext; - require MT::Asset; - my $asset_pkg = MT::Asset->handler_for_file($local_basename); # Now save the asset. + my $asset_pkg = MT::Asset->handler_for_file($local_basename); my $asset = $asset_pkg->new(); my $w = delete $asset_values->{'image_width'}; my $h = delete $asset_values->{'image_height'}; @@ -414,6 +426,9 @@ sub _create_asset { $cb->(MT->translate(" and asset will be tagged ('[_1]')...", join(',', @tags))); if ($asset->save) { $cb->(MT->translate("ok (ID [_1])", $asset->id) . "\n"); + if ( exists($self->{'wp_download'}) && $self->{'wp_download'} ) { + _get_item_via_http($asset->id, $old_url); + } } else { $cb->(MT->translate("failed") . "\n"); die MT->translate( @@ -436,8 +451,7 @@ sub _create_post { }; my %meta_hash; - require MT::App::CMS; - my $class = MT::App::CMS->_load_driver_for($class_type); + my $class = MT->model($class_type); require MT::Comment; require MT::TBPing; require MT::Trackback; @@ -458,7 +472,7 @@ sub _create_post { } elsif ('dc_creator' eq $key) { $post->author_id($self->_get_author_id($cb, $value)); } elsif ('_category' eq $key) { - my $cat_class = MT::App::CMS->_load_driver_for( + my $cat_class = MT->model( $class_type eq 'entry' ? 'category' : 'folder'); my $cat = $cat_class->load( { label => $value, @@ -558,6 +572,21 @@ sub _create_post { } } + # Check dupe + if ( $class->count( + { + class => $class_type, + blog_id => $post->blog_id, + title => $post->title, + authored_on => $post->authored_on + } + )) + { + $cb->(MT->translate("Duplicate entry ('[_1]') found. Skipping.", $post->title)); + $cb->("\n"); + return 1; + } + # Now save the entry/page. if ('entry' eq $class_type) { $cb->(MT->translate("Saving entry ('[_1]')...", $post->title)); @@ -706,4 +735,17 @@ sub _gmt2blogtime { return undef; } +sub _get_item_via_http { + my ($asset_id, $url) = @_; + + require MT::TheSchwartz; + require TheSchwartz::Job; + my $job = TheSchwartz::Job->new(); + $job->funcname('WXRImporter::Worker::Downloader'); + $job->uniqkey( $asset_id ); + $job->arg( { old_url => $url } ); + $job->coalesce( $$ . ':' . ( time - ( time % 100 ) ) ); + MT::TheSchwartz->insert($job); +} + 1; plugins/WXRImporter/lib/WXRImporter/WXRHandler.pm @@ -1,21 +1,29 @@ -<mt:if name="missing_paths"> -<div class="error-message"><__trans phrase="Before you import WordPress posts to Movable Type, we recommend that you <a href='[_1]'>configure your blog's publishing paths</a> first." params="<mt:var name="script_uri">?__mode=cfg_archives&amp;blog_id=<mt:var name="blog_id">"></div> -</mt:if> - - <mtapp:setting - id="wp_path" - label="<__trans phrase="Upload path for this WordPress blog">"> -<input name="wp_path" id="wp_path" size="50" value="wp-content/uploads" /> - </mtapp:setting> - - <mtapp:setting - id="mt_site_path" - label="<__trans phrase="Replace with">"> -<select name="mt_site_path" onchange="setExtraPath(this)"> -<option value="1">&#60;<MT_TRANS phrase="Site Root">&#62;</option> -<mt:if name="enable_archive_paths"> -<option value="0">&#60;<MT_TRANS phrase="Archive Root">&#62;</option> -</mt:if> -</select> -/ <input name="mt_extra_path" id="mt_extra_path" /> - </mtapp:setting> +<mt:if name="missing_paths"> +<div class="error-message"><__trans phrase="Before you import WordPress posts to Movable Type, we recommend that you <a href='[_1]'>configure your blog's publishing paths</a> first." params="<mt:var name="script_uri">?__mode=cfg_archives&amp;blog_id=<mt:var name="blog_id">"></div> +</mt:if> + + <mtapp:setting + id="wp_path" + label="<__trans phrase="Upload path for this WordPress blog">"> +<input name="wp_path" id="wp_path" size="50" value="wp-content/uploads" /> + </mtapp:setting> + + <mtapp:setting + id="mt_site_path" + label="<__trans phrase="Replace with">"> +<select name="mt_site_path" onchange="setExtraPath(this)"> +<option value="1">&#60;<MT_TRANS phrase="Site Root">&#62;</option> +<mt:if name="enable_archive_paths"> +<option value="0">&#60;<MT_TRANS phrase="Archive Root">&#62;</option> +</mt:if> +</select> +/ <input name="mt_extra_path" id="mt_extra_path" /> + </mtapp:setting> + + <mtapp:setting + id="wp_download" + label="<__trans phrase="Download attachments">" + show_hint="1" + hint="<__trans phrase="Requires the use of a cron job to download attachments from WordPress powered blog in the background.">"> +<input type="checkbox" name="wp_download" id="wp_download" value="1" /> <__trans phrase="Download attachments (images and files) from the imported WordPress powered blog."> + </mtapp:setting> plugins/WXRImporter/tmpl/options.tmpl @@ -1,9 +1,13 @@ -# WidgetManager plugin for Movable Type -# Author: Byrne Reese, Six Apart (http://www.sixapart.com) -# Released under the Artistic License +# Movable Type (r) Open Source (C) 2005-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ +# WidgetManager plugin for Movable Type +# Author: Byrne Reese, Six Apart (http://www.sixapart.com) +# Released under the Artistic and GPLv2 License + package MT::Plugin::WidgetManager; use strict; @@ -44,6 +48,7 @@ sub init_registry { callback => 'MT::Blog::post_remove', handler => '$WidgetManager::WidgetManager::Plugin::remove_blog_widgetmanager', }, + 'DefaultTemplateFilter' => '$WidgetManager::MT::Plugin::WidgetManager::default_templates', }, applications => { cms => { @@ -91,6 +96,15 @@ sub load_selected_modules { WidgetManager::Plugin::load_selected_modules(@_); } +sub default_templates { + my $cb = shift; + my ($tmpl_list) = @_; + + my $widgetmgr = MT::Plugin::WidgetManager->instance; + my $widget_tmpls = $widgetmgr->templates(MT->instance); + push @$tmpl_list, @$widget_tmpls; +} + sub templates { my $plugin = shift; my ($app) = @_; plugins/WidgetManager/WidgetManager.pl @@ -1,70 +1,94 @@ $default_widget_templates = [ { - template => 'technorati_search.tmpl', - label => 'Technorati Search', + template => 'about_this_page.mtml', + label => 'About This Page', }, { - template => 'calendar.tmpl', - label => 'Calendar', + template => 'archive_meta_widget.mtml', + label => 'Archives', + }, + { + template => 'author_archive_list.mtml', + label => 'Author Archives', }, { - template => 'category_archive_list.tmpl', - label => 'Category list (nested)', + template => 'current_author_monthly_archive_list.mtml', + label => 'Current Author Monthly Archives', }, { - template => 'date-based_category_archives.tmpl', - label => 'Date-based Category Archives', + template => 'calendar.mtml', + label => 'Calendar', + }, + { + template => 'category_archive_list.mtml', + label => 'Category Archives', }, { - template => 'date-based_author_archives.tmpl', - label => 'Date-based Author Archives', + template => 'current_category_monthly_archive_list.mtml', + label => 'Current Category Monthly Archives', }, { - template => 'creative_commons.tmpl', + template => 'creative_commons.mtml', label => 'Creative Commons', }, { - template => 'monthly_archive_list.tmpl', - label => 'Monthly archive list', + template => 'main_index_meta_widget.mtml', + label => 'Home Page Widgets', + }, + { + template => 'monthly_archive_dropdown.mtml', + label => 'Monthly Archives Dropdown', }, { - template => 'powered_by.tmpl', - label => 'Powered by', + template => 'monthly_archive_list.mtml', + label => 'Monthly Archives', }, { - template => 'recent_posts.tmpl', - label => 'Recent posts', + template => 'pages_list.mtml', + label => 'Pages', }, { - template => 'search.tmpl', - label => 'Search form', + template => 'recent_assets.mtml', + label => 'Recent Assets', }, { - template => 'subscribe_to_feed.tmpl', - label => 'Subscribe to feed', + template => 'powered_by.mtml', + label => 'Powered By', }, { - template => 'recent_comments.tmpl', - label => 'Recent comments', + template => 'recent_comments.mtml', + label => 'Recent Comments', }, { - template => 'tag_cloud_module.tmpl', - label => 'Tag cloud (sidebar)', + template => 'recent_entries.mtml', + label => 'Recent Entries', }, { - template => 'monthly_archive_dropdown.tmpl', - label => 'Monthly archive dropdown', + template => 'search.mtml', + label => 'Search', }, { - template => 'signin.tmpl', + template => 'signin.mtml', label => 'Sign In', }, { - template => 'pages_list.tmpl', - label => 'Pages list (nested)', + template => 'syndication.mtml', + label => 'Syndication', + }, + { + template => 'tag_cloud.mtml', + label => 'Tag Cloud', + }, + { + template => 'technorati_search.mtml', + label => 'Technorati Search', + }, + { + template => 'date_based_author_archives.mtml', + label => 'Date-Based Author Archives', }, { - template => 'photos.tmpl', - label => 'Photos', + template => 'date_based_category_archives.mtml', + label => 'Date-Based Category Archives', } ]; plugins/WidgetManager/default_widgets/widgets.cfg @@ -230,6 +230,8 @@ sub list { $tmpl->param(plugin_version => $MT::Plugin::WidgetManager::VERSION); $tmpl->param(rebuild => $app->param('rebuild') || 0); $tmpl->param(deleted => $app->param('deleted') || 0); + $tmpl->param(listing_screen => 1); + $tmpl->param(screen_id => "list-widget-set"); return $app->build_page($tmpl); } plugins/WidgetManager/lib/WidgetManager/CMS.pm @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + function smarty_function_mtwidgetmanager($args, &$ctx) { $blog_id = $ctx->stash('blog_id'); $widgetmanager = $args['name']; // Should we try to load is there's only one? plugins/WidgetManager/php/function.mtwidgetmanager.php @@ -1,4 +1,10 @@ <?php +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + require_once("function.mtwidgetmanager.php"); function smarty_function_mtwidgetset($args, &$ctx) { return smarty_function_mtwidgetmanager($args, $ctx); plugins/WidgetManager/php/function.mtwidgetset.php @@ -347,7 +347,7 @@ TC.attachLoadEvent( init ); <button type="submit" accesskey="s" - title="<__trans phrase="Save changes to this [_1] (s)" params="<mt:var name="object_label" lower_case="1">">" + title="<__trans phrase="Save changes to this [lc,_1] (s)" params="<mt:var name="object_label">">" class="primary-button" ><__trans phrase="Save Changes"></button> </mt:setvarblock> plugins/WidgetManager/tmpl/edit.tmpl @@ -1,10 +1,11 @@ -# SpamLookup plugin for Movable Type -# Original copyright (c) 2004-2006, Brad Choate and Tobias Hoellrich -# Author: Six Apart (http://www.sixapart.com) -# Released under the Artistic License +# Movable Type (r) Open Source (C) 2006-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ +# Original copyright (c) 2004-2006, Brad Choate and Tobias Hoellrich + package spamlookup; use strict; @@ -492,8 +493,15 @@ sub wordlist_match { my ($opt) = $re =~ m!/([^/]*)$!; $re =~ s!^/!!; $re =~ s!/[^/]*$!!; - $re = '(?'.$opt.':'.$re.')' if $opt; - $re = eval { qr/$re/ }; + if ($opt) { + # increment any internal backreferences (\1), + # since we're wrapping the whole expression in + # a capturing group + $re =~ s/ \\(\d+) / '\\' . ($1 + 1) /gex; + + $re = '(?' . $opt . ':' . $re . ')'; + } + $re = eval { qr/($re)/ }; $re = $re_opt . quotemeta($patt) . $re_opt if $@; if ($has_encode) { push @matches, [ Encode::encode($enc, $patt), plugins/spamlookup/lib/spamlookup.pm @@ -1,9 +1,11 @@ -# SpamLookup plugin for Movable Type -# Author: Brad Choate, Six Apart (http://www.sixapart.com) -# Released under the Artistic License +# Movable Type (r) Open Source (C) 2006-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ +# Original copyright (c) 2004-2006, Brad Choate and Tobias Hoellrich + package spamlookup::L10N; use strict; plugins/spamlookup/lib/spamlookup/L10N.pm @@ -1,10 +1,11 @@ -# SpamLookup plugin for Movable Type -# Original copyright (c) 2004-2006, Brad Choate and Tobias Hoellrich -# Author: Six Apart (http://www.sixapart.com) -# Released under the Artistic License +# Movable Type (r) Open Source (C) 2006-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ +# Original copyright (c) 2004-2006, Brad Choate and Tobias Hoellrich + package MT::Plugin::SpamLookup; use strict; plugins/spamlookup/spamlookup.pl @@ -1,10 +1,11 @@ -# SpamLookup plugin for Movable Type -# Original copyright (c) 2004-2006, Brad Choate and Tobias Hoellrich -# Author: Six Apart (http://www.sixapart.com) -# Released under the Artistic License +# Movable Type (r) Open Source (C) 2004-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ +# Original copyright (c) 2004-2006, Brad Choate and Tobias Hoellrich + package MT::Plugin::SpamLookup::Link; use strict; plugins/spamlookup/spamlookup_urls.pl @@ -1,10 +1,11 @@ -# SpamLookup plugin for Movable Type -# Original copyright (c) 2004-2006, Brad Choate and Tobias Hoellrich -# Author: Six Apart (http://www.sixapart.com) -# Released under the Artistic License +# Movable Type (r) Open Source (C) 2004-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. # # $Id$ +# Original copyright (c) 2004-2006, Brad Choate and Tobias Hoellrich + package MT::Plugin::SpamLookup::KeywordFilter; use strict; plugins/spamlookup/spamlookup_words.pl @@ -8,7 +8,7 @@ use lib 'extlib'; # $Id$ -use Test::More tests => 45; +use Test::More tests => 53; use MT; use MT::Author; t/20-setup.t @@ -414,5 +414,30 @@ Work rdf:about=\"http://narnia.na/nana/\"> { "r" : "1", "t" : "<MTAuthors sort_by='id' need_entry='0' status='disabled'><MTAuthorName>;</MTAuthors>", "e" : "Hiro Nakamura;"}, #362 { "r" : "1", "t" : "<MTAuthors sort_by='id' need_entry='0' status='enabled or disabled'><MTAuthorName>;</MTAuthors>", "e" : "Melody;Chuck D;Bob D;John Doe;Hiro Nakamura;"}, #363 { "r" : "1", "t" : "<MTAuthors sort_by='id' need_entry='0' role='Author'><MTAuthorName>;</MTAuthors>", "e" : "Chuck D;"}, #364 -{ "r" : "1", "t" : "<MTAuthors sort_by='id' need_entry='0' role='Author or Designer'><MTAuthorName>;</MTAuthors>", "e" : "Chuck D;Bob D;"} #365 +{ "r" : "1", "t" : "<MTAuthors sort_by='id' need_entry='0' role='Author or Designer'><MTAuthorName>;</MTAuthors>", "e" : "Chuck D;Bob D;"}, #365 +{ "r" : "1", "t" : "<MTSetVar name='offices' value='San Francisco' index='0'><MTSetVar name='offices' value='Tokyo' function='unshift'><MTSetVarBlock name='offices' index='2'>Paris</MTSetVarBlock>--<MTGetVar name='offices' function='count'>;<MTGetVar name='offices' index='1'>;<MTGetVar name='offices' function='shift'>;<MTGetVar name='offices' function='count'>;<MTGetVar name='offices' index='1'>", "e" : "--3;San Francisco;Tokyo;2;Paris"}, #366 +{ "r" : "1", "t" : "<MTSetVar name='MTVersions' key='4.0' value='Athena'><MTSetVarBlock name='MTVersions' key='4.01'>Enterprise Solution</MTSetVarBlock><MTSetVarBlock name='MTVersions' key='4.1'>Boomer<MTSetVar name='4.2' value='Cal'></MTSetVarBlock><MTGetVar name='MTVersions' key='4.0'>;<MTGetVar name='MTVersions' key='4.01'>;<MTGetVar name='MTVersions' key='4.1'>;<MTGetVar name='MTVersions' key='4.2'>;", "e" : "Athena;Enterprise Solution;Boomer;Cal;"}, #367 +{ "r" : "1", "t" : "<MTVar name='object1' key='name' value='foo'><MTVar name='object1' key='price' value='1.00'><MTVar name='object2' key='name' value='bar'><MTVar name='object2' key='price' value='1.13'><MTSetVar name='array1' function='push' value='$object1'><MTSetVar name='array1' function='push' value='$object2'><MTLoop name='array1'><MTVar name='name'>(<MTVar name='price'>)<br /></MTLoop>", "e" : "foo(1.00)<br />bar(1.13)<br />"}, #368 +{ "r" : "1", "t" : "<MTSetVar name='offices1' value='San Francisco' index='0'><MTSetVar name='offices1' value='Tokyo' function='unshift'><MTSetVarBlock name='offices1' index='2'>Paris</MTSetVarBlock>--<MTGetVar name='offices1' function='count'>;<MTGetVar name='offices1' index='1'>;<MTGetVar name='offices1' function='shift'>;<MTGetVar name='offices1' function='count'>;<MTGetVar name='offices1' index='1'>", "e" : "--3;San Francisco;Tokyo;2;Paris"}, #369 +{ "r" : "1", "t" : "<MTSetVar name='offices2' value='San Francisco' index='0'><MTSetVar name='offices2' value='Tokyo' function='unshift'><MTSetVarBlock name='offices2' index='2'>Paris</MTSetVarBlock>--<MTSetVarBlock name='count'><MTGetVar name='offices2' function='count' op='sub' value='1'></MTSetVarBlock><MTFor from='0' to='$count' step='1' glue=','><MTGetVar name='offices2' index='$__index__'></MTFor>", "e" : "--Tokyo,San Francisco,Paris"}, #370 +{ "r" : "1", "t" : "<MTSetVar name='MTVersions2' key='4.0' value='Athena'><MTSetVarBlock name='MTVersions2' key='4.01'>Enterprise Solution</MTSetVarBlock><MTSetVarBlock name='MTVersions2' key='4.1'>Boomer<MTSetVar name='4.2' value='Cal'></MTSetVarBlock>--<MTLoop name='MTVersions2'><MTVar name='__key__'> - <MTVar name='__value__'>;</MTLoop>", "e" : "--4.2 - Cal;4.01 - Enterprise Solution;4.0 - Athena;4.1 - Boomer;"}, #371 +{ "r" : "1", "t" : "<MTSetVar name='MTVersions3' key='4.0' value='Athena'><MTSetVarBlock name='MTVersions3' key='4.01'>Enterprise Solution</MTSetVarBlock><MTSetVarBlock name='MTVersions3' key='4.1'>Boomer<MTSetVar name='4.2' value='Cal'></MTSetVarBlock>--<MTLoop name='MTVersions3' sort_by='key'><MTVar name='__key__'> - <MTVar name='__value__'>;</MTLoop>", "e" : "--4.0 - Athena;4.01 - Enterprise Solution;4.1 - Boomer;4.2 - Cal;"}, #372 +{ "r" : "1", "t" : "<MTSetVar name='offices3' value='San Francisco' index='0'><MTSetVar name='offices3' value='Tokyo' function='unshift'><MTSetVarBlock name='offices3' index='2'>Paris</MTSetVarBlock>--<MTLoop name='offices3' glue=','><MTVar name='__value__'></MTLoop>", "e" : "--Tokyo,San Francisco,Paris"}, #373 +{ "r" : "1", "t" : "<MTSetVar name='offices4' value='San Francisco' index='0'><MTSetVar name='offices4' value='Tokyo' function='unshift'><MTSetVarBlock name='offices4' index='2'>Paris</MTSetVarBlock>--<MTLoop name='offices4' glue=',' sort_by='value'><MTVar name='__value__'></MTLoop>", "e" : "--Paris,San Francisco,Tokyo"}, #374 +{ "r" : "1", "t" : "<MTSetVar name='num' op='add' value='99'><MTGetVar name='num'>;<MTGetVar name='num' value='1' op='+'>;<MTSetVar name='num' value='1'><MTGetVar name='num'>;<MTGetVar name='num' value='20' op='mul'>;<MTSetVar name='num' value='2' op='add'><MTGetVar name='num'>;<MTGetVar name='num' value='20' op='*'>;<MTSetVar name='num' value='3' op='*'><MTGetVar name='num'>;<MTGetVar name='num' value='3' op='/'>;<MTSetVar name='num' op='div' value='2'><MTGetVar name='num'>;<MTGetVar name='num' value='0.5' op='-'>;<MTSetVar name='num' op='mod' value='6'><MTGetVar name='num'>;<MTGetVar name='num' value='3' op='%'>;", "e" : "99;100;1;20;3;60;9;3;4.5;4;4;1;"}, #375 +{ "r" : "1", "t" : "<MTSetVar name='num' value='1'><MTGetVar name='num' op='++'>;<MTSetVar name='num' op='inc'><MTGetVar name='num'>;<MTSetVar name='num' op='dec'><MTGetVar name='num'>;<MTGetVar name='num' op='--'>;", "e" : "2;2;1;0;"}, #376 +{ "r" : "1", "t" : "<MTSetVar name='offices9[0]' value='San Francisco'><MTSetVar name='unshift(offices9)' value='Tokyo'><MTSetVarBlock name='offices9[2]'>Paris</MTSetVarBlock>--<MTGetVar name='count(offices9)'>;<MTGetVar name='offices9[1]'>;<MTGetVar name='shift(offices9)'>;<MTGetVar name='count(offices9)'>;<MTGetVar name='offices9' index='1'>", "e" : "--3;San Francisco;Tokyo;2;Paris"}, #377 +{ "r" : "1", "t" : "<MTSetVar name='MTVersions4{4.0}' value='Athena'><MTSetVarBlock name='MTVersions4{4.01}'>Enterprise Solution</MTSetVarBlock><MTSetVarBlock name='MTVersions4{4.1}'>Boomer<MTSetVar name='4.2' value='Cal'></MTSetVarBlock><MTGetVar name='MTVersions4{4.0}'>;<MTGetVar name='MTVersions4{4.01}'>;<MTGetVar name='MTVersions4{4.1}'>;<MTGetVar name='MTVersions4{4.2}'>;", "e" : "Athena;Enterprise Solution;Boomer;Cal;"}, #378 +{ "r" : "1", "t" : "<MTVar name='object3{name}' value='foo'><MTVar name='object3{price}' value='1.00'><MTVar name='object4{name}' value='bar'><MTVar name='object4{price}' value='1.13'><MTSetVar name='push(array2)' value='$object3'><MTSetVar name='push(array2)' value='$object4'><MTLoop name='array2'><MTVar name='name'>(<MTVar name='price'>)<br /></MTLoop>", "e" : "foo(1.00)<br />bar(1.13)<br />"}, #379 +{ "r" : "1", "t" : "<MTSetVar name='offices5[0]' value='San Francisco'><MTSetVar name='unshift(offices5)' value='Tokyo'><MTSetVarBlock name='offices5[2]'>Paris</MTSetVarBlock>--<MTGetVar name='count(offices5)'>;<MTGetVar name='offices5[1]'>;<MTGetVar name='shift(offices5)'>;<MTGetVar name='count(offices5)'>;<MTGetVar name='offices5[1]'>", "e" : "--3;San Francisco;Tokyo;2;Paris"}, #380 +{ "r" : "1", "t" : "<MTSetVar name='offices6[0]' value='San Francisco'><MTSetVar name='unshift(offices6)' value='Tokyo'><MTSetVarBlock name='offices6[2]'>Paris</MTSetVarBlock>--<MTSetVarBlock name='count'><MTGetVar name='count(offices6)' op='--'></MTSetVarBlock><MTFor from='0' to='$count' increment='1' glue=','><MTGetVar name='offices6[$__index__]'></MTFor>", "e" : "--Tokyo,San Francisco,Paris"}, #381 +{ "r" : "1", "t" : "<MTSetVar name='MTVersions5{4.0}' value='Athena'><MTSetVarBlock name='MTVersions5{4.01}'>Enterprise Solution</MTSetVarBlock><MTSetVarBlock name='MTVersions5{4.1}'>Boomer<MTSetVar name='4.2' value='Cal'></MTSetVarBlock>--<MTLoop name='MTVersions5'><MTVar name='__key__'> - <MTVar name='__value__'>;</MTLoop>", "e" : "--4.2 - Cal;4.01 - Enterprise Solution;4.0 - Athena;4.1 - Boomer;"}, #382 +{ "r" : "1", "t" : "<MTSetVar name='MTVersions6{4.0}' value='Athena'><MTSetVarBlock name='MTVersions6{4.01}'>Enterprise Solution</MTSetVarBlock><MTSetVarBlock name='MTVersions6{4.1}'>Boomer<MTSetVar name='4.2' value='Cal'></MTSetVarBlock>--<MTLoop name='MTVersions6' sort_by='key'><MTVar name='__key__'> - <MTVar name='__value__'>;</MTLoop>", "e" : "--4.0 - Athena;4.01 - Enterprise Solution;4.1 - Boomer;4.2 - Cal;"}, #383 +{ "r" : "1", "t" : "<MTSetVar name='offices7' value='San Francisco' index='0'><MTSetVar name='unshift(offices7)' value='Tokyo'><MTSetVarBlock name='offices7' index='2'>Paris</MTSetVarBlock>--<MTVar name='offices7[1]'>,<MTVar name='shift(offices7)'>,<MTSetVar name='i' value='1'><MTVar name='offices7[$i]'>", "e" : "--San Francisco,Tokyo,Paris"}, #384 +{ "r" : "1", "t" : "<MTSetVar name='offices8' value='San Francisco' index='0'><MTSetVar name='unshift(offices8)' value='Tokyo'><MTSetVarBlock name='offices8' index='2'>Paris</MTSetVarBlock><MTSetVar name='var_offices' value='$offices8'>--<MTVar name='var_offices[1]'>,<MTVar name='shift(var_offices)'>,<MTSetVar name='i' value='1'><MTVar name='var_offices[$i]'>", "e" : "--San Francisco,Tokyo,Paris"}, #385 +{ "r" : "1", "t" : "<MTSetVar name='MTVersions7' key='4.0' value='Athena'><MTSetVarBlock name='MTVersions7' key='4.01'>Enterprise Solution</MTSetVarBlock><MTSetVarBlock name='MTVersions7' key='4.1'>Boomer<MTSetVar name='4.2' value='Cal'></MTSetVarBlock><MTSetVar name='var_hash' value='$MTVersions7'><MTGetVar name='var_hash{4.0}'>;<MTGetVar name='var_hash{4.01}'>;<MTGetVar name='var_hash{4.1}'>;<MTGetVar name='var_hash{4.2}'>;", "e" : "Athena;Enterprise Solution;Boomer;Cal;"}, #386 +{ "r" : "1", "t" : "<MTSetVar name='MTVersions8' key='4.0' value='Athena'><MTSetVarBlock name='MTVersions8' key='4.01'>Enterprise Solution</MTSetVarBlock><MTSetVarBlock name='MTVersions8' key='4.1'>Boomer<MTSetVar name='4.2' value='Cal'></MTSetVarBlock><MTGetVar name='delete(var_hash{4.0})'>;<MTGetVar name='var_hash{4.0}'>;<MTSetVar name='delete(var_hash{4.01})'>;<MTGetVar name='var_hash{4.01}'>;<MTGetVar name='var_hash' function='delete' key='4.2'>;<MTGetVar name='var_hash' function='delete' key='4.1'>;<MTGetVar name='var_hash' key='4.1'>;", "e" : "Athena;;;;Cal;Boomer;;"}, #387 +{ "r" : "1", "t" : "<MTSetVar name='offices9' value='San Francisco' index='0'><MTSetVar name='unshift(offices9)' value='Tokyo'><MTSetVarBlock name='offices9' index='2'>Paris</MTSetVarBlock>--<MTIf name='offices9' index='2' eq='Paris'>TRUE<MTElse>FALSE</MTIf>,<MTIf name='offices9[1]' eq='San Francisco'>TRUE<MTElse>FALSE</MTIf>,<MTVar name='idx' value='0'><MTIf name='offices9[$idx]' eq='San Francisco'><MTVar name='offices9[0]'><MTElse name='offices9[2]' eq='San Francisco'>TRUE<MTElse>FALSE</MTIf>,<MTIf name='offices9' index='3' eq='1'><MTIgnore>value is undef so it is always evaluated false.</MTIgnore>TRUE<MTElse>FALSE</MTIf>,", "e" : "--TRUE,TRUE,FALSE,FALSE,"}, #388 +{ "r" : "1", "t" : "<MTSetVar name='MTVersions8' key='4.0' value='Athena'><MTSetVarBlock name='MTVersions8' key='4.01'>Enterprise Solution</MTSetVarBlock><MTSetVarBlock name='MTVersions8' key='4.1'>Boomer<MTSetVar name='4.2' value='Cal'></MTSetVarBlock><MTSetVar name='var_hash' value='$MTVersions8'><MTIf name='var_hash{4.0}' eq='Enterprise Solution'>TRUE<MTElse>FALSE</MTIf>;<MTIf name='var_hash{4.01}' eq='Enterprise Solution'>TRUE<MTElse>FALSE</MTIf>;<MTIf name='var_hash' key='4.2' eq='Boomer'>TRUE<MTElse>FALSE</MTIf>;<MTIf name='MTVersions8{4.1}' ne='Boomer'><MTVar name='MTVersions8{4.1}'><MTElse name='MTVersions8{4.1}' eq='Cal'>TRUE<MTElse>FALSE</MTIf>;", "e" : "FALSE;TRUE;FALSE;FALSE;"}, #389 +{ "r" : "1", "t" : "<MTSetVar name='num' value='1'><MTGetVar name='num'>;<MTIf name='num' eq='1'>TRUE<MTElse>FALSE</MTIf>;<MTGetVar name='num' value='20' op='mul'>;<MTIf name='num' value='3' op='*' eq='60'>TRUE<MTElse>FALSE</MTIf>;<MTIf name='num' value='3' op='+' eq='4'>TRUE<MTElse name='num' op='+' value='4' eq='5'>555<MTElse>FALSE</MTIf>;", "e" : "1;TRUE;20;FALSE;TRUE;"} #390 ] t/35-tags.dat @@ -57,7 +57,7 @@ MT::BackupRestore->backup(undef, $printer, sub {}, sub {}, sub { print $_[0], "\ use IO::String; my $h = IO::String->new(\$backup_data); my (%objects, %deferred, @errors); -MT::BackupRestore->restore_process_single_file($h, \%objects, \%deferred, \@errors, "4.0", sub { print $_[0], "\n"; }); +MT::BackupRestore->restore_process_single_file($h, \%objects, \%deferred, \@errors, "4.0", 0, sub { print $_[0], "\n"; }); is(scalar(keys %deferred), 0); print join "\n", @errors; t/61-to_from_xml.t @@ -1,5 +1,11 @@ #!/usr/bin/perl +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + use strict; use vars qw( $T_CFG ); @@ -28,12 +34,12 @@ $T_CFG = $ARGV[0] || $T_CFG; my $mt = MT->instance(Config => $T_CFG) or die "No MT object " . MT->errstr(); my $driver = MT::Object->driver(); -my @tables = qw(author blog category comment entry fileinfo ipbanlist log notification permission placement plugindata session tbping template templatemap trackback objecttag group association); -if ($driver->{dbh}) { - $driver->{dbh}->do("drop table mt_$_") foreach @tables; - if ($driver->{dbh}->isa('MT::ObjectDriver::DBI::postgres')) { - $driver->{dbh}->do("drop sequence mt_$_\_id") foreach @tables; - } +my @tables = keys %{ $mt->registry("object_types") }; +@tables = grep { ! m/^plugin$/ } @tables; +my $dbh = $driver->rw_handle; +$dbh->do("drop table mt_$_") foreach @tables; +if (MT->config('ObjectDriver') =~ m/(postgres|pg)/i) { + $dbh->do("drop sequence mt_$_\_id") foreach @tables; } require MT::Upgrade; MT::Upgrade->do_upgrade(Install => 1, App => __PACKAGE__); @@ -216,6 +222,7 @@ $cat->description('bar'); $cat->author_id($chuckd->id); $cat->parent(0); $cat->save or die "Couldn't save category record 1: ". $cat->errstr; +my $parent_cat = $cat->id; $cat = new MT::Category; $cat->blog_id(1); @@ -242,7 +249,7 @@ $cat->blog_id(1); $cat->label('subfoo'); $cat->description('subcat'); $cat->author_id($bobd->id); -$cat->parent(1); +$cat->parent($parent_cat); $cat->save or die "Couldn't save category record 3: ". $cat->errstr; require MT::Placement; t/blog-common.pl @@ -1,5 +1,11 @@ #!/usr/bin/perl + +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# # $Id$ + use strict; use warnings; use Data::Dumper; @@ -17,7 +23,7 @@ BEGIN { $ENV{MT_CONFIG} = "$driver-test.cfg"; } -use Test::More tests => 227; +use Test::More tests => 230; use lib 't/lib', 'extlib', 'lib', '../lib', '../extlib'; use MT::Test qw(:testdb); @@ -263,11 +269,11 @@ isa_ok($tmp, 'Foo'); is($tmp->id, 2, 'id'); ## Get count of objects -is(Foo->count, 2, 'count'); -is(Foo->count({ status => 0 }), 1, 'count'); +is(Foo->count, 2, 'count1'); +is(Foo->count({ status => 0 }), 1, 'count2'); is(Foo->count( { created_on => [ $foo[1]->column('created_on')-1 ] }, - { range => { created_on => 1 } }), 1, 'count'); + { range => { created_on => 1 } }), 1, 'count3'); ## Update status for later tests. $foo[0]->status(2); @@ -416,11 +422,11 @@ my ($count, $bfid, $month); isa_ok($cgb_iter, 'CODE'); ok(($count, $bfid) = $cgb_iter->(), 'set'); is($bfid, $bar[1]->id, 'id'); -is($count, 1, 'count'); +is($count, 1, 'count4'); ok(($count, $bfid) = $cgb_iter->(), 'set'); is($bfid, $bar[0]->id, 'id'); -is($count, 1, 'count'); -ok(!$iter->(), 'no $iter'); +is($count, 1, 'count5'); +ok(!$cgb_iter->(), 'no $iter'); $cgb_iter = Bar->count_group_by(undef, { group => [ 'extract(month from created_on)' ], @@ -430,8 +436,8 @@ isa_ok($cgb_iter, 'CODE'); ok(($count, $month) = $cgb_iter->(), 'set'); use POSIX qw(strftime); is(int($month), int(strftime("%m", localtime)), 'month'); -is($count, 3, 'count'); -ok(!$iter->(), 'no $iter'); +is($count, 3, 'count6'); +ok(!$cgb_iter->(), 'no $iter'); ## Get a count of all Foo objects in order of most recently ## created Bar object. No uniqueness requirement. This tests @@ -442,7 +448,7 @@ is(Foo->count(undef, undef, { unique => 1, sort => 'created_on', - direction => 'descend', } ] }), 2, 'count'); + direction => 'descend', } ] }), 2, 'count7'); ## Now load all Foo objects in order of most recently ## created Bar object. Make sure they are unique. @@ -681,13 +687,16 @@ isa_ok($offs[2], 'Foo'); is($offs[2]->id, $foo1->id, 'id'); #sum_group_by -my $iterx = Foo->load_iter; +my $cnt = 0; +my @data = Foo->load(undef, {direction => 'ascend'}); my @foos; -while (my $f = $iterx->()) { - $f->status(scalar(@foos) + 1); +foreach my $f (@data) { + $f->status($cnt + 1); $f->save; unshift @foos, $f; + $cnt++; } + my $sgb = Foo->sum_group_by(undef, { sum => 'status', group => ['id'], direction => 'ascend' }); while (my ($status, $id2) = $sgb->()) { my $f = pop @foos; @@ -706,4 +715,48 @@ SKIP: { } +# -or +my $newdata = Foo->new; +$newdata->status(11); +$newdata->name('Apple'); +$newdata->text('MacBook'); +$newdata->save; +$newdata = Foo->new; +$newdata->status(12); +$newdata->name('Linux'); +$newdata->text('Ubuntu'); +$newdata->save; +$newdata = Foo->new; +$newdata->status(13); +$newdata->name('Microsoft'); +$newdata->text('Vista'); +$newdata->save; +$newdata = Foo->new; +$newdata->status(10); +$newdata->name('Microsoft'); +$newdata->text('XP'); +$newdata->save; +$newdata = Foo->new; +$newdata->status(10); +$newdata->name('Apple'); +$newdata->text('iBook'); +$newdata->save; + +my $count = Foo->count( [{status => 10}, -or => {name => 'Apple'}] ); +# ==> select count(*) from mt_foo where foo_status = 10 or foo_name = 'Apple' +is($count, 3, '-or count'); + +$count = Foo->count( [ { status => { '<=' => 20 }, name => 'Apple' }, -and_not => { status => 11 } ] ); +# ==> select count(*) from mt_foo where (foo_status <= 20 and foo_name = 'Apple') and not (foo_status = 11) +is($count, 1, '-and_not count'); + +$count = Foo->count( [ + { status => 10 }, + -or => { name => 'Apple' }, + -or => { name => { like => '%nux' } }, +] ); +# ==> select count(*) from mt_foo where (foo_status = 10) or (foo_name = 'Apple') or (foo_name like '%nux') +# (selects Apple+MacBook, Apple+iBook, Microsoft+XP, Linux+Ubuntu) +is($count, 4, '-or count, 3 clauses'); + 1; t/driver-tests.pl @@ -58,7 +58,8 @@ sub init_test_db { # with stubs since we're not creating a full schema. MT::Upgrade->register_upgrade_function({ core_seed_database => { code => sub { 1 } }, - core_install_templates => { code => sub { 1 } }, + core_upgrade_templates => { code => sub { 1 } }, + core_upgrade_templates => { code => sub { 1 } }, core_finish => { code => sub { 1 } }, }); $pkg->init_db(); t/lib/MT/Test.pm @@ -1,3 +1,7 @@ +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# # $Id$ package __FILE__; t/plugins/testplug.pl @@ -1,5 +1,11 @@ #!/usr/bin/perl + +# Movable Type (r) Open Source (C) 2001-2007 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# # $Id$ + use strict; use warnings; t/test-common.pl @@ -130,15 +130,14 @@ function is_valid_path(path_){ } function disableFields(path1,path2) { - var url_is = "<mt:var name="site_url">" - var path_is = "<mt:var name="site_path">" + var url_is = "<mt:var name="site_url" encode_js="1">"; + var path_is = "<mt:var name="site_path" encode_js="1">"; if (url_is.match(/BLOG-NAME/)) { var daURL = getByID(path1); var lock = path1 +"-lock"; var lock_img = getByID(lock); daURL.disabled = false; lock_img.style.display = 'none'; - } else { } if (path_is.match(/BLOG-NAME/)) { var daPath = getByID(path2); @@ -146,7 +145,6 @@ function disableFields(path1,path2) { var lock_img = getByID(lock); daPath.disabled = false; lock_img.style.display = 'none'; - } else { } return; } @@ -362,7 +360,7 @@ TC.attachLoadEvent( init ); <button type="submit" accesskey="s" - title="<__trans phrase="Save changes to this [_1] (s)" params="<mt:var name="object_label" lower_case="1">">" + title="<__trans phrase="Save changes to this [lc,_1] (s)" params="<mt:var name="object_label">">" class="primary-button" ><__trans phrase="Save Changes"></button> </mt:setvarblock> tmpl/cms/cfg_archives.tmpl @@ -67,6 +67,7 @@ <input type="hidden" name="return_args" value="<mt:var name="return_args" escape="html">" /> <input type="hidden" name="magic_token" value="<mt:var name="magic_token">" /> +<mt:if name="allow_comments"> <mt:unless name="system_allow_comments"> <mtapp:statusmsg id="system-allow-comments" @@ -74,6 +75,7 @@ <__trans phrase="Note: Commenting is currently disabled at the system level."> </mtapp:statusmsg> </mt:unless> +</mt:if> <mt:unless name="tk_available"> <p><__trans phrase="Comment authentication is not available because one of the needed modules, MIME::Base64 or LWP::UserAgent is not installed. Talk to your host about getting this module installed."></p> @@ -245,7 +247,7 @@ <button type="submit" accesskey="s" - title="<__trans phrase="Save changes to this [_1] (s)" params="<mt:var name="object_label" lower_case="1">">" + title="<__trans phrase="Save changes to this [lc,_1] (s)" params="<mt:var name="object_label">">" class="primary-button" ><__trans phrase="Save Changes"></button> </mt:setvarblock> tmpl/cms/cfg_comments.tmpl @@ -199,7 +199,7 @@ <mtapp:settinggroup id="default-field-settings"> <h3><__trans phrase="Default Editor Fields"></h3> - +<mt:setvarblock name="more_fields" id="more_fields"></mt:setvarblock> <mtapp:setting id="entry_prefs" label="<__trans phrase="Editor Fields">" @@ -214,6 +214,7 @@ <li><input type="checkbox" name="custom_prefs" id="custom-prefs-tags" value="tags" <mt:if name="disp_prefs_show_tags"> checked="checked"</mt:if> class="cb" /> <label for="custom-prefs-tags"><__trans phrase="Tags"></label></li> <li><input type="checkbox" name="custom_prefs" id="custom-prefs-publishing" value="publishing" <mt:if name="disp_prefs_show_publishing"> checked="checked"</mt:if> class="cb" /> <label for="custom-prefs-publishing"><__trans phrase="Publishing"></label></li> <li><input type="checkbox" name="custom_prefs" id="custom-prefs-feedback" value="feedback" <mt:if name="disp_prefs_show_feedback"> checked="checked"</mt:if> class="cb" /> <label for="custom-prefs-feedback"><__trans phrase="Feedback"></label></li> + <mt:var name="more_fields"> </ul> </mtapp:setting> @@ -235,7 +236,7 @@ <button type="submit" accesskey="s" - title="<__trans phrase="Save changes to this [_1] (s)" params="<mt:var name="object_label" lower_case="1">">" + title="<__trans phrase="Save changes to this [lc,_1] (s)" params="<mt:var name="object_label">">" class="primary-button" ><__trans phrase="Save Changes"></button> </mt:setvarblock> tmpl/cms/cfg_entry.tmpl @@ -11,7 +11,7 @@ id="useful-links" label="<__trans phrase="Useful links">"> <ul> - <li><a href="<__trans phrase="http://www.sixapart.com/pronet/plugins/">" target="_blank"><__trans phrase="Find Plugins"></a></li> + <li><a href="<__trans phrase="http://plugins.movabletype.org/">" target="_blank"><__trans phrase="Find Plugins"></a></li> </ul> </mtapp:widget> <mt:unless name="blog_view"> tmpl/cms/cfg_plugin.tmpl @@ -157,7 +157,7 @@ function validate (f) { <button type="submit" accesskey="s" - title="<__trans phrase="Save changes to this [_1] (s)" params="<mt:var name="object_label" lower_case="1">">" + title="<__trans phrase="Save changes to this [lc,_1] (s)" params="<mt:var name="object_label">">" class="primary-button" ><__trans phrase="Save Changes"></button> </mt:setvarblock> tmpl/cms/cfg_prefs.tmpl @@ -97,7 +97,7 @@ <button type="submit" accesskey="s" - title="<__trans phrase="Save changes to this [_1] (s)" params="<mt:var name="object_label" lower_case="1">">" + title="<__trans phrase="Save changes to this [lc,_1] (s)" params="<mt:var name="object_label">">" class="primary-button" ><__trans phrase="Save Changes"></button> </mt:setvarblock> tmpl/cms/cfg_registration.tmpl @@ -121,7 +121,7 @@ function scoreNudge(amount) { <button type="submit" accesskey="s" - title="<__trans phrase="Save changes to this [_1] (s)" params="<mt:var name="object_label" lower_case="1">">" + title="<__trans phrase="Save changes to this [lc,_1] (s)" params="<mt:var name="object_label">">" class="primary-button" ><__trans phrase="Save Changes"></button> </mt:setvarblock> tmpl/cms/cfg_spam.tmpl @@ -36,7 +36,7 @@ </mtapp:setting> <mtapp:setting - id="comment_disable" + id="ping_disable" label="<__trans phrase="TrackBacks">" content_class="field-content-text" hint="<__trans phrase="This will override all individual blog settings.">"> @@ -84,7 +84,7 @@ <button type="submit" accesskey="s" - title="<__trans phrase="Save changes to this [_1] (s)" params="<mt:var name="object_label" lower_case="1">">" + title="<__trans phrase="Save changes to this [lc,_1] (s)" params="<mt:var name="object_label">">" class="primary-button" ><__trans phrase="Save Changes"></button> </mt:setvarblock> tmpl/cms/cfg_system_feedback.tmpl @@ -87,7 +87,7 @@ function is_valid_path(path_){ <button type="submit" accesskey="s" - title="<__trans phrase="Save changes to this [_1] (s)" params="<mt:var name="object_label" lower_case="1">">" + title="<__trans phrase="Save changes to this [lc,_1] (s)" params="<mt:var name="object_label">">" class="primary-button" ><__trans phrase="Save Changes"></button> </mt:setvarblock> tmpl/cms/cfg_system_general.tmpl @@ -235,7 +235,7 @@ function clearNotifyUsers() { <button type="submit" accesskey="s" - title="<__trans phrase="Save changes to this [_1] (s)" params="<mt:var name="object_label" lower_case="1">">" + title="<__trans phrase="Save changes to this [lc,_1] (s)" params="<mt:var name="object_label">">" class="primary-button" ><__trans phrase="Save Changes"></button> </mt:setvarblock> tmpl/cms/cfg_system_users.tmpl @@ -169,7 +169,7 @@ <button type="submit" accesskey="s" - title="<__trans phrase="Save changes to this [_1] (s)" params="<mt:var name="object_label" lower_case="1">">" + title="<__trans phrase="Save changes to this [lc,_1] (s)" params="<mt:var name="object_label">">" class="primary-button" ><__trans phrase="Save Changes"></button> </mt:setvarblock> tmpl/cms/cfg_trackbacks.tmpl @@ -114,7 +114,7 @@ <button type="submit" accesskey="s" - title="<__trans phrase="Save changes to this [_1] (s)" params="<mt:var name="object_label" lower_case="1">">" + title="<__trans phrase="Save changes to this [lc,_1] (s)" params="<mt:var name="object_label">">" class="primary-button" ><__trans phrase="Save Changes"></button> </mt:setvarblock> tmpl/cms/cfg_web_services.tmpl @@ -44,48 +44,47 @@ </div> <$mt:var name="select_widget_form" set="sidebar"$> </mt:setvarblock> +<mt:setvarblock name="content_header"> + <div id="msg-block"> -<mt:include name="include/header.tmpl"> - -<div id="msg-block"> - -<mt:if name="saved"> - <mtapp:statusmsg - id="saved" - class="info" - can_close="1"> - <__trans phrase="Your Dashboard has been updated."> - </mtapp:statusmsg> -</mt:if> - -<mt:if name="permission"> - <mtapp:statusmsg - id="permissions" - class="error"> - <__trans phrase="You have attempted to use a feature that you do not have permission to access. If you believe you are seeing this message in error contact your system administrator."> - </mtapp:statusmsg> -</mt:if> + <mt:if name="saved"> + <mtapp:statusmsg + id="saved" + class="info" + can_close="1"> + <__trans phrase="Your Dashboard has been updated."> + </mtapp:statusmsg> + </mt:if> -<mt:unless name="has_uploads_path"> - <mt:if name="is_administrator"> + <mt:if name="permission"> <mtapp:statusmsg id="permissions" class="error"> - <__trans phrase="The directory you have configured for uploading avatars is not writable. In order to enable users to upload userpics, please make the following directory writable by your web server: [_1]" params="<mt:var name="support_path">"> + <__trans phrase="You have attempted to use a feature that you do not have permission to access. If you believe you are seeing this message in error contact your system administrator."> </mtapp:statusmsg> </mt:if> -</mt:unless> -<mt:unless name="main"> -<mtapp:statusmsg - id="empty_dashboard" - class="info"> - <__trans phrase="Your dashboard is empty!"> -</mtapp:statusmsg> -</mt:unless> + <mt:unless name="has_uploads_path"> + <mt:if name="is_administrator"> + <mtapp:statusmsg + id="permissions" + class="error"> + <__trans phrase="The directory you have configured for uploading avatars is not writable. In order to enable users to upload userpics, please make the following directory writable by your web server: [_1]" params="<mt:var name="support_path">"> + </mtapp:statusmsg> + </mt:if> + </mt:unless> -</div> + <mt:unless name="main"> + <mtapp:statusmsg + id="empty_dashboard" + class="info"> + <__trans phrase="Your dashboard is empty!"> + </mtapp:statusmsg> + </mt:unless> + </div> +</mt:setvarblock> +<mt:include name="include/header.tmpl"> <div id="widget-container-main"> <mt:section id="main" class="widget-container"><mt:var name="main"></mt:section> tmpl/cms/dashboard.tmpl @@ -1,7 +1,10 @@ <mt:include name="dialog/header.tmpl"> +<mt:setvarblock name="insert_script" id="insert_script"> +window.parent.app.insertHTML( '<mt:var name="UPLOAD_HTML" escape="JS">', '<mt:var name="EDIT_FIELD">' ); +</mt:setvarblock> <script type="text/javascript"> <!-- -window.parent.app.insertHTML( '<mt:var name="UPLOAD_HTML" escape="JS">', '<mt:var name="EDIT_FIELD">' ); +<mt:var name="insert_script"> closeDialog(); //--> </script> tmpl/cms/dialog/asset_insert.tmpl @@ -57,7 +57,8 @@ <div class="panel-header"> <mt:setvarblock name="upload_new_file_link"> <img src="<mt:var name="static_uri">images/status_icons/create.gif" alt="<__trans phrase="Upload New File">" width="9" height="9" /> - <a href="<mt:var name="script_url">?__mode=start_upload&amp;_type=asset&amp;blog_id=<mt:var name="blog_id">&amp;dialog_view=1&amp;<mt:if name="asset_select">asset_select=1&amp;<mt:else>entry_insert=1&amp;</mt:if>edit_field=<mt:var name="edit_field">&amp;upload_mode=<mt:var name="upload_mode" escape="url">&amp;<mt:if name="require_type">require_type=<mt:var name="require_type">&amp;</mt:if>return_args=<mt:var name="return_args" escape="url">"><mt:if name="is_image"><__trans phrase="Upload New Image"><mt:else><__trans phrase="Upload New File"></mt:if></a> + <mt:unless name="asset_select"><mt:setvar name="entry_insert" value="1"></mt:unless> + <a href="<mt:var name="script_url">?__mode=start_upload&amp;_type=asset&amp;blog_id=<mt:var name="blog_id">&amp;dialog_view=1&amp;<mt:if name="asset_select">asset_select=1&amp;<mt:else>entry_insert=1&amp;</mt:if>edit_field=<mt:var name="edit_field">&amp;upload_mode=<mt:var name="upload_mode" escape="url">&amp;<mt:if name="require_type">require_type=<mt:var name="require_type">&amp;</mt:if>return_args=<mt:var name="return_args" escape="url">" onclick="toggleHidden('list-assets-dialog'); toggleHidden('upload-asset-dialog'); return false"><mt:if name="is_image"><__trans phrase="Upload New Image"><mt:else><__trans phrase="Upload New File"></mt:if></a> </mt:setvarblock> <mt:if name="edit_blog_id"> <mt:if name="can_upload"> @@ -219,5 +220,12 @@ </div> +<div id="upload-asset-dialog" class="hidden"> +<mt:setvar name="included_upload_asset" value="1"> + +<mt:include name="include/asset_upload.tmpl"> + +</div> + <mt:include name="dialog/footer.tmpl"> </mt:unless> tmpl/cms/dialog/asset_list.tmpl @@ -93,13 +93,13 @@ hint="" show_hint="0"> <input type="radio" name="align" id="align-left" class="rb" value="left" <mt:if name="align_left">checked="checked" </mt:if>/> - <label class="icon-left icon-left-xwide icon-align icon-align-left"><__trans phrase="Left"></label> + <label class="icon-left-xwide icon-align icon-align-left"><__trans phrase="Left"></label> <input type="radio" name="align" id="align-center" class="rb" value="center" <mt:if name="align_center">checked="checked" </mt:if>/> - <label class="icon-left icon-left-xwide icon-align icon-align-center"><__trans phrase="Center"></label> + <label class="icon-left-xwide icon-align icon-align-center"><__trans phrase="Center"></label> <input type="radio" name="align" id="align-right" class="rb" value="right" <mt:if name="align_right">checked="checked" </mt:if>/> - <label class="icon-left icon-left-xwide icon-align icon-align-right"><__trans phrase="Right"></label> + <label class="icon-left-xwide icon-align icon-align-right"><__trans phrase="Right"></label> </mtapp:setting> <mt:if name="do_thumb"> <mtapp:setting tmpl/cms/dialog/asset_options_image.tmpl @@ -4,7 +4,7 @@ <!-- function submit_form(f, command) { f['overwrite_' + command].value = 1; - f.submit(); + return true; } // --> </script> tmpl/cms/dialog/asset_replace.tmpl @@ -9,107 +9,6 @@ </mt:if> <mt:include name="dialog/header.tmpl"> -<script type="text/javascript"> -<!-- -function setExtraPath(sel) { - var opt = sel.options[sel.selectedIndex]; - var path = opt.getAttribute("middle_path"); - if (!path) path = ''; - var middle = sel.form['middle_path']; - if (middle) middle.value = path; -} -//--> -</script> - -<mt:if name="missing_paths"> - <mt:if name="have_permissions"> -<p><__trans phrase="Before you can upload a file, you need to publish your blog. [_1]Configure your blog's publishing paths[_2] and rebuild your blog." params="<a href="javascript:void(0);" onclick="closeDialog('<mt:var name="script_url">?__mode=cfg_archives&amp;blog_id=<mt:var name="blog_id">');">%%</a>"></p> - <mt:else> -<p><__trans phrase="Your system or blog administrator needs to publish the blog before you can upload files. Please contact your system or blog administrator."></p> - </mt:if> -<div class="actions-bar"> - <div class="actions-bar-inner pkg actions"> - <button - onclick="closeDialog(); return false" - type="submit" - accesskey="x" - title="<__trans phrase="Close (x)">" - ><__trans phrase="Close"></button> - </div> -</div> - -<mt:else> - <mt:if name="error"> - <mtapp:statusmsg - id="generic-error" - class="error"> - <mt:var name="error"> - </mtapp:statusmsg> - </mt:if> - -<form method="post" enctype="multipart/form-data" action="<mt:var name="script_url">"> - <input type="hidden" name="__mode" value="<mt:if name="upload_mode"><mt:var name="upload_mode" escape="html"><mt:else>upload_file</mt:if>" /> - <input type="hidden" name="blog_id" value="<mt:var name="blog_id">" /> - <input type="hidden" name="middle_path" value="<mt:var name="middle_path" escape="html">" /> - <input type="hidden" name="entry_insert" value="<mt:var name="entry_insert">" /> - <input type="hidden" name="asset_select" value="<mt:var name="asset_select">" /> - <input type="hidden" name="edit_field" value="<mt:var name="edit_field">" /> - <input type="hidden" name="require_type" value="<mt:var name="require_type">" /> - <input type="hidden" name="magic_token" value="<mt:var name="magic_token">" /> - - <mtapp:setting - id="file" - label_class="top-label" - label="<__trans phrase="Select File to Upload">" - hint="" - show_hint="0"> - <input type="file" name="file" /> - </mtapp:setting> - - <mt:if name="enable_destination"> - <mt:setvarblock name="upload_hint"> - <__trans phrase="_USAGE_UPLOAD" params="<$mt:var name="blog_name" escape="html"$>"> - </mt:setvarblock> - <mtapp:setting - id="folder" - label_class="top-label" - label="<__trans phrase="Upload Destination">" - hint="<$mt:var name="upload_hint"$>" - show_hint="1"> - <!-- <$mt:var name="blog_url" escape="html"$> --> - <select name="site_path" onchange="setExtraPath(this)"> - <option value="1">&#60;<__trans phrase="Site Root">&#62;</option> - <mt:if name="enable_archive_paths"> - <option value="0"<mt:if name="archive_path"> selected="selected"</mt:if>>&#60;<__trans phrase="Archive Root">&#62;</option> - </mt:if> - <mt:if name="extra_paths"> - <mt:loop name="extra_paths"> - <option value="<mt:if name="enable_archive_paths">0<mt:else>1</mt:if>" middle_path="<mt:var name="path" escape="html">"<mt:if name="selected"> selected="selected"</mt:if>><mt:var name="label" escape="html"></option> - </mt:loop> - </mt:if> - </select> - / <input name="extra_path" id="extra_path" value="<mt:var name="extra_path" escape="html">" /> - </mtapp:setting> - </mt:if> - - <div class="actions-bar"> - <div class="actions-bar-inner pkg actions"> - <button - type="submit" - accesskey="s" - title="<__trans phrase="Upload (s)">" - class="primary-button" - ><__trans phrase="Upload"></button> - <button - onclick="closeDialog(); return false" - type="submit" - accesskey="x" - title="<__trans phrase="Cancel (x)">" - ><__trans phrase="Cancel"></button> - </div> - </div> - -</form> -</mt:if> +<mt:include name="include/asset_upload.tmpl"> <mt:include name="dialog/footer.tmpl"> tmpl/cms/dialog/asset_upload.tmpl @@ -7,8 +7,10 @@ var author_userpic = '<mt:var name="author_userpic" escape="JS">'; if (author_userpic != '') { var preview = window.parent.getByID( 'userpic-preview-userpic' ); preview.innerHTML = author_userpic; - window.parent.show( 'remove-userpic', window.parent.document, 'inline' ); - window.parent.show( 'userpic-preview', window.parent.document ); + if (window.parent.DOM.hasClassName( 'remove-userpic', 'hidden' )) + window.parent.toggleHidden( 'remove-userpic' ); + if (window.parent.DOM.hasClassName( 'userpic-preview', 'hidden' )) + window.parent.toggleHidden( 'userpic-preview' ); } closeDialog(); //--> tmpl/cms/dialog/asset_userpic.tmpl @@ -34,7 +34,7 @@ </mt:if> <$mt:var name="html_head"$> <script type="text/javascript" src="<mt:var name="static_uri">mt.js"></script> -<mt:if name="local_lang_id"><link rel="stylesheet" href="<mt:var name="static_uri">styles_<mt:var name="local_lang_id">.css" /> +<mt:if name="local_lang_id" ne="en"><link rel="stylesheet" href="<mt:var name="static_uri">styles_<mt:var name="local_lang_id">.css" /> <script type="text/javascript" src="<mt:var name="static_uri">mt_<mt:var name="local_lang_id">.js" charset="utf-8"></script></mt:if> <$mt:var name="js_include"$> <script type="text/javascript"> tmpl/cms/dialog/header.tmpl @@ -70,6 +70,7 @@ <input type="hidden" name="is_dirty" value="<mt:var name="is_dirty">" /> <input type="hidden" name="is_asset" value="<mt:var name="is_asset">" /> <input type="hidden" name="schema_version" value="<mt:var name="schema_version">" /> + <input type="hidden" name="overwrite_templates" value="<mt:var name="overwrite_templates">" /> <input type="hidden" name="objects_json" value="<mt:var name="objects_json" escape="html">" /> <input type="hidden" name="deferred_json" value="<mt:var name="deferred_json" escape="html">" /> <mt:setvarblock name="restore_file_label"> tmpl/cms/dialog/restore_upload.tmpl @@ -192,6 +192,7 @@ TC.attachLoadEvent(init); <mtapp:setting id="userpic_asset_id" label="<__trans phrase="Userpic">" + content_class="field-content-text" hint="<__trans phrase="The image associated with this user.">"> <span id="userpic-preview"<mt:unless name="userpic"> class="hidden"</mt:unless>> <span id="userpic-preview-userpic"><mt:var name="userpic"></span> @@ -201,7 +202,7 @@ TC.attachLoadEvent(init); <input name="userpic_asset_id" id="userpic_asset_id" type="hidden" value="<mt:var name="userpic_asset_id" default="0" escape="html">" /> <span id="remove-userpic"<mt:unless name="userpic"> class="hidden"</mt:unless>> <br /> - <a href="javascript:void(0)" onclick="getByID('userpic_asset_id').value = '0'; hide('userpic-preview'); hide('remove-userpic'); return false"><__trans phrase="Remove Userpic"></a> + <a href="javascript:void(0)" onclick="getByID('userpic_asset_id').value = '0'; if (!DOM.hasClassName('userpic-preview', 'hidden')) toggleHidden('userpic-preview'); if (!DOM.hasClassName('remove-userpic', 'hidden')) toggleHidden('remove-userpic'); return false"><__trans phrase="Remove Userpic"></a> </span> </mtapp:setting> @@ -341,12 +342,12 @@ TC.attachLoadEvent(init); accesskey="s" title="<__trans phrase="Create [_1] (s)" params="<mt:var name="object_label">">" class="primary-button" - ><__trans phrase="Create User"></button> + ><__trans phrase="Create [_1]" params="<mt:var name="object_label">"></button> <mt:else> <button type="submit" accesskey="s" - title="<__trans phrase="Save changes to this [_1] (s)" params="<mt:var name="object_label" lower_case="1">">" + title="<__trans phrase="Save changes to this [lc,_1] (s)" params="<mt:var name="object_label">">" class="primary-button" ><__trans phrase="Save Changes"></button> </mt:if> tmpl/cms/edit_author.tmpl @@ -126,6 +126,8 @@ TC.attachLoadEvent(init); <input type="hidden" name="return_args" value="<mt:var name="return_args" escape="html">" /> <input type="hidden" name="magic_token" value="<mt:var name="magic_token">" /> +<fieldset> + <h3><__trans phrase="Blog Details"></h3> <mt:if name="can_edit_config"> <mtapp:setting @@ -136,7 +138,7 @@ TC.attachLoadEvent(init); help_section="blog_name"> <input name="name" id="name" value="<mt:var name="name" escape="html">" size="50" onkeyup="dirify_blog_name(this)" /> </mtapp:setting> - +<mt:if name="template_set_index"> <mtapp:setting id="template_set" label="<__trans phrase="Template Set">" @@ -150,6 +152,7 @@ TC.attachLoadEvent(init); </select> </mtapp:setting> </mt:if> +</mt:if> <mt:if name="can_set_publish_paths"> <mtapp:setting id="site_url" @@ -216,11 +219,12 @@ TC.attachLoadEvent(init); <button type="submit" accesskey="s" - title="<__trans phrase="Create [_1] (s)" params="<mt:var name="object_label" lower_case="1">">" + title="<__trans phrase="Create [lc,_1] (s)" params="<mt:var name="object_label">">" class="primary-button" ><__trans phrase="Create [_1]" params="<mt:var name="object_label">"></button> </mt:setvarblock> <mt:include name="include/actions_bar.tmpl" bar_position="bottom" hide_pager="1" settings_bar="1"> + </fieldset> </form> <mt:include name="include/footer.tmpl"> tmpl/cms/edit_blog.tmpl @@ -160,7 +160,7 @@ TC.attachLoadEvent( init ); <button type="submit" accesskey="s" - title="<__trans phrase="Save changes to this [_1] (s)" params="<mt:var name="object_label" lower_case="1">">" + title="<__trans phrase="Save changes to this [lc,_1] (s)" params="<mt:var name="object_label">">" class="primary-button" ><__trans phrase="Save Changes"></button> </mt:setvarblock> tmpl/cms/edit_category.tmpl @@ -21,7 +21,7 @@ <button type="submit" accesskey="s" - title="<__trans phrase="Save changes to this [_1] (s)" params="<mt:var name="object_label" lower_case="1">">" + title="<__trans phrase="Save changes to this [lc,_1] (s)" params="<mt:var name="object_label">">" class="primary-button" ><__trans phrase="Save Changes"></button> <button tmpl/cms/edit_comment.tmpl @@ -45,14 +45,14 @@ onclick="doForMarkedInThisWindow(this.form, '<__trans phrase="commenter" escape="js">', '<__trans phrase="commenters" escape="js">', 'id', 'trust_commenter', {}, '<__trans phrase="to act upon" escape="js">')" type="submit" accesskey="t" - title="<__trans phrase="Trust [_1] (t)" params="<mt:var name="object_label" lower_case="1">">" + title="<__trans phrase="Trust [lc,_1] (t)" params="<mt:var name="object_label">">" ><__trans phrase="Trust"></button> <mt:else> <button onclick="doForMarkedInThisWindow(this.form, '<__trans phrase="commenter" escape="js">', '<__trans phrase="commenters" escape="js">', 'id', 'itemset_action', {action_name:'untrust'}, '<__trans phrase="to act upon" escape="js">')" type="submit" accesskey="t" - title="<__trans phrase="Untrust [_1] (t)" params="<mt:var name="object_label" lower_case="1">">" + title="<__trans phrase="Untrust [lc,_1] (t)" params="<mt:var name="object_label">">" ><__trans phrase="Untrust"></button> </mt:unless> </mt:unless> @@ -61,14 +61,14 @@ onclick="doForMarkedInThisWindow(this.form, '<__trans phrase="commenter" escape="js">', '<__trans phrase="commenters" escape="js">', 'id', 'ban_commenter', {}, '<__trans phrase="to act upon" escape="js">')" type="submit" accesskey="b" - title="<__trans phrase="Ban [_1] (b)" params="<mt:var name="object_label" lower_case="1">">" + title="<__trans phrase="Ban [lc,_1] (b)" params="<mt:var name="object_label">">" ><__trans phrase="Ban"></button> <mt:else> <button onclick="doForMarkedInThisWindow(this.form, '<__trans phrase="commenter" escape="js">', '<__trans phrase="commenters" escape="js">', 'id', 'itemset_action', {action_name:'unban'}, '<__trans phrase="to act upon" escape="js">')" type="submit" accesskey="b" - title="<__trans phrase="Unban [_1] (b)" params="<mt:var name="object_label" lower_case="1">">" + title="<__trans phrase="Unban [lc,_1] (b)" params="<mt:var name="object_label">">" ><__trans phrase="Unban"></button> </mt:unless> <mt:else> @@ -76,13 +76,13 @@ onclick="doForMarkedInThisWindow(this.form, '<__trans phrase="commenter" escape="js">', '<__trans phrase="commenters" escape="js">', 'id', 'trust_commenter', {}, '<__trans phrase="to act upon" escape="js">')" type="submit" accesskey="t" - title="<__trans phrase="Trust [_1] (t)" params="<mt:var name="object_label" lower_case="1">">" + title="<__trans phrase="Trust [lc,_1] (t)" params="<mt:var name="object_label">">" ><__trans phrase="Trust"></button> <button onclick="doForMarkedInThisWindow(this.form, '<__trans phrase="commenter" escape="js">', '<__trans phrase="commenters" escape="js">', 'id', 'ban_commenter', {}, '<__trans phrase="to act upon" escape="js">')" type="submit" accesskey="b" - title="<__trans phrase="Ban [_1] (b)" params="<mt:var name="object_label" lower_case="1">">" + title="<__trans phrase="Ban [lc,_1] (b)" params="<mt:var name="object_label">">" ><__trans phrase="Ban"></button> /> </mt:if> @@ -159,12 +159,12 @@ TC.attachLoadEvent(init); hint="<__trans phrase="The trusted status of the commenter">" show_hint="0"> <mt:if name="commenter_approved"> - <span class="icon-left icon-left-wide icon-trusted"><__trans phrase="Trusted"></span> + <span class="icon-left-wide icon-trusted"><__trans phrase="Trusted"></span> <mt:else> <mt:if name="commenter_banned"> - <span class="icon-left icon-left-wide icon-banned"><__trans phrase="Banned"></span> + <span class="icon-left-wide icon-banned"><__trans phrase="Banned"></span> <mt:else> - <span class="icon-left icon-left-wide icon-authenticated"><__trans phrase="Authenticated"></span> + <span class="icon-left-wide icon-authenticated"><__trans phrase="Authenticated"></span> </mt:if> </mt:if> <a title="<__trans phrase="View all commenters">" href="<mt:var name="script_url">?__mode=list_member&amp;blog_id=<mt:var name="blog_id">&amp;filter_key=commenter"><img src="<mt:var name="static_uri">images/filter.gif" alt="" width="8" height="8" /></a> tmpl/cms/edit_commenter.tmpl @@ -1,29 +1,52 @@ <mt:if name="object_type" eq="page"> <mt:if name="can_manage_pages"> - <mt:setvar name="can_publish_post" value="1"> + <$mt:setvar name="can_publish_post" value="1"$> </mt:if> - <mt:setvar name="disp_prefs_show_category" value="1"> - <mt:setvar name="container_label" value="<__trans phrase="Folder">"> - <mt:setvar name="basename_label" value="<__trans phrase="Filename">"> - <mt:setvar name="container_label_plural" value="<__trans phrase="Folders">"> - <mt:setvar name="container_type" value="Folder"> + <$mt:setvar name="disp_prefs_show_category" value="1"$> + <$mt:setvar name="container_label" value="<__trans phrase="Folder">"$> + <$mt:setvar name="basename_label" value="<__trans phrase="Filename">"$> + <$mt:setvar name="container_label_plural" value="<__trans phrase="Folders">"$> + <$mt:setvar name="container_type" value="Folder"> <mt:else> - <mt:setvar name="container_label" value="<__trans phrase="Category">"> - <mt:setvar name="basename_label" value="<__trans phrase="Basename">"> - <mt:setvar name="container_label_plural" value="<__trans phrase="Categories">"> - <mt:setvar name="container_type" value="Category"> - <mt:ignore> - <__trans phrase="folder"> - <__trans phrase="folders"> - <__trans phrase="category"> - <__trans phrase="categories"> - </mt:ignore> + <$mt:setvar name="container_label" value="<__trans phrase="Category">"$> + <$mt:setvar name="basename_label" value="<__trans phrase="Basename">"$> + <$mt:setvar name="container_label_plural" value="<__trans phrase="Categories">"$> + <$mt:setvar name="container_type" value="Category"> + <$mt:setvar name="container_label_class" value="no-header"$> </mt:if> <mt:if name="new_object"> <mt:setvarblock name="page_title"><__trans phrase="Create [_1]" params="<$mt:var name="object_label"$>"></mt:setvarblock> <mt:else> <mt:setvarblock name="page_title"><__trans phrase="Edit [_1]" params="<$mt:var name="object_label"$>"></mt:setvarblock> </mt:if> +<mt:setvartemplate name="action_buttons"> + <button + mt:mode="save_entry" + type="submit" + accesskey="s" + title="<__trans phrase="Save this [lc,_1] (s)" params="<mt:var name="object_label">">" + class="primary-button" + ><__trans phrase="Save"></button> + <button + mt:mode="preview_entry" + name="preview_entry" + type="submit" + accesskey="v" + title="<__trans phrase="Preview this [lc,_1] (v)" params="<mt:var name="object_label">">" + ><__trans phrase="Preview"></button> + <mt:if name="id"> + <button + mt:command="do-remove-items" + mt:object-singular="<mt:var name="object_label" lower_case="1" escape="html">" + mt:object-plural="<mt:var name="object_label_plural" lower_case="1" escape="html">" + mt:object-type="<mt:var name="object_type" escape="html">" mt:blog-id="<mt:var name="blog_id">" + type="submit" + accesskey="x" + title="<__trans phrase="Delete this [lc,_1] (x)" params="<mt:var name="object_label">">" + ><__trans phrase="Delete"></button> + </mt:if> + <div id="autosave-notification-<$mt:var name="bar_position" default="top"$>" class="autosave-notification"></div> +</mt:setvartemplate> <mt:setvarblock name="content_header"> <div id="msg-block"> @@ -41,7 +64,7 @@ <mtapp:statusmsg id="saved-added" class="success"> - <__trans phrase="Your [_1] has been saved." params="<$mt:var name="object_label" lower_case="1"$>"> + <__trans phrase="Your [lc,_1] has been saved." params="<$mt:var name="object_label"$>"> </mtapp:statusmsg> </mt:if> @@ -127,79 +150,258 @@ </mt:if> </div> </mt:setvarblock> +<mt:setvarblock name="form_header"> + <form name="entry_form" id="entry_form" method="post" action="<$mt:var name="script_url"$>" mt:once="1" mt:auto-save="1" mt:auto-save-delay="<$mt:var name="autosave_frequency"$>000"> + <mt:if name="new_object"> + <input type="hidden" name="author_id" value="<$mt:var name="author_id"$>" /> + <mt:else> + <input type="hidden" name="id" value="<$mt:var name="id"$>" /> + </mt:if> + <input type="hidden" name="blog_id" value="<$mt:var name="blog_id"$>" /> + <input type="hidden" name="__mode" value="save_entry" /> + <input type="hidden" name="_type" value="<$mt:var name="object_type"$>" /> + <input type="hidden" name="return_args" value="<$mt:var name="return_args" escape="html"$>" /> + <input type="hidden" name="magic_token" value="<$mt:var name="magic_token"$>" id="m_t" /> + <input type="hidden" name="action_name" value="" /> + <input type="hidden" name="itemset_action_input" value="" /> +</mt:setvarblock> +<mt:setvarblock name="category_setting"> + <mtapp:setting + id="category" + shown="$disp_prefs_show_category" + label="$container_label" + label_class="$container_label_class" + help_page="entries" + help_section="entry_categories" + content_class="field-content-text"> + <mt:if name="object_type" eq="page"> + <a href="javascript:void(0);" class="change-folder-link" mt:command="open-category-selector" title="<__trans phrase="Change [lc,_1]" params="<$mt:var name="container_label"$>">"><__trans phrase="Add"/></a> + <div mt:delegate="category-list" id="category-list"></div> + <mt:else> + <a href="javascript:void(0);" class="add-new-category-link" mt:command="open-category-selector" title="<__trans phrase="Add [lc,_1]" params="<$mt:var name="container_label"$>">"><__trans phrase="Add"/></a> + <div mt:delegate="category-list" id="category-list"></div> + </mt:if> + <input id="category-ids" type="hidden" name="category_ids" value="<$mt:var name="selected_category_loop" glue=","$>" /> + <script type="text/javascript"> + /* <![CDATA[ */ + MT.App.selectedCategoryList = <$mt:if name="selected_category_loop"><$mt:var name="selected_category_loop" to_json="1"$><mt:else>[]</mt:if>; + Template.templates.categoryList = '<mt:section encode_js="1"> + [# if ( !items.length ) { #] + <span class="disabled">[#|h trans("None selected") #]</span> + [#* return #] + [# } #] + <ul class="<$mt:var name="container_type" lower_case="1"$>-list pkg"> + [# var map = {}; #] + [# for ( var i = 0; i < items.length; i++ ) { #] + [# if ( items[ i ] == 0 && i == 0 ) { #] + [#-- special case, no primary selected, but has secondaries --#] + [# continue #] + [# } #] + [# var cat = cache.getItem( "cat:"+items[ i ] ); #] + [# if ( !cat ) continue; #] + [# var label; #] + [# if ( cat.path.length ) { + label = []; + for ( var j = 0; j < cat.path.length; j++ ) { + var c = cache.getItem( "cat:"+cat.path[ j ] ); + if ( c ) + label.push( c.label ); + } + label.push( cat.label ); + for ( var j = 0; j < label.length; j++ ) + label[ j ] = context.f.h( label[ j ] ); + label = label.join( <mt:if name="object_type" ne="page">' &raquo; '<mt:else>''</mt:if> ); + } else { + label = context.f.h( cat.label ); + } #] + <mt:if name="object_type" ne="page"> + [# if ( i == 0 ) { #] + <li class="primary pkg" mt:focus-hover="1" mt:id="[#= cat.id #]"><strong>[#= label #]</strong><a href="javascript:void(0);" mt:command="remove" class="delete" title="[#|h trans("Remove") #]">&nbsp;<span>[#|h trans("Remove") #]</span></a></li> + [# } else { #] + <li class="pkg" mt:focus-hover="1" mt:id="[#= cat.id #]"><mt:if name="object_type" eq="entry"><a mt:focus-hover="1" href="javascript:void(0);" mt:command="primary" class="primary" title="[#|h trans("Make primary") #]">[#= label #]</a></mt:if><a mt:focus-hover="1" href="javascript:void(0);" mt:command="remove" class="delete" title="[#|h "Remove" #]">&nbsp;<span>[#|h trans("Remove") #]</span></a></li> + [# } #] + <mt:else> + <li class="pkg" mt:focus-hover="1" mt:id="[#= cat.id #]">[#= label #]</li> + </mt:if> + [# } #] + </ul> + </mt:section>'; + /* ]]> */ + </script> + </mtapp:setting> +</mt:setvarblock> <mt:setvarblock name="related_content"> <mt:unless name="new_object"> - <mt:setvarblock name="summary_label"><__trans phrase="[_1] Summary" params="<$mt:var name="object_label"$>"></mt:setvarblock> + <mt:setvarblock name="stats_widget_id"><$mt:var name="object_type"$>-stats-widget</mt:setvarblock> <mtapp:widget - id="entry-summary-widget" - label="$summary_label"> + id="$stats_widget_id" + class="stats-widget" + label="<__trans phrase="Stats">"> + <div class="object-status"> + <ul class="pkg"> + <li class="object-status-detail"> + <mt:if name="status_draft"> + <span class="icon-left-wide icon-draft"><__trans phrase="Unpublished (Draft)"></span> + <mt:else name="status_review"> + <span class="icon-left-wide icon-warning"><__trans phrase="Unpublished (Review)"></span> + <mt:else name="status_future"> + <span class="icon-left-wide icon-future"><__trans phrase="Scheduled"></span> + <mt:else name="status_publish"> + <span class="icon-left-wide icon-success"><__trans phrase="Published"></span> + </mt:if> + </li> + <mt:if name="status_publish"> + <mt:if name="entry_permalink"> + <li class="view-entry-link"><a href="<$mt:var name="entry_permalink"$>" target="<__trans phrase="_external_link_target">" class="icon-left-wide icon-view"><__trans phrase="View"></a></li> + </mt:if> + <mt:if name="can_send_notifications"> + <li><a href="javascript:void(0)" onclick="openDialog(null,'entry_notify','blog_id=<mt:var name="blog_id">&amp;entry_id=<mt:var name="id">');return false;" class="icon-left-wide icon-share"><__trans phrase="Share"></a></li> + </mt:if> + </mt:if> + </ul> + </div> + <ul class="object-stats"> + <li class="comments-link"><__trans phrase="<a href="[_2]">[quant,_1,comment,comments]</a>" params="<$mt:var name="num_comments"$>%%<$mt:var name="script_url">?__mode=list_comments&amp;filter_key=_comments_by_entry&amp;filter_val=<$mt:var name="id"$>&amp;blog_id=<$mt:var name="blog_id"$>"></li> + <li class="pings-link"><__trans phrase="<a href="[_2]">[quant,_1,trackback,trackbacks]</a>" params="<$mt:var name="num_pings"$>%%<$mt:var name="script_url">?__mode=list_pings&amp;filter=entry_id&amp;filter_val=<$mt:var name="id"$>&amp;blog_id=<$mt:var name="blog_id"$>"></li> + </ul> + </mtapp:widget> + </mt:unless> + <mtapp:widget + id="entry-publishing-widget" + label="<__trans phrase="Publishing">"> + <mtapp:setting + id="status" + label="<__trans phrase="Status">" + help_page="entries" + help_section="status"> + <mt:unless name="sitepath_configured"> + <input type="hidden" name="status" id="status" value="1" /><span><__trans phrase="Unpublished"></span>&nbsp;<span class="alert-warning-inline"><img src="<$mt:var name="static_uri"$>images/status_icons/warning.gif" alt="<__trans phrase="Warning">" width="9" height="9" /> <a href="<$mt:var name="script_url"$>?__mode=cfg_archives&amp;id=<$mt:var name="blog_id"$>&amp;blog_id=<$mt:var name="blog_id"$>"><__trans phrase="You must configure this blog before you can publish this [lc,_1]." params="<mt:var name="object_label">"></a></span> + <mt:else> + <mt:if name="can_publish_post"> + <select name="status" id="status" class="full-width" tabindex="9" onchange="highlightSwitch(this)"> + <option value="1"<mt:if name="status_draft"> selected="selected"</mt:if>><__trans phrase="Unpublished (Draft)"></option> + <option value="2"<mt:if name="status_publish"> selected="selected"</mt:if>><__trans phrase="Published"></option> + <mt:if name="status_review"> + <option value="3"<mt:if name="status_review"> selected="selected"</mt:if>><__trans phrase="Unpublished (Review)"></option> + </mt:if> + <mt:if name="new_object"> + <option value="4"<mt:if name="status_future"> selected="selected"</mt:if>><__trans phrase="Scheduled"></option> + <mt:else> + <mt:unless name="status_publish"> + <option value="4"<mt:if name="status_future"> selected="selected"</mt:if>><__trans phrase="Scheduled"></option> + </mt:unless> + </mt:if> + </select> + <mt:else> + <mt:if name="new_object"> + <input type="hidden" name="status" id="status" value="1" /><span><__trans phrase="Unpublished"></span> + <mt:else> + <mt:if name="status_draft"> + <input type="hidden" name="status" id="status" value="1" /><span><__trans phrase="Unpublished (Draft)"></span> + <mt:else name="status_publish"> + <input type="hidden" name="status" id="status" value="2" /><span><__trans phrase="Published"></span> + <mt:else name="status_future"> + <input type="hidden" name="status" id="status" value="4" /><span><__trans phrase="Scheduled"></span> + <mt:else name="status_review"> + <input type="hidden" name="status" id="status" value="3" /><span><__trans phrase="Unpublished (Review)"></span> + </mt:if> + </mt:if> + </mt:if> + </mt:unless> + <mt:unless name="new_object"> <ul> - <li><__trans phrase="Created [_1] by [_2]." params="<$mt:date ts="$created_on_ts" relative="1" _default="$created_on_formatted"$>%%<$mt:var name="created_by" escape="html"$>"></li> - <mt:if name="modified_by"> - <li><__trans phrase="Last edited [_1] by [_2]." params="<$MTDate ts="$modified_on_ts" relative="1" _default="$modified_on_formatted"$>%%<$mt:var name="modified_by" escape="html"$>"></li> - </mt:if> + <li><__trans phrase="[_1] - Created by [_2]" params="<$mt:date ts="$created_on_ts" relative="1" _default="$created_on_formatted"$>%%<$mt:var name="created_by" escape="html"$>"></li> <mt:if name="status_publish"> - <li><__trans phrase="Published [_1]." params="<$MTDate ts="$authored_on_ts" relative="1" _default="$authored_on_formatted"$>"></li> + <li><__trans phrase="[_1] - Published by [_2]" params="<$MTDate ts="$authored_on_ts" relative="1" _default="$authored_on_formatted"$>%%<$mt:var name="author_name" escape="html"$>"></li> + </mt:if> + <mt:if name="modified_by"> + <li><__trans phrase="[_1] - Edited by [_2]" params="<$MTDate ts="$modified_on_ts" relative="1" _default="$modified_on_formatted"$>%%<$mt:var name="modified_by" escape="html"$>"></li> </mt:if> - <li><__trans phrase="This [_1] has received <a href="[_4]">[quant,_2,comment,comments]</a> and <a href="[_5]">[quant,_3,trackback,trackbacks]</a>." params="<$mt:var name="object_label" lower_case="1"$>%%<$mt:var name="num_comments"$>%%<$mt:var name="num_pings"$>%%<$mt:var name="script_url">?__mode=list_comments&amp;filter_key=_comments_by_entry&amp;filter_val=<$mt:var name="id"$>&amp;blog_id=<$mt:var name="blog_id"$>%%<$mt:var name="script_url">?__mode=list_pings&amp;filter=entry_id&amp;filter_val=<$mt:var name="id"$>&amp;blog_id=<$mt:var name="blog_id"$>"></li> </ul> + </mt:unless> + </mtapp:setting> + + <mt:if name="status_future"> + <$mt:setvar name="authored_on_label" value="<__trans phrase="Publish On">"$> + <mt:else> + <$mt:setvar name="authored_on_label" value="<__trans phrase="Publish Date">"$> + </mt:if> + <mtapp:setting + id="authored_on" + label="$authored_on_label" + help_page="entries" + help_section="date"> + <span class="date-time-fields<mt:if name="status_future"><mt:if name="can_publish_post"> highlight</mt:if></mt:if>"> + <input id="created-on" class="entry-date" name="authored_on_date" tabindex="10" value="<$mt:var name="authored_on_date" escape="html"$>" /> + <a href="javascript:void(0);" mt:command="open-calendar-created-on" class="date-picker" title="<__trans phrase="Select entry date">"><span>Choose Date</span></a> + <input class="entry-time" name="authored_on_time" tabindex="11" value="<$mt:var name="authored_on_time" escape="html"$>" /> + </span> + </mtapp:setting> + + <mt:if name="object_type" eq="page"> + <$mt:var name="category_setting"$> + </mt:if> + + <mtapp:setting + id="basename" + label="$basename_label" + help_page="entries" + help_section="basename"> + <input type="hidden" name="basename_manual" id="basename_manual" value="0" /> + <input type="hidden" name="basename_old" id="basename_old" value="<$mt:var name="basename_old" escape="html"$>" /> + <input type="text" <mt:if name="object_type" eq="entry">disabled="disabled"</mt:if> name="basename" id="basename" value="<$mt:var name="basename"$>" onchange="setElementValue('basename', dirify(this.value))" tabindex="12" /> + <mt:if name="object_type" eq="page"> + <span class="file-extension"><$mt:var name="file_extension"$></span> + </mt:if> + <mt:if name="object_type" eq="entry"> + <mt:if name="can_publish_post"> + <a href="javascript:void(0);" id="basename-lock" title="<__trans phrase="Unlock this entry&rsquo;s output filename for editing">" onclick="return toggleFile()"><span>Unlock</span></a> + </mt:if> + <p class="alert-warning-inline" id="basename-warning" style="display: none"> + <img src="<$mt:var name="static_uri"$>images/status_icons/warning.gif" alt="<__trans phrase="Warning">" width="9" height="9" /> + <mt:if name="new_object"> + <__trans phrase="Warning: If you set the basename manually, it may conflict with another entry."> + <mt:else> + <__trans phrase="Warning: Changing this entry's basename may break inbound links."> + </mt:if> + </p> + </mt:if> + </mtapp:setting> + </mtapp:widget> + <mt:if name="object_type" eq="entry"> + <mtapp:widget + id="entry-category-widget" + label="<__trans phrase="Categories">"> + <$mt:var name="category_setting"$> </mtapp:widget> - </mt:unless> + </mt:if> <mtapp:widget - id="display-options-widget" - label="<__trans phrase="Display Options">" - label_link="javascript:void(0)" - label_onclick="return toggleEntryDisplayOptions();"> + id="entry-feedback-widget" + label="<__trans phrase="Feedback">"> + <mtapp:setting + id="allow_feedback" + label="<__trans phrase="Accept">" + help_page="entries" + help_section="accept_comments"> + <ul> + <li><input type="checkbox" name="allow_comments" id="allow_comments" tabindex="14" value="1"<mt:if name="allow_comments"> checked="checked"</mt:if> class="cb" /> <label for="allow_comments"><__trans phrase="Comments"/></label></li> + <li><input type="checkbox" name="allow_pings" id="allow_pings" tabindex="15" value="1"<mt:if name="allow_pings"> checked="checked"</mt:if> class="cb" /> <label for="allow_pings"><__trans phrase="TrackBacks"/></label></li> + </ul> + </mtapp:setting> + + <mtapp:setting + id="ping_urls" + label="<__trans phrase="Outbound TrackBack URLs">" + help_page="entries" + help_section="urls_to_ping"> + <textarea name="to_ping_urls" id="to_ping_urls" class="full-width short" tabindex="16" cols="" rows=""><$mt:var name="to_ping_urls" escape="html"$></textarea> + <mt:unless name="new_object"> + <mt:if name="has_any_pinged_urls"> + <div id="sent-tb"><a href="javascript:void(0)" onclick="listPreviousPings(); return false"><__trans phrase="View Previously Sent TrackBacks"></a></div> + </mt:if> + </mt:unless> + </mtapp:setting> - <form name="display-options-form" method="post" action="<mt:var name="script_url">"> - <input type="hidden" id="entry_prefs" name="entry_prefs" value="<mt:if name="disp_prefs_default">Default<mt:else>Custom</mt:if>"> - <mtapp:setting - id="entry_fields" - label="<__trans phrase="Fields">" - label_class="display-options"> - <ul> - <li><label><input type="checkbox" name="custom_prefs" id="custom-prefs-title" value="title" checked="checked" disabled="disabled" class="cb" /> <__trans phrase="Title"></label></li> - <li><label><input type="checkbox" name="custom_prefs" id="custom-prefs-body" value="body" checked="checked" disabled="disabled" class="cb" /> <__trans phrase="Body"></label></li> - <li><label><input type="checkbox" onclick="setCustomFields(); return true;" name="custom_prefs" id="custom-prefs-tags" value="tags" <mt:if name="disp_prefs_show_tags"> checked="checked"</mt:if> class="cb" /> <__trans phrase="Tags"></label></li> - <mt:if name="object_type" ne="page"> - <li><label><input type="checkbox" name="custom_prefs" id="custom-prefs-category" value="category" onclick="setCustomFields(); return true"<mt:if name="disp_prefs_show_category"> checked="checked"</mt:if> class="cb" /> <__trans phrase="Category"></label></li> - </mt:if> - <li><label><input type="checkbox" name="custom_prefs" id="custom-prefs-excerpt" value="excerpt" onclick="setCustomFields(); return true"<mt:if name="disp_prefs_show_excerpt"> checked="checked"</mt:if> class="cb" /> <__trans phrase="Excerpt"></label></li> - <li><label><input type="checkbox" name="custom_prefs" id="custom-prefs-keywords" value="keywords" onclick="setCustomFields(); return true"<mt:if name="disp_prefs_show_keywords"> checked="checked"</mt:if> class="cb" /> <__trans phrase="Keywords"></label></li> - <li><label><input type="checkbox" name="custom_prefs" id="custom-prefs-publishing" value="publishing" onclick="setCustomFields(); return true"<mt:if name="disp_prefs_show_publishing"> checked="checked"</mt:if> class="cb" /> <__trans phrase="Publishing"></label></li> - <li><label><input type="checkbox" name="custom_prefs" id="custom-prefs-feedback" value="feedback" onclick="setCustomFields(); return true"<mt:if name="disp_prefs_show_feedback"> checked="checked"</mt:if> class="cb" /> <__trans phrase="Feedback"></label></li> - </ul> - </mtapp:setting> - <mtapp:setting - id="action_bars" - label="<__trans phrase="Actions">" - label_class="display-options"> - <ul class="action-button-options"> - <li><label><input type="radio" name="bar_position" id="bar_position_top" value="Top"<mt:unless name="position_actions_both"><mt:if name="position_actions_top"> checked="checked"</mt:if></mt:unless> onclick="setBarPosition(this)" class="rb" /> <__trans phrase="Top"></label></li> - <li><label><input type="radio" name="bar_position" id="bar_position_both" value="Both"<mt:if name="position_actions_both"> checked="checked"</mt:if> onclick="setBarPosition(this)" class="rb" /> <__trans phrase="Both"></label></li> - <li><label><input type="radio" name="bar_position" id="bar_position_bottom" value="Bottom"<mt:unless name="position_actions_both"><mt:if name="position_actions_bottom"> checked="checked"</mt:if></mt:unless> onclick="setBarPosition(this)" class="rb" /> <__trans phrase="Bottom"></label></li> - </ul> - </mtapp:setting> - <mtapp:setting - id="reset_display_options" - label="<__trans phrase="Reset display options">" - label_class="display-options" - show_label="0"> - <a href="javascript:void(0)" onclick="return setFieldGroup('Default');" title="<__trans phrase="Reset display options to blog defaults">" ><__trans phrase="Reset defaults"></a> - </mtapp:setting> - <div class="actions-bar display-options-actions-bar buttons"> - <div class="actions-bar-inner"> - <a href="javascript:void(0)" - onclick="saveEntryFieldOptions(); return toggleEntryDisplayOptions();" - title="<__trans phrase="Save display options">" - ><__trans phrase="OK"></a> - <a href="javascript:void(0)" - onclick="return toggleEntryDisplayOptions();" - title="<__trans phrase="Close display options">" - ><__trans phrase="Cancel"></a> - </div> - </div> - </form> </mtapp:widget> <mt:if name="object_type" eq="page"> <$MTApp:PageActions from="edit_page"$> @@ -213,12 +415,12 @@ <script type="text/javascript" src="<$mt:var name="static_uri"$>js/edit.js?v=<$mt:var name="mt_version" escape="url"$>"></script> </mt:setvarblock> -<mt:include name="include/archetype_editor.tmpl"> +<mt:if name="rich_editor"><mt:var name="rich_editor"><mt:else><mt:include name="include/archetype_editor.tmpl"></mt:if> <mt:setvarblock name="html_head" append="1"> <script type="text/javascript"> /* <![CDATA[ */ - Editor.strings.unsavedChanges = '<__trans phrase="You have unsaved changes to your [_1] that will be lost." escape="js" params="<$mt:var name="object_label" lower_case="1"$>">'; + Editor.strings.unsavedChanges = '<__trans phrase="You have unsaved changes to your [lc,_1] that will be lost." escape="js" params="<$mt:var name="object_label"$>">'; Editor.strings.enterEmailAddress = '<__trans phrase="Enter email address:" escape="js">'; Editor.strings.enterLinkAddress = '<__trans phrase="Enter the link address:" escape="js">'; Editor.strings.enterTextToLinkTo = '<__trans phrase="Enter the text to link to:" escape="js">'; @@ -305,7 +507,7 @@ function convertedText(c, result) { form.text_more.value = response.result.text_more; cur_text_format = 'richtext'; TC.removeClassName(TC.elementOrId("editor-content"), "editor-plaintext"); - app.setEditorIframeHTML( app.editorInput[ app.currentEditor ].value ); + app.setEditorIframeHTML(); } function changedTextFormat(sel) { @@ -728,92 +930,98 @@ function listPreviousPings () { <mt:include name="include/calendar.tmpl"> <div id="<$mt:var name="container_type" lower_case="1"$>-selector" class="category-selector <mt:if name="object_type" eq="page">autolayout-flyout-smart<mt:else>autolayout-flyout-left-from-right</mt:if> flyout"><div id="<$mt:var name="container_type" lower_case="1"$>-selector-inner" class="inner"> <h3><$mt:var name="container_label_plural"$></h3> - <div id="add-category-form" class="add-category-form hidden"><input id="add-category-input" class="add-category-input input-hint" type="text" value="<__trans phrase="Add [_1] name" params="<$mt:var name="container_label" lower_case="1"$>">" mt:default="<__trans phrase="Add [_1] name" params="<$mt:var name="container_label" lower_case="1"$>">" mt:delegate="default-value" /> <a href="javascript:void(0);" mt:command="add" class="add-category-save-link"><span>Add</span>&nbsp;&nbsp;&nbsp;</a><a href="javascript:void(0);" mt:command="cancel" class="add-category-cancel-link"><span>Cancel</span>&nbsp;&nbsp;&nbsp;</a></div> + <div id="add-category-form" class="add-category-form hidden"><input id="add-category-input" class="add-category-input input-hint" type="text" value="<__trans phrase="Add [lc,_1] name" params="<$mt:var name="container_label"$>">" mt:default="<__trans phrase="Add [lc,_1] name" params="<$mt:var name="container_label"$>">" mt:delegate="default-value" /> <a href="javascript:void(0);" mt:command="add" class="add-category-save-link"><span>Add</span>&nbsp;&nbsp;&nbsp;</a><a href="javascript:void(0);" mt:command="cancel" class="add-category-cancel-link"><span>Cancel</span>&nbsp;&nbsp;&nbsp;</a></div> <div id="<$mt:var name="container_type" lower_case="1"$>-selector-list" class="category-selector-list"> </div> <mt:if name="object_type" eq="entry"> - <a class="add-category-new-parent-link" mt:command="show-add-category" href="javascript:void(0);" title="<__trans phrase="Add new parent [_1]" params="<$mt:var name="container_label" lower_case="1"$>">"><__trans phrase="Add new"></a> + <a class="add-category-new-parent-link" mt:command="show-add-category" href="javascript:void(0);" title="<__trans phrase="Add new parent [lc,_1]" params="<$mt:var name="container_label"$>">"><__trans phrase="Add new"></a> </mt:if> <a class="add-category-ok-link" href="javascript:void(0)" mt:command="close"><__trans phrase="OK"></a> </div></div><!-- /category-selector --> - </mt:setvarblock> -<mt:setvartemplate name="action_buttons"> - <button - mt:mode="save_entry" - type="submit" - accesskey="s" - title="<__trans phrase="Save this [_1] (s)" params="<mt:var name="object_label" lower_case="1">">" - class="primary-button" - ><__trans phrase="Save"></button> - <button - mt:mode="preview_entry" - name="preview_entry" - type="submit" - accesskey="v" - title="<__trans phrase="Preview this [_1] (v)" params="<mt:var name="object_label" lower_case="1">">" - ><__trans phrase="Preview"></button> - <mt:if name="id"> - <button - mt:command="do-remove-items" - mt:object-singular="<mt:var name="object_label" lower_case="1" escape="html">" - mt:object-plural="<mt:var name="object_label_plural" lower_case="1" escape="html">" - mt:object-type="<mt:var name="object_type" escape="html">" mt:blog-id="<mt:var name="blog_id">" - type="submit" - accesskey="x" - title="<__trans phrase="Delete this [_1] (v)" params="<mt:var name="object_label" lower_case="1">">" - ><__trans phrase="Delete"></button> - </mt:if> - <div id="autosave-notification-<$mt:var name="bar_position" default="top"$>" class="autosave-notification"></div> -</mt:setvartemplate> +<mt:setvarblock name="html_body_footer"> + <$mt:setvar name="show_display_options_link" value="1"$> + <mtapp:widget + id="display-options-widget" + class="display-options-widget autolayout-flyout-smart hidden" + label="<__trans phrase="Display Options">"> -<mt:include name="include/header.tmpl" id="header_include"> -<form name="entry_form" id="entry_form" method="post" action="<$mt:var name="script_url"$>" mt:once="1" mt:auto-save="1" mt:auto-save-delay="<$mt:var name="autosave_frequency"$>000"> -<mt:if name="new_object"> - <input type="hidden" name="author_id" value="<$mt:var name="author_id"$>" /> -<mt:else> - <input type="hidden" name="id" value="<$mt:var name="id"$>" /> -</mt:if> - <input type="hidden" name="blog_id" value="<$mt:var name="blog_id"$>" /> - <input type="hidden" name="__mode" value="save_entry" /> - <input type="hidden" name="_type" value="<$mt:var name="object_type"$>" /> - <input type="hidden" name="return_args" value="<$mt:var name="return_args" escape="html"$>" /> - <input type="hidden" name="magic_token" value="<$mt:var name="magic_token"$>" id="m_t" /> - <input type="hidden" name="action_name" value="" /> - <input type="hidden" name="itemset_action_input" value="" /> - <mt:if name="id"> - <div id="entry-nav" class="pkg"> - <ul class="inline-nav right"> - <mt:if name="status_publish"> - <mt:if name="can_send_notifications"> - <li><a href="javascript:void(0)" onclick="openDialog(null,'entry_notify','blog_id=<mt:var name="blog_id">&amp;entry_id=<mt:var name="id">');return false;"><__trans phrase="Share this [_1]" params="<$mt:var name="object_label" lower_case="1"$>"></a></li> - </mt:if> - <mt:if name="entry_permalink"> - <li class="view-entry-link"><a href="<$mt:var name="entry_permalink"$>" target="<__trans phrase="_external_link_target">"><__trans phrase="View published [_1]" params="<$mt:var name="object_label" lower_case="1"$>"></a></li> - </mt:if> - </mt:if> - </ul> - <ul class="inline-nav left"> - <li id="previous-link"><mt:if name="previous_entry_id"><a href="<$mt:var name="script_url"$>?__mode=view&amp;_type=<$mt:var name="object_type" lower_case="1"$>&amp;id=<$mt:var name="previous_entry_id"$>&amp;blog_id=<$mt:var name="blog_id"$>"><__trans phrase="&laquo; Previous"></a><mt:else><__trans phrase="&laquo; Previous"></mt:if></li> - <li><a href="<$mt:var name="script_url"$>?__mode=list_<$mt:var name="object_type" lower_case="1"$>&amp;blog_id=<$mt:var name="blog_id"$>"><__trans phrase="Manage [_1]" params="<$mt:var name="object_label_plural"$>"></a></li> - <li id="next-link"><mt:if name="next_entry_id"><a href="<$mt:var name="script_url"$>?__mode=view&amp;_type=<$mt:var name="object_type" lower_case="1"$>&amp;id=<$mt:var name="next_entry_id"$>&amp;blog_id=<$mt:var name="blog_id"$>"><__trans phrase="Next &raquo;"></a><mt:else><__trans phrase="Next &raquo;"></mt:if></li> + <form name="display-options-form" method="post" action="<mt:var name="script_url">"> + <input type="hidden" id="entry_prefs" name="entry_prefs" value="<mt:if name="disp_prefs_default">Default<mt:else>Custom</mt:if>"> + <mtapp:setting + id="entry_fields" + label="<__trans phrase="Fields">" + label_class="display-options"> + <ul> + <li><label><input type="checkbox" name="custom_prefs" id="custom-prefs-title" value="title" checked="checked" disabled="disabled" class="cb" /> <__trans phrase="Title"></label></li> + <li><label><input type="checkbox" name="custom_prefs" id="custom-prefs-body" value="body" checked="checked" disabled="disabled" class="cb" /> <__trans phrase="Body"></label></li> + <li><label><input type="checkbox" onclick="setCustomFields(); return true;" name="custom_prefs" id="custom-prefs-tags" value="tags" <mt:if name="disp_prefs_show_tags"> checked="checked"</mt:if> class="cb" /> <__trans phrase="Tags"></label></li> + <mt:if name="object_type" ne="page"> + <li><label><input type="checkbox" name="custom_prefs" id="custom-prefs-category" value="category" onclick="setCustomFields(); return true"<mt:if name="disp_prefs_show_category"> checked="checked"</mt:if> class="cb" /> <__trans phrase="Category"></label></li> + </mt:if> + <li><label><input type="checkbox" name="custom_prefs" id="custom-prefs-excerpt" value="excerpt" onclick="setCustomFields(); return true"<mt:if name="disp_prefs_show_excerpt"> checked="checked"</mt:if> class="cb" /> <__trans phrase="Excerpt"></label></li> + <li><label><input type="checkbox" name="custom_prefs" id="custom-prefs-keywords" value="keywords" onclick="setCustomFields(); return true"<mt:if name="disp_prefs_show_keywords"> checked="checked"</mt:if> class="cb" /> <__trans phrase="Keywords"></label></li> + <li><label><input type="checkbox" name="custom_prefs" id="custom-prefs-publishing" value="publishing" onclick="setCustomFields(); return true"<mt:if name="disp_prefs_show_publishing"> checked="checked"</mt:if> class="cb" /> <__trans phrase="Publishing"></label></li> + <li><label><input type="checkbox" name="custom_prefs" id="custom-prefs-feedback" value="feedback" onclick="setCustomFields(); return true"<mt:if name="disp_prefs_show_feedback"> checked="checked"</mt:if> class="cb" /> <__trans phrase="Feedback"></label></li> + </ul> + </mtapp:setting> + <mtapp:setting + id="action_bars" + label="<__trans phrase="Actions">" + label_class="display-options"> + <ul class="action-button-options"> + <li><label><input type="radio" name="bar_position" id="bar_position_top" value="Top"<mt:unless name="position_actions_both"><mt:if name="position_actions_top"> checked="checked"</mt:if></mt:unless> onclick="setBarPosition(this)" class="rb" /> <__trans phrase="Top"></label></li> + <li><label><input type="radio" name="bar_position" id="bar_position_both" value="Both"<mt:if name="position_actions_both"> checked="checked"</mt:if> onclick="setBarPosition(this)" class="rb" /> <__trans phrase="Both"></label></li> + <li><label><input type="radio" name="bar_position" id="bar_position_bottom" value="Bottom"<mt:unless name="position_actions_both"><mt:if name="position_actions_bottom"> checked="checked"</mt:if></mt:unless> onclick="setBarPosition(this)" class="rb" /> <__trans phrase="Bottom"></label></li> + </ul> + </mtapp:setting> + <mtapp:setting + id="reset_display_options" + label="<__trans phrase="Reset display options">" + label_class="display-options" + show_label="0"> + <a href="javascript:void(0)" onclick="return setFieldGroup('Default');" title="<__trans phrase="Reset display options to blog defaults">" ><__trans phrase="Reset defaults"></a> + </mtapp:setting> + <div class="actions-bar display-options-actions-bar buttons"> + <div class="actions-bar-inner"> + <a href="javascript:void(0)" + onclick="saveEntryFieldOptions();" + mt:command="close-flyout" + title="<__trans phrase="Save display options">" + ><__trans phrase="OK"></a> + <a href="javascript:void(0)" + mt:command="close-flyout" + title="<__trans phrase="Close display options">" + ><__trans phrase="Cancel"></a> + </div> + </div> + </form> + </mtapp:widget> +</mt:setvarblock> +<mt:unless name="new_object"> + <mt:setvarblock name="object_nav"> + <ul class="object-nav"> + <li id="previous-link"><mt:if name="previous_entry_id"><a href="<$mt:var name="script_url"$>?__mode=view&amp;_type=<$mt:var name="object_type" lower_case="1"$>&amp;id=<$mt:var name="previous_entry_id"$>&amp;blog_id=<$mt:var name="blog_id"$>"><__trans phrase="Previous"></a><mt:else><span><__trans phrase="Previous"></span></mt:if></li> + <li id="manage-link"><a href="<$mt:var name="script_url"$>?__mode=list_<$mt:var name="object_type" lower_case="1"$>&amp;blog_id=<$mt:var name="blog_id"$>"><__trans phrase="Manage [_1]" params="<$mt:var name="object_label_plural"$>"></a></li> + <li id="next-link"><mt:if name="next_entry_id"><a href="<$mt:var name="script_url"$>?__mode=view&amp;_type=<$mt:var name="object_type" lower_case="1"$>&amp;id=<$mt:var name="next_entry_id"$>&amp;blog_id=<$mt:var name="blog_id"$>"><__trans phrase="Next"></a><mt:else><span><__trans phrase="Next"></span></mt:if></li> </ul> - </div> - </mt:if> + </mt:setvarblock> +</mt:unless> +<mt:include name="include/header.tmpl" id="header_include"> <mt:include name="include/actions_bar.tmpl" hide_pager="1"> <mtapp:setting id="title" label="<__trans phrase="Title">" - label_class = "no-header" + label_class="top-label" help_page="entries" help_section="entry_title"> <input name="title" id="title" tabindex="1" value="<$mt:var name="title" escape="html"$>" maxlength="255" mt:watch-change="1" onkeyup="rebasename(this)" /> </mtapp:setting> <div id="editor"> - <div class="editor-header pkg" mt:delegate="tab-container"> + <div id="editor-inner" class="editor-header pkg" mt:delegate="tab-container"> <div class="tab selected-tab" mt:command="set-editor-content" mt:tab="content"> <label><a href="javascript:void(0);"><__trans phrase="Body"></a></label> </div> @@ -848,9 +1056,6 @@ function listPreviousPings () { <mt:include name="include/editor.tmpl"> <mt:setvarblock name="show_metadata"><$mt:var name="disp_prefs_show_tags"$><mt:unless name="object_type" eq="page"><$mt:var name="disp_prefs_show_category"></mt:unless><$mt:var name="disp_prefs_show_excerpt"$><$mt:var name="disp_prefs_show_keywords"$></mtsetvarblock> -<fieldset id="entry-metadata-settings" mt:fields="tags <mt:unless name="object_type" eq="page">category </mt:unless>excerpt keywords" class="pkg<mt:unless name="show_metadata"> hidden</mt:unless>"> - - <h3><__trans phrase="Metadata"></h3> <mt:if name="auth_pref_tag_delim_comma"> <$mt:setvar name="tags_hint" value="<__trans phrase="(comma-delimited list)">"$> @@ -867,6 +1072,7 @@ function listPreviousPings () { id="tags" shown="$disp_prefs_show_tags" label="<__trans phrase="Tags">" + label_class="top-label" help_page="entries" help_section="entry_tags"> <div class="textarea-wrapper"> @@ -879,79 +1085,11 @@ function listPreviousPings () { <!--[if lte IE 6.5]></div><![endif]--> </mtapp:setting> -<mt:setvarblock name="category_setting"> - <mtapp:setting - id="category" - shown="$disp_prefs_show_category" - label="$container_label" - help_page="entries" - help_section="entry_categories" - content_class="field-content-text"> - <mt:if name="object_type" eq="page"> - <div mt:delegate="category-list" id="category-list"></div> - <a href="javascript:void(0);" class="change-folder-link" mt:command="open-category-selector"><__trans phrase="Change [_1]" params="<$mt:var name="container_label" lower_case="1"$>"></a> - <mt:else> - <a href="javascript:void(0);" class="add-new-category-link" mt:command="open-category-selector"><__trans phrase="Add [_1]" params="<$mt:var name="container_label" lower_case="1"$>"></a> - <div mt:delegate="category-list" id="category-list"></div> - </mt:if> - <input id="category-ids" type="hidden" name="category_ids" value="<$mt:var name="selected_category_loop" glue=","$>" /> - <script type="text/javascript"> - /* <![CDATA[ */ - MT.App.selectedCategoryList = <$mt:if name="selected_category_loop"><$mt:var name="selected_category_loop" to_json="1"$><mt:else>[]</mt:if>; - Template.templates.categoryList = '<mt:section encode_js="1"> - [# if ( !items.length ) { #] - <span class="disabled">[#|h trans("None selected") #]</span> - [#* return #] - [# } #] - <ul class="<$mt:var name="container_type" lower_case="1"$>-list pkg"> - [# var map = {}; #] - [# for ( var i = 0; i < items.length; i++ ) { #] - [# if ( items[ i ] == 0 && i == 0 ) { #] - [#-- special case, no primary selected, but has secondaries --#] - [# continue #] - [# } #] - [# var cat = cache.getItem( "cat:"+items[ i ] ); #] - [# if ( !cat ) continue; #] - [# var label; #] - [# if ( cat.path.length ) { - label = []; - for ( var j = 0; j < cat.path.length; j++ ) { - var c = cache.getItem( "cat:"+cat.path[ j ] ); - if ( c ) - label.push( c.label ); - } - label.push( cat.label ); - for ( var j = 0; j < label.length; j++ ) - label[ j ] = context.f.h( label[ j ] ); - label = label.join( <mt:if name="object_type" ne="page">' &raquo; '<mt:else>''</mt:if> ); - } else { - label = context.f.h( cat.label ); - } #] - <mt:if name="object_type" ne="page"> - [# if ( i == 0 ) { #] - <li class="primary pkg" mt:focus-hover="1" mt:id="[#= cat.id #]"><strong>[#= label #]</strong><a href="javascript:void(0);" mt:command="remove" class="delete" title="[#|h trans("Remove") #]">&nbsp;<span>[#|h trans("Remove") #]</span></a></li> - [# } else { #] - <li class="pkg" mt:focus-hover="1" mt:id="[#= cat.id #]"><mt:if name="object_type" eq="entry"><a mt:focus-hover="1" href="javascript:void(0);" mt:command="primary" class="primary" title="[#|h trans("Make primary") #]">[#= label #]</a></mt:if><a mt:focus-hover="1" href="javascript:void(0);" mt:command="remove" class="delete" title="[#|h "Remove" #]">&nbsp;<span>[#|h trans("Remove") #]</span></a></li> - [# } #] - <mt:else> - <li class="pkg" mt:focus-hover="1" mt:id="[#= cat.id #]">[#= label #]</li> - </mt:if> - [# } #] - </ul> - </mt:section>'; - /* ]]> */ - </script> - </mtapp:setting> -</mt:setvarblock> - -<mt:if name="object_type" eq="entry"> - <$mt:var name="category_setting"$> -</mt:if> - <mtapp:setting id="excerpt" shown="$disp_prefs_show_excerpt" label="<__trans phrase="Excerpt">" + label_class="top-label" help_page="entries" help_section="excerpt"> <textarea name="excerpt" id="excerpt" class="full-width short" tabindex="7" cols="" rows="" mt:watch-change="1"><$mt:var name="excerpt" escape="html"$></textarea> @@ -961,139 +1099,21 @@ function listPreviousPings () { id="keywords" shown="$disp_prefs_show_keywords" label="<__trans phrase="Keywords">" + label_class="top-label" help_page="entries" help_section="keywords"> <div class="textarea-wrapper"> <input name="keywords" id="keywords" class="full-width" tabindex="8" value="<$mt:var name="keywords" escape="html"$>" mt:watch-change="1" autocomplete="off" /> </div> </mtapp:setting> -</fieldset> - -<fieldset id="publishing-field" class="pkg<mt:unless name="disp_prefs_show_publishing"> hidden</mt:unless>"> - - <h3><__trans phrase="Publishing"></h3> - - <mtapp:setting - id="status" - label="<__trans phrase="Status">" - help_page="entries" - help_section="status"> - <mt:unless name="sitepath_configured"> - <input type="hidden" name="status" id="status" value="1" /><span><__trans phrase="Unpublished"></span>&nbsp;<span class="alert-warning-inline"><img src="<$mt:var name="static_uri"$>images/status_icons/warning.gif" alt="<__trans phrase="Warning">" width="9" height="9" /> <a href="<$mt:var name="script_url"$>?__mode=cfg_archives&amp;id=<$mt:var name="blog_id"$>&amp;blog_id=<$mt:var name="blog_id"$>"><__trans phrase="You must configure blog before you can publish this [_1]." params="<mt:var name="object_label" lower_case="1">"></a></span> - <mt:else> - <mt:if name="can_publish_post"> - <select name="status" id="status" class="full-width" tabindex="9" onchange="highlightSwitch(this)"> - <option value="1"<mt:if name="status_draft"> selected="selected"</mt:if>><__trans phrase="Unpublished (Draft)"></option> - <option value="2"<mt:if name="status_publish"> selected="selected"</mt:if>><__trans phrase="Published"></option> - <mt:if name="status_review"> - <option value="3"<mt:if name="status_review"> selected="selected"</mt:if>><__trans phrase="Unpublished (Review)"></option> - </mt:if> - <mt:if name="new_object"> - <option value="4"<mt:if name="status_future"> selected="selected"</mt:if>><__trans phrase="Scheduled"></option> - <mt:else> - <mt:unless name="status_publish"> - <option value="4"<mt:if name="status_future"> selected="selected"</mt:if>><__trans phrase="Scheduled"></option> - </mt:unless> - </mt:if> - </select> - <mt:else> - <mt:if name="new_object"> - <input type="hidden" name="status" id="status" value="1" /><span><__trans phrase="Unpublished"></span> - <mt:else> - <mt:if name="status_draft"> - <input type="hidden" name="status" id="status" value="1" /><span><__trans phrase="Unpublished (Draft)"></span> - <mt:else name="status_publish"> - <input type="hidden" name="status" id="status" value="2" /><span><__trans phrase="Published"></span> - <mt:else name="status_future"> - <input type="hidden" name="status" id="status" value="4" /><span><__trans phrase="Scheduled"></span> - <mt:else name="status_review"> - <input type="hidden" name="status" id="status" value="3" /><span><__trans phrase="Unpublished (Review)"></span> - </mt:if> - </mt:if> - </mt:if> - </mt:unless> - </mtapp:setting> - <mt:if name="status_future"> - <$mt:setvar name="authored_on_label" value="<__trans phrase="Publish On">"$> - <mt:else> - <$mt:setvar name="authored_on_label" value="<__trans phrase="Publish Date">"$> - </mt:if> - <mtapp:setting - id="authored_on" - label="$authored_on_label" - help_page="entries" - help_section="date"> - <span class="date-time-fields<mt:if name="status_future"><mt:if name="can_publish_post"> highlight</mt:if></mt:if>"> - <input id="created-on" class="entry-date" name="authored_on_date" tabindex="10" value="<$mt:var name="authored_on_date" escape="html"$>" /> - <a href="javascript:void(0);" mt:command="open-calendar-created-on" class="date-picker" title="<__trans phrase="Select entry date">"><span>Choose Date</span></a> - <input class="entry-time" name="authored_on_time" tabindex="11" value="<$mt:var name="authored_on_time" escape="html"$>" /> - </span> - </mtapp:setting> - -<mt:if name="object_type" eq="page"> - <$mt:var name="category_setting"$> -</mt:if> - - <mtapp:setting - id="basename" - label="$basename_label" - help_page="entries" - help_section="basename"> - <input type="hidden" name="basename_manual" id="basename_manual" value="0" /> - <input type="hidden" name="basename_old" id="basename_old" value="<$mt:var name="basename_old" escape="html"$>" /> - <input type="text" <mt:if name="object_type" eq="entry">disabled="disabled"</mt:if> name="basename" id="basename" value="<$mt:var name="basename"$>" onchange="setElementValue('basename', dirify(this.value))" tabindex="12" /> - <mt:if name="object_type" eq="page"> - <span class="file-extension"><$mt:var name="file_extension"$></span> - </mt:if> - <mt:if name="object_type" eq="entry"> - <mt:if name="can_publish_post"> - <a href="javascript:void(0);" id="basename-lock" title="<__trans phrase="Unlock this entry&rsquo;s output filename for editing">" onclick="return toggleFile()"><span>Unlock</span></a> - </mt:if> - <p class="alert-warning-inline" id="basename-warning" style="display: none"> - <img src="<$mt:var name="static_uri"$>images/status_icons/warning.gif" alt="<__trans phrase="Warning">" width="9" height="9" /> - <mt:if name="new_object"> - <__trans phrase="Warning: If you set the basename manually, it may conflict with another entry."> - <mt:else> - <__trans phrase="Warning: Changing this entry's basename may break inbound links."> - </mt:if> - </p> - </mt:if> - </mtapp:setting> -</fieldset> - -<fieldset id="feedback-field" class="pkg<mt:unless name="disp_prefs_show_feedback"> hidden</mt:unless>"> - <h3><__trans phrase="Feedback"></h3> - - <mtapp:setting - id="allow_feedback" - label="<__trans phrase="Accept">" - help_page="entries" - help_section="accept_comments"> - <ul> - <li><input type="checkbox" name="allow_comments" id="allow_comments" tabindex="14" value="1"<mt:if name="allow_comments"> checked="checked"</mt:if> class="cb" /> <__trans phrase="Comments"></li> - <li><input type="checkbox" name="allow_pings" id="allow_pings" tabindex="15" value="1"<mt:if name="allow_pings"> checked="checked"</mt:if> class="cb" /> <__trans phrase="TrackBacks"></li> - </ul> - </mtapp:setting> - - <mtapp:setting - id="ping_urls" - label="<__trans phrase="Outbound TrackBack URLs">" - help_page="entries" - help_section="urls_to_ping"> - <textarea name="to_ping_urls" id="to_ping_urls" class="full-width short" tabindex="16" cols="" rows=""><$mt:var name="to_ping_urls" escape="html"$></textarea> - <mt:unless name="new_object"> - <mt:if name="has_any_pinged_urls"> - <div id="sent-tb"><a href="javascript:void(0)" onclick="listPreviousPings(); return false"><__trans phrase="View Previously Sent TrackBacks"></a></div> - </mt:if> - </mt:unless> - </mtapp:setting> -</fieldset> <mt:include name="include/actions_bar.tmpl" bar_position="bottom" hide_pager="1"> -</form> <div id="quickpost"> <__trans phrase="[_1]QuickPost to [_2]</a> - Drag this link to your browser's toolbar then click it when you are on a site you want to blog about." params="<a href="<mt:var name="quickpost_js" escape="html">">%%<$mt:var name="blog_name" escape="html"$>"> </div> +<mt:setvarblock name="form_footer"> +</form> +</mt:setvarblock> <mt:include name="include/footer.tmpl" id="footer_include"> tmpl/cms/edit_entry.tmpl @@ -101,7 +101,7 @@ TC.attachLoadEvent( init ); <button type="submit" accesskey="s" - title="<__trans phrase="Save changes to this [_1] (s)" params="<mt:var name="object_label" lower_case="1">">" + title="<__trans phrase="Save changes to this [lc,_1] (s)" params="<mt:var name="object_label">">" class="primary-button" ><__trans phrase="Save Changes"></button> </mt:setvarblock> tmpl/cms/edit_folder.tmpl @@ -37,14 +37,14 @@ <button type="submit" accesskey="s" - title="<__trans phrase="Save changes to this [_1] (s)" params="<mt:var name="object_label" lower_case="1">">" + title="<__trans phrase="Save changes to this [lc,_1] (s)" params="<mt:var name="object_label">">" class="primary-button" ><__trans phrase="Save Changes"></button> <button onclick="doRemoveItems(this.form, '<__trans phrase="TrackBack" escape="js">', '<__trans phrase="TrackBack" escape="js">', false, { 'return_args' : '__mode=list_pings&blog_id=<mt:var name="blog_id">'})" type="submit" accesskey="x" - title="<__trans phrase="Delete this [_1] (x)" params="<mt:var name="object_label" lower_case="1">">" + title="<__trans phrase="Delete this [lc,_1] (x)" params="<mt:var name="object_label">">" ><__trans phrase="Delete"></button> <mt:if name="is_ip_filter"> <mt:if name="blog_id"> tmpl/cms/edit_ping.tmpl @@ -16,14 +16,15 @@ <__trans phrase="Your changes have been saved."> </mtapp:statusmsg> </mt:if> - - <p class="page-desc hidden"><__trans phrase="_USAGE_ROLE_PROFILE"><a href="javascript:void(0)" onclick="return openManual('author_permissions', 'permissions')" class="help-link">?</a></p> - - <p><a href="<mt:var name="script_url">?__mode=list_roles" class="icon-left icon-related"><__trans phrase="List Roles"></a></p> - -<mt:if name="id"> - <p><a href="<mt:var name="script_url">?__mode=list_associations&amp;role_id=<mt:var name="id">"><__trans phrase="[quant,_1,User,Users] with this role" params="<mt:var name="user_count">"></a></p> -</mt:if> + + <ul class="action-link-list"> + <li> + <a href="<mt:var name="script_url">?__mode=list_roles" class="icon-left icon-related"><__trans phrase="List Roles"></a> + <mt:if name="id"> + - <a href="<mt:var name="script_url">?__mode=list_associations&amp;role_id=<mt:var name="id">"><__trans phrase="[quant,_1,User,Users] with this role" params="<mt:var name="user_count">"></a> + </mt:if> + </li> + </ul> </mt:setvarblock> <mt:include name="include/header.tmpl"> @@ -355,7 +356,7 @@ TC.attachLoadEvent( rectifyAll ); </mt:if> type="submit" accesskey="s" - title="<__trans phrase="Save changes to this [_1] (s)" params="<mt:var name="object_label" lower_case="1">">" + title="<__trans phrase="Save changes to this [lc,_1] (s)" params="<mt:var name="object_label">">" class="primary-button" ><__trans phrase="Save Changes"></button> </mt:setvarblock> tmpl/cms/edit_role.tmpl @@ -39,7 +39,7 @@ </mtapp:statusmsg> <mt:else> <mtapp:statusmsg - id="saed" + id="saved" class="success"> <__trans phrase="Your template changes have been saved."> <mt:unless name="build_dynamic"> @@ -166,7 +166,7 @@ tag_inserts['<mt:var name="id" escape="js">'] = content; if ( !window.Editor ) Editor = { strings: {} }; -Editor.strings.unsavedChanges = '<__trans phrase="You have unsaved changes to your [_1] that will be lost." escape="js" params="<$mt:var name="object_label" lower_case="1"$>">'; +Editor.strings.unsavedChanges = '<__trans phrase="You have unsaved changes to your [lc,_1] that will be lost." escape="js" params="<$mt:var name="object_label"$>">'; var fieldStorage = {}; var dirty = false; @@ -449,7 +449,7 @@ TC.attachLoadEvent( init ); <form name="template-listing-form" id="template-listing-form" method="post" action="<mt:var name="script_url">" mt:once="1" mt:auto-save="1" mt:auto-save-delay="<$mt:var name="autosave_frequency"$>000"> <input type="hidden" name="id" value="<mt:var name="id">" /> -<input type="hidden" name="blog_id" value="<mt:var name="blog_id">" /> +<input type="hidden" name="blog_id" value="<mt:var name="blog_id" default="0">" /> <input type="hidden" name="type" value="<mt:var name="type" escape="html">" /> <input type="hidden" name="__mode" value="save" /> <input type="hidden" name="_type" value="template" /> tmpl/cms/edit_template.tmpl @@ -20,11 +20,8 @@ function selectBlog() { <MTSetVarBlock name="content_nav"> <mt:include name="include/tools_content_nav.tmpl"> </MTSetVarBlock> -<mt:setvarblock name="content_header"> - <p><__trans phrase="_USAGE_EXPORT_1"></p> -</mt:setvarblock> <mt:include name="include/header.tmpl"> - +<p><__trans phrase="_USAGE_EXPORT_1"></p> <form method="post" enctype="multipart/form-data" action="<mt:var name="script_url">" onsubmit="return validate(this)"> <input type="hidden" name="__mode" value="export" /> <mt:if name="blog_id"> tmpl/cms/export.tmpl @@ -15,7 +15,6 @@ <th class="cb"><input type="checkbox" name="id-head" value="all" class="select" /></th> <th id="as-file-status" class="si"><img src="<mt:var name="static_uri">images/status_icons/invert-flag.gif" alt="<__trans phrase="Status">" title="<__trans phrase="Status">" width="9" height="9" /></th> <th id="as-file-name"><__trans phrase="Title"></th> - <th id="as-asset-type"><__trans phrase="Type"></th> <mt:unless name="edit_blog_id"> <th id="as-weblog"><__trans phrase="Blog"></th> </mt:unless> @@ -27,34 +26,54 @@ </thead> <tbody> </mt:if> - <tr id="asset-<mt:var name="id">" class="<mt:if name="__odd__">odd<mt:else>even</mt:if>"> + <tr id="asset-<mt:var name="id">" class="<mt:if name="__odd__">odd<mt:else>even</mt:if> status-<mt:if name="file_is_missing">missing<mt:else>publish</mt:if><mt:unless name="file_is_missing"> <mt:if name="has_thumbnail">asset-thumbnail<mt:else>asset-no-thumbnail</mt:if></mt:unless>"> <td class="cb"> <input type="hidden" id="asset-<mt:var name="id">-json" value="<mt:var name="metadata_json" escape="html">" /> <input type="checkbox" name="id" value="<mt:var name="id">" class="select" /> </td> - <td class="si status-<mt:if name="file_is_missing">missing<mt:else>publish</mt:if>"><img src="<mt:var name="static_uri">images/spacer.gif" <mt:if name="file_is_missing">alt="<__trans phrase="Pending">"<mt:else>alt="<__trans phrase="Published">"</mt:if> width="9" height="9" /></td> - <td> - <mt:if name="has_thumbnail"> - <a href="javascript:void(0)" onclick="return toggleAssetDetails('<mt:var name="id">');" title="<$mt:var name="file_name"$>"><$mt:var name="label" escape="html"$></a> + <td class="si as-file-status asset-type-<mt:var name="asset_class" escape="html" lower_case="1">"> + <div class="asset-thumb"> + <div class="asset-thumb-inner"> + <mt:if name="file_is_missing"> + <a href="<$mt:var name="script_url"$>?__mode=view&amp;_type=<mt:var name="object_type">&amp;id=<$mt:var name="id"$>&amp;blog_id=<$mt:var name="blog_id"$>" title="<$mt:var name="file_name"$>"><span class="asset-missing"><__trans phrase="Asset Missing"></span></a> <mt:else> - <$mt:var name="label" escape="html"$> + <a href="<$mt:var name="script_url"$>?__mode=view&amp;_type=<mt:var name="object_type">&amp;id=<$mt:var name="id"$>&amp;blog_id=<$mt:var name="blog_id"$>" title="<$mt:var name="file_name"$>"> + <mt:if name="has_thumbnail"> + <img src="<mt:var name="thumbnail_url" escape="html">" width="<mt:var name="thumbnail_width" escape="html">" height="<mt:var name="thumbnail_height" escape="html">"<mt:if name="thumbnail_width"> style="padding: <$mt:var name="thumbnail_height_offset"$>px <$mt:var name="thumbnail_width_offset"$>px"</mt:if> /> + <mt:else> + <span><__trans phrase="No thumbnail image"></span> + </mt:if> + </a> + <mt:if name="has_thumbnail"> + <a href="javascript:void(0)" onclick="return toggleAssetDetails('<mt:var name="id">');" class="asset-preview-link"><span><__trans phrase="Preview"></span></a> + </mt:if> </mt:if> + </div> + </div> + </td> + <td> + <a href="<$mt:var name="script_url"$>?__mode=view&amp;_type=<mt:var name="object_type">&amp;id=<$mt:var name="id"$>&amp;blog_id=<$mt:var name="blog_id"$>" title="<$mt:var name="file_name"$>"><$mt:var name="label" escape="html"$></a> + <div class="as-asset-type"><mt:if name="file_is_missing"><__trans phrase="[_1] is missing" params="<mt:var name="asset_class" escape="html">"><mt:else><mt:var name="asset_class" escape="html"></mt:if></div> <div id="asset-<mt:var name="id">-preview" class="asset-preview"> <div id="asset-<mt:var name="id">-preview-inner" class="asset-preview-inner"></div> </div> </td> - <td class="as-asset-type"><mt:var name="asset_class" escape="html"></td> <mt:unless name="edit_blog_id"> <td><a href="<mt:var name="script_url">?__mode=list_assets&amp;blog_id=<mt:var name="blog_id">"><mt:var name="blog_name" escape="html"></a></td> </mt:unless> + <td class="as-file-size" title="<mt:var name="file_size">"> + <mt:if name="class" eq="image"> + <mt:var name="image_width" escape="html"> &times; <mt:var name="image_height" escape="html">px<br /> + </mt:if> <mt:if name="file_size_formatted"> - <td class="as-file-size"><span title="<mt:var name="file_size">"><mt:var name="file_size_formatted"></span></td> + <mt:var name="file_size_formatted"> <mt:else> - <td class="as-file-size"><mt:var name="file_size"></td> + <mt:var name="file_size"> </mt:if> + </td> <td class="as-created-by"><mt:if name="created_by"><mt:var name="created_by"><mt:else><em><__trans phrase="System"></em></mt:if></td> <td><span title="<mt:var name="created_on_formatted">"><mt:if name="created_on_relative"><mt:if name="dates_relative"><mt:var name="created_on_relative"><mt:else><mt:var name="created_on_formatted"></mt:if><mt:else><mt:var name="created_on_formatted"></mt:if></span></td> - <td class="status-view"><mt:if name="url"><a href="<mt:var name="url">" target="view_uploaded" title="<__trans phrase="View">"><img src="<mt:var name="static_uri">images/spacer.gif" alt="<__trans phrase="View">" width="13" height="9" /></a><mt:else>&nbsp;</mt:if></td> + <td class="si status-view"><mt:if name="url"><a href="<mt:var name="url">" target="view_uploaded" title="<__trans phrase="View">"><img src="<mt:var name="static_uri">images/spacer.gif" alt="<__trans phrase="View">" width="13" height="9" /></a><mt:else>&nbsp;</mt:if></td> </tr> <mt:if __last__> </tbody> tmpl/cms/include/asset_table.tmpl @@ -35,9 +35,9 @@ <td align="right"><mt:if name="can_edit_entries"><a href="<mt:var name="script_url">?__mode=list_pings&amp;blog_id=<mt:var name="id">"><mt:var name="num_pings"></a><mt:else><mt:var name="num_pings"></mt:if></td> <td align="right"><mt:var name="num_authors"></td> <td><mt:if name="can_edit_config"><a href="<mt:var name="script_url">?__mode=cfg_prefs&amp;blog_id=<mt:var name="id">"><__trans phrase="Settings"></a><mt:else>&nbsp;</mt:if></td> - <mt:unless name="mode_search_replace"><mt:unless name="is_administrator"><mt:if name="can_administer_blog"> + <mt:unless name="mode_search_replace"><mt:if name="is_administrator"> <td><a href="javascript:void(0)" onclick="doRemoveBlog('<mt:var name="id">'); return false;"><img src="<mt:var name="static_uri">images/nav_icons/mini/delete.gif" width="9" height="11" alt="<__trans phrase="Delete">" /></a></td> - <mt:else><td>&nbsp;</td></mt:if></mt:unless></mt:unless> + <mt:else><td>&nbsp;</td></mt:if></mt:unless> </tr> <mt:if name="__last__"> </tbody> tmpl/cms/include/blog_table.tmpl @@ -1,4 +1,4 @@ -<mt:if name="BLOG_ID"> +<mt:if name="BLOG_ID"><mt:setvarblock id="more_items" name="more_items"></mt:setvarblock> <ul> <li<mt:if name="general-settings"> class="active"</mt:if>><a href="<mt:var name="SCRIPT_URL">?__mode=cfg_prefs&amp;blog_id=<mt:var name="BLOG_ID">"><__trans phrase="General"></a></li> <li<mt:if name="publishing"> class="active"</mt:if>><a href="<mt:var name="SCRIPT_URL">?__mode=cfg_archives&amp;blog_id=<mt:var name="BLOG_ID">"><__trans phrase="Publishing"></a></li> @@ -11,5 +11,6 @@ <mt:if name="show_ip_info"> <li<mt:if name="ip_info"> class="active"</mt:if>><a href="<mt:var name="SCRIPT_URL">?__mode=list&amp;_type=banlist&amp;blog_id=<mt:var name="BLOG_ID">"><__trans phrase="IP Banning"></a></li> </mt:if> + <mt:var name="more_items"> </ul> </mt:if> tmpl/cms/include/cfg_content_nav.tmpl @@ -1,7 +1,8 @@ -<mt:if name="IS_ADMINISTRATOR"> +<mt:if name="IS_ADMINISTRATOR"><mt:setvarblock id="more_items" name="more_items"></mt:setvarblock> <ul> <li<mt:if name="system-general-settings"> class="active"</mt:if>><a href="<mt:var name="SCRIPT_URL">?__mode=cfg_system"><__trans phrase="General"></a></li> <li<mt:if name="system-user-settings"> class="active"</mt:if>><a href="<mt:var name="SCRIPT_URL">?__mode=cfg_system_users"><__trans phrase="User"></a></li> <li<mt:if name="system-feedback-settings"> class="active"</mt:if>><a href="<mt:var name="SCRIPT_URL">?__mode=cfg_system_feedback"><__trans phrase="Feedback"></a></li> + <mt:var name="more_items"> </ul> </mt:if> tmpl/cms/include/cfg_system_content_nav.tmpl @@ -18,7 +18,7 @@ <!--[if IE]> <link rel="stylesheet" href="<$mt:var name="static_uri"$>css/hacks/ie.css?v=<mt:var name="mt_version" escape="url">" type="text/css" /> <![endif]--> -<mt:if name="local_lang_id"> +<mt:if name="local_lang_id" ne="en-us"> <link rel="stylesheet" href="<$mt:var name="static_uri"$>styles_<$mt:var name="local_lang_id"$>.css?v=<mt:var name="mt_version" escape="url">" /> </mt:if> @@ -27,6 +27,9 @@ </mt:setvarblock> <$mt:var name="html_head"$> <script type="text/javascript" src="<$mt:var name="static_uri"$>mt.js?v=<mt:var name="mt_version" escape="url">"></script> +<mt:if name="local_lang_id" ne="en-us"> +<script type="text/javascript" src="<$mt:var name="static_uri"$>mt_<$mt:var name="local_lang_id"$>.js?v=<mt:var name="mt_version" escape="URL">" charset="utf-8"></script> +</mt:if> <script language="javascript" type="text/javascript"> <!-- tmpl/cms/include/chromeless_header.tmpl @@ -3,29 +3,29 @@ <mt:if name="state_editable"><a href="javascript:void(0)" onclick="doForMarkedInThisWindow(getByID('<$mt:var name="object_type"$>-listing-form'), '<__trans phrase="comment" escape="js">', '<__trans phrase="comments" escape="js">', 'id', 'approve_item', {}, '<__trans phrase="to publish" escape="js">'); return false;" accesskey="a" - title="<__trans phrase="Publish selected [_1] (a)" params="<$mt:var name="object_label_plural"$>">" + title="<__trans phrase="Publish selected [lc,_1] (a)" params="<$mt:var name="object_label_plural"$>">" ><__trans phrase="Publish"></a></mt:if> </mt:unless> <a href="javascript:void(0)" onclick="doRemoveItems(getByID('<$mt:var name="object_type"$>-listing-form'), '<__trans phrase="comment" escape="js">', '<__trans phrase="comments" escape="js">'); return false;" accesskey="x" - title="<__trans phrase="Delete selected [_1] (x)" params="<$mt:var name="object_label_plural"$>">" + title="<__trans phrase="Delete selected [lc,_1] (x)" params="<$mt:var name="object_label_plural"$>">" ><__trans phrase="Delete"></a> <mt:unless name="filter_spam"> <mt:if name="state_editable"><a href="javascript:void(0)" onclick="doItemsAreJunk(getByID('<$mt:var name="object_type"$>-listing-form'), '<__trans phrase="comment" escape="js">', '<__trans phrase="comments" escape="js">'); return false;" accesskey="j" - title="<__trans phrase="Report selected [_1] as Spam (j)" params="<$mt:var name="object_label_plural"$>">" + title="<__trans phrase="Report selected [lc,_1] as Spam (j)" params="<$mt:var name="object_label_plural"$>">" ><__trans phrase="Spam"></a></mt:if> <mt:else> <mt:if name="state_editable"><a href="javascript:void(0)" onclick="doItemsAreNotJunk(getByID('<$mt:var name="object_type"$>-listing-form'), '<__trans phrase="comment" escape="js">', '<__trans phrase="comments" escape="js">'); return false;" accesskey="j" - title="<__trans phrase="Report selected [_1] as Not Spam and Publish (j)" params="<$mt:var name="object_label_plural"$>">" + title="<__trans phrase="Report selected [lc,_1] as Not Spam and Publish (j)" params="<$mt:var name="object_label_plural"$>">" ><__trans phrase="Not Spam"></a></mt:if> <mt:if name="can_empty_junk"><a href="javascript:void(0)" mt:command="submit" mt:mode="empty_junk" mt:confirm-msg="<__trans phrase="Are you sure you want to remove all comments reported as spam?">" - title="<__trans phrase="Deletes all [_1] reported as Spam" params="<$mt:var name="object_label_plural"$>">" + title="<__trans phrase="Deletes all [lc,_1] reported as Spam" params="<$mt:var name="object_label_plural"$>">" ><__trans phrase="Empty"></a></mt:if> </mt:unless> <mt:if name="is_ip_filter"> @@ -89,7 +89,7 @@ <mt:var name="comment_short" escape="html"> </mt:if> </mt:if> - <mt:if name="reply_count"><mt:if name="reply_count" eq="1"><__trans phrase="(1 reply)"><mt:else><__trans phrase="([_1] replies)" params="<mt:var name="reply_count">"></mt:if></mt:if> + <mt:if name="reply_count"><__trans phrase="([quant,_1,reply,replies])" params="<mt:var name="reply_count">"></mt:if> <mt:unless name="view_expanded"> <mt:if name="has_edit_access"><mt:if name="visible"><span id="replyto_<mt:var name="id">" style="visibility: hidden; margin-left: 10px"><a href="javascript:void(0)" onclick="return openDialog(this.form, 'dialog_post_comment', 'reply_to=<mt:var name="id">&amp;magic_token=<mt:var name="magic_token" encode="url">&amp;blog_id=<mt:var name="blog_id"><mt:if name="return_args">&amp;return_args=<mt:var name="return_args" escape="url"></mt:if>')"><__trans phrase="Reply"></a></span></mt:if></mt:if> </mt:unless> @@ -123,7 +123,7 @@ </mt:if> </mt:if> <mt:if name="auth_icon_url"><img style="background-image: none" src="<mt:var name="auth_icon_url">" height="9" width="9" alt="" border="0" /></mt:if> - <a href="<mt:var name="script_url">?__mode=view&amp;_type=commenter&amp;blog_id=<mt:var name="blog_id">&amp;id=<mt:var name="commenter_id">" class="icon-right icon-right-wide icon-<mt:if name="commenter_approved">trusted<mt:else><mt:if name="commenter_banned">banned<mt:else>authenticated</mt:if></mt:if>" title="<__trans phrase="Edit this [_1] commenter" params="<$mt:var name="commenter_status" escape="html"$>">"><mt:var name="author" escape="html"></a> + <a href="<mt:var name="script_url">?__mode=view&amp;_type=commenter&amp;blog_id=<mt:var name="blog_id">&amp;id=<mt:var name="commenter_id">" class="icon-right-wide icon-<mt:if name="commenter_approved">trusted<mt:else><mt:if name="commenter_banned">banned<mt:else>authenticated</mt:if></mt:if>" title="<__trans phrase="Edit this [_1] commenter" params="<$mt:var name="commenter_status" escape="html"$>">"><mt:var name="author" escape="html"></a> <mt:else> <mt:if name="author"> <mt:if name="auth_icon_url"><img src="<mt:var name="auth_icon_url">" height="9" width="9" alt="" border="0" /></mt:if><a href="<mt:var name="script_url">?__mode=search_replace&amp;_type=comment&amp;search_cols=author&amp;is_limited=1&amp;do_search=1&amp;search=<mt:var name="author" escape="url">&amp;blog_id=<mt:var name="blog_id">" title="<__trans phrase="Search for comments by this commenter">"><mt:var name="author_display" escape="html"></a> @@ -138,7 +138,7 @@ </mt:if> <td class="entry"> <mt:if name="entry_title"> - <a href="<mt:var name="script_url">?__mode=view&amp;_type=<mt:var name="entry_class">&amp;blog_id=<mt:var name="blog_id">&amp;id=<mt:var name="entry_id">" title="<__trans phrase="View this [_1]" params="<mt:var name="entry_class_label" lower_case="1">">"><mt:var name="entry_title" escape="html"></a> + <a href="<mt:var name="script_url">?__mode=view&amp;_type=<mt:var name="entry_class">&amp;blog_id=<mt:var name="blog_id">&amp;id=<mt:var name="entry_id">" title="<__trans phrase="View this [lc,_1]" params="<mt:var name="entry_class_label">">"><mt:var name="entry_title" escape="html"></a> <mt:else> &nbsp; </mt:if> tmpl/cms/include/comment_table.tmpl @@ -1,8 +1,8 @@ +<$mt:setvar name="show_display_options_link" value="1"$> <mtapp:widget id="display-options-widget" - label="<__trans phrase="Display Options">" - label_link="javascript:void(0)" - label_onclick="return toggleEntryDisplayOptions();"> + class="display-options-widget autolayout-flyout-smart hidden" + label="<__trans phrase="Display Options">"> <form method="get" action="<mt:var name="SCRIPT_URL">" id="display-options-form"> <input type="hidden" name="__mode" value="update_list_prefs" /> <input type="hidden" name="_type" value="<mt:var name="OBJECT_TYPE">" /> @@ -12,13 +12,10 @@ label="<__trans phrase="_DISPLAY_OPTIONS_SHOW">" label_class="display-options"> <select name="limit"> - <option value="5"<mt:if name="LIMIT_5"> selected="selected"</mt:if>><__trans phrase="[quant,_1,row,rows]" params="5"></option> - <option value="10"<mt:if name="LIMIT_10"> selected="selected"</mt:if>><__trans phrase="[quant,_1,row,rows]" params="10"></option> - <option value="15"<mt:if name="LIMIT_15"> selected="selected"</mt:if>><__trans phrase="[quant,_1,row,rows]" params="15"></option> - <option value="20"<mt:if name="LIMIT_20"> selected="selected"</mt:if>><__trans phrase="[quant,_1,row,rows]" params="20"></option> + <option value="25"<mt:if name="LIMIT_25"> selected="selected"</mt:if>><__trans phrase="[quant,_1,row,rows]" params="25"></option> <option value="50"<mt:if name="LIMIT_50"> selected="selected"</mt:if>><__trans phrase="[quant,_1,row,rows]" params="50"></option> - <option value="75"<mt:if name="LIMIT_75"> selected="selected"</mt:if>><__trans phrase="[quant,_1,row,rows]" params="75"></option> <option value="100"<mt:if name="LIMIT_100"> selected="selected"</mt:if>><__trans phrase="[quant,_1,row,rows]" params="100"></option> + <option value="200"<mt:if name="LIMIT_200"> selected="selected"</mt:if>><__trans phrase="[quant,_1,row,rows]" params="200"></option> </select> </mtapp:setting> @@ -61,8 +58,7 @@ <a href="javascript:void(0)" mt:command="submit" title="<__trans phrase="Save display options">" ><__trans phrase="Save"></a> - <a href="javascript:void(0)" - onclick="toggleEntryDisplayOptions()" + <a href="javascript:void(0)" mt:command="close-flyout" title="<__trans phrase="Close display options">" ><__trans phrase="Cancel"></a> </div> tmpl/cms/include/display_options.tmpl @@ -4,39 +4,39 @@ <mt:if name="object_type" eq="entry"> <mt:if name="is_power_edit"> <a href="javascript:void(0)" mt:command="submit" mt:mode="save_entries" accesskey="s" - title="<__trans phrase="Save these [_1] (s)" params="<mt:var name="object_label_plural" lower_case="1">">" + title="<__trans phrase="Save these [lc,_1] (s)" params="<mt:var name="object_label_plural">">" ><__trans phrase="Save"></a> <mt:else> - <mt:if name="can_rebuild"> + <mt:if name="can_republish"> <a href="javascript:void(0)" onclick="doForMarkedInThisWindow(getByID('<$mt:var name="object_type"$>-listing-form'), '<mt:var name="object_label" lower_case="1" escape="js">', '<mt:var name="object_label_plural" lower_case="1" escape="js">', null, 'rebuild_new_phase', {<mt:if name="blog_id">'blog_id': '<mt:var name="blog_id">'</mt:if>}, '<__trans phrase="to republish" escape="js">'); return false;" accesskey="r" - title="<__trans phrase="Republish selected [_1] (r)" params="<mt:var name="object_label_plural" lower_case="1">">" + title="<__trans phrase="Republish selected [lc,_1] (r)" params="<mt:var name="object_label_plural">">" ><__trans phrase="Republish"></a> </mt:if> <a href="javascript:void(0)" onclick="doRemoveItems(getByID('<$mt:var name="object_type"$>-listing-form'), '<mt:var name="object_label" lower_case="1" escape="js">', '<mt:var name="object_label_plural" lower_case="1" escape="js">'); return false;" accesskey="x" - title="<__trans phrase="Delete selected [_1] (x)" params="<mt:var name="object_label_plural">">" + title="<__trans phrase="Delete selected [lc,_1] (x)" params="<mt:var name="object_label_plural">">" ><__trans phrase="Delete"></a> </mt:if> <mt:else> <mt:if name="is_power_edit"> <a href="javascript:void(0)" mt:command="submit" mt:mode="save_pages" accesskey="s" - title="<__trans phrase="Save these [_1] (s)" params="<$mt:var name="object_label_plural" lower_case="1"$>">" + title="<__trans phrase="Save these [lc,_1] (s)" params="<$mt:var name="object_label_plural"$>">" ><__trans phrase="Save"></a> <mt:else> - <mt:if name="can_rebuild"> + <mt:if name="can_republish"> <a href="javascript:void(0)" onclick="doForMarkedInThisWindow(getByID('<$mt:var name="object_type"$>-listing-form'), '<__trans phrase="page" escape="js">', '<__trans phrase="pages" escape="js">', null, 'rebuild_new_phase', {<mt:if name="blog_id">'blog_id': '<mt:var name="blog_id">'</mt:if>}, '<__trans phrase="to republish" escape="js">'); return false;" accesskey="r" - title="<__trans phrase="Republish selected [_1] (r)" params="<mt:var name="object_label_plural">">" + title="<__trans phrase="Republish selected [lc,_1] (r)" params="<mt:var name="object_label_plural">">" ><__trans phrase="Republish"></a> </mt:if> <a href="javascript:void(0)" onclick="doRemoveItems(getByID('<$mt:var name="object_type"$>-listing-form'), '<__trans phrase="page" escape="js">', '<__trans phrase="pages" escape="js">'); return false;" name="delete_pages" value="<__trans phrase="Delete">" accesskey="x" - title="<__trans phrase="Delete selected [_1] (x)" params="<mt:var name="object_label_plural">">" + title="<__trans phrase="Delete selected [lc,_1] (x)" params="<mt:var name="object_label_plural">">" ><__trans phrase="Delete"></a> </mt:if> </mt:if> @@ -92,16 +92,16 @@ <mt:else> <td class="status si<mt:if name="status_draft"> status-draft</mt:if><mt:if name="status_publish"> status-publish</mt:if><mt:if name="status_review"> status-review</mt:if><mt:if name="status_future"> status-future</mt:if>"> <mt:if name="status_draft"> - <a href="<$mt:var name="script_url"$>?__mode=list_<mt:var name="object_type"><mt:if name="blog_id">&amp;blog_id=<$mt:var name="blog_id"$></mt:if>&amp;filter=status&amp;filter_val=1" title="<__trans phrase="Only show unpublished [_1]" params="<mt:var name="object_label_plural">">"><img src="<$mt:var name="static_uri"$>images/spacer.gif" alt="<__trans phrase="Unpublished (Draft)">" width="9" height="9" /></a> + <a href="<$mt:var name="script_url"$>?__mode=list_<mt:var name="object_type"><mt:if name="blog_id">&amp;blog_id=<$mt:var name="blog_id"$></mt:if>&amp;filter=status&amp;filter_val=1" title="<__trans phrase="Only show unpublished [lc,_1]" params="<mt:var name="object_label_plural">">"><img src="<$mt:var name="static_uri"$>images/spacer.gif" alt="<__trans phrase="Unpublished (Draft)">" width="9" height="9" /></a> </mt:if> <mt:if name="status_publish"> - <a href="<$mt:var name="script_url"$>?__mode=list_<mt:var name="object_type"><mt:if name="blog_id">&amp;blog_id=<$mt:var name="blog_id"$></mt:if>&amp;filter=status&amp;filter_val=2" title="<__trans phrase="Only show published [_1]" params="<mt:var name="object_label_plural">">"><img src="<$mt:var name="static_uri"$>images/spacer.gif" alt="<__trans phrase="Published">" width="9" height="9" /></a> + <a href="<$mt:var name="script_url"$>?__mode=list_<mt:var name="object_type"><mt:if name="blog_id">&amp;blog_id=<$mt:var name="blog_id"$></mt:if>&amp;filter=status&amp;filter_val=2" title="<__trans phrase="Only show published [lc,_1]" params="<mt:var name="object_label_plural">">"><img src="<$mt:var name="static_uri"$>images/spacer.gif" alt="<__trans phrase="Published">" width="9" height="9" /></a> </mt:if> <mt:if name="status_review"> - <a href="<$mt:var name="script_url"$>?__mode=list_<mt:var name="object_type"><mt:if name="blog_id">&amp;blog_id=<$mt:var name="blog_id"$></mt:if>&amp;filter=status&amp;filter_val=3" title="<__trans phrase="Only show [_1] for review" params="<mt:var name="object_label_plural">">"><img src="<$mt:var name="static_uri"$>images/spacer.gif" alt="<__trans phrase="Unpublished (Review)">" width="9" height="9" /></a> + <a href="<$mt:var name="script_url"$>?__mode=list_<mt:var name="object_type"><mt:if name="blog_id">&amp;blog_id=<$mt:var name="blog_id"$></mt:if>&amp;filter=status&amp;filter_val=3" title="<__trans phrase="Only show [lc,_1] for review" params="<mt:var name="object_label_plural">">"><img src="<$mt:var name="static_uri"$>images/spacer.gif" alt="<__trans phrase="Unpublished (Review)">" width="9" height="9" /></a> </mt:if> <mt:if name="status_future"> - <a href="<$mt:var name="script_url"$>?__mode=list_<mt:var name="object_type"><mt:if name="blog_id">&amp;blog_id=<$mt:var name="blog_id"$></mt:if>&amp;filter=status&amp;filter_val=4" title="<__trans phrase="Only show scheduled [_1]" params="<mt:var name="object_label_plural">">"><img src="<$mt:var name="static_uri"$>images/spacer.gif" alt="<__trans phrase="Scheduled">" width="9" height="9" /></a> + <a href="<$mt:var name="script_url"$>?__mode=list_<mt:var name="object_type"><mt:if name="blog_id">&amp;blog_id=<$mt:var name="blog_id"$></mt:if>&amp;filter=status&amp;filter_val=4" title="<__trans phrase="Only show scheduled [lc,_1]" params="<mt:var name="object_label_plural">">"><img src="<$mt:var name="static_uri"$>images/spacer.gif" alt="<__trans phrase="Scheduled">" width="9" height="9" /></a> </mt:if> </td> </mt:if> @@ -133,7 +133,7 @@ <tr class="<mt:if name="__odd__">odd<mt:else>even</mt:if> slave"> <td>&#160;</td> <td>&#160;</td> - <td><mt:if name="has_edit_access"><a href="<$mt:var name="script_url"$>?__mode=view&amp;_type=<mt:var name="object_type">&amp;id=<$mt:var name="id"$>&amp;blog_id=<$mt:var name="blog_id"$>"><__trans phrase="Edit [_1]" params="<mt:var name="object_label">"></a><mt:else>&#160;</mt:if></td> + <td><mt:if name="has_edit_access"><a href="<$mt:var name="script_url"$>?__mode=view&amp;_type=<mt:var name="object_type">&amp;id=<$mt:var name="id"$>&amp;blog_id=<$mt:var name="blog_id"$>"><__trans phrase="Edit [lc,_1]" params="<mt:var name="object_labe