From: Michael Andreen <harv@ruin.nu>
Date: Mon, 11 Dec 2006 20:19:10 +0000 (+0000)
Subject: some more done
X-Git-Url: https://ruin.nu/git/?a=commitdiff_plain;h=073463a38ef44b632155ffd6f4e61f4e1370a821;hp=9e13e343c9a55ca8a765ebc138779dcec9146829;p=ndwebbie.git

some more done
---

diff --git a/include.pl b/include.pl
index cc7bbe6..eab857e 100644
--- a/include.pl
+++ b/include.pl
@@ -36,4 +36,12 @@ sub isBC {
 	return exists $ND::GROUPS{BC};
 }
 
+sub parseMarkup {
+	my ($text) = @_;
+
+	$text =~ s{\n}{\n<br/>}g;
+	$text =~ s{\[B\](.*?)\[B\]}{<b>$1</b>};
+	return $text;
+}
+
 1;
diff --git a/main.pl b/main.pl
index 3917873..7614d8a 100644
--- a/main.pl
+++ b/main.pl
@@ -22,7 +22,49 @@ use strict;
 $ND::TEMPLATE->param(TITLE => 'Main Page');
 
 our $BODY;
+our $DBH;
 
+if (param('cmd') eq 'fleet'){
+	$DBH->begin_work;
+	my $fleet = $DBH->prepare("SELECT id FROM fleets WHERE uid = ? AND fleet = 0");
+	my ($id) = $DBH->selectrow_array($fleet,undef,$ND::UID);
+	unless ($id){
+		my $insert = $DBH->prepare(q{INSERT INTO fleets (uid,target,mission,landing_tick,fleet,eta) VALUES (?,$?,'Base',0,0,0)});
+		$insert->execute($ND::UID,$ND::PLANET);
+		($id) = $DBH->selectrow_array($fleet,undef,$ND::UID);
+	}
+	my $delete = $DBH->prepare("DELETE FROM fleet_ships WHERE fleet = ?");
+	$delete->execute($id);
+	my $insert = $DBH->prepare('INSERT INTO fleet_ships (fleet,ship,amount) VALUES (?,?,?)');
+	$fleet = param('fleet');
+	while ($fleet =~ m/((?:[A-Z][a-z]+ )*[A-Z][a-z]+)\s+((?:\d+|,)+)/g){
+		my $amount = $2;
+		$amount =~ s/,//;
+		$insert->execute($id,$1,$amount);
+	}
+	$fleet = $DBH->prepare('UPDATE fleets SET landing_tick = tick() WHERE id = ?');
+	$fleet->execute($id);
+	$DBH->commit;
+}
+if (param('sms')){
+	my $query = $DBH->prepare('UPDATE users SET sms = ? WHERE uid = ?');
+	$query->execute(escapeHTML(param('sms')),$ND::UID);
+}
+if (isMember() && !$ND::PLANET && (param('planet') =~ m/(\d+)(?: |:)(\d+)(?: |:)(\d+)/)){
+	my $query = $DBH->prepare(q{
+UPDATE users SET planet = 
+	(SELECT id from current_planet_stats where x = ? AND y = ? AND z = ?)
+WHERE uid = ? });
+	$query->execute($1,$2,$3,$ND::UID);
+}
+if(param('oldpass') && param('pass')){
+	my $query = $DBH->prepare('UPDATE users SET password = MD5(?) WHERE password = MD5(?) AND uid = ?');
+	$query->execute(param('pass'),param('oldpass'),$ND::UID);
+}
+
+my ($motd) = $DBH->selectrow_array("SELECT value FROM misc WHERE id='MOTD'");
+
+$BODY->param(MOTD => parseMarkup($motd));
 $BODY->param(Username => 'harv');
 $BODY->param(isMember => isMember());
 $BODY->param(isHC => isHC());
@@ -30,4 +72,50 @@ my @groups = map {name => $_}, sort keys %ND::GROUPS;
 $BODY->param(Groups => \@groups);
 
 
+my $query = $DBH->prepare(q{SELECT planet,defense_points,attack_points,scan_points,humor_points, (attack_points+defense_points+scan_points/20) as total_points, sms,rank FROM users WHERE uid = ?});
+
+my ($planet,$defense_points,$attack_points,$scan_points,$humor_points,$total_points,$sms,$rank) = $DBH->selectrow_array($query,undef,$ND::UID);
+
+$ND::PLANET = $planet unless $ND::PLANET;
+
+$BODY->param(NDRank => $rank);
+$BODY->param(DefensePoints => $defense_points);
+$BODY->param(AttackPoints => $attack_points);
+$BODY->param(ScanPoints => $scan_points);
+$BODY->param(HumorPoints => $humor_points);
+$BODY->param(TotalPoints => $total_points);
+
+$BODY->param(hasPlanet => $planet);
+
+if ($planet){
+	my @row = $DBH->selectrow_array('SELECT ruler,planet,coords(x,y,z),size,sizerank
+			,score,scorerank,value,valuerank,xp,xprank FROM current_planet_stats
+			WHERE id = ?',undef,$planet);
+	$BODY->param(PlanetName => "$row[0] OF $row[1] ($row[2])");
+	$BODY->param(PlanetSize => "$row[3] ($row[4])");
+	$BODY->param(PlanetScore => "$row[5] ($row[6])");
+	$BODY->param(PlanetValue => "$row[7] ($row[8])");
+	$BODY->param(PlanetXP => "$row[9] ($row[10])");
+}
+
+
+my $query = $DBH->prepare(q{SELECT f.fleet, coords(x,y,z), mission, sum(fs.amount) AS amount, landing_tick 
+FROM fleets f 
+	JOIN fleet_ships fs ON f.id = fs.fleet 
+	JOIN current_planet_stats p ON f.target = p.id
+WHERE f.uid = ? AND (f.fleet = 0 OR landing_tick > ?)
+GROUP BY f.fleet, x,y,z, mission, landing_tick
+ORDER BY f.fleet
+});
+
+$query->execute($ND::UID,$ND::TICK);
+my @fleets;
+while (my($fleet,$coords,$mission,$amount,$landing_tick) = $query->fetchrow){
+	push @fleets,{Target => $coords, Mission => $mission, Amount => $amount, LandingTick => $landing_tick};
+}
+$BODY->param(Fleets => \@fleets);
+
+$BODY->param(SMS => $sms);
+
 1;
+
diff --git a/templates/main.tmpl b/templates/main.tmpl
index b628d22..03da63c 100644
--- a/templates/main.tmpl
+++ b/templates/main.tmpl
@@ -33,17 +33,23 @@
 </fieldset>
 <fieldset> <legend>Fleets</legend>
 	<table>
-	<tr><th>Target</th><th>Mission</th><th>Amount</th><th>Landing Tick</th></tr></table>
+	<tr><th>Target</th><th>Mission</th><th>Amount</th><th>Landing Tick</th></tr>
+	<TMPL_LOOP Fleets>
+	<tr><td><TMPL_VAR NAME=Target></td><td><TMPL_VAR NAME=Mission></td>
+		<td><TMPL_VAR NAME=Amount></td><td><TMPL_VAR NAME=LandingTick></td>
+	</tr>
+	</TMPL_LOOP>
+	</table>
 </fieldset>
-<form action="/index.pl" method="post">
+<form action="/index.pl?page=main" method="post">
 <fieldset> <legend>SMS</legend>
 	<p>Number: 
-	<input type="text" name="sms" value="+46730506275"/>
+	<input type="text" name="sms" value="<TMPL_VAR NAME=SMS>"/>
 	<input type="submit" value="Submit"/>
 	</p>
 </fieldset>
 </form>
-<form action="/index.php" method="post">
+<form action="/index.pl?page=main.pl" method="post">
 <fieldset> <legend>Fleet</legend>
 	<p>Paste your total fleet from ships section on overview here (do it daily to see the menus):</p>
 	<textarea rows="15" cols="50" name="fleet"></textarea>
@@ -51,7 +57,7 @@
 	<br/><input type="submit" value="Submit"/>
 </fieldset>
 </form>
-<form action="/index.php" method="post">
+<form action="/index.pl?page=main" method="post">
 <fieldset> <legend>Change password</legend>
 	<p>Old password: 
 	<input type="password" name="oldpass" value=""/>