Changeset 937

Timestamp:

12/16/06 02:56:46 (2 years ago)

Author:

bchoate

Message:

Updates to support asset search within selection dialog; MT::Asset now provides insert options.

Files:

• branches/wheeljack/lib/MT/App/CMS.pm (modified) (15 diffs)
• branches/wheeljack/lib/MT/Asset.pm (modified) (3 diffs)
• branches/wheeljack/lib/MT/Asset/Image.pm (modified) (4 diffs)
• branches/wheeljack/tmpl/cms/asset_image_options.tmpl (added)
• branches/wheeljack/tmpl/cms/dialog_list_assets.tmpl (modified) (3 diffs)
• branches/wheeljack/tmpl/cms/upload_complete.tmpl (modified) (4 diffs)

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

@@ -920 +920 @@
-        my $blog;
-        unless ($blog_id) {
-
-
-
+
-        }
-        $row->{blog_name} = $blog ? $blog->name : '-';
@@ -997 +995 @@
-            can_delete_files => ($blog ? $app->{perms}->can_edit_assets : $app->user->is_superuser),
-            nav_assets => 1,
+            panel_searchable => 1,
+            search_prompt => $app->translate("Search Assets") . ":",
+            #search_type => $app->translate("Assets"),
-        },
-    });
@@ -5490 +5491 @@
-
-sub asset_insert {
-($app, %args) = @_
+$app = shift
-
-    # Just insert text if there are arguments, unless one is
-    # 'is_image' otherwise we are definitely uploading.
-
-
-
+
-    return unless defined $text;
-
-    $app->build_page('asset_insert.tmpl', {
-
-$app->param('edit_field')
+ || ''
+scalar $app->param('edit_field') || ''
-        },
-    );
@@ -5512 +5511 @@
-    defined(my $text = $app->_process_post_upload) or return;
-    $q->param('text', $text);
+    # strip any asset id
+    $q->param('id', 0);
-    $app->edit_object;
-}
@@ -5517 +5518 @@
-sub _process_post_upload {
-    my $app = shift;
+    my %param = $app->param_hash;
+    my $asset;
+    require MT::Asset;
+    $param{id} && ($asset = MT::Asset->load($param{id}))
+        or return $app->errtrans("Invalid request.");
+    $asset->on_upload(\%param);
+    return $app->asset_insert_text(\%param);
+}
+
+sub asset_insert_text {
+    my $app = shift;
+    my ($param) = @_;
-    my $q = $app->param;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    require MT::Asset;
-
-
-
-
-
-
+
+
+
-}
-
@@ -9203 +9032 @@
-
-sub complete_insert {
-
+
+
-
-    my $asset = $args{asset};
@@ -9209 +9039 @@
-        require MT::Asset;
-        $asset = MT::Asset->load($app->param('id')) ||
-, ". $app->param('id') .'.'
-
-No asset to upload
+ #[_1].", $app->param('id')
+
+Invalid request
-
-    $args{is_image} = $asset->isa('MT::Asset::Image') ? 1 : 0
@@ -9217 +9047 @@
-
-    require MT::Blog;
-rgs{blog} || MT::Blog->load($app->param('blog_id')) ||
-, ". $app->param('blog_id') .'.'
-rgs{perms} || $app->{perms} ||
+sset->blog or
+ #[_1].", $app->param('blog_id') 
+pp->{perms} or
-        return $app->errtrans('No permissions');
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -9482 +9293 @@
-
-    if ($is_image) {
-'
+.' . $asset->class
-                          File => $local_file, Url => $url, Size => $bytes,
-                          Asset => $asset,
@@ -9495 +9306 @@
-                          Blog => $blog);
-    } else {
-'
+.' . $asset->class
-                          File => $local_file, Url => $url, Size => $bytes,
-                          Asset => $asset,
@@ -9504 +9315 @@
-    $app->complete_insert(
-        asset => $asset,
-        blog => $blog,
-        bytes => $bytes,
-        perms => $perms,
-    );
-}
@@ -9533 +9342 @@
-    my $res = $app->do_search_replace(@_);
-    $app->add_breadcrumb($app->translate('Search & Replace'));
+    $res->{nav_search} = 1;
-    $app->build_page('search_replace.tmpl', $res);
-}
@@ -9553 +9363 @@
-
-    my $search_api = {
+        'asset' => {
+            'perm_check' => sub {
+                1;
+            },
+            'search_cols' => [ qw(file_name description) ],
+            'replace_cols' => [],
+            'can_replace' => 0,
+            'can_search_by_date' => 1,
+        },
-        'entry' => {
-            'perm_check' => sub {
@@ -9880 +9699 @@
-    if (@data) {
-        my $meth = 'build_' . $type . '_table';
-
+
+
+
+
+
+
+
-    }
-    if ($is_dateranged) {
@@ -9922 +9747 @@
-    $res{'tab_junk'} = 1 if $is_junk;
-    $res{'search_cols_' . $_} = 1 foreach @cols;
-    $res{nav_search} = 1;
-    \%res;
-}

branches/wheeljack/lib/MT/Asset.pm

@@ -189 +189 @@
-        my $blog_id = $asset->blog_id or return undef;
-        require MT::Blog;
-
+
+
-    });
-}
@@ -199 +200 @@
-    # undef is returned from fileparse if the extension is not known.
-    require File::Basename;
-
+
+
-}
-
@@ -258 +260 @@
-
-sub as_html {
-
-
-
+
+
+
+
+
+
+
-    return $text;
+}
+
+# Return a HTML snippet of form options for inserting this asset
+# into a web page. Default behavior is no options.
+sub insert_options {
+    my $asset = shift;
+    my ($param) = @_;
+    return undef;
+}
+
+sub on_upload {
+    my $asset = shift;
+    my ($param) = @_;
+    1;
-}
-

branches/wheeljack/lib/MT/Asset/Image.pm

@@ -7 +7 @@
-package MT::Asset::Image;
-
+use strict;
-use base 'MT::Asset';
-
@@ -39 +40 @@
-    my $file = $asset->file_name;
-    $file =~ s!\.[a-z]+$!!i;
-
+my 
-    my @thumbinfo = stat($thumbnail);
-
@@ -48 +49 @@
-
-    # stale or non-existent thumbnail. let's create one!
-
-
+
-    return undef unless $blog;
-    my $fmgr = $blog->file_mgr;
@@ -103 +103 @@
-
-sub as_html {
-
+
+
-
-    my $text = '';
-
-
+
+
-
-    my $thumb = undef;
-
-
-
-
+
+
+
+
+
-            );
-    }
-
-
+
+
+
+
+
+
-        my $link = $thumb
-
-
+
+
+
+
-              )
-'<MT_TRANS phrase="View image">'
+MT->translate('View image')
-        $text = sprintf(
-            q|<a href="%s" onclick="window.open('%s','popup','width=%d,height=%d,scrollbars=no,resizable=no,toolbar=no,directories=no,location=no,menubar=no,status=no,left=0,top=0'); return false">%s</a>|,
-
+
+
+
-        );
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-            $text = sprintf(
-
-
+
+
+
+
+
-            );
-
-
+
+
+
+
+
+
-            $text = sprintf(
-
-
+
+
+
+
-            );
-        }
-
-
+
-        $text = sprintf(
-
+
+
-        );
-    }
-
-    return $text;
+}
+
+# Return a HTML snippet of form options for inserting this asset
+# into a web page. Default behavior is no options.
+sub insert_options {
+    my $asset = shift;
+    my ($param) = @_;
+
+    my $app = MT->instance;
+    my $perms = $app->{perms};
+    my $blog = $asset->blog or return;
+
+    eval { require MT::Image; MT::Image->new or die; };
+    $param->{do_thumb} = $@ ? 0 : 1;
+
+    $param->{can_save_image_defaults} = $perms->can_save_image_defaults ? 1 : 0;
+    $param->{constrain} = $blog->image_default_constrain ? 1 : 0;
+    $param->{popup} = $blog->image_default_popup ? 1 : 0;
+    $param->{image_defaults} = $blog->image_default_set ? 1 : 0;
+    $param->{wrap_text} = $blog->image_default_wrap_text ? 1 : 0;
+    $param->{make_thumb} = $blog->image_default_thumb ? 1 : 0;
+    $param->{'align_'.$_} = $blog->image_default_align eq $_ ? 1 : 0
+        for qw(left center right);
+    $param->{'unit_w'.$_} = $blog->image_default_wunits eq $_ ? 1 : 0
+        for qw(percent pixels);
+    $param->{'unit_h'.$_} = $blog->image_default_hunits eq $_ ? 1 : 0
+        for qw(percent pixels);
+    $param->{thumb_width} = $blog->image_default_width || $asset->image_width || 0;
+    $param->{thumb_height} = $blog->image_default_height || $asset->image_height || 0;
+
+    return $app->build_page('asset_image_options.tmpl', $param);
+}
+
+sub on_upload {
+    my $asset = shift;
+    my ($param) = @_;
+
+    my $app = MT->instance;
+    require MT::Util;
+
+    my $url = $asset->url;
+    my $width = $asset->image_width;
+    my $height = $asset->image_height;
+
+    my ($base_url, $fname) = $url =~ m|(.*)/([^/]*)|;
+    $url = $base_url . '/' . $fname; # no need to re-encode filename; url is already encoded
+    my $blog = $asset->blog or return;
+    my $blog_id = $blog->id;
+
+    my($thumb, $thumb_width, $thumb_height);
+    # Save new defaults if requested.
+    if($param->{image_defaults}) {
+        return $app->error($app->translate(
+            'Permission denied setting image defaults for blog #[_2]', $blog_id
+        )) unless $app->{perms}->can_save_image_defaults;
+        $blog->image_default_set(1);
+        $blog->image_default_wrap_text($param->{wrap_text} ? 1 : 0);
+        $blog->image_default_align($param->{align} || MT::Blog::ALIGN());
+        $blog->image_default_thumb($param->{thumb} ? 1 : 0);
+        $blog->image_default_width($param->{thumb_width} || MT::Blog::WIDTH());
+        $blog->image_default_wunits($param->{thumb_width_type} || MT::Blog::UNITS());
+        $blog->image_default_height($param->{thumb_height} || MT::Blog::WIDTH());
+        $blog->image_default_hunits($param->{thumb_height_type} || MT::Blog::UNITS());
+        $blog->image_default_constrain($param->{constrain} ? 1 : 0);
+        $blog->image_default_popup($param->{popup} ? 1 : 0);
+        $blog->save;
+    }
+
+    # Thumbnail creation
+    if ($thumb = $param->{thumb}) {
+        require MT::Image;
+        my $base_path = $param->{site_path} ?
+            $blog->site_path : $blog->archive_path;
+        my $file = $param->{fname};
+        if ($file =~ m!\.\.|\0|\|!) {
+            return $app->error($app->translate("Invalid filename '[_1]'", $file));
+        }
+        my $i_file = File::Spec->catfile($base_path, $file);
+        ## Untaint. We checked $file for security holes above.
+        ($i_file) = $i_file =~ /(.+)/s;
+        my $fmgr = $blog->file_mgr;
+        my $data = $fmgr->get_data($i_file, 'upload')
+            or return $app->error($app->translate(
+                "Reading '[_1]' failed: [_2]", $i_file, $fmgr->errstr));
+        my $image_type = scalar $param->{image_type};
+        my $img = MT::Image->new( Data => $data,
+                                  Type => $image_type )
+            or return $app->error($app->translate(
+                "Thumbnail failed: [_1]", MT::Image->errstr));
+        my($w, $h) = map $param->{$_}, qw( thumb_width thumb_height );
+        (my($blob), $thumb_width, $thumb_height) =
+            $img->scale( Width => $w, Height => $h )
+            or return $app->error($app->translate("Thumbnail failed: [_1]",
+                $img->errstr));
+        require File::Basename;
+        my($base, $path, $ext) = File::Basename::fileparse($i_file, '\.[^.]*');
+        my $t_file = $path . $base . '-thumb' . $ext;
+        my $basename = $base . '-thumb' . $ext;
+        ## If the thumbnail filename already exists, we don't want to overwrite
+        ## it, because it could contain valuable data; so we'll just make
+        ## sure to generate the name uniquely.
+        my $i = 0;
+        while ($fmgr->exists($t_file)) {
+            $t_file = File::Spec->catfile($path . $base . '-thumb' . (++$i) . $ext);
+        }
+        $fmgr->put_data($blob, $t_file, 'upload')
+            or return $app->error($app->translate(
+                "Error writing to '[_1]': [_2]", $t_file, $fmgr->errstr));
+
+        $file =~ s/\Q$base$ext\E$//;
+        my $url = $param->{site_path} ? $blog->site_url : $blog->archive_url;
+        $url .= '/' unless $url =~ m!/$!;
+        $url .= $file;
+        $thumb = $url . MT::Util::encode_url($base . '-thumb' . $ext);
+
+        my $img_pkg = MT::Asset->class_handler('image');
+        my $asset_thumb = new $img_pkg;
+        my $original = $asset_thumb->clone;
+        $asset_thumb->blog_id($blog_id);
+        $asset_thumb->url($thumb);
+        $asset_thumb->file_path($t_file);
+        $asset_thumb->file_name($basename);
+        my $ext2 = $ext;
+        $ext2 =~ s/^\.//;
+        $asset_thumb->file_ext($ext2);
+        $asset_thumb->image_width($thumb_width);
+        $asset_thumb->image_height($thumb_height);
+        $asset_thumb->created_by($app->user->id);
+        $asset_thumb->save;
+        MT->run_callbacks('CMSPostSave.asset', $app, $asset_thumb, $original);
+
+        $param->{thumb_asset_id} = $asset_thumb->id;
+
+        MT->run_callbacks('CMSUploadFile.thumbnail',
+                          File => $t_file, Url => $thumb, Size => length($blob),
+                          Asset => $asset_thumb,
+                          Type => 'thumbnail',
+                          Blog => $blog);
+
+        MT->run_callbacks('CMSUploadImage.thumbnail',
+                          File => $t_file, Url => $thumb,
+                          Asset => $asset_thumb,
+                          Width => $thumb_width, Height => $thumb_height,
+                          ImageType => $image_type,
+                          Size => length($blob),
+                          Type => 'thumbnail',
+                          Blog => $blog);
+    }
+    if ($param->{popup}) {
+        require MT::Template;
+        if (my $tmpl = MT::Template->load({ blog_id => $blog_id,
+                                            type => 'popup_image' })) {
+            (my $rel_path = $param->{fname}) =~ s!\.[^.]*$!!;
+            if ($rel_path =~ m!\.\.|\0|\|!) {
+                return $app->error($app->translate(
+                    "Invalid basename '[_1]'", $rel_path));
+            }
+            my $ext = $blog->file_extension || '';
+            $ext = '.' . $ext if $ext ne '';
+            require MT::Template::Context;
+            my $ctx = MT::Template::Context->new;
+            $ctx->stash('blog', $blog);
+            $ctx->stash('blog_id', $blog->id);
+            $ctx->stash('asset', $asset);
+            $ctx->stash('image_url', $url);
+            $ctx->stash('image_width', $width);
+            $ctx->stash('image_height', $height);
+            my $popup = $tmpl->build($ctx) or die $tmpl->errstr;
+            my $fmgr = $blog->file_mgr;
+            my $root_path = $param->{site_path} ?
+                $blog->site_path : $blog->archive_path;
+            my $abs_file_path = File::Spec->catfile($root_path, $rel_path . $ext);
+
+            ## If the popup filename already exists, we don't want to overwrite
+            ## it, because it could contain valuable data; so we'll just make
+            ## sure to generate the name uniquely.
+            my($i, $rel_path_ext) = (0, $rel_path . $ext);
+            while ($fmgr->exists($abs_file_path)) {
+                $rel_path_ext = $rel_path . ++$i . $ext;
+                $abs_file_path = File::Spec->catfile($root_path, $rel_path_ext);
+            }
+            my ($vol, $dirs, $basename) = File::Spec->splitpath($rel_path_ext);
+            my $rel_url_ext = File::Spec->catpath($vol, $dirs, MT::Util::encode_url($basename));
+ 
+            ## Untaint. We have checked for security holes above, so we
+            ## should be safe.
+            ($abs_file_path) = $abs_file_path =~ /(.+)/s;
+            $fmgr->put_data($popup, $abs_file_path, 'upload')
+                or return $app->error($app->translate(
+                   "Error writing to '[_1]': [_2]", $abs_file_path,
+                                                     $fmgr->errstr));
+            $url = $param->{site_path} ?
+                $blog->site_url : $blog->archive_url;
+            $url .= '/' unless $url =~ m!/$!;
+            $rel_url_ext =~ s!^/!!;
+            $url .= $rel_url_ext;
+
+            my $html_pkg = MT::Asset->handler_for_file($abs_file_path);
+            my $asset_html = new $html_pkg;
+            my $original = $asset_html->clone;
+            $asset_html->blog_id($blog_id);
+            $asset_html->url($url);
+            $asset_html->file_path($abs_file_path);
+            $asset_html->file_name($basename);
+            $asset_html->file_ext($blog->file_extension);
+            $asset_html->created_by($app->user->id);
+            $asset_html->save;
+            MT->run_callbacks('CMSPostSave.asset', $app, $asset_html, $original);
+
+            MT->run_callbacks('CMSUploadFile.popup',
+                          File => $abs_file_path, Url => $url,
+                          Asset => $asset_html,
+                          Size => length($popup),
+                          Type => 'popup',
+                          Blog => $blog);
+        }
+    }
+    1;
-}
-

branches/wheeljack/tmpl/cms/dialog_list_assets.tmpl

@@ -33 +33 @@
-        // setup
-        dlg = new Dialog.Simple("list-assets");
-s
+
-        dlg.panel = panel;
+
+        // hook into view updates so we can close any opened detail panel
-        var old_update = panel.datasource.onUpdate;
-        panel.datasource.onUpdate = function(ds) { viewChange(ds, old_update) };
+
-        panel.pager.setState(<TMPL_VAR NAME=PAGER_JSON>);
-        panel.parent = dlg;
@@ -45 +48 @@
-</script>
-
-s
+
-
-<h2><span class="weblog-title-highlight"><TMPL_IF NAME=EDIT_BLOG_ID><TMPL_VAR NAME=BLOG_NAME ESCAPE=HTML><TMPL_ELSE><MT_TRANS phrase="System-wide"></TMPL_IF>: </span> <MT_TRANS phrase="Assets"></h2>
@@ -59 +62 @@
-</TMPL_IF>
-</p>
+
+<div class="search-box">
+    <TMPL_IF PANEL_SEARCHABLE>
+    <form action="" method="get">
+        <p class="page-desc"><TMPL_VAR NAME=SEARCH_PROMPT>
+        <input type="text" class="search-input"<TMPL_UNLESS PANEL_SEARCHABLE> disabled="disabled"</TMPL_UNLESS> />
+        <input type="image" class="search-command" src="<TMPL_VAR NAME=STATIC_URI>images/nav_icons/color/search.gif" title="<MT_TRANS phrase="Search">" />
+        <input type="button" class="search-reset hidden" value="<MT_TRANS phrase="View All">" />
+    </p></form>
+    <TMPL_ELSE>
+    <p class="page-desc">&nbsp;<img border="0" src="<TMPL_VAR NAME=STATIC_URI>images/spacer.gif" width="17" height="20"></p>
+    </TMPL_IF>
+</div>
-
-<div class="list-wrapper">

branches/wheeljack/tmpl/cms/upload_complete.tmpl

@@ -4 +4 @@
-<!--
-
-doClick (f, trigger
+presubmit(f
-    var mode = 'list_assets';
-<TMPL_IF NAME=ENTRY_INSERT>
@@ -10 +10 @@
-<TMPL_ELSE>
-<TMPL_IF NAME=CAN_POST>
-
+ && f.new_entry
-</TMPL_IF>
-</TMPL_IF>
-
-
-
-
-
-
-
-
-
-
+
+
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-