james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #243 from pachuco/master

Browse Source 
Oekaki extension tweaks
This commit is contained in:
Shish 2012-06-26 11:43:18 -07:00
commit 756de7b023
4 changed files with 79 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ext/oekaki/chibipaint.jar
View File

Binary file not shown.

8
ext/oekaki/main.php
View File

@ -10,12 +10,10 @@ class Oekaki extends Extension {
global $user, $page;
if($event->page_matches("oekaki")) {
if(!$user->can("create_image")) {
$this->theme->display_permission_denied();
}
if($event->get_arg(0) == "create") {
if($event->get_arg(0) == "create" and $user->can("create_image")){
$this->theme->display_page();
}else{
$this->theme->display_permission_denied();
}
if($event->get_arg(0) == "upload") {
// FIXME: this allows anyone to upload anything to /data ...

20
ext/oekaki/readme.txt
View File

@ -1,6 +1,24 @@
ChibiPaint
Original version of ChibiPaint:
Copyright (c) 2006-2008 Marc Schefer
http://www.chibipaint.com/
Some icons taken from the GNU Image Manipulation Program.
Art contributors: http://git.gnome.org/browse/gimp/tree/AUTHORS
Lapo Calamandrei
Paul Davey
Alexia Death
Aurore Derriennic
Tuomas Kuosmanen
Karl La Rocca
Andreas Nilsson
Ville Pätsi
Mike Schaeffer
Carol Spears
Jakub Steiner
William Szilveszter
This file is part of ChibiPaint.
@ -66,7 +84,7 @@
The form data name for the png file is 'picture' and 'chibifile' for the multilayer file. The recommended extension
for chibifiles is '.chi'
The applet expects the server to answer with the single line reply "CHIBIOK" followed by a newline character.
"CHIBIERROR" followed by an error message on the same list is the planned way to report an error but currently the

66
ext/oekaki/theme.php
View File

@ -1,35 +1,83 @@
<?php
// FIXME: Move all the stuff that handles size input to main.php
// FIXME: Move default canvas size to config file; changeable in board config
// While we're here, add maximum and minimum image sizes in config
// Maybe allow the resolution limiter extension to have a say in this
$defOekW = 400; // Common default for oekaki boards: 300x300
$defOekH = 400;
class OekakiTheme extends Themelet {
public function display_page() {
global $config, $page;
global $config, $page, $defOekW, $defOekH;
$base_href = get_base_href();
$http_base = make_http($base_href);
if (isset($_POST['oekW']) and isset($_POST['oekH'])){
$oekW = $_POST['oekW'];
$oekH = $_POST['oekH'];
if(!ctype_digit($oekW) or !ctype_digit($oekH)){
$oekW = $defOekW;
$oekH = $defOekH;
}
} else{
$oekW = $defOekW;
$oekH = $defOekH;
}
$html = "
<applet archive='$base_href/ext/oekaki/chibipaint.jar' code='chibipaint.ChibiPaint.class' width='800' height='600'>
<param name='canvasWidth' value='400' />
<param name='canvasHeight' value='300' />
<param name='canvasWidth' value='".$oekW."' />
<param name='canvasHeight' value='".$oekH."' />
<param name='postUrl' value='".make_http(make_link("oekaki/upload"))."' />
<param name='exitUrl' value='".make_http(make_link("oekaki/claim"))."' />
<param name='exitUrlTarget' value='_self' />
JAVA NOT SUPPORTED! <!-- alternative content for users who don't have Java installed -->
JAVA NOT INSTALLED >:(<!-- alternative content for users who don't have Java installed -->
</applet>
";
# <param name='loadImage' value='http://yourserver/oekaki/pictures/168.png' />
# <param name='loadChibiFile' value='http://yourserver/oekaki/pictures/168.chi' />
// FIXME: prevent oekaki block from collapsing on click in cerctain themes. This causes canvas reset
$page->set_title("Oekaki");
$page->set_heading("Oekiaki");
$page->set_heading("Oekaki");
$page->add_block(new NavBlock());
$page->add_block(new Block("Oekaki", $html, "main", 20));
$page->add_block(new Block(null,
"
Change canvas size.
<br>
<form form enctype='multipart/form-data' action='".make_link("oekaki/create")."' method='POST'>
<div style='display: inline; margin: 0; width: auto;'>
<input autocomplete='off' style='display: inline; margin: 0; width: auto;font-size: 90%' name='oekW' type='text' size='3' value='".$oekW."'/>
x
<input autocomplete='off' style='display: inline; margin: 0; width: auto;font-size: 90%' name='oekH' type='text' size='3' value='".$oekH."'/>
<input autocomplete='off' style='display: inline; margin: 0; width: auto;font-size: 90%' type='submit' value='Go!' />
</div>
</form>
<br>
<b>WARNING: Resets canvas!</b>
"
, "left", 21)); // upload is 20
}
public function display_block() {
global $page;
$page->add_block(new Block(null, "<a href='".make_link("oekaki/create")."'>Open Oekaki</a>", "left", 21)); // upload is 20
global $page, $defOekW, $defOekH;
//FIXME: input field alignment could be done more elegantly, without inline styling
//FIXME: autocomplete='off' seems to be an invalid HTML tag
$page->add_block(new Block(null,
"
<b>Oekaki</b>
<br>
<form form enctype='multipart/form-data' action='".make_link("oekaki/create")."' method='POST'>
<div style='display: inline; margin: 0; width: auto;'>
<input autocomplete='off' style='display: inline; margin: 0; width: auto; font-size: 90%' name='oekW' type='text' size='3' value='".$defOekW."'/>
x
<input autocomplete='off' style='display: inline; margin: 0; width: auto; font-size: 90%' name='oekH' type='text' size='3' value='".$defOekH."'/>
<input autocomplete='off' style='display: inline; margin: 0; width: auto; font-size: 90%' type='submit' value='Go!' />
</div>
</form>
"
, "left", 21)); // upload is 20
}
}
?>