Changeset 153 for branches

Show
Ignore:
Timestamp:
2008-08-03 10:16:31 (5 months ago)
Author:
hannes
Message:

merging changesets [151] and [152] from trunk; creating version 5.0.2

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/5.0/classes/misc/Member.php

    r143 r153  
    498498            $logins = split("\n", $LOGINS); 
    499499            // open file for write access 
    500             $file = @fopen($_pref . 'includes/config/logins.php', 'w'); 
     500            $file = @fopen($_pref . 'includes/config/logins.php', 'r+'); 
     501            flock($file, LOCK_EX); 
     502            ftruncate($file, 0); 
    501503            // file header 
    502504            @fwrite($file, "<?php\n\n/**\n * Package: Spam Board 5\n * File: includes/config/logins.php\n * Description: list of IPs and their unsuccessful login attempts\n **/\n\n\$LOGINS = \""); 
    …… 
    517519                    } 
    518520                    // write updated data 
    519                     @fwrite($file, $_SERVER['REMOTE_ADDR'] . '|' . $newlogins . '|' . time() . '\n'); 
     521                    @fwrite($file, $_SERVER['REMOTE_ADDR'] . '|' . $newlogins . '|' . time() . "\n"); 
    520522                } 
    521523                $i++; 
    …… 
    523525            if ($found == 0) { 
    524526                // write new entry 
    525                 @fwrite($file, $_SERVER['REMOTE_ADDR'] . '|' . $newlogins . '|' .  time() . '\n'); 
     527                @fwrite($file, $_SERVER['REMOTE_ADDR'] . '|' . $newlogins . '|' .  time() . "\n"); 
    526528            } 
    527529            @fwrite($file, "\";\n?>"); 
     530            flock($file, LOCK_UN); 
    528531            @fclose($file); 
    529532            // update cookie and session 

  • branches/5.0/classes/misc/Post.php

    r149 r153  
    282282                                $q = NULL; 
    283283                            } 
     284                        } 
     285                        // check if username set 
     286                        if (!isset($user) || $user == '') { 
     287                            $_error = $LANG['error_mandatory']; 
     288                            $ok = 0; 
    284289                        } 
    285290                        // finally, sort out e-mail banning 

  • branches/5.0/classes/pages/Page.php

    r143 r153  
    341341        } 
    342342        // The authors politely ask you to keep this notice of authorship and copyright intact in the spirit of 'credit where credit is due'. 
    343         $_temp = new XMLElement('<div id="bottombar">' . $LANG['Powered_by'] . ' <a href="http://www.spamboard.net" target="_blank">Spam Board</a> ' . $VERSION . ' &amp;copy; 2007 <a href="http://www.spamboard.net/wiki/Authors" target="_blank">Spam Board Team</a></div>'); 
     343        $_temp = new XMLElement('<div id="bottombar">' . $LANG['Powered_by'] . ' <a href="http://www.spamboard.net" target="_blank">Spam Board</a> ' . $VERSION . ' &amp;copy; 2007, 2008 <a href="http://www.spamboard.net/wiki/Authors" target="_blank">Spam Board Team</a></div>'); 
    344344        // append page footer 
    345345        $this->html->body->addElement($_temp); 

  • branches/5.0/includes/config/version.php

    r149 r153  
    2828 * Also good: Spam Board Viking Edition 1.0 (then, you can do your own version numbering from there) */ 
    2929 
    30 $VERSION = '5.0.1'; 
     30$VERSION = '5.0.2'; 
    3131 
    3232?>