Merge branch 'mysql4-utf8' of git://github.com/takuya-o/scuttle

[scuttle] / login.php

diff --git a/login.php b/login.php
index 4d212a94def47199bce52884d4b2a74a706e82cf..38ca3606e29c16351888e1955a3897d866436ae4 100644 (file)
--- a/login.php
+++ b/login.php
@@ -1,7 +1,6 @@
 <?php
 /***************************************************************************
 <?php
 /***************************************************************************

-Copyright (C) 2004 - 2006 Scuttle project
-http://sourceforge.net/projects/scuttle/
+Copyright (c) 2004 - 2006 Marcus Campbell

 http://scuttle.org/
 
 This program is free software; you can redistribute it and/or modify
 http://scuttle.org/
 
 This program is free software; you can redistribute it and/or modify


@@ -19,8 +18,8 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ***************************************************************************/
 
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ***************************************************************************/
 

-require_once('header.inc.php');
-$userservice =& ServiceFactory::getServiceInstance('UserService');
+require_once 'header.inc.php';
+$userservice     =& ServiceFactory::getServiceInstance('UserService');

 $templateservice =& ServiceFactory::getServiceInstance('TemplateService');
 
 $tplVars = array();
 $templateservice =& ServiceFactory::getServiceInstance('TemplateService');
 
 $tplVars = array();


@@ -28,7 +27,7 @@ $tplVars = array();
 $login = false;
 if (isset($_POST['submitted']) && isset($_POST['username']) && isset($_POST['password'])) {
     $posteduser = trim(utf8_strtolower($_POST['username']));
 $login = false;
 if (isset($_POST['submitted']) && isset($_POST['username']) && isset($_POST['password'])) {
     $posteduser = trim(utf8_strtolower($_POST['username']));

-    $login = $userservice->login($posteduser, $_POST['password'], ($_POST['keeppass'] == "yes")); 
+    $login      = $userservice->login($posteduser, $_POST['password'], ($_POST['keeppass'] == 'yes'), $path); 

     if ($login) {
         if ($_POST['query'])
             header('Location: '. createURL('bookmarks', $posteduser .'?'. $_POST['query']));
     if ($login) {
         if ($_POST['query'])
             header('Location: '. createURL('bookmarks', $posteduser .'?'. $_POST['query']));