Navigation

← Previous Changeset
Next Changeset →

Changeset 6dd5b7381121a7223962ea089baefead5c590107

Timestamp:

04/17/07 15:53:19 (2 years ago)

Author:

Christopher Jung <bktheg@web.de>

git-committer:

Christopher Jung <bktheg@web.de> 1176817999 +0200

git-parent:

[7fb52b25f1c73fc488cc08200cf501bcedbfa6e5]

git-author:

Christopher Jung <bktheg@web.de> 1176817999 +0200

Message:

Eine Warnung gefixt

Files:

src/net/driftingsouls/ds2/server/modules/PortalController.java (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

src/net/driftingsouls/ds2/server/modules/PortalController.java

r7fb52b2	r6dd5b73
751	751	clear = false;
752	752	}
753		~~User user = getContext().createUserObject(uid.getInt("id"));~~
754
755		~~if( !user.getPassword().equals(enc_pw) ) {~~
756		~~t.set_var( "show.msg.login.wrongpassword",1 );~~
757		~~user.setLoginFailedCount(user.getLoginFailedCount()+1);~~
758		Common.writeLog("login.log", Common.date("j.m.Y H:i:s")+": <"+getRequest().getRemoteAddress()+"> ("+user.getID()+") <"+username+"> Password <"+password+"> *LOGIN GESCHEITERT* von Browser <"+getRequest().getUserAgent()+">\n");
759		~~clear = false;~~
760		}
761		~~else if( user.getDisabled() ) {~~
762		~~t.set_var("show.login.msg.accdisabled",1);~~
763		Common.writeLog("login.log", Common.date( "j.m.Y H:i:s")+": <"+getRequest().getRemoteAddress()+"> ("+user.getID()+") <"+username+"> Password <"+password+"> *ACCOUNT GESPERRT* von Browser <"+getRequest().getUserAgent()+">\n");
764
765		~~db.update("DELETE FROM sessions WHERE id='",user.getID(),"'");~~
766		~~clear = false;~~
767		}
768	753	else {
769		SQLResultRow session = db.first("SELECT * FROM sessions WHERE id='",user.getID(),"'");
770		if( !session.isEmpty() && (session.getInt("tick") != 0) ) {
771		t.set_var("show.login.msg.tick",1);
	754	User user = getContext().createUserObject(uid.getInt("id"));
	755
	756	if( !user.getPassword().equals(enc_pw) ) {
	757	t.set_var( "show.msg.login.wrongpassword",1 );
	758	user.setLoginFailedCount(user.getLoginFailedCount()+1);
	759	Common.writeLog("login.log", Common.date("j.m.Y H:i:s")+": <"+getRequest().getRemoteAddress()+"> ("+user.getID()+") <"+username+"> Password <"+password+"> *LOGIN GESCHEITERT* von Browser <"+getRequest().getUserAgent()+">\n");
772	760	clear = false;
773		}
774		else{
775		Common.writeLog("login.log",Common.date( "j.m.Y H:i:s")+": <"+getRequest().getRemoteAddress()+"> ("+user.getID()+") <"+username+"> Login von Browser <"+getRequest().getUserAgent()+">\n");
776
777		int id = user.getID();
778
779		String sess = Common.md5(""+RandomUtils.nextInt(Integer.MAX_VALUE));
780
781		db.update("DELETE FROM sessions WHERE id='",id,"' AND attach IS NULL");
782		db.update("INSERT INTO sessions (id,session,ip,lastaction,usegfxpak) ",
783		" VALUES('",id,"','",sess,"','<",getRequest().getRemoteAddress(),">','",Common.time(),"','",usegfxpak,"')");
784
785		if( (user.getVacationCount() == 0) \|\| (user.getWait4VacationCount() != 0) ) {
786		t.set_var( "show.login.msg.ok", 1,
787		"login.sess", sess );
788		}
789		else {
790		t.set_var( "show.login.vacmode", 1,
791		"login.vacmode.dauer", Common.ticks2Days(user.getVacationCount()),
792		"login.vacmode.sess", sess );
	761	}
	762	else if( user.getDisabled() ) {
	763	t.set_var("show.login.msg.accdisabled",1);
	764	Common.writeLog("login.log", Common.date( "j.m.Y H:i:s")+": <"+getRequest().getRemoteAddress()+"> ("+user.getID()+") <"+username+"> Password <"+password+"> *ACCOUNT GESPERRT* von Browser <"+getRequest().getUserAgent()+">\n");
	765
	766	db.update("DELETE FROM sessions WHERE id='",user.getID(),"'");
	767	clear = false;
	768	}
	769	else {
	770	SQLResultRow session = db.first("SELECT * FROM sessions WHERE id='",user.getID(),"'");
	771	if( !session.isEmpty() && (session.getInt("tick") != 0) ) {
	772	t.set_var("show.login.msg.tick",1);
	773	clear = false;
793	774	}
794
795		// Ueberpruefen ob das gfxpak noch aktuell ist
796		if( (usegfxpak != 0) && !user.getUserImagePath().equals(User.getDefaultImagePath(db)) ) {
797		t.set_var( "login.checkgfxpak", 1,
798		"login.checkgfxpak.path", user.getUserImagePath() );
799		}
800
801		/*
802		* HACK (? - das ganze sollte vieleicht besser ins Framework)
803		*
804		* Browser erkennen und ggf eine Warnung ausgeben
805		*
806		*/
807
808		String browser = getRequest().getUserAgent().toLowerCase();
809		String browsername = null;
810		if( browser.indexOf("opera") != -1 ) {
811		browsername = "opera";
812		}
813		else if( browser.indexOf("msie") != -1 ) {
814		browsername = "msie";
815		}
816		else if( (browser.indexOf("firefox") != -1) \|\| (browser.indexOf("gecko") != -1) ) {
817		browsername = "mozilla";
818		}
819		else {
820		browsername = "unknown";
821		}
822
823		try {
824		if( browsername.equals("opera") ) {
825		Matcher browserpattern = Pattern.compile("opera ([0-9\\.,]+)").matcher(browser);
826		browserpattern.find();
827		String tmp = browserpattern.group(0);
828
829		double version = Double.parseDouble(tmp);
830		if( (version > 0) && (version < 9.0) ) {
	775	else{
	776	Common.writeLog("login.log",Common.date( "j.m.Y H:i:s")+": <"+getRequest().getRemoteAddress()+"> ("+user.getID()+") <"+username+"> Login von Browser <"+getRequest().getUserAgent()+">\n");
	777
	778	int id = user.getID();
	779
	780	String sess = Common.md5(""+RandomUtils.nextInt(Integer.MAX_VALUE));
	781
	782	db.update("DELETE FROM sessions WHERE id='",id,"' AND attach IS NULL");
	783	db.update("INSERT INTO sessions (id,session,ip,lastaction,usegfxpak) ",
	784	" VALUES('",id,"','",sess,"','<",getRequest().getRemoteAddress(),">','",Common.time(),"','",usegfxpak,"')");
	785
	786	if( (user.getVacationCount() == 0) \|\| (user.getWait4VacationCount() != 0) ) {
	787	t.set_var( "show.login.msg.ok", 1,
	788	"login.sess", sess );
	789	}
	790	else {
	791	t.set_var( "show.login.vacmode", 1,
	792	"login.vacmode.dauer", Common.ticks2Days(user.getVacationCount()),
	793	"login.vacmode.sess", sess );
	794	}
	795
	796	// Ueberpruefen ob das gfxpak noch aktuell ist
	797	if( (usegfxpak != 0) && !user.getUserImagePath().equals(User.getDefaultImagePath(db)) ) {
	798	t.set_var( "login.checkgfxpak", 1,
	799	"login.checkgfxpak.path", user.getUserImagePath() );
	800	}
	801
	802	/*
	803	* HACK (? - das ganze sollte vieleicht besser ins Framework)
	804	*
	805	* Browser erkennen und ggf eine Warnung ausgeben
	806	*
	807	*/
	808
	809	String browser = getRequest().getUserAgent().toLowerCase();
	810	String browsername = null;
	811	if( browser.indexOf("opera") != -1 ) {
	812	browsername = "opera";
	813	}
	814	else if( browser.indexOf("msie") != -1 ) {
	815	browsername = "msie";
	816	}
	817	else if( (browser.indexOf("firefox") != -1) \|\| (browser.indexOf("gecko") != -1) ) {
	818	browsername = "mozilla";
	819	}
	820	else {
	821	browsername = "unknown";
	822	}
	823
	824	try {
	825	if( browsername.equals("opera") ) {
	826	Matcher browserpattern = Pattern.compile("opera ([0-9\\.,]+)").matcher(browser);
	827	browserpattern.find();
	828	String tmp = browserpattern.group(0);
	829
	830	double version = Double.parseDouble(tmp);
	831	if( (version > 0) && (version < 9.0) ) {
	832	t.set_var( "show.login.browserwarning", 1,
	833	"browser.name", "Opera",
	834	"browser.version", version );
	835	}
	836	}
	837	else if( browsername.equals("msie") ) {
	838	Matcher browserpattern = Pattern.compile("msie ([0-9\\.,]+)").matcher(browser);
	839	browserpattern.find();
	840	String tmp = browserpattern.group(1);
	841
	842	double version = Double.parseDouble(tmp);
	843
831	844	t.set_var( "show.login.browserwarning", 1,
832		"browser.name", "~~Opera~~",
	845	"browser.name", "Microsoft Internet Explorer",
833	846	"browser.version", version );
834	847	}
835	848	}
836		else if( browsername.equals("msie") ) {
837		Matcher browserpattern = Pattern.compile("msie ([0-9\\.,]+)").matcher(browser);
838		browserpattern.find();
839		String tmp = browserpattern.group(1);
840
841		double version = Double.parseDouble(tmp);
842
843		t.set_var( "show.login.browserwarning", 1,
844		"browser.name", "Microsoft Internet Explorer",
845		"browser.version", version );
	849	catch( Exception e ) {
	850	java.lang.System.err.println(e);
	851	e.printStackTrace();
846	852	}
	853
	854	clear = true;
847	855	}
848		~~catch( Exception e ) {~~
849		~~java.lang.System.err.println(e);~~
850		~~e.printStackTrace();~~
851		}
852
853		~~clear = true;~~
854	856	}
855	857	}

Navigation

Changeset 6dd5b7381121a7223962ea089baefead5c590107

Legend:

src/net/driftingsouls/ds2/server/modules/PortalController.java

Download in other formats: