Changeset 7

Timestamp:

2007-11-21 15:27:52 (5 years ago)

Author:

hannes

Message:

redirectors/uploadavatar.php added (ticket #3)

Files:

• trunk/admin/classes/pages/Permissions.php (modified) (1 diff)
• trunk/classes/pages/Editprofile.php (modified) (2 diffs)
• trunk/db/spamboard.sql (modified) (2 diffs)
• trunk/includes/lang/en.php (modified) (2 diffs)
• trunk/redirectors/showip.php (modified) (4 diffs)
• trunk/redirectors/uploadavatar.php (added)

trunk/admin/classes/pages/Permissions.php

@@ -46 +46 @@
-        $_exclude_pages = Array('Page', 'Category', 'Forum', 'Topic', 'Newpoll', 'Reply', 'Moderate', 'Newtopic');
-        // define special 'pseudo-pages'
-
+Uploadavatar', '
-        // define the forum-specific pages
-        $_forum_pages = Array('Forum', 'Newpoll', 'Newtopic', 'Reply');

trunk/classes/pages/Editprofile.php

@@ -308 +308 @@
-                    while (FALSE !== ($file = @readdir($handle))) {
-                        // only image files
-$file != 'index.htm'
+(strtolower(substr($file, strlen($file) - 4)) == '.png' || strtolower(substr($file, strlen($file) - 4)) == '.gif' || strtolower(substr($file, strlen($file) - 4)) == '.jpg' || strtolower(substr($file, strlen($file) - 5)) == '.jpeg')
-                            $_col1 .= '<option value="images/avatars/' . $file . '"';
-                            if ($m->getAvatar() == 'images/avatars/' . $file) {
@@ -319 +319 @@
-                    @closedir($handle);
-                }
-
+0
-                $_col2 = '<td>';
-                /* it shouldn't really occur that the avatar is an empty string,

trunk/db/spamboard.sql

@@ -228 +228 @@
-INSERT INTO "sb_rights" VALUES('Delete',3,0,0);
-INSERT INTO "sb_rights" VALUES('Edit',3,0,0);
+INSERT INTO "sb_rights" VALUES('Uploadavatar',1,1,1);
+INSERT INTO "sb_rights" VALUES('Uploadavatar',2,1,1);
+INSERT INTO "sb_rights" VALUES('Uploadavatar',3,1,1);
+INSERT INTO "sb_rights" VALUES('Uploadavatar',4,1,1);
+INSERT INTO "sb_rights" VALUES('Uploadavatar',5,0,0);
-
-CREATE TABLE sb_rights_default (
@@ -382 +387 @@
-INSERT INTO "sb_rights_default" VALUES('Delete',3,0,0);
-INSERT INTO "sb_rights_default" VALUES('Edit',3,0,0);
+INSERT INTO "sb_rights_default" VALUES('Uploadavatar',1,1,1);
+INSERT INTO "sb_rights_default" VALUES('Uploadavatar',2,1,1);
+INSERT INTO "sb_rights_default" VALUES('Uploadavatar',3,1,1);
+INSERT INTO "sb_rights_default" VALUES('Uploadavatar',4,1,1);
+INSERT INTO "sb_rights_default" VALUES('Uploadavatar',5,0,0);
-
-CREATE TABLE sb_usergroups (

trunk/includes/lang/en.php

@@ -367 +367 @@
-$LANG['welcome_mail'] = 'Hello and welcome to ' . $SETTINGS['forumname'] . "!\n\nYour initial password is %password%\n\nYou can now use it to log in and change your profile settings.\n\n" . $SETTINGS['forumadmin'] . "\nhttp://" . $_SERVER['SERVER_NAME'] . substr($_SERVER['PHP_SELF'], 0, strrpos($_SERVER[PHP_SELF], '/'));
-$LANG['lost_password_mail'] = "%membername%,\n\nsomebody (hopefully you) has requested a new password for your account over at " . $SETTINGS['forumname'] . ".\n\nThis is said password: %password%\n\nUse it to log in and change it to whatever you like.\n\n" . $SETTINGS['forumadmin'] . "\nhttp://" . $_SERVER['SERVER_NAME'] . substr($_SERVER['PHP_SELF'], 0, strrpos($_SERVER[PHP_SELF], '/'));
+$LANG['upload_avatar_hints'] = "<ul><li>File size must be smaller or equal 50KB</li><li>Width and height of the image mustn't exceed " . $SETTINGS['maxavatarsize'] . " pixels each</li><li>Allow file types are PNG, JPEG and GIF</li></ul>";
+$LANG['upload_avatar_success'] = 'Your avatar has been uploaded successfully. You can now safely close this window, then reload the page from which you opened it and the new file should appear in the list.';
-
-/* error messages */
@@ -411 +413 @@
-$LANG['error_bans_file_not_writable'] = "Error: The bans file isn't writable. Please adjust the permissions accordingly.";
-$LANG['error_mail_address_already_used'] = "Error: The e-mail address you entered has already been used to register another account. The board administrators have chosen to allow only one account per address.";
+$LANG['error_avatar_file_missing'] = "Error: It seems you didn't select a file to upload.";
+$LANG['error_avatar_filesize'] = "Error: The file you tried to upload is larger than 50KB.";
+$LANG['error_avatar_filetype'] = "Error: The file you uploaded is neither a PNG, a JPEG or a GIF.";
+$LANG['error_avatar_dimension'] = "Error: The file's width or height exceeds " . $SETTINGS['maxavatarsize'] . ' pixels.';
+$LANG['error_avatar_filename'] = "Error: A file with the same name as the one you tried to upload already exists among the avatars. Please rename it and try again.";
+$LANG['error_avatar_move'] = "Error: Something unforseen went wrong with the upload. Please try again. If this error persists, contact the administrators.";
-
-?>

trunk/redirectors/showip.php

@@ -38 +38 @@
-// formatting object
-$F = new Format();
-.$SETTINGS['language'].
+ . $SETTINGS['language'] . 
-// open database connection
-$C = new Connection('../');
-require_once('../includes/session.php');
-if ($_SESSION['lang'] != '') {
-.$_SESSION['lang'].
+ . $_SESSION['lang'] . 
-}
-// translate passed variables to local identifiers
@@ -62 +62 @@
-    $_style = $_SESSION['boardstyle'];
-}
-.
+ . 
-// tell spiders not to index this
-$_meta = $html->head->addChild('meta');
@@ -70 +70 @@
-$html->addChild('body');
-
-independent from
+dependent on
-if (Member::checkRights('Showip', 'read', $id)) {
-    // permission granted
@@ -118 +118 @@
-header('Pragma: no-cache');
-header('Cache-Control: no-cache, must-revalidate');
-.
-.
+ . 
+ . 
-// send document to client
-print(str_replace(Array('ο', '»', 'α', '©', ' '), Array('ο', '»', 'α', '©', ' '), $html->asXML()));