Commit graph

331 commits

Author SHA1 Message Date
Shish
fc4bd27529 simplify user_can_edit_user -- many nested if/else's to one if 2014-08-24 20:43:12 +01:00
Shish
eb51a9b639 migrate to bcrypt for password storage 2014-05-24 09:47:42 +01:00
jgen
317028a63b More PHP Doc comments. 2014-04-29 01:33:03 -04:00
jgen
b3f9925839 PHPDoc all the things! 2014-04-28 18:22:57 -04:00
jgen
9f838c0c11 Clean all the things. 2014-04-28 03:32:43 -04:00
jgen
022c162f40 More linting and fixing of comments and PHP Doc, types, etc. 2014-04-28 01:26:22 -04:00
jgen
1ca3865a1c Removing the closing PHP "?>" tag as per style guidelines. (Also see: https://stackoverflow.com/questions/4410704/why-would-one-omit-the-close-tag ) 2014-04-25 22:54:51 -04:00
jgen
478eb3a4cc Linting: Check for null return value, and throw an exception if null. 2014-04-25 15:39:00 -04:00
jgen
7ef68b15f9 Fix indentation. 2014-04-25 15:38:15 -04:00
jgen
daee99c1bc Removing the closing PHP "?>" tag as per style guidelines. 2014-04-24 22:28:53 -04:00
Daku
25c286b71f add support for using : as a metatag seperator + updated docs 2014-01-02 14:00:24 +00:00
Shish
bf8b085de6 fix being logged in after changing password 2013-09-12 16:29:20 +01:00
Shish
4584bf603a finally got that zero... 2013-09-09 13:46:47 +01:00
Shish
1b73dd4ddc add 'hellbanned' user class, with support from the comments extension 2013-09-09 13:41:08 +01:00
Shish
44e9714d88 logging for delete user 2013-04-28 07:48:42 +01:00
Shish
3175e605da Merge branch 'master' of https://github.com/shish/shimmie2 2013-03-07 03:25:23 +00:00
Shish
d5bc06835d reserve block slot #0 for site announcements 2013-03-03 18:27:06 +00:00
Drudex Software
c90689a63e Update ext/user/main.php
- Added board config option for user login forwarding
- Set user_loginshowprofile default to 0
- now only applies when user is on a page containing post/ in its url (to avoid weird messages)
2013-02-15 02:22:09 +01:00
Drudex Software
55b0919465 Update ext/user/main.php
Also don't return to same page if page is "user_admin/login". 
Otherwise it can occur if user first failed to log in with the correct credentials
2013-02-14 23:54:23 +01:00
Drudex Software
62ad4c0ecb Update ext/user/main.php
Site owners can now choose in board config what page users will go to when logging in:
- Previous page (default)
- My Profile (old default)
2013-02-14 22:34:43 +01:00
Shish
06832bae48 Actually, that causes warnings in other versions; use the static version 2013-01-24 10:52:35 +00:00
Stijn Raeymaekers
160bdb3553 Replaced invalid operator
Caused all images and some other pages to get the following error:
syntax error, unexpected T_PAAMAYIM_NEKUDOTAYIM
2013-01-24 11:08:34 +01:00
Shish
6a5b92502b Log user creation with created user 2012-12-30 16:04:05 +00:00
Shish
5a3b4dae49 normalise usernames 2012-12-10 21:28:41 +00:00
Shish
f8cc785560 flashes for user changes 2012-06-10 18:13:22 +01:00
Shish
2542051bc4 show user classes 2012-06-09 15:25:07 +01:00
Shish
14770e4733 show stats *after* gathering them 2012-04-01 20:47:59 +01:00
Shish
eb05458c9f change user class / delete user separate from admin 2012-03-31 19:25:27 +01:00
Shish
75abdc7c04 store enabled exts in a config file, rather than moving directories around 2012-03-31 19:07:05 +01:00
Shish
1d648d0d32 remove redundant code 2012-03-31 15:54:29 +01:00
Shish
5a2a2fa7e4 more removal of distinct classes 2012-03-31 15:43:25 +01:00
Shish
567755a185 Merge branch 'master' of github.com:shish/shimmie2 2012-03-31 12:38:44 +01:00
Shish
11372366ad gravatar note 2012-03-31 12:38:39 +01:00
Shish
b628bcfa86 user deletion event, with vote deletion 2012-03-25 02:41:33 +01:00
Shish
3acf53a32a default style:width:100% overrides width:100%. Use a local style 2012-03-14 20:28:15 +00:00
Shish
8b78fce982 more forminess 2012-03-13 15:23:56 +00:00
Shish
f67b049176 allow logout from link 2012-03-12 18:04:06 +00:00
Shish
2ed73f9a68 user signup form 2012-03-12 18:03:46 +00:00
Shish
34d42d27f4 delete with images / with comments, and check auth token 2012-03-12 17:44:07 +00:00
Shish
0e262f5500 change_X -> edit_X for consistency 2012-03-12 17:29:03 +00:00
Shish
5803920bcc more forms 2012-03-11 15:53:19 +00:00
Shish
b7006e90db Merge branch 'master' of github.com:shish/shimmie2 2012-03-11 15:50:04 +00:00
Shish
4c0b2dcb39 Merge branch 'master' of github.com:shish/shimmie2 2012-03-11 15:49:52 +00:00
Shish
c78ad128bf forms 2012-03-11 15:49:40 +00:00
Shish
071b783f56 forms 2012-03-11 15:49:25 +00:00
Shish
a20245ff70 Merge branch 'master' of github.com:shish/shimmie2 2012-03-10 01:07:02 +00:00
Shish
d7d2bf7418 user test updates 2012-03-09 18:15:03 +00:00
Shish
c7e2ef74f8 if username or password are blank, exit early (saves logging the failed attempt) 2012-03-08 04:35:52 +00:00
Shish
569e93cd6b postgres requires a sequence name to be passed to get_last_insert_id 2012-03-08 02:55:04 +00:00
Shish
8448a4cee1 don't overwrite global $user... 2012-03-05 09:55:11 +00:00
Shish
169ae5f590 installer fails 2012-02-22 13:58:55 +00:00
Shish
eccea620ba only admins can change user classes, and they should be protected from moderators 2012-02-22 12:32:54 +00:00
Shish
4d2a066717 user classes in the installer 2012-02-21 18:37:36 +00:00
Shish
af7704825b use HTTP status codes with error messages 2012-02-16 15:37:05 +00:00
Shish
3c1b20e05b user classes 2012-02-14 20:38:19 +00:00
Shish
519e46578d more notation for which strings are HTML safe and which aren't 2012-02-13 20:51:34 +00:00
Shish
67623246e9 leave sizes to css 2012-02-12 11:14:04 +00:00
Shish
0698b780f9 remove regular Extension, have SimpleExtension take its place, optimise the event system based on SimpleExtension methods 2012-02-08 12:07:01 +00:00
Shish
0589f9d72e fine grained permission bits 2012-02-07 15:15:18 +00:00
Shish
4e1300631b Merge branch 'master' of github.com:shish/shimmie2 2012-02-05 04:25:58 +00:00
Shish
0b13db8ed7 hide anonymous's user page - having made a million comments, it was taking upwards of 60 seconds to process that one page, triggering the DOS defences... 2012-02-05 04:25:50 +00:00
Shish
dab85e5f26 merge type hints 2012-02-02 14:16:14 +00:00
Shish
cc8f1f35a5 more type hints 2012-02-02 14:14:33 +00:00
Shish
dc6c173efd type hints for hiphop 2012-02-02 08:07:57 +00:00
Shish
ec0fab54d8 these are magicked now 2012-02-02 07:53:27 +00:00
Shish
aed5e1a30e hand merge of speed tweaks 2012-01-31 13:20:43 +00:00
Shish
93c2aa2084 only show IP list to admin and self-user, and don't show anon's list 2012-01-27 10:17:44 +00:00
Shish
52bbb36af4 shm_user breaks varnish cache 2012-01-26 16:51:24 +00:00
Shish
f38b45e2a9 there are some odd cases where anonymous is not user #1, so use the anon_id variable 2012-01-24 16:40:36 +00:00
NaGeL
ddd3f99835 deleting the user withouth images delete resulted in image deletion too: the DB entriy gets removed but the image stays on the Hard drive.
this is fixed.
also the Foreign key needs to be manually updated in images table.
named the foreign keys in install.php for easier altering in the future.
2012-01-22 20:14:35 +01:00
NaGeL
023384149f User deletion (Deletes the user with comments, favorites and private messages)
User deletion with uploaded images ( all above plus the images the user uploaded)
Also the Database fix that is all needed for this in DBupdate.php
2012-01-22 18:55:52 +01:00
NaGeL
8eaaa6a7ca Added user deletion.
User is deleted from database
the Comments are deleted too, unknown reason for me
Noting else is deleted so far.
2012-01-19 18:23:43 +01:00
NaGeL
557a82e7be Fixed linking bug in admin_user/list page. 2012-01-19 16:43:20 +01:00
green-ponies (jgen)
fc12bbbfe5 More small changes to help save a few microseconds. 2012-01-12 15:46:34 -05:00
Shish
ad2bb8b8b6 switch timeago to a javascript implementation 2011-12-31 14:12:34 +00:00
Shish
cfbeddde9f HTTP level caching, so we can stick varnish in front of the web pages 2011-12-27 19:23:37 +00:00
Shish
ba02e589b0 IP isn't an int 2011-12-25 12:38:07 +00:00
Shish
070aeff199 search images by uploader IP 2011-12-25 12:31:28 +00:00
Shish
b1cb655adc hopefully fix signup for PDO 2011-02-21 11:57:50 +00:00
Shish
fc7eb0609e warn on login failure 2011-01-22 16:10:07 +00:00
Shish
ee3c24117b more pdo compat, database bits 2011-01-03 15:18:24 +00:00
Shish
d6baeab977 more pdo compat 2011-01-01 16:28:04 +00:00
Shish
ffb1762280 Insert_ID -> lastInsertId 2010-12-31 20:00:59 +00:00
Shish
1e04df7765 <form> -> make_form(), or add auth token manually 2010-10-07 21:26:27 +01:00
Shish
3eee6f313e avatar options 2010-04-21 17:56:01 +01:00
Shish
0816e6bb67 in theory, selectable avatar hosts 2010-04-21 17:32:32 +01:00
Shish
69bfc1868e show user ID number 2010-03-25 10:51:30 +00:00
Shish
4361bb0645 put the captcha in the table 2010-01-23 12:40:03 +00:00
Shish
c7eb0cd99d redundant declaration 2010-01-23 12:39:27 +00:00
Shish
4e7f135024 htmlable t&c 2010-01-05 19:06:04 +00:00
Shish
62862994db set user creation to use the generic captcha api 2010-01-05 17:57:10 +00:00
Shish
f4a74c4d4c better logging 2010-01-05 10:52:23 +00:00
Shish
7a60e6fae5 lots of extension docs 2010-01-05 10:11:53 +00:00
Shish
63277a0864 gah 2009-12-30 08:17:33 +00:00
Shish
694200d9f8 proper logging 2009-12-30 07:59:40 +00:00
Shish
9f37a50256 signup captcha 2009-11-10 03:21:02 +00:00
Shish
3f759619f3 test the right thing... 2009-10-26 10:49:07 +00:00
Shish
a7caf1e060 prefixed cookies 2009-10-08 13:59:12 +01:00
Shish
159a862c02 configurability for avatars 2009-10-08 12:40:52 +01:00
Shish
82bf804fad fix avatar display on user page 2009-10-08 12:32:01 +01:00
Shish
c7a9c4b92c not finished, but add to test coverage 2009-09-20 03:48:24 +01:00
Shish
1946e3c943 consistent naming for test functions 2009-08-19 01:28:48 +01:00
Shish
b1bcb8252f extendable user stats rather than hardcoded with assumptions of extensions 2009-08-18 22:30:52 +01:00
Shish
9aa54af90a fix this test 2009-08-13 19:01:34 +01:00
Shish
76a9090ded settable email field 2009-08-11 17:07:03 +01:00
Shish
2e8eff8f38 gravatar on user page 2009-08-11 15:44:26 +01:00
Shish
9a79f77deb better looking downtime message, and login box 2009-08-03 19:58:24 +01:00
Shish
63be20458d themable user links 2009-08-03 10:46:40 +01:00
Shish
4a4546c427 bring back X blah per day 2009-07-30 03:47:43 +01:00
Shish
572f84511a lots of docs, and some internal changes 2009-07-21 07:38:53 +01:00
Shish
aa7969cdde MOAR TESTING. 2009-07-20 06:51:51 +01:00
Shish
4cb59929d3 hide user stats from anonymous 2009-07-20 06:42:26 +01:00
Shish
c88ecebb7b A ton of tests, figured out how to test uploads \o/ 2009-07-15 02:43:14 +01:00
Shish Moom
e23b80f822 start of password recovery 2009-07-11 05:38:52 -07:00
Shish Moom
b0448eba6f theme changes 2009-07-06 04:29:55 -07:00
Shish Moom
9e1c144f57 fix login... 2009-06-06 12:04:33 -07:00
Shish Moom
413a0ede91 basic user list 2009-05-30 06:47:57 -07:00
Shish
bb84a735a2 requestcontext stuff is messy, go back to globals :( 2009-05-11 07:04:33 -07:00
Shish
415f6901da logging things 2009-05-08 03:52:29 -07:00
Shish
d98962a30e a bunch of fixes 2009-01-22 05:42:44 -08:00
Shish
bda38bff6c did I mention that mysql devs can go choke on a bucket of cocks? Well they can. (Two ways to specify foreign keys, one works, one is silently ignored; wtf?) 2009-01-22 05:03:51 -08:00
Shish
81a4e0fa76 more normal words 2009-01-22 02:49:01 -08:00
Shish
3af5caf523 make things work 2009-01-22 02:14:16 -08:00
Shish
b336b5296f delayed user creation 2009-01-22 01:39:44 -08:00
Shish
2c37ce9a8d match better, so user_id=123 doesn't hit id=123 2009-01-21 23:04:29 -08:00
Shish
ddaa85583e how was this not noticed? 2009-01-21 22:41:44 -08:00
Shish
69efd181c2 no days... 2009-01-21 22:41:24 -08:00
Shish
12cccde8f8 move extension specific parts out of user and into extensions 2009-01-20 03:56:13 -08:00
Shish
0bfafe0e9a classy 2009-01-04 11:41:03 -08:00
Shish
f94a41c3df more global removal 2009-01-04 11:39:07 -08:00
Shish
738fa3ef1e whitespace... 2009-01-04 11:38:47 -08:00
Shish
11873e9601 remove EOL whitespace 2009-01-04 11:18:37 -08:00
Shish
966180aef5 fewer globals 2009-01-04 10:46:18 -08:00
Shish
33d24b2f5c new events 2009-01-04 10:43:44 -08:00
Shish
98b0a55dcb show the right user 2009-01-04 10:41:14 -08:00
Shish
820f60d5e8 make the user extension work again 2009-01-04 10:31:54 -08:00
Shish
7f90fdbf97 pass config to get_session_ip, so it knows what mask to use 2009-01-04 08:17:41 -08:00
Shish
1c8094cabf replace the veto system with exceptions 2009-01-04 06:01:59 -08:00
shish
ae477a6d88 nor in trunk
git-svn-id: file:///home/shish/svn/shimmie2/trunk@1114 7f39781d-f577-437e-ae19-be835c7a54ca
2008-11-19 22:55:04 +00:00
shish
98f6800f9d configurable testing URL
git-svn-id: file:///home/shish/svn/shimmie2/trunk@1096 7f39781d-f577-437e-ae19-be835c7a54ca
2008-10-18 10:34:15 +00:00
shish
c68df68195 test files for various extensions
git-svn-id: file:///home/shish/svn/shimmie2/trunk@1070 7f39781d-f577-437e-ae19-be835c7a54ca
2008-10-11 07:09:42 +00:00
shish
96a37605e4 port page_matches from score to trunk
git-svn-id: file:///home/shish/svn/shimmie2/trunk@1028 7f39781d-f577-437e-ae19-be835c7a54ca
2008-09-06 17:48:03 +00:00
shish
f8f7470e61 much friendlier get_theme_object
git-svn-id: file:///home/shish/svn/shimmie2/trunk@1019 7f39781d-f577-437e-ae19-be835c7a54ca
2008-09-06 16:59:02 +00:00
shish
aee1af4e0e move user stuff into the user class
git-svn-id: file:///home/shish/svn/shimmie2/trunk@1004 7f39781d-f577-437e-ae19-be835c7a54ca
2008-08-23 12:49:47 +00:00
shish
434fab2dc5 and make the extensions match
git-svn-id: file:///home/shish/svn/shimmie2/trunk@1003 7f39781d-f577-437e-ae19-be835c7a54ca
2008-08-23 12:08:19 +00:00
shish
09b2be6830 PHP4 is dead \o/ \o/ \o/ (Part 1, make use of instanceof)
git-svn-id: file:///home/shish/svn/shimmie2/trunk@994 7f39781d-f577-437e-ae19-be835c7a54ca
2008-08-22 09:41:30 +00:00
shish
a658019697 Slightly major rework of the search code internals, makes things more sane and fixes a couple of bugs
git-svn-id: file:///home/shish/svn/shimmie2/trunk@867 7f39781d-f577-437e-ae19-be835c7a54ca
2008-05-19 15:59:58 +00:00
shish
c88a35b58c session IP mask, for users with varying IPs; mostly from a patch in #303
git-svn-id: file:///home/shish/svn/shimmie2/trunk@779 7f39781d-f577-437e-ae19-be835c7a54ca
2008-04-08 16:02:43 +00:00
shish
0b59c40865 remove user enable / disable, as the feature was ass, and better handled elsewhere :|
git-svn-id: file:///home/shish/svn/shimmie2/trunk@749 7f39781d-f577-437e-ae19-be835c7a54ca
2008-04-02 20:07:52 +00:00
shish
d0483bcc2a get the user to change their pass
git-svn-id: file:///home/shish/svn/shimmie2/trunk@726 7f39781d-f577-437e-ae19-be835c7a54ca
2008-03-15 21:53:17 +00:00
shish
c828ce5cfe move user search to user extension, and search by ID
git-svn-id: file:///home/shish/svn/shimmie2/trunk@719 7f39781d-f577-437e-ae19-be835c7a54ca
2008-02-16 03:14:38 +00:00
shish
6d90231d50 Limit length of recent IP lists on user info page
git-svn-id: file:///home/shish/svn/shimmie2/trunk@637 7f39781d-f577-437e-ae19-be835c7a54ca
2007-12-08 03:23:53 +00:00
shish
d880c8cac0 massive user management cleanup, part 1
git-svn-id: file:///home/shish/svn/shimmie2/trunk@610 7f39781d-f577-437e-ae19-be835c7a54ca
2007-11-04 03:51:41 +00:00
shish
862e647365 theme engine 2.1
git-svn-id: file:///home/shish/svn/shimmie2/trunk@466 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-23 11:14:03 +00:00
shish
25b1ebad8b search user rather than poster; everything else refers to 'user'
git-svn-id: file:///home/shish/svn/shimmie2/trunk@420 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-02 19:57:40 +00:00
shish
ff5f41c91e optional user links on user page
git-svn-id: file:///home/shish/svn/shimmie2/trunk@413 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-01 17:11:46 +00:00
shish
7b9a8f83eb empty email = NULL
git-svn-id: file:///home/shish/svn/shimmie2/trunk@405 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-01 16:01:33 +00:00
shish
1137fe7025 default tac
git-svn-id: file:///home/shish/svn/shimmie2/trunk@401 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-01 15:08:40 +00:00
shish
951e4bbf66 formatted terms & conditions
git-svn-id: file:///home/shish/svn/shimmie2/trunk@400 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-01 15:02:05 +00:00
shish
f26bd31f7a hide IP list from anon
git-svn-id: file:///home/shish/svn/shimmie2/trunk@388 7f39781d-f577-437e-ae19-be835c7a54ca
2007-07-28 13:45:12 +00:00
shish
06f59cca08 argh
git-svn-id: file:///home/shish/svn/shimmie2/trunk@387 7f39781d-f577-437e-ae19-be835c7a54ca
2007-07-27 15:35:32 +00:00
shish
6ceb65c49b user admin things moved to user_admin, user/* is now usernames only
git-svn-id: file:///home/shish/svn/shimmie2/trunk@385 7f39781d-f577-437e-ae19-be835c7a54ca
2007-07-27 13:05:48 +00:00
shish
63777446bf brain fail
git-svn-id: file:///home/shish/svn/shimmie2/trunk@384 7f39781d-f577-437e-ae19-be835c7a54ca
2007-07-27 03:41:09 +00:00
shish
2434a6ddb1 mysql 4.x fix
git-svn-id: file:///home/shish/svn/shimmie2/trunk@383 7f39781d-f577-437e-ae19-be835c7a54ca
2007-07-27 02:31:15 +00:00
shish
7c9740e4d3 themeyness
git-svn-id: file:///home/shish/svn/shimmie2/trunk@381 7f39781d-f577-437e-ae19-be835c7a54ca
2007-07-27 00:49:03 +00:00
shish
7ffbde97dc limit usernames
git-svn-id: file:///home/shish/svn/shimmie2/trunk@380 7f39781d-f577-437e-ae19-be835c7a54ca
2007-07-27 00:42:22 +00:00
shish
96a870790e that should've been post/list
git-svn-id: file:///home/shish/svn/shimmie2/trunk@374 7f39781d-f577-437e-ae19-be835c7a54ca
2007-07-26 13:20:53 +00:00
shish
2e8e839f5c make_link with no args links to default page
git-svn-id: file:///home/shish/svn/shimmie2/trunk@373 7f39781d-f577-437e-ae19-be835c7a54ca
2007-07-26 13:19:39 +00:00
shish
446c3a3579 don't send UPBE for null user
git-svn-id: file:///home/shish/svn/shimmie2/trunk@367 7f39781d-f577-437e-ae19-be835c7a54ca
2007-07-26 11:49:52 +00:00
shish
fe28f1abff sort ip lists properly
git-svn-id: file:///home/shish/svn/shimmie2/trunk@358 7f39781d-f577-437e-ae19-be835c7a54ca
2007-07-23 13:51:41 +00:00
shish
6e02af258d IP list is only for admins
git-svn-id: file:///home/shish/svn/shimmie2/trunk@357 7f39781d-f577-437e-ae19-be835c7a54ca
2007-07-23 13:48:52 +00:00
shish
bd91945c76 more event->page
git-svn-id: file:///home/shish/svn/shimmie2/trunk@352 7f39781d-f577-437e-ae19-be835c7a54ca
2007-07-22 11:07:07 +00:00
shish
ef7044ce48 user themed
git-svn-id: file:///home/shish/svn/shimmie2/trunk@333 7f39781d-f577-437e-ae19-be835c7a54ca
2007-07-19 14:32:25 +00:00
shish
0c5f7244db consistency
git-svn-id: file:///home/shish/svn/shimmie2/trunk@312 7f39781d-f577-437e-ae19-be835c7a54ca
2007-07-17 07:45:35 +00:00
shish
b782b3e970 argh, another one
git-svn-id: file:///home/shish/svn/shimmie2/trunk@311 7f39781d-f577-437e-ae19-be835c7a54ca
2007-07-17 02:23:24 +00:00
shish
b57ea27f19 a bit more themey
git-svn-id: file:///home/shish/svn/shimmie2/trunk@302 7f39781d-f577-437e-ae19-be835c7a54ca
2007-07-16 19:47:25 +00:00
shish
4e5d7ff7b3 UserPageBuildingEvent
git-svn-id: file:///home/shish/svn/shimmie2/trunk@301 7f39781d-f577-437e-ae19-be835c7a54ca
2007-07-16 19:38:12 +00:00
shish
da30c88776 more set_default
git-svn-id: file:///home/shish/svn/shimmie2/trunk@293 7f39781d-f577-437e-ae19-be835c7a54ca
2007-07-16 13:15:56 +00:00
shish
5a4d6f7277 remove ConfigSaveEvent handlers
git-svn-id: file:///home/shish/svn/shimmie2/trunk@265 7f39781d-f577-437e-ae19-be835c7a54ca
2007-07-12 08:14:37 +00:00
shish
c6b7c9bb83 remove ambiguous database->get_user(...)
git-svn-id: file:///home/shish/svn/shimmie2/trunk@263 7f39781d-f577-437e-ae19-be835c7a54ca
2007-07-12 07:37:32 +00:00
shish
16448bf36c no longer any need for core extensions per se
git-svn-id: file:///home/shish/svn/shimmie2/trunk@253 7f39781d-f577-437e-ae19-be835c7a54ca
2007-07-10 19:43:36 +00:00