diff --git a/README.txt b/README.txt index 622d90a9..b419b692 100644 --- a/README.txt +++ b/README.txt @@ -1,10 +1,13 @@ - _________.__ .__ .__ ________ - / _____/| |__ |__| _____ _____ |__| ____ \_____ \ - \_____ \ | | \| |/ \ / \| |/ __ \ / ____/ - / \| Y \ | Y Y \ Y Y \ \ ___// \ - /_______ /|___| /__|__|_| /__|_| /__|\___ >_______ \ - \/ \/ \/ \/ \/ \/ + _________.__ .__ .__ ________ + / _____/| |__ |__| _____ _____ |__| ____ \_____ \ + \_____ \ | | \ | | / \ / \ | |_/ __ \ / ____/ + / \| Y \| || Y Y \| Y Y \| |\ ___/ / \ + /_______ /|___| /|__||__|_| /|__|_| /|__| \___ >\_______ \ + \/ \/ \/ \/ \/ \/ + +_________________________________________________________________________ + Shimmie Alpha ~~~~~~~~~~~~~ @@ -58,6 +61,15 @@ database and file formats haven't changed *completely*, it's different enough to be a pain. +Custom Configuration +~~~~~~~~~~~~~~~~~~~~ + +Various aspects of Shimmie can be configured to suit your site specific +needs via the file "config.php" (created after installation). +Take a look at "core/default_config.inc.php" for the available options +that can used. + + Development Info ~~~~~~~~~~~~~~~~ http://shimmie.shishnet.org/doc/ @@ -70,7 +82,7 @@ Contact ~~~~~~~ #shimmie on Freenode -- IRC webmaster at shishnet.org -- email -https://github.com/shish/shimmie2 -- bug tracker +https://github.com/shish/shimmie2/issues -- bug tracker Licence diff --git a/contrib/resize/main.php b/contrib/resize/main.php index 51b1bf24..bb5b423b 100644 --- a/contrib/resize/main.php +++ b/contrib/resize/main.php @@ -172,8 +172,19 @@ class ResizeImage extends Extension { throw new ImageResizeException("The image size does not match what is in the database! - Aborting Resize."); } - /* Check memory usage limits */ - $memory_use = (filesize($image_filename)*2) + ($width*$height*4) + (4*1024*1024); + /* + Check Memory usage limits + + Old check: $memory_use = (filesize($image_filename)*2) + ($width*$height*4) + (4*1024*1024); + New check: memory_use = width * height * (bits per channel) * channels * 2.5 + + It didn't make sense to compute the memory usage based on the NEW size for the image. ($width*$height*4) + We need to consider the size that we are GOING TO instead. + + The factor of 2.5 is simply a rough guideline. + http://stackoverflow.com/questions/527532/reasonable-php-memory-limit-for-image-resize + */ + $memory_use = ($info[0] * $info[1] * ($info['bits'] / 8) * $info['channels'] * 2.5) / 1024; $memory_limit = get_memory_limit(); if ($memory_use > $memory_limit) { @@ -191,7 +202,7 @@ class ResizeImage extends Extension { else $factor = min( $width / $image_obj->width, $height / $image_obj->height ); $new_width = round( $image_obj->width * $factor ); - $new_height = round( $image_obj->height * $factor ); + $new_height = round( $image_obj->height * $factor ); } /* Attempt to load the image */ diff --git a/core/default_config.inc.php b/core/default_config.inc.php index 2f3003ca..c6a44b57 100644 --- a/core/default_config.inc.php +++ b/core/default_config.inc.php @@ -1,4 +1,16 @@ diff --git a/core/util.inc.php b/core/util.inc.php index 04fb2b65..158d1f2e 100644 --- a/core/util.inc.php +++ b/core/util.inc.php @@ -547,24 +547,48 @@ function get_memory_limit() { global $config; // thumbnail generation requires lots of memory - $default_limit = 8*1024*1024; + $default_limit = 8*1024*1024; // 8 MB of memory is PHP's default. $shimmie_limit = parse_shorthand_int($config->get_int("thumb_mem_limit")); + if($shimmie_limit < 3*1024*1024) { // we aren't going to fit, override $shimmie_limit = $default_limit; } - - ini_set("memory_limit", $shimmie_limit); + + /* + Get PHP's configured memory limit. + Note that this is set to -1 for NO memory limit. + + http://ca2.php.net/manual/en/ini.core.php#ini.memory-limit + */ $memory = parse_shorthand_int(ini_get("memory_limit")); - - // changing of memory limit is disabled / failed - if($memory == -1) { - $memory = $default_limit; + + if ($memory == -1) { + // No memory limit. + + // Return the larger of the set limits. + if ($shimmie_limit > $default_limit) { + return $shimmie_limit; + } else { + return $default_limit; // return the default memory limit + } + } else { + // PHP has a memory limit set. + + if ($shimmie_limit > $memory) { + // Shimmie wants more memory than what PHP is currently set for. + + // Attempt to set PHP's memory limit. + if ( ini_set("memory_limit", $shimmie_limit) === FALSE ) { + /* We can't change PHP's limit, oh well, return whatever its currently set to */ + return $memory; + } + $memory = parse_shorthand_int(ini_get("memory_limit")); + } + + // PHP's memory limit is more than Shimmie needs. + return $memory; // return the current setting } - - assert($memory > 0); - - return $memory; } /** diff --git a/ext/alias_editor/theme.php b/ext/alias_editor/theme.php index 7b6bfb49..dfb24f44 100644 --- a/ext/alias_editor/theme.php +++ b/ext/alias_editor/theme.php @@ -12,8 +12,8 @@ class AliasEditorTheme extends Themelet { $can_manage = $user->can("manage_alias_list"); if($can_manage) { - $action = "Action"; - $add = " + $h_action = "Action"; + $h_add = " ".make_form(make_link("alias/add"))." @@ -24,8 +24,8 @@ class AliasEditorTheme extends Themelet { "; } else { - $action = ""; - $add = ""; + $h_action = ""; + $h_add = ""; } $h_aliases = ""; @@ -49,15 +49,10 @@ class AliasEditorTheme extends Themelet { $h_aliases .= ""; } $html = " - - - $action +
FromTo
+ $h_action$h_aliases - $add + $h_add
FromTo

Download as CSV

"; diff --git a/ext/comment/theme.php b/ext/comment/theme.php index acdabed2..0da3f240 100644 --- a/ext/comment/theme.php +++ b/ext/comment/theme.php @@ -167,7 +167,6 @@ class CommentListTheme extends Themelet { if($i_uid == $config->get_int("anon_id")) { $anoncode = ""; - $style = ""; $anoncode2 = ""; if($this->show_anon_id) { $anoncode = ''.$this->anon_id.''; @@ -181,7 +180,7 @@ class CommentListTheme extends Themelet { } } } - $h_userlink = "" . $h_name . $anoncode . $anoncode2 . ""; + $h_userlink = "" . $h_name . $anoncode . $anoncode2 . ""; $this->anon_id++; } else { @@ -197,10 +196,10 @@ class CommentListTheme extends Themelet { '; } else { - $avatar = ""; + $h_avatar = ""; if(!empty($comment->owner_email)) { $hash = md5(strtolower($comment->owner_email)); - $avatar = "
"; + $h_avatar = "
"; } $h_reply = " - Reply"; $h_ip = $user->can("view_ip") ? "
".show_ip($comment->poster_ip, "Comment posted {$comment->posted}") : ""; @@ -211,7 +210,7 @@ class CommentListTheme extends Themelet {
- '.$avatar.' + '.$h_avatar.' '.$h_timestamp.$h_reply.$h_ip.$h_del.'
'.$h_userlink.': '.$h_comment.' @@ -221,19 +220,19 @@ class CommentListTheme extends Themelet { return ""; } - protected function build_postbox($image_id) { + protected function build_postbox(/*int*/ $image_id) { global $config; $i_image_id = int_escape($image_id); $hash = CommentList::get_hash(); - $captcha = $config->get_bool("comment_captcha") ? captcha_get_html() : ""; + $h_captcha = $config->get_bool("comment_captcha") ? captcha_get_html() : ""; return ' '.make_form(make_link("comment/add")).' - '.$captcha.' + '.$h_captcha.'
'; diff --git a/ext/ext_manager/theme.php b/ext/ext_manager/theme.php index 7dd74d5c..879380cb 100644 --- a/ext/ext_manager/theme.php +++ b/ext/ext_manager/theme.php @@ -3,7 +3,7 @@ class ExtManagerTheme extends Themelet { public function display_table(Page $page, /*array*/ $extensions, /*bool*/ $editable) { global $user; - $en = $editable ? "Enabled" : ""; + $h_en = $editable ? "Enabled" : ""; $html = " ".make_form(make_link("ext_manager/set"))." - $en + $h_en "; @@ -21,27 +21,26 @@ class ExtManagerTheme extends Themelet { foreach($extensions as $extension) { if(!$editable && $extension->visibility == "admin") continue; - $ext_name = $extension->ext_name; - $h_name = empty($extension->name) ? $ext_name : html_escape($extension->name); + $h_name = html_escape(empty($extension->name) ? $extension->ext_name : $extension->name); $h_description = html_escape($extension->description); if($extension->enabled === TRUE) $h_enabled = " checked='checked'"; else if($extension->enabled === FALSE) $h_enabled = ""; else $h_enabled = " disabled checked='checked'"; - $h_link = make_link("ext_doc/".html_escape($extension->ext_name)); + $h_link = make_link("ext_doc/".url_escape($extension->ext_name)); $oe = ($n++ % 2 == 0) ? "even" : "odd"; - $en = $editable ? "" : ""; + $h_en = $editable ? "" : ""; $html .= " - $en + $h_en "; } - $set = $editable ? "" : ""; + $h_set = $editable ? "" : ""; $html .= " - $set + $h_set
NameDescription
NameDescription
$h_name $h_description
"; diff --git a/ext/handle_pixel/theme.php b/ext/handle_pixel/theme.php index a90543c3..84957ac3 100644 --- a/ext/handle_pixel/theme.php +++ b/ext/handle_pixel/theme.php @@ -4,8 +4,8 @@ class PixelFileHandlerTheme extends Themelet { public function display_image(Page $page, Image $image) { global $config; - $ilink = $image->get_image_link(); - $html = ""; + $u_ilink = $image->get_image_link(); + $html = ""; if($config->get_bool("image_show_meta")) { # FIXME: only read from jpegs? $exif = @exif_read_data($image->get_image_filename(), 0, true); diff --git a/ext/image/theme.php b/ext/image/theme.php index 8d0537a1..c21a7390 100644 --- a/ext/image/theme.php +++ b/ext/image/theme.php @@ -6,7 +6,7 @@ class ImageIOTheme { * * @param $image_id The image to delete */ - public function get_deleter_html($image_id) { + public function get_deleter_html(/*int*/ $image_id) { global $config; if($config->get_bool("image_jquery_confirm")) { @@ -33,14 +33,11 @@ class ImageIOTheme { * * @param $image_id The image to replace */ - public function get_replace_html($image_id) { - - $html = " - ".make_form(make_link("image_admin/replace"))." + public function get_replace_html(/*int*/ $image_id) { + $html = make_form(make_link("image_admin/replace"))." "; - return $html; } } diff --git a/ext/setup/theme.php b/ext/setup/theme.php index 472a074f..609ed6b8 100644 --- a/ext/setup/theme.php +++ b/ext/setup/theme.php @@ -15,7 +15,6 @@ class SetupTheme extends Themelet { public function display_page(Page $page, SetupPanel $panel) { global $user; - usort($panel->blocks, "blockcmp"); /* @@ -44,35 +43,31 @@ class SetupTheme extends Themelet { public function display_advanced(Page $page, $options) { global $user; - $rows = ""; + $h_rows = ""; $n = 0; ksort($options); foreach($options as $name => $value) { + $h_name = html_escape($name); $h_value = html_escape($value); $len = strlen($h_value); $oe = ($n++ % 2 == 0) ? "even" : "odd"; - $box = ""; + $h_box = ""; if(strpos($value, "\n") > 0) { - $box .= ""; + $h_box .= ""; } else { - $box .= ""; + $h_box .= ""; } - $box .= ""; - $rows .= "$name$box"; + $h_box .= ""; + $h_rows .= "$h_name$h_box"; } $table = " - ".make_form(make_link("setup/save"))." - +
- $rows + $h_rows
NameValue
diff --git a/ext/tag_edit/theme.php b/ext/tag_edit/theme.php index 7dd5e9da..419afee6 100644 --- a/ext/tag_edit/theme.php +++ b/ext/tag_edit/theme.php @@ -37,12 +37,12 @@ class TagEditTheme extends Themelet { $h_owner = html_escape($image->get_owner()->name); $h_av = $image->get_owner()->get_avatar_html(); $h_date = autodate($image->posted); - $ip = $user->can("view_ip") ? " (".show_ip($image->owner_ip, "Image posted {$image->posted}").")" : ""; + $h_ip = $user->can("view_ip") ? " (".show_ip($image->owner_ip, "Image posted {$image->posted}").")" : ""; return " Uploader - $h_owner$ip, $h_date + $h_owner$h_ip, $h_date $h_av @@ -64,7 +64,7 @@ class TagEditTheme extends Themelet { "; } - private function format_source($source) { + private function format_source(/*string*/ $source) { if(!empty($source)) { $h_source = html_escape($source); if(startsWith($source, "http://") || startsWith($source, "https://")) { diff --git a/ext/tag_list/theme.php b/ext/tag_list/theme.php index 23065572..59f7c556 100644 --- a/ext/tag_list/theme.php +++ b/ext/tag_list/theme.php @@ -53,9 +53,10 @@ class TagListTheme extends Themelet { } } - if($config->get_string('tag_list_image_type')=="tags"){ - $page->add_block(new Block("Tags", $html, "left", 10));} - else{ + if($config->get_string('tag_list_image_type')=="tags") { + $page->add_block(new Block("Tags", $html, "left", 10)); + } + else { $page->add_block(new Block("Related Tags", $html, "left", 10)); } } @@ -109,7 +110,7 @@ class TagListTheme extends Themelet { global $config; // store local copy for speed. - $info_link = $config->get_string('info_link'); + $info_link = $config->get_string('info_link'); $html = ""; $n = 0; diff --git a/ext/upload/_style.css b/ext/upload/_style.css deleted file mode 100644 index ef8424c9..00000000 --- a/ext/upload/_style.css +++ /dev/null @@ -1,14 +0,0 @@ -/* Only need to change the file/url inputs */ -#large_upload_form INPUT.wid { - width: 100%; -} -#radio_button { - width: auto; -} -#wrapper { - opacity : 0.4; - filter: alpha(opacity=40); // msie -} - -/* This is needed since the theme style.css forcibly sets vertical align to "top". */ -TABLE.vert TD, TABLE.vert TH {vertical-align: middle;} diff --git a/ext/upload/style.css b/ext/upload/style.css index 33c7f922..7102f3cc 100644 --- a/ext/upload/style.css +++ b/ext/upload/style.css @@ -1,3 +1,17 @@ +/* Only need to change the file/url inputs */ +#large_upload_form INPUT.wid { + width: 100%; +} +#radio_button { + width: auto; +} +#wrapper { + opacity : 0.4; + filter: alpha(opacity=40); // msie +} + +/* This is needed since the theme style.css forcibly sets vertical align to "top". */ +TABLE.vert TD, TABLE.vert TH {vertical-align: middle;} .mini_upload INPUT { width: 100%; } diff --git a/ext/upload/theme.php b/ext/upload/theme.php index 567938d0..8c3dca71 100644 --- a/ext/upload/theme.php +++ b/ext/upload/theme.php @@ -11,7 +11,6 @@ class UploadTheme extends Themelet { public function display_page(Page $page) { global $config, $page; - $page->add_html_header(""); $tl_enabled = ($config->get_string("transload_engine", "none") != "none"); // Uploader 2.0! @@ -157,7 +156,6 @@ class UploadTheme extends Themelet { /* only allows 1 file to be uploaded - for replacing another image file */ public function display_replace_page(Page $page, /*int*/ $image_id) { global $config, $page; - $page->add_html_header(""); $tl_enabled = ($config->get_string("transload_engine", "none") != "none"); $js2 = 'javascript:$(function() { diff --git a/ext/user/theme.php b/ext/user/theme.php index c8a7068e..a4639cd7 100644 --- a/ext/user/theme.php +++ b/ext/user/theme.php @@ -17,7 +17,7 @@ class UserPageTheme extends Themelet { $html .= "Name"; foreach($users as $duser) { $html .= ""; - $html .= "".html_escape($duser->name).""; + $html .= "".html_escape($duser->name).""; $html .= ""; } $html .= ""; @@ -50,7 +50,7 @@ class UserPageTheme extends Themelet { if(empty($tac)) {$html = "";} else {$html = '

'.$tac.'

';} - $reca = "".captcha_get_html().""; + $h_reca = "".captcha_get_html().""; $html .= ' '.make_form(make_link("user_admin/create"))." @@ -59,7 +59,7 @@ class UserPageTheme extends Themelet { Password Repeat Password Email (Optional) - $reca + $h_reca @@ -135,8 +135,8 @@ class UserPageTheme extends Themelet { assert(is_array($stats)); $stats[] = 'User ID: '.$duser->id; - $page->set_title($duser->name."'s Page"); - $page->set_heading($duser->name."'s Page"); + $page->set_title(html_escape($duser->name)."'s Page"); + $page->set_heading(html_escape($duser->name)."'s Page"); $page->add_block(new NavBlock()); $page->add_block(new Block("Stats", join("
", $stats), "main", 0)); diff --git a/ext/view/theme.php b/ext/view/theme.php index 7e0bd8b9..4bce845d 100644 --- a/ext/view/theme.php +++ b/ext/view/theme.php @@ -7,11 +7,11 @@ class ViewImageTheme extends Themelet { public function display_page(Image $image, $editor_parts) { global $page; - $metatags = str_replace(" ", ", ", html_escape($image->get_tag_list())); + $h_metatags = str_replace(" ", ", ", html_escape($image->get_tag_list())); $page->set_title("Image {$image->id}: ".html_escape($image->get_tag_list())); - $page->add_html_header(""); - $page->add_html_header(""); + $page->add_html_header(""); + $page->add_html_header(""); $page->add_html_header(""); $page->add_html_header("get_thumb_link())."\">"); $page->add_html_header("id}"))."\">");