diff --git a/subsites/films-apache b/subsites/films-apache deleted file mode 100644 index 694550a..0000000 --- a/subsites/films-apache +++ /dev/null @@ -1,68 +0,0 @@ -WSGIDaemonProcess films.metanohi.name processes=2 threads=3 display-name=%{GROUP} -WSGIProcessGroup films.metanohi.name - - - - ServerName films.metanohi.name - ServerAlias www.films.metanohi.name films.lcl - ServerAdmin ngws@metanohi.name - - DocumentRoot /home/niels/www/meta/subsites/films - - Alias /robots.txt /home/niels/www/meta/subsites/films/robots.txt - Alias /favicon.ico /home/niels/www/meta/subsites/films/favicon.ico - Alias /favicon.png /home/niels/www/meta/subsites/films/favicon.png - Alias /static /home/niels/www/meta/subsites/films/static - Alias /previews /home/niels/www/meta/subsites/films/previews - Alias /films /home/niels/www/meta/heavy/films - Alias /films.wsgi /home/niels/www/meta/subsites/films/films.wsgi - Alias /apache-config-template /home/niels/www/meta/subsites/films/apache-config-template - - WSGIScriptAlias / /home/niels/www/meta/subsites/films/films.wsgi - - - Order allow,deny - Allow from all - - - LogLevel warn - ErrorLog /var/log/apache2/films.metanohi.name-error.log - CustomLog /var/log/apache2/films.metanohi.name-access.log combined - - - - - - ServerName films.metanohi.name - ServerAlias www.films.metanohi.name films.lcl - ServerAdmin ngws@metanohi.name - - DocumentRoot /home/niels/www/meta/subsites/films - - Alias /robots.txt /home/niels/www/meta/subsites/films/robots.txt - Alias /favicon.ico /home/niels/www/meta/subsites/films/favicon.ico - Alias /favicon.png /home/niels/www/meta/subsites/films/favicon.png - Alias /static /home/niels/www/meta/subsites/films/static - Alias /previews /home/niels/www/meta/subsites/films/previews - Alias /films /home/niels/www/meta/heavy/films - Alias /films.wsgi /home/niels/www/meta/subsites/films/films.wsgi - Alias /apache-config-template /home/niels/www/meta/subsites/films/apache-config-template - - WSGIScriptAlias / /home/niels/www/meta/subsites/films/films.wsgi - - - Order allow,deny - Allow from all - - - LogLevel warn - ErrorLog /var/log/apache2/films.metanohi.name-error.log - CustomLog /var/log/apache2/films.metanohi.name-access.log combined - - SSLEngine on - SSLCertificateFile /home/niels/www/meta/metanohi_server.pem - SSLCertificateKeyFile /home/niels/www/meta/metanohi_privatekey.pem - SSLCipherSuite HIGH - SSLProtocol all -SSLv2 - - \ No newline at end of file diff --git a/subsites/films/about.html b/subsites/films/about.html deleted file mode 100644 index 4eef6f8..0000000 --- a/subsites/films/about.html +++ /dev/null @@ -1,18 +0,0 @@ -

- This is nohifilms, Niels Serup's index of his short films. The earliest films - involved often revolve around - the stopmotion - technique, while others don't. -

- -

- - Play OGG - -

- -

- nohifilms runs on a simple AGPLv3-licensed WSGI script which can downloaded - here using an Apache config file similar - to this one. -

diff --git a/subsites/films/apache-config-template b/subsites/films/apache-config-template deleted file mode 100644 index 67af8a6..0000000 --- a/subsites/films/apache-config-template +++ /dev/null @@ -1,28 +0,0 @@ - - - ServerName films.example.org - ServerAlias films.example.org - ServerAdmin webmaster@example.org - - DocumentRoot /path/to/dir/of/films - - Alias /robots.txt /path/to/dir/of/films/robots.txt - Alias /favicon.ico /path/to/dir/of/films/favicon.ico - Alias /favicon.png /path/to/dir/of/films/favicon.png - Alias /static /path/to/dir/of/films/static - Alias /previews /path/to/dir/of/films/previews - Alias /films /path/to/dir/of/videos - Alias /films.wsgi /path/to/dir/of/films/films.wsgi - Alias /apache-config-template /path/to/dir/of/films/apache-config-template - - - Order allow,deny - Allow from all - - - WSGIDaemonProcess films.example.org processes=2 threads=15 display-name=%{GROUP} - WSGIProcessGroup films.example.org - - WSGIScriptAlias / /path/to/dir/of/films/films.wsgi - - diff --git a/subsites/films/filminfo b/subsites/films/filminfo deleted file mode 100644 index be719af..0000000 --- a/subsites/films/filminfo +++ /dev/null @@ -1,175 +0,0 @@ -super-surveillance -SUPER SURVEILLANCE -2011 -true -ab -true - -Yes, it is true. Truedom. - - -creative-process -The Creative Process of an Artist -2010 -false -ab -false - -I was bored. - - -paranoia -Paranoia -2010 -true -ab -false - -Do you have paranoia? - - -box -Box -2010 -true -ab -false - -A box and a human. - - -cola -Cola -2008 -true -bcd -false - -The Coca Cola Company has created a monster: a can that moves by itself! Too -much caffeine, perhaps? - - -robo -Robo -2009 -true -bcd -false - -In the future, scientists will have to construct robots out of crap. For now, -simple boxes will do.

Music credit goes to user RedChili at http://jamendo.com/en/user/redchili. His -track is called "Sen Mandaryna" and is released under CC-BY-NC-SA 3.0, which is -why I have to license this works as a whole under the same license, thus -releasing this film under the Creative Commons -Attribution-Noncommercial-ShareAlike 3.0. Note that this film is available -under CC-BY-SA as well, just without the background music. So if you want to -use this for commercial purposes, use another soundtrack. - - -dice -Dice -2010 -false -bcd -false - -A die meets a die. No sound. - - -compufight -Compufight -2009 -false -bcde -false - -The kung fu of computing. - - -mobility -Mobility -2008 -true -bcde -false - -Is it a bird? Is it an airplane? No, it's a MOBILE PHONE! - - -legoshow -Lego SHOW -2006 -false -none -false - -Showoff. - - -easteregg -Beware of the Easter Egg -2007 -false -none -false - -It's dangerous, I tell you. Beware of other traditions, too.

Music -credit goes to freesound contributor Richard Frohlich at freesound.org. His piano track is released -under CC Sampling -Plus 1.0.. When I originally applied this track to my film, I didn't -realize that its license was somewhat non-free and not compatible with -CC-BY-SA. So to get this film under CC-BY-SA, you'll have to take it without -sound. - - -compumotion -Compumotion -2008 -false -bcd -false - -Or maybe "Lapstop"? - - -crazychristmas -Crazy Christmas -2007 -false -bcd -false - -Celebrating Christmas also means celebrating the day these unfortunate lego -accesories went berserk. - - -testdraw -Test draw -2008 -true -b -false - -Just testing. - - -legoparty -Lego Party -2006 -false -bc -false - -They seem to be slightly.. drunk? - - -saltvspepper -Salt vs. pepper -2008 -false -bcd -false - -Who will win this battle of destiny? diff --git a/subsites/films/films.config b/subsites/films/films.config deleted file mode 100644 index 172d00d..0000000 --- a/subsites/films/films.config +++ /dev/null @@ -1,3 +0,0 @@ -[films] -previews_dir = /previews -videos_dir = /films diff --git a/subsites/films/films.wsgi b/subsites/films/films.wsgi deleted file mode 100644 index 9a0451a..0000000 --- a/subsites/films/films.wsgi +++ /dev/null @@ -1,185 +0,0 @@ -#!/usr/bin/env python3 - -# films.wsgi: a WSGI script for showing films -# Copyright (C) 2011 Niels Serup - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public -# License along with this program. If not, see -# . - -## Version:...... 0.1.0 -## Maintainer:... Niels Serup -## Website:...... http://films.metanohi.name/about/ - -import sys -import os -import bottle -from bottle import route, abort, error, request, redirect -import configparser -import locale -_preferred_encoding = 'utf-8' #locale.getpreferredencoding() # fail - -_absfile = os.path.abspath(__file__) -_filedir = os.path.dirname(_absfile) -_configfile_name = 'films.config' - -# Get settings -_settings = {'previews_dir': '/previews', 'videos_dir': '/videos'} # Defaults - -_cfg = configparser.SafeConfigParser(_settings) -_cfg.add_section('films') -try: - _cfg.read(os.path.join(_filedir, _configfile_name)) -except configparser.Error as e: - print('Python error: ' + repr(e), file=sys.stderr) -except TypeError: - pass -_settings = {name: value for name, value in _cfg.items('films')} - -# Get templates -def _readfile(locpath): - with open(os.path.join(_filedir, locpath), 'rb') as f: - return f.read().decode(_preferred_encoding) - -_template, _about, _frontpage = (_readfile(x + '.html') for x in - ('template', 'about', 'frontpage')) - -# Create more templates -_videosource = ''' \n''' -_videotemplate = ''' - - -
-

{description}

-

Year: {year}

-
- -
-

Download: {downloads}

-
-''' - -# Extract info -def _parse_filminfo(locpath): - with open(os.path.join(_filedir, locpath), 'U') as f: - sfilms = (line.split('\n', 7) for line in f.read().split('\n' * 3)) - films, films_html = [], {} - i = 1 - for x in sfilms: - kwds = { - 'name': x[0], - 'title': x[1], - 'year': int(x[2]), - '16:9': x[3] == 'true', - 'sizes': x[4], - 'webm': x[5] == 'true', - 'description': x[7] - } - - if kwds['16:9']: - kwds['height'] = 360 - sizes = ( - '640x360', - '1024x576', - '1280x720', - '1920x1080' - ) - else: - kwds['height'] = 480 - sizes = ( - '640x480', - '768x576', - '960x720', - '1440x1080' - ) - kwds['downloads'] = '' - linknames = { - '': (sizes[0], '640w'), - 'b': (sizes[1], '576p'), - 'c': (sizes[2], '720p'), - 'd': (sizes[3], '1080p'), - 'e': ('Behind', 'behind') - } - for x in filter(lambda x: x in kwds['sizes'], linknames.keys()): - linkname, sid = linknames[x] - if kwds['webm']: - kwds['downloads'] += "{linkname} WebM".format( - dir=_settings['videos_dir'], sid=sid, name=kwds['name'], linkname=linkname) - kwds['downloads'] += "{linkname} Theora".format( - dir=_settings['videos_dir'], sid=sid, name=kwds['name'], linkname=linkname) - - addr = _settings['videos_dir'] - srcs = '' - kwds['url'] = '{}/{}-{}.ogv'.format( - addr, kwds['name'], linknames[''][1]) - if kwds['webm']: - srcs += _videosource.format(url='{}/{}-{}.webm'.format( - addr, kwds['name'], linknames[''][1]), mime='video/webm') - srcs += _videosource.format(url=kwds['url'], mime='video/ogg') - kwds['sources'] = srcs - kwds['content'] = _videotemplate.format(**kwds) - kwds['leftclass'] = " class='left'" if i % 2 else '' - i += 1 - - films.append(kwds) - films_html[kwds['name']] = _template.format(**kwds) - return films, films_html - -_films, _films_html = _parse_filminfo('filminfo') -_settings['numberoffilms'] = len(_films) - -# Improve templates -_frontpage_boxlink = ''' - - {{title}} - -'''.format(**_settings) - -_settings['filmboxes'] = ''.join(_frontpage_boxlink.format(**kwds) - for kwds in _films) - -_frontpage = _frontpage.format(**_settings) - -_settings['content'], _settings['title'] = _frontpage, 'Start' -_frontpage = _template.format(**_settings) -_settings['content'], _settings['title'] = _about, 'About' -_about = _template.format(**_settings) -del _settings['content'] -del _settings['title'] - -@route('/') -def frontpage(): - if request.query_string: - # compatibility reasons, can be removed - redirect('/' + request.query_string) - return _frontpage - -@route('/about') -@route('/!about') # compatibility reasons, can be removed -def about(): - return _about - -@route('/:name') -def film(name): - return _films_html[name] - -application = bottle.default_app() - diff --git a/subsites/films/frontpage.html b/subsites/films/frontpage.html deleted file mode 100644 index ed6846f..0000000 --- a/subsites/films/frontpage.html +++ /dev/null @@ -1,17 +0,0 @@ -

- This is my personal film index. Below is a list of the {numberoffilms} films - that I have so far produced. The films are both downloadable and directly - viewable in any fairly modern web browser. I'm releasing all of my films - under the Creative - Commons Attribution-ShareAlike 3.0 license, which permits everyone to - remix and share my videos as long as they attribute me and do not restrict - other remixers and sharers from altering and sharing new versions. -

-

Read more.

- -
- {filmboxes} -
-
- -

That is all.

diff --git a/subsites/films/previews/box.jpg b/subsites/films/previews/box.jpg deleted file mode 100644 index fff623c..0000000 Binary files a/subsites/films/previews/box.jpg and /dev/null differ diff --git a/subsites/films/previews/cola.jpg b/subsites/films/previews/cola.jpg deleted file mode 100644 index b766179..0000000 Binary files a/subsites/films/previews/cola.jpg and /dev/null differ diff --git a/subsites/films/previews/compufight.jpg b/subsites/films/previews/compufight.jpg deleted file mode 100644 index 83810dc..0000000 Binary files a/subsites/films/previews/compufight.jpg and /dev/null differ diff --git a/subsites/films/previews/compumotion.jpg b/subsites/films/previews/compumotion.jpg deleted file mode 100644 index 1ea7235..0000000 Binary files a/subsites/films/previews/compumotion.jpg and /dev/null differ diff --git a/subsites/films/previews/crazychristmas.jpg b/subsites/films/previews/crazychristmas.jpg deleted file mode 100644 index 81ec236..0000000 Binary files a/subsites/films/previews/crazychristmas.jpg and /dev/null differ diff --git a/subsites/films/previews/creative-process.jpg b/subsites/films/previews/creative-process.jpg deleted file mode 100644 index ae62dae..0000000 Binary files a/subsites/films/previews/creative-process.jpg and /dev/null differ diff --git a/subsites/films/previews/dice.jpg b/subsites/films/previews/dice.jpg deleted file mode 100644 index ff21336..0000000 Binary files a/subsites/films/previews/dice.jpg and /dev/null differ diff --git a/subsites/films/previews/easteregg.jpg b/subsites/films/previews/easteregg.jpg deleted file mode 100644 index 77d1693..0000000 Binary files a/subsites/films/previews/easteregg.jpg and /dev/null differ diff --git a/subsites/films/previews/legoparty.jpg b/subsites/films/previews/legoparty.jpg deleted file mode 100644 index fb3e8ac..0000000 Binary files a/subsites/films/previews/legoparty.jpg and /dev/null differ diff --git a/subsites/films/previews/legoshow.jpg b/subsites/films/previews/legoshow.jpg deleted file mode 100644 index 53dae3d..0000000 Binary files a/subsites/films/previews/legoshow.jpg and /dev/null differ diff --git a/subsites/films/previews/mobility.jpg b/subsites/films/previews/mobility.jpg deleted file mode 100644 index da7a955..0000000 Binary files a/subsites/films/previews/mobility.jpg and /dev/null differ diff --git a/subsites/films/previews/paranoia.jpg b/subsites/films/previews/paranoia.jpg deleted file mode 100644 index d7d46a5..0000000 Binary files a/subsites/films/previews/paranoia.jpg and /dev/null differ diff --git a/subsites/films/previews/robo.jpg b/subsites/films/previews/robo.jpg deleted file mode 100644 index 7bae901..0000000 Binary files a/subsites/films/previews/robo.jpg and /dev/null differ diff --git a/subsites/films/previews/saltvspepper.jpg b/subsites/films/previews/saltvspepper.jpg deleted file mode 100644 index 4b292f6..0000000 Binary files a/subsites/films/previews/saltvspepper.jpg and /dev/null differ diff --git a/subsites/films/previews/super-surveillance.jpg b/subsites/films/previews/super-surveillance.jpg deleted file mode 100644 index 1a41aee..0000000 Binary files a/subsites/films/previews/super-surveillance.jpg and /dev/null differ diff --git a/subsites/films/previews/testdraw.jpg b/subsites/films/previews/testdraw.jpg deleted file mode 100644 index ddb780d..0000000 Binary files a/subsites/films/previews/testdraw.jpg and /dev/null differ diff --git a/subsites/films/robots.txt b/subsites/films/robots.txt deleted file mode 100644 index 2f698a1..0000000 --- a/subsites/films/robots.txt +++ /dev/null @@ -1,2 +0,0 @@ -User-agent: * -Disallow: /static diff --git a/subsites/films/static/logo.png b/subsites/films/static/logo.png deleted file mode 100644 index d87b77f..0000000 Binary files a/subsites/films/static/logo.png and /dev/null differ diff --git a/subsites/films/static/logo.svg b/subsites/films/static/logo.svg deleted file mode 100644 index f821dc6..0000000 --- a/subsites/films/static/logo.svg +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - nohifilms - - diff --git a/subsites/films/static/playogg.png b/subsites/films/static/playogg.png deleted file mode 100644 index 05b4b97..0000000 Binary files a/subsites/films/static/playogg.png and /dev/null differ diff --git a/subsites/films/static/screen.css b/subsites/films/static/screen.css deleted file mode 100644 index 291a984..0000000 --- a/subsites/films/static/screen.css +++ /dev/null @@ -1,135 +0,0 @@ -* { - margin: 0; - padding: 0; -} - -body { - background-color: #555; - color: #fff; - font-size: 14px; - font-family: 'Dejavu Sans', 'Nimbus Sans', Helvetica, Arial, Verdana, sans-serif; -} - -.end { - clear: both; - float: none; - width: 1px; - height: 1px; - background: transparent; -} - -#wrapper { - width: 900px; - margin: 0 auto; -} - -#header { - font-size: 30px; - height: 20px; - background: #000 url(logo.png) right top no-repeat; - margin-bottom: 6px; - padding: 23px 6px; - position: relative; -} - -#header a { - position: absolute; - right: 0; - top: 0; - width: 198px; - height: 66px; - text-decoration: none; -} - -#content { - background: #222; - padding: 10px; -} - -/* MAIN PAGE SPECIFIC */ -#films { - margin-top: 5px; -} - -#films a { - width: 435px; - height: 300px; - float: left; - background-color: #666; - background-position: center center; - display: block; - text-decoration: none; - margin-bottom: 10px; -} - -#films a.left { - margin-right: 10px; -} - -#films a span { - width: 425px; - padding: 3px 5px; - background: rgba(0, 0, 0, .5); - font-size: 25px; - display: inline-block; -} - -#films a:hover div { - height: 294px; -} - -#film { - width: 640px; - background: #999; - margin-right: 10px; -} - -span { - font-weight: bold; -} - -#description { - padding: 5px; - width: 220px; - overflow: auto; - float: right; - margin-bottom: 10px; -} - -#dl { - clear: both; - padding: 3px; - background: #444; -} - -#dl a { - padding: 0 15px; -} - -#footer { - margin-top: 6px; - background: #000; - padding: 3px; - font-size: 11px; - text-align: center; -} - -pre { - font-family: Inconsolata, 'Dejavu Sans Mono', monospace; -} - -.end { - clear: both; -} - -img { - border: 0; -} - -a:link, a:visited { - color: #00aaff; -} - -a:hover { - color: #00eeff; -} diff --git a/subsites/films/template.html b/subsites/films/template.html deleted file mode 100644 index ada554d..0000000 --- a/subsites/films/template.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - nohifilms :: {title} - - - - - - - - - - - - - - - -
- - - -
-{content} -
- - - -
- - diff --git a/subsites/pictures-apache b/subsites/pictures-apache deleted file mode 100644 index 2c52dbc..0000000 --- a/subsites/pictures-apache +++ /dev/null @@ -1,43 +0,0 @@ - - ServerName pictures.metanohi.name - ServerAlias www.pictures.metanohi.name pictures.lcl - ServerAdmin ngws@metanohi.name - - DocumentRoot /home/niels/www/meta/subsites/pictures - - Options Indexes Includes FollowSymLinks MultiViews - AllowOverride All - Order allow,deny - allow from all - - - LogLevel warn - ErrorLog /var/log/apache2/pictures.metanohi.name-error.log - CustomLog /var/log/apache2/pictures.metanohi.name-access.log combined - - - - - ServerName pictures.metanohi.name - ServerAlias www.pictures.metanohi.name pictures.lcl - ServerAdmin ngws@metanohi.name - - DocumentRoot /home/niels/www/meta/subsites/pictures - - Options Indexes Includes FollowSymLinks MultiViews - AllowOverride All - Order allow,deny - allow from all - - - LogLevel warn - ErrorLog /var/log/apache2/pictures.metanohi.name-error.log - CustomLog /var/log/apache2/pictures.metanohi.name-access.log combined - - SSLEngine on - SSLCertificateFile /home/niels/www/meta/metanohi_server.pem - SSLCertificateKeyFile /home/niels/www/meta/metanohi_privatekey.pem - SSLCipherSuite HIGH - SSLProtocol all -SSLv2 - - diff --git a/subsites/pictures/.gitignore b/subsites/pictures/.gitignore deleted file mode 100644 index d3984ca..0000000 --- a/subsites/pictures/.gitignore +++ /dev/null @@ -1 +0,0 @@ -img/ \ No newline at end of file diff --git a/subsites/pictures/.htaccess b/subsites/pictures/.htaccess deleted file mode 100755 index 0723dda..0000000 --- a/subsites/pictures/.htaccess +++ /dev/null @@ -1 +0,0 @@ -ErrorDocument 404 /show.php diff --git a/subsites/pictures/about b/subsites/pictures/about deleted file mode 100755 index 5df4d70..0000000 --- a/subsites/pictures/about +++ /dev/null @@ -1,5 +0,0 @@ - ...--' About '--... - -I choose a copyleft license when I want to protect a picture from being -abused by people who do not want to allow sharing and editing. When a -picture isn't worth protecting, I just throw it in the public domain. diff --git a/subsites/pictures/edit/edit.php b/subsites/pictures/edit/edit.php deleted file mode 100755 index b81062d..0000000 --- a/subsites/pictures/edit/edit.php +++ /dev/null @@ -1,26 +0,0 @@ - diff --git a/subsites/pictures/edit/index.php b/subsites/pictures/edit/index.php deleted file mode 100755 index 6c1f53f..0000000 --- a/subsites/pictures/edit/index.php +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - Edit info text - - - -
- -

-

-

-
- - - - diff --git a/subsites/pictures/edit/php_errorlog b/subsites/pictures/edit/php_errorlog deleted file mode 100755 index 9b9486d..0000000 --- a/subsites/pictures/edit/php_errorlog +++ /dev/null @@ -1,3 +0,0 @@ -[19-Oct-2009 05:02:21] PHP Parse error: syntax error, unexpected T_VARIABLE, expecting ',' or ';' in /home/metanohi/public_html/pictures/edit/edit.php on line 19 -[19-Oct-2009 05:04:08] PHP Parse error: syntax error, unexpected T_VARIABLE, expecting ',' or ';' in /home/metanohi/public_html/pictures/edit/edit.php on line 20 -[19-Oct-2009 05:33:58] PHP Parse error: syntax error, unexpected T_CONSTANT_ENCAPSED_STRING in /home/metanohi/public_html/pictures/edit/edit.php on line 18 diff --git a/subsites/pictures/get_info.php b/subsites/pictures/get_info.php deleted file mode 100755 index 6974d2c..0000000 --- a/subsites/pictures/get_info.php +++ /dev/null @@ -1,13 +0,0 @@ -/', '/[(.*)]/'), array("<$1>", "[$1]"), $txt); - //$txt = preg_replace('/<(.*)>/', "<$1>", $txt); - //$txt = preg_replace('/\[(.*)\]/', "[$1]", $txt); - return preg_replace(array('/<(.*)>/', '/\[([^]]*)\]/'), array("<$1>", "[$1]"), $txt); - return $txt; -} -?> diff --git a/subsites/pictures/index.php b/subsites/pictures/index.php deleted file mode 100755 index 76333af..0000000 --- a/subsites/pictures/index.php +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - Pictures - - - - -

Pictures

$x

\n"; -} -?> - - diff --git a/subsites/pictures/info/Akiba_squirrel.jpg.info b/subsites/pictures/info/Akiba_squirrel.jpg.info deleted file mode 100755 index 4377ff8..0000000 --- a/subsites/pictures/info/Akiba_squirrel.jpg.info +++ /dev/null @@ -1,6 +0,0 @@ -This picture is released under the Creative Commons Attribution-ShareAlike 3.0 -Unported license. The author is Niels Serup, and it's based on the pictures -found at and at -, -both also released under CC BY-SA 3.0. -See also [Akiba_squirrel.xcf] and [ssq.png]. diff --git a/subsites/pictures/info/Akiba_squirrel.xcf.info b/subsites/pictures/info/Akiba_squirrel.xcf.info deleted file mode 100755 index 0c45b7c..0000000 --- a/subsites/pictures/info/Akiba_squirrel.xcf.info +++ /dev/null @@ -1,7 +0,0 @@ -This picture is released under the Creative Commons Attribution-ShareAlike 3.0 -Unported license. The author is Niels Serup, and it's based on the pictures -found at and at -, -both also released under CC BY-SA 3.0. -This file can be opened in GIMP. -See also [Akiba_squirrel.jpg] and [ssq.png]. diff --git a/subsites/pictures/info/Gnou_Thoiry_19803_modbw4.png.info b/subsites/pictures/info/Gnou_Thoiry_19803_modbw4.png.info deleted file mode 100644 index 1f87cc6..0000000 --- a/subsites/pictures/info/Gnou_Thoiry_19803_modbw4.png.info +++ /dev/null @@ -1,4 +0,0 @@ -Based on in PD. -This also in the public domain. - -See also [Gnou_Thoiry_19803_modwb4.png] \ No newline at end of file diff --git a/subsites/pictures/info/Gnou_Thoiry_19803_modwb4.png.info b/subsites/pictures/info/Gnou_Thoiry_19803_modwb4.png.info deleted file mode 100644 index bd68301..0000000 --- a/subsites/pictures/info/Gnou_Thoiry_19803_modwb4.png.info +++ /dev/null @@ -1,4 +0,0 @@ -Based on in PD. -This also in the public domain. - -See also [Gnou_Thoiry_19803_modbw4.png] \ No newline at end of file diff --git a/subsites/pictures/info/bloklys.png.info b/subsites/pictures/info/bloklys.png.info deleted file mode 100755 index 43de800..0000000 --- a/subsites/pictures/info/bloklys.png.info +++ /dev/null @@ -1 +0,0 @@ -It's a candle in the public domain. \ No newline at end of file diff --git a/subsites/pictures/info/catcool.jpg.info b/subsites/pictures/info/catcool.jpg.info deleted file mode 100644 index 1d96988..0000000 --- a/subsites/pictures/info/catcool.jpg.info +++ /dev/null @@ -1,3 +0,0 @@ -cc-by-sa Niels Serup - -[catcool.xcf] \ No newline at end of file diff --git a/subsites/pictures/info/catcool.xcf.info b/subsites/pictures/info/catcool.xcf.info deleted file mode 100644 index 92cc887..0000000 --- a/subsites/pictures/info/catcool.xcf.info +++ /dev/null @@ -1,3 +0,0 @@ -CC BY-SA 3.0. - -Also see [catcool.jpg]. \ No newline at end of file diff --git a/subsites/pictures/info/coolcircle.png.info b/subsites/pictures/info/coolcircle.png.info deleted file mode 100755 index 7eba5ba..0000000 --- a/subsites/pictures/info/coolcircle.png.info +++ /dev/null @@ -1 +0,0 @@ -GIMP. Public domain. See also [coolcircle.xcf]. \ No newline at end of file diff --git a/subsites/pictures/info/coolcircle.xcf.info b/subsites/pictures/info/coolcircle.xcf.info deleted file mode 100755 index 0c83e3f..0000000 --- a/subsites/pictures/info/coolcircle.xcf.info +++ /dev/null @@ -1 +0,0 @@ -GIMP. Public domain. See also [coolcircle.png]. \ No newline at end of file diff --git a/subsites/pictures/info/deadinsect-wshd-red.jpg.info b/subsites/pictures/info/deadinsect-wshd-red.jpg.info deleted file mode 100755 index 5a0d202..0000000 --- a/subsites/pictures/info/deadinsect-wshd-red.jpg.info +++ /dev/null @@ -1,3 +0,0 @@ -It wasn't me! -CC-BY-SA 3.0 -[deadinsect-wshd.jpg] \ No newline at end of file diff --git a/subsites/pictures/info/deadinsect-wshd.jpg.info b/subsites/pictures/info/deadinsect-wshd.jpg.info deleted file mode 100755 index 05aec5f..0000000 --- a/subsites/pictures/info/deadinsect-wshd.jpg.info +++ /dev/null @@ -1,3 +0,0 @@ -I honestly didn't kill it. -CC-BY-SA 3.0 -[deadinsect-wshd-red.jpg] \ No newline at end of file diff --git a/subsites/pictures/info/end.png.info b/subsites/pictures/info/end.png.info deleted file mode 100755 index b7a2cbc..0000000 --- a/subsites/pictures/info/end.png.info +++ /dev/null @@ -1,3 +0,0 @@ -Or is it? - -Public domain. \ No newline at end of file diff --git a/subsites/pictures/info/foot-base.png.info b/subsites/pictures/info/foot-base.png.info deleted file mode 100755 index 005859d..0000000 --- a/subsites/pictures/info/foot-base.png.info +++ /dev/null @@ -1,3 +0,0 @@ -It's a foot. -CC-BY-SA 3.0 -Also check out [foot-neon.png] and [foot-morbid.png]. \ No newline at end of file diff --git a/subsites/pictures/info/foot-morbid.png.info b/subsites/pictures/info/foot-morbid.png.info deleted file mode 100755 index 50932bd..0000000 --- a/subsites/pictures/info/foot-morbid.png.info +++ /dev/null @@ -1,3 +0,0 @@ -It's a foot. -CC-BY-SA 3.0 -Also check out [foot-base.png] and [foot-neon.png]. \ No newline at end of file diff --git a/subsites/pictures/info/foot-neon.png.info b/subsites/pictures/info/foot-neon.png.info deleted file mode 100755 index e4f800a..0000000 --- a/subsites/pictures/info/foot-neon.png.info +++ /dev/null @@ -1,3 +0,0 @@ -It's a foot. -CC-BY-SA 3.0 -Also check out [foot-base.png] and [foot-morbid.png]. \ No newline at end of file diff --git a/subsites/pictures/info/laseronwall.png.info b/subsites/pictures/info/laseronwall.png.info deleted file mode 100644 index 4ddfe2e..0000000 --- a/subsites/pictures/info/laseronwall.png.info +++ /dev/null @@ -1 +0,0 @@ -public domain \ No newline at end of file diff --git a/subsites/pictures/info/laseronwall2.png.info b/subsites/pictures/info/laseronwall2.png.info deleted file mode 100644 index 4ddfe2e..0000000 --- a/subsites/pictures/info/laseronwall2.png.info +++ /dev/null @@ -1 +0,0 @@ -public domain \ No newline at end of file diff --git a/subsites/pictures/info/ldit.png.info b/subsites/pictures/info/ldit.png.info deleted file mode 100755 index 13de69f..0000000 --- a/subsites/pictures/info/ldit.png.info +++ /dev/null @@ -1 +0,0 @@ -It's just a couple 'o warm 'n fuzzy colors. Public domain. \ No newline at end of file diff --git a/subsites/pictures/info/me1.jpg.info b/subsites/pictures/info/me1.jpg.info deleted file mode 100644 index 8a5dab5..0000000 --- a/subsites/pictures/info/me1.jpg.info +++ /dev/null @@ -1,6 +0,0 @@ -A picture of me sitting in a chair reading about something on Wikipedia (I think) - -This picture is released under the Creative Commons Attribution-ShareAlike 3.0 -Unported license. The author is Niels Serup. - -I didn't take this picture (my parents did), but they have transferred their copyright to me. \ No newline at end of file diff --git a/subsites/pictures/info/skelhand.png.info b/subsites/pictures/info/skelhand.png.info deleted file mode 100755 index 51b6a79..0000000 --- a/subsites/pictures/info/skelhand.png.info +++ /dev/null @@ -1,3 +0,0 @@ -Watch out! -CC-BY-SA 3.0 -[skelhand.xcf] \ No newline at end of file diff --git a/subsites/pictures/info/skelhand.xcf.info b/subsites/pictures/info/skelhand.xcf.info deleted file mode 100755 index cee6a13..0000000 --- a/subsites/pictures/info/skelhand.xcf.info +++ /dev/null @@ -1 +0,0 @@ -GIMP-specific. See [skelhand.png]. \ No newline at end of file diff --git a/subsites/pictures/info/snegle.png.info b/subsites/pictures/info/snegle.png.info deleted file mode 100644 index 6493f65..0000000 --- a/subsites/pictures/info/snegle.png.info +++ /dev/null @@ -1,5 +0,0 @@ -Scary! - -CC BY-SA 3.0 Unported - -[snegle.xcf] \ No newline at end of file diff --git a/subsites/pictures/info/snegle.xcf.info b/subsites/pictures/info/snegle.xcf.info deleted file mode 100644 index a5ad5de..0000000 --- a/subsites/pictures/info/snegle.xcf.info +++ /dev/null @@ -1,5 +0,0 @@ -U-U-h - -CC BY-SA 3.0 Unported - -[snegle.png] \ No newline at end of file diff --git a/subsites/pictures/info/sq.png.info b/subsites/pictures/info/sq.png.info deleted file mode 100644 index 8c35369..0000000 --- a/subsites/pictures/info/sq.png.info +++ /dev/null @@ -1 +0,0 @@ -WTFPL 2.0 \ No newline at end of file diff --git a/subsites/pictures/info/sqrt-n.png.info b/subsites/pictures/info/sqrt-n.png.info deleted file mode 100644 index 31b4a38..0000000 --- a/subsites/pictures/info/sqrt-n.png.info +++ /dev/null @@ -1 +0,0 @@ -=? \ No newline at end of file diff --git a/subsites/pictures/info/ssq.png.info b/subsites/pictures/info/ssq.png.info deleted file mode 100755 index a6e081b..0000000 --- a/subsites/pictures/info/ssq.png.info +++ /dev/null @@ -1,6 +0,0 @@ -This picture is released under the Creative Commons Attribution-ShareAlike 3.0 -Unported license. The author is Niels Serup, and it's based on the picture -found at -, -also released under CC BY-SA 3.0. -See also [Akiba_squirrel.xcf] and [Akiba_squirrel.jpg]. diff --git a/subsites/pictures/info/stam.png.info b/subsites/pictures/info/stam.png.info deleted file mode 100644 index 68237f6..0000000 --- a/subsites/pictures/info/stam.png.info +++ /dev/null @@ -1,7 +0,0 @@ -Stamtræ for Knud Romers "Papa Schneider blinzelt nicht!" - -^^^^^^^^^ -in Danish - --------------------- -cc-by-sa Niels Serup \ No newline at end of file diff --git a/subsites/pictures/info/tube0.png.info b/subsites/pictures/info/tube0.png.info deleted file mode 100644 index 04a8583..0000000 --- a/subsites/pictures/info/tube0.png.info +++ /dev/null @@ -1,3 +0,0 @@ -See also [tube1.png], [tube2.png], [tube3.png] and [tube3m.png]. - -Public domain. \ No newline at end of file diff --git a/subsites/pictures/info/tube1.png.info b/subsites/pictures/info/tube1.png.info deleted file mode 100644 index c712814..0000000 --- a/subsites/pictures/info/tube1.png.info +++ /dev/null @@ -1,3 +0,0 @@ -See also [tube0.png], [tube2.png], [tube3.png] and [tube3m.png]. - -Public domain. \ No newline at end of file diff --git a/subsites/pictures/info/tube2.png.info b/subsites/pictures/info/tube2.png.info deleted file mode 100644 index 1e1398c..0000000 --- a/subsites/pictures/info/tube2.png.info +++ /dev/null @@ -1,3 +0,0 @@ -See also [tube0.png], [tube1.png], [tube3.png] and [tube3m.png]. - -Public domain. \ No newline at end of file diff --git a/subsites/pictures/info/tube3.png.info b/subsites/pictures/info/tube3.png.info deleted file mode 100644 index 439813d..0000000 --- a/subsites/pictures/info/tube3.png.info +++ /dev/null @@ -1,3 +0,0 @@ -See also [tube0.png], [tube1.png], [tube2.png] and [tube3m.png]. - -Public domain. \ No newline at end of file diff --git a/subsites/pictures/info/tube3m.png.info b/subsites/pictures/info/tube3m.png.info deleted file mode 100644 index cc36aa1..0000000 --- a/subsites/pictures/info/tube3m.png.info +++ /dev/null @@ -1,3 +0,0 @@ -See also [tube0.png], [tube1.png], [tube2.png] and [tube3.png]. - -Public domain. \ No newline at end of file diff --git a/subsites/pictures/info/vortex.png.info b/subsites/pictures/info/vortex.png.info deleted file mode 100755 index 1f257e0..0000000 --- a/subsites/pictures/info/vortex.png.info +++ /dev/null @@ -1,2 +0,0 @@ -It's just a vortex. Public domain. -[vortex.xcf] \ No newline at end of file diff --git a/subsites/pictures/info/vortex.xcf.info b/subsites/pictures/info/vortex.xcf.info deleted file mode 100755 index 3c6f8ab..0000000 --- a/subsites/pictures/info/vortex.xcf.info +++ /dev/null @@ -1 +0,0 @@ -See [vortex.png]. \ No newline at end of file diff --git a/subsites/pictures/info/xcf.png.info b/subsites/pictures/info/xcf.png.info deleted file mode 100755 index b3fbf44..0000000 --- a/subsites/pictures/info/xcf.png.info +++ /dev/null @@ -1 +0,0 @@ -Eh.. \ No newline at end of file diff --git a/subsites/pictures/saved_crypt_pass.php b/subsites/pictures/saved_crypt_pass.php deleted file mode 100755 index 0945be7..0000000 --- a/subsites/pictures/saved_crypt_pass.php +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/subsites/pictures/show.php b/subsites/pictures/show.php deleted file mode 100755 index 4eafa30..0000000 --- a/subsites/pictures/show.php +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - <?php echo $img; ?> - - - -Index -

-

<?php echo $img; ?>

-

Information

-
-
-
-Edit - - diff --git a/subsites/pictures/upload/index.php b/subsites/pictures/upload/index.php deleted file mode 100755 index 02260c4..0000000 --- a/subsites/pictures/upload/index.php +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - Upload picture - - - -
-

-

-

-

-
- - - - diff --git a/subsites/pictures/upload/upload.php b/subsites/pictures/upload/upload.php deleted file mode 100755 index e87e57b..0000000 --- a/subsites/pictures/upload/upload.php +++ /dev/null @@ -1,42 +0,0 @@ -$filename' uploaded"; - if (!(file_exists($info_path) && $info == '')) { - $info = str_replace('\\\'', '\'', str_replace('\"', "\"", $info)); - // Info file - $f = fopen($info_path, 'w'); - fwrite($f, $info); - fclose($f); - } - } - else - $msg = "Upload error"; -} -?> - - - Uploader - - -

-New - - -