modules/swfupload/info.yaml modules/swfupload/lib/FlashDevelop/Core Changelog.txt modules/swfupload/lib/FlashDevelop/Flash8/Delegate.as modules/swfupload/lib/FlashDevelop/Flash8/ExternalCall.as modules/swfupload/lib/FlashDevelop/Flash8/FileItem.as modules/swfupload/lib/FlashDevelop/Flash8/SWFUpload v2.as2proj modules/swfupload/lib/FlashDevelop/Flash8/SWFUpload.as modules/swfupload/lib/FlashDevelop/Flash8/deploy.bat modules/swfupload/lib/FlashDevelop/Flash8/swfupload_f8.swf modules/swfupload/lib/FlashDevelop/Flash9/ExternalCall.as modules/swfupload/lib/FlashDevelop/Flash9/FileItem.as modules/swfupload/lib/FlashDevelop/Flash9/SWFUpload v2.as3proj modules/swfupload/lib/FlashDevelop/Flash9/SWFUpload.as modules/swfupload/lib/FlashDevelop/Flash9/SWFUpload.as.bak modules/swfupload/lib/FlashDevelop/Flash9/deploy.bat modules/swfupload/lib/FlashDevelop/Flash9/obj/SWFUpload-v2Config.old modules/swfupload/lib/FlashDevelop/Flash9/obj/SWFUpload-v2Config.xml modules/swfupload/lib/FlashDevelop/Flash9/swfupload_f9.swf modules/swfupload/lib/FlashDevelop/SWFObject License.txt modules/swfupload/lib/FlashDevelop/deploy.bat modules/swfupload/lib/FlashDevelop/license.txt modules/swfupload/lib/FlashDevelop/plugins/swfupload.cookies.js modules/swfupload/lib/FlashDevelop/plugins/swfupload.graceful_degradation.js modules/swfupload/lib/FlashDevelop/plugins/swfupload.queue.js modules/swfupload/lib/FlashDevelop/plugins/swfupload.swfobject.js modules/swfupload/lib/FlashDevelop/plugins/swfupload.v102/swfupload.v102.accept.png modules/swfupload/lib/FlashDevelop/plugins/swfupload.v102/swfupload.v102.add.png modules/swfupload/lib/FlashDevelop/plugins/swfupload.v102/swfupload.v102.callbacks.js modules/swfupload/lib/FlashDevelop/plugins/swfupload.v102/swfupload.v102.cancel.png modules/swfupload/lib/FlashDevelop/plugins/swfupload.v102/swfupload.v102.js modules/swfupload/lib/FlashDevelop/plugins/swfupload.v102/swfupload.v102.progressbar.png modules/swfupload/lib/FlashDevelop/plugins/swfupload.v102/swfupload.v102.theme.css modules/swfupload/lib/FlashDevelop/swfupload.js modules/swfupload/lib/fileprogress.js modules/swfupload/lib/handlers.js modules/swfupload/lib/index.php modules/swfupload/style.css modules/swfupload/swfupload.php modules/swfupload/upload_handler.php @@ -22,13 +22,24 @@ $this->respondTo("feed_item", "enclose_mp3"); $this->respondTo("filter_post", "filter_post"); } + public function __init() { + if (!ADMIN or !isset($_GET['action']) or !isset($_GET['feather'])) + return; + if ($_GET['action'] != "write_post" or $_GET['feather'] != "audio") + return; + + Trigger::current()->call("prepare_swfupload", "audio", "*.mp3"); + } public function submit() { - if (isset($_FILES['audio']) and $_FILES['audio']['error'] == 0) - $filename = upload($_FILES['audio'], "mp3"); - elseif (!empty($_POST['from_url'])) - $filename = upload_from_url($_POST['from_url'], "mp3"); - else - error(__("Error"), __("Couldn't upload audio file.")); + if (!isset($_POST['filename'])) { + if (isset($_FILES['audio']) and $_FILES['audio']['error'] == 0) + $filename = upload($_FILES['audio'], "mp3"); + elseif (!empty($_POST['from_url'])) + $filename = upload_from_url($_POST['from_url'], "mp3"); + else + error(__("Error"), __("Couldn't upload audio file.")); + } else + $filename = $_POST['filename']; return Post::add(array("filename" => $filename, "description" => $_POST['description']), @@ -38,14 +49,17 @@ public function update() { $post = new Post($_POST['id']); - if (isset($_FILES['audio']) and $_FILES['audio']['error'] == 0) { - $this->delete_file($post); - $filename = upload($_FILES['audio'], "mp3"); - } elseif (!empty($_POST['from_url'])) { - $this->delete_file($post); - $filename = upload_from_url($_POST['from_url'], "mp3"); - } else - $filename = $post->filename; + if (!isset($_POST['filename'])) + if (isset($_FILES['audio']) and $_FILES['audio']['error'] == 0) { + $this->delete_file($post); + $filename = upload($_FILES['audio'], "mp3"); + } elseif (!empty($_POST['from_url'])) { + $this->delete_file($post); + $filename = upload_from_url($_POST['from_url'], "mp3"); + } else + $filename = $post->filename; + else + $filename = $_POST['filename']; $post->update(array("filename" => $filename, "description" => $_POST['description'])); feathers/audio/audio.php @@ -22,13 +22,24 @@ $this->respondTo("new_post_options", "alt_text_field"); $this->respondTo("edit_post_options", "alt_text_field"); } + public function __init() { + if (!ADMIN or !isset($_GET['action']) or !isset($_GET['feather'])) + return; + if ($_GET['action'] != "write_post" or $_GET['feather'] != "photo") + return; + + Trigger::current()->call("prepare_swfupload", "photo", "*.jpg;*.jpeg;*.png;*.gif;*.tiff;*.bmp"); + } public function submit() { - if (isset($_FILES['photo']) and $_FILES['photo']['error'] == 0) - $filename = upload($_FILES['photo'], array("jpg", "jpeg", "png", "gif", "tiff", "bmp")); - elseif (!empty($_POST['from_url'])) - $filename = upload_from_url($_POST['from_url'], array("jpg", "jpeg", "png", "gif", "tiff", "bmp")); - else - error(__("Error"), __("Couldn't upload photo.")); + if (!isset($_POST['filename'])) { + if (isset($_FILES['photo']) and $_FILES['photo']['error'] == 0) + $filename = upload($_FILES['photo'], array("jpg", "jpeg", "png", "gif", "tiff", "bmp")); + elseif (!empty($_POST['from_url'])) + $filename = upload_from_url($_POST['from_url'], array("jpg", "jpeg", "png", "gif", "tiff", "bmp")); + else + error(__("Error"), __("Couldn't upload photo.")); + } else + $filename = $_POST['filename']; return Post::add(array("filename" => $filename, "caption" => $_POST['caption']), @@ -38,14 +49,17 @@ public function update() { $post = new Post($_POST['id']); - if (isset($_FILES['photo']) and $_FILES['photo']['error'] == 0) { - $this->delete_file($post); - $filename = upload($_FILES['photo'], array("jpg", "jpeg", "png", "gif", "tiff", "bmp")); - } elseif (!empty($_POST['from_url'])) { - $this->delete_file($post); - $filename = upload_from_url($_POST['from_url'], array("jpg", "jpeg", "png", "gif", "tiff", "bmp")); - } else - $filename = $post->filename; + if (!isset($_POST['filename'])) + if (isset($_FILES['photo']) and $_FILES['photo']['error'] == 0) { + $this->delete_file($post); + $filename = upload($_FILES['photo'], array("jpg", "jpeg", "png", "gif", "tiff", "bmp")); + } elseif (!empty($_POST['from_url'])) { + $this->delete_file($post); + $filename = upload_from_url($_POST['from_url'], array("jpg", "jpeg", "png", "gif", "tiff", "bmp")); + } else + $filename = $post->filename; + else + $filename = $_POST['filename']; $post->update(array("filename" => $filename, "caption" => $_POST['caption'])); feathers/photo/photo.php @@ -95,6 +95,8 @@ $(function(){ fontSize: "9px" }) }) + +<?php $trigger->call("admin_javascript_domready"); ?> }) var Post = { includes/admin.js.php @@ -10,7 +10,7 @@ $post = new Post($_POST['id'], array("filter" => false)); if (!$post->editable()) - error(__("Access Denied"), __("You do not have sufficient privileges to edit posts.")); + show_403(__("Access Denied"), __("You do not have sufficient privileges to edit posts.")); $title = $post->title(); $theme_file = THEME_DIR."/forms/feathers/".$post->feather.".php"; @@ -95,7 +95,7 @@ case "delete_post": $post = new Post($_POST['id']); if (!$post->deletable()) - error(__("Access Denied"), __("You do not have sufficient privileges to delete this post.")); + show_403(__("Access Denied"), __("You do not have sufficient privileges to delete this post.")); Post::delete($_POST['id']); break; @@ -126,7 +126,7 @@ break; case "check_confirm": if (!$visitor->group()->can("toggle_extensions")) - error(__("Access Denied"), __("You do not have sufficient privileges to enable/disable extensions.")); + show_403(__("Access Denied"), __("You do not have sufficient privileges to enable/disable extensions.")); $dir = ($_POST['type'] == "module") ? MODULES_DIR : FEATHERS_DIR ; $info = Horde_Yaml::loadFile($dir."/".$_POST['check']."/info.yaml"); includes/ajax.php @@ -2,7 +2,7 @@ require_once "common.php"; if (!$visitor->group()->can("add_post")) - error(__("Access Denied"), __("You do not have sufficient privileges to create posts.")); + show_403(__("Access Denied"), __("You do not have sufficient privileges to create posts.")); if (empty($config->enabled_feathers)) error(__("No Feathers"), __("Please install a feather or two in order to add a post.")); includes/bookmarklet.php @@ -160,7 +160,7 @@ $pinned = (isset($result->pinned) and $result->pinned); $shown = in_array(when("m-d-Y", $result->created_at), $shown_dates); - $result->first_of_day = !$pinned and !$shown and !AJAX; + $result->first_of_day = (!$pinned and !$shown and !AJAX); if (!$pinned and !$shown) $shown_dates[] = when("m-d-Y", $result->created_at); includes/class/Model.php @@ -46,7 +46,7 @@ $pinned = (isset($result->pinned) and $result->pinned); $shown = in_array(when("m-d-Y", $result->created_at), $shown_dates); - $result->first_of_day = !$pinned and !$shown and !AJAX; + $result->first_of_day = (!$pinned and !$shown and !AJAX); if (!$pinned and !$shown) $shown_dates[] = when("m-d-Y", $result->created_at); includes/class/Paginator.php @@ -315,7 +315,7 @@ if ($trigger->exists("can_not_view_site")) $trigger->call("can_not_view_site"); else - error(__("Access Denied"), __("You are not allowed to view this site.")); + show_403(__("Access Denied"), __("You are not allowed to view this site.")); $trigger->call("runtime"); @@ -338,8 +338,4 @@ redirect(fallback($config->feed_url, url("feed/"), true)); # Really? Nothing? Too bad. MAIN FEED 4 U. $theme = Theme::current(); - - # If the URL is invalid, show a 404. - if (!ADMIN and !AJAX and !JAVASCRIPT and count($_GET) == 1 and $_GET['action'] == "index" and !empty($route->arg[0]) and $route->arg[0] != "index") - show_404(); } includes/common.php @@ -35,7 +35,7 @@ show_403(__("Access Denied"), __("You do not have sufficient privileges to create posts.")); if (!isset($_POST['hash']) or $_POST['hash'] != Config::current()->secure_hashkey) - error(__("Access Denied"), __("Invalid security key.")); + show_403(__("Access Denied"), __("Invalid security key.")); global $feathers; @@ -75,7 +75,7 @@ show_403(__("Access Denied"), __("You do not have sufficient privileges to edit this post.")); if (!isset($_POST['hash']) or $_POST['hash'] != Config::current()->secure_hashkey) - error(__("Access Denied"), __("Invalid security key.")); + show_403(__("Access Denied"), __("Invalid security key.")); global $feathers; $feathers[$post->feather]->update(); @@ -111,7 +111,7 @@ redirect("/admin/?action=manage_posts"); if (!isset($_POST['hash']) or $_POST['hash'] != Config::current()->secure_hashkey) - error(__("Access Denied"), __("Invalid security key.")); + show_403(__("Access Denied"), __("Invalid security key.")); $post = new Post($_POST['id']); if (!$post->deletable()) @@ -195,7 +195,7 @@ show_403(__("Access Denied"), __("You do not have sufficient privileges to create pages.")); if (!isset($_POST['hash']) or $_POST['hash'] != Config::current()->secure_hashkey) - error(__("Access Denied"), __("Invalid security key.")); + show_403(__("Access Denied"), __("Invalid security key.")); $show_in_list = !empty($_POST['show_in_list']); $clean = (!empty($_POST['slug'])) ? $_POST['slug'] : sanitize($_POST['title']) ; @@ -230,7 +230,7 @@ show_403(__("Access Denied"), __("You do not have sufficient privileges to edit pages.")); if (!isset($_POST['hash']) or $_POST['hash'] != Config::current()->secure_hashkey) - error(__("Access Denied"), __("Invalid security key.")); + show_403(__("Access Denied"), __("Invalid security key.")); $page = new Page($_POST['id']); @@ -284,7 +284,7 @@ redirect("/admin/?action=manage_pages"); if (!isset($_POST['hash']) or $_POST['hash'] != Config::current()->secure_hashkey) - error(__("Access Denied"), __("Invalid security key.")); + show_403(__("Access Denied"), __("Invalid security key.")); $page = new Page($_POST['id']); foreach ($page->children() as $child) @@ -366,7 +366,7 @@ show_403(__("Access Denied"), __("You do not have sufficient privileges to add users.")); if (!isset($_POST['hash']) or $_POST['hash'] != Config::current()->secure_hashkey) - error(__("Access Denied"), __("Invalid security key.")); + show_403(__("Access Denied"), __("Invalid security key.")); if (empty($_POST['login'])) error(__("Error"), __("Please enter a username for your account.")); @@ -416,7 +416,7 @@ error(__("No ID Specified"), __("An ID is required to edit a user.")); if (!isset($_POST['hash']) or $_POST['hash'] != Config::current()->secure_hashkey) - error(__("Access Denied"), __("Invalid security key.")); + show_403(__("Access Denied"), __("Invalid security key.")); $visitor = Visitor::current(); @@ -466,7 +466,7 @@ redirect("/admin/?action=manage_users"); if (!isset($_POST['hash']) or $_POST['hash'] != Config::current()->secure_hashkey) - error(__("Access Denied"), __("Invalid security key.")); + show_403(__("Access Denied"), __("Invalid security key.")); User::delete($_POST['id']); @@ -531,7 +531,7 @@ show_403(__("Access Denied"), __("You do not have sufficient privileges to create groups.")); if (!isset($_POST['hash']) or $_POST['hash'] != Config::current()->secure_hashkey) - error(__("Access Denied"), __("Invalid security key.")); + show_403(__("Access Denied"), __("Invalid security key.")); Group::add($_POST['name'], array_keys($_POST['permissions'])); @@ -559,7 +559,7 @@ show_403(__("Access Denied"), __("You do not have sufficient privileges to edit groups.")); if (!isset($_POST['hash']) or $_POST['hash'] != Config::current()->secure_hashkey) - error(__("Access Denied"), __("Invalid security key.")); + show_403(__("Access Denied"), __("Invalid security key.")); $permissions = array_keys($_POST['permissions']); @@ -602,7 +602,7 @@ redirect("/admin/?action=manage_pages"); if (!isset($_POST['hash']) or $_POST['hash'] != Config::current()->secure_hashkey) - error(__("Access Denied"), __("Invalid security key.")); + show_403(__("Access Denied"), __("Invalid security key.")); $group = new Group($_POST['id']); foreach ($group->members() as $user) @@ -1601,7 +1601,7 @@ return; if (!isset($_POST['hash']) or $_POST['hash'] != Config::current()->secure_hashkey) - error(__("Access Denied"), __("Invalid security key.")); + show_403(__("Access Denied"), __("Invalid security key.")); $config = Config::current(); $config->set("name", $_POST['name']); @@ -1629,7 +1629,7 @@ return; if (!isset($_POST['hash']) or $_POST['hash'] != Config::current()->secure_hashkey) - error(__("Access Denied"), __("Invalid security key.")); + show_403(__("Access Denied"), __("Invalid security key.")); $config = Config::current(); $config->set("can_register", !empty($_POST['can_register'])); @@ -1651,7 +1651,7 @@ return; if (!isset($_POST['hash']) or $_POST['hash'] != Config::current()->secure_hashkey) - error(__("Access Denied"), __("Invalid security key.")); + show_403(__("Access Denied"), __("Invalid security key.")); $config = Config::current(); $config->set("feed_items", $_POST['feed_items']); @@ -1676,7 +1676,7 @@ return; if (!isset($_POST['hash']) or $_POST['hash'] != Config::current()->secure_hashkey) - error(__("Access Denied"), __("Invalid security key.")); + show_403(__("Access Denied"), __("Invalid security key.")); $config = Config::current(); $config->set("clean_urls", !empty($_POST['clean_urls'])); includes/controller/Admin.php @@ -53,7 +53,7 @@ public function drafts() { $visitor = Visitor::current(); if (!$visitor->group()->can("view_own_draft", "view_draft")) - error(__("Access Denied"), __("You do not have sufficient privileges to view drafts.")); + show_403(__("Access Denied"), __("You do not have sufficient privileges to view drafts.")); global $posts; $posts = new Paginator(Post::find(array("placeholders" => true, includes/controller/Main.php @@ -42,6 +42,7 @@ # Since the header might already be set to gzip, start output buffering again. if (extension_loaded("zlib") and !ini_get("zlib.output_compression") and + isset($_SERVER['HTTP_ACCEPT_ENCODING']) and substr_count($_SERVER['HTTP_ACCEPT_ENCODING'], "gzip")) { ob_start("ob_gzhandler"); header("Content-Encoding: gzip"); includes/helpers.php @@ -146,7 +146,7 @@ break; case "bookmarklet": if (!$visitor->group()->can("add_post")) - error(__("Access Denied"), __("You do not have sufficient privileges to create posts.")); + show_403(__("Access Denied"), __("You do not have sufficient privileges to create posts.")); if (empty($config->enabled_feathers)) error(__("No Feathers"), __("Please install a feather or two in order to add a post.")); index.php @@ -128,7 +128,7 @@ return; if (!isset($_POST['hash']) or $_POST['hash'] != Config::current()->secure_hashkey) - error(__("Access Denied"), __("Invalid security key.")); + show_403(__("Access Denied"), __("Invalid security key.")); Config::current()->set("cache_expire", $_POST['cache_expire']); modules/cacher/cacher.php @@ -121,7 +121,7 @@ redirect("/admin/?action=manage_comments"); if (!isset($_POST['hash']) or $_POST['hash'] != Config::current()->secure_hashkey) - error(__("Access Denied"), __("Invalid security key.")); + show_403(__("Access Denied"), __("Invalid security key.")); $comment = new Comment($_POST['id']); if (!$comment->deletable()) @@ -142,7 +142,7 @@ static function admin_manage_spam() { if (!Comment::any_editable() and !Comment::any_deletable()) - error(__("Access Denied"), __("You do not have sufficient privileges to manage any comments.", "comments")); + show_403(__("Access Denied"), __("You do not have sufficient privileges to manage any comments.", "comments")); global $admin; @@ -267,7 +267,7 @@ return; if (!isset($_POST['hash']) or $_POST['hash'] != Config::current()->secure_hashkey) - error(__("Access Denied"), __("Invalid security key.")); + show_403(__("Access Denied"), __("Invalid security key.")); $config = Config::current(); $config->set("allowed_comment_html", explode(", ", $_POST['allowed_comment_html'])); @@ -322,7 +322,7 @@ static function admin_manage_comments() { if (!Comment::any_editable() and !Comment::any_deletable()) - error(__("Access Denied"), __("You do not have sufficient privileges to manage any comments.", "comments")); + show_403(__("Access Denied"), __("You do not have sufficient privileges to manage any comments.", "comments")); global $admin; modules/comments/comments.php @@ -2458,7 +2458,7 @@ class MarkdownExtra_Parser extends Markdown_Parser { [:][ ]+ # definition mark (colon) ) ((?s:.+?)) # definition text = $3 - (?= \n+ # stop at next definition mark, + (?= \n+ # stop at next definition mark, (?: # next term or end of text [ ]{0,'.$less_than_tab.'} [:][ ] | <dt> | \z modules/markdown/lib/markdown.php @@ -10,7 +10,11 @@ {% endif %} <div class="clear"></div> <span class="info"> - <strong><a href="$post.url">${ post.created_at | strftime("%B %d @ %I:%M %p") }</a></strong> + {% if post.pinned %} + <strong><a href="$post.url">${ post.created_at | strftime("%B %e @ %I:%M %p") }</a></strong> + {% else %} + <strong><a href="$post.url">${ post.created_at | strftime("%I:%M %p") }</a></strong> + {% endif %} {% if enabled_modules.categorize and post.category.id != 0 %} | <a href="$post.category.url" rel="tag">$post.category.name</a> @@ -21,12 +25,14 @@ {% endif %} {% if post.tags.linked | length > 0 %} | - Tags: ${ post.tags.linked | join } + ${ "Tags" | translate }: ${ post.tags.linked | join } {% endif %} </span> +{% if visitor.group.can("edit_post", "delete_post") %} <span class="controls"> - ${ post.edit_link("Edit" | translate, "") } + $post.edit_link ${ post.delete_link("Delete" | translate, "| ") } </span> +{% endif %} <div class="clear"></div> </div> \ No newline at end of file themes/stardust/content/post.twig @@ -138,9 +138,12 @@ textarea { margin-bottom: 1.5em; padding: .3em .4em; } +input[type="file"] { + margin-bottom: 1.5em; +} input[type="text"], input[type="password"] { - width: 20.0em; + width: 20em; } textarea.wide { <?php if (substr_count($_SERVER['HTTP_USER_AGENT'], "Safari")): ?> @@ -533,6 +536,9 @@ div.page span.controls { width: 41.4em; <?php endif; ?> } +.inline_edit input[type="file"] { + color: #eee; +} .inline_edit .more_options_link:link { color: #5B7C99; display: block; themes/stardust/stylesheets/screen.css.php 053373bf5f7074321c346007d8437d5f7fd3c053 Alex Suraci i.am@toogeneric.com http://github.com/vito/chyrp/commit/6acd3ceef2e9e5858309f9f07fc6718f48b969b6 6acd3ceef2e9e5858309f9f07fc6718f48b969b6 2008-07-10T02:03:45-07:00 2008-07-10T02:03:45-07:00 * Added a SWFUpload module, and had the Photo and Audio feathers utilize it. * Updated Access Denied errors to use show_403() * CSS fixes 551d65c14ee96c99e900116606d935d02e03304f Alex Suraci i.am@toogeneric.com