Makeup FlatPress Installer

- The HTML of the installer now has a lang attribute in the html start tag to specify the language.
- The installer tries to provide the fp-content directory for owners and groups with write permissions, which had to be done manually before.
Write permissions for "others" removed via default.php. Even if the webserver is configured very unfavorable, only owners and groups should be allowed to write.
- Image files, which are not used by the installer, were removed.
- Removed unnecessary lang variable in default settings.
- In the setup CSS, unused IDs, classes and incorrect references to fonts have been removed.
- The installer header now shines in a simple FlatPress style

defaults.php

@@ -18,8 +18,8 @@
 define('DUMB_MODE_ENABLED', false);
 // default file permissions
 // change file to 644 and dir to 755 if your webserver "complains"
-define('FILE_PERMISSIONS', 0777);
+define('FILE_PERMISSIONS', 0775);
-define('DIR_PERMISSIONS', 0777);
+define('DIR_PERMISSIONS', 0775);
 
 // first some webserver setup...
 
@@ -36,10 +36,10 @@ define('ABS_PATH', dirname(__FILE__) . '/');
 define('FP_DEFAULTS', 'fp-defaults/');
 
 // all writable directories go here.
-define('FP_CONTENT', 'fp-content/'); // must be chmodded to 0777
+define('FP_CONTENT', 'fp-content/'); // must be chmodded to 0775
 
 // blog configurations files
-define('CONFIG_DIR', FP_CONTENT . 'config/'); // must be chmodded to 0777
+define('CONFIG_DIR', FP_CONTENT . 'config/'); // must be chmodded to 0775
 define('CONFIG_FILE', CONFIG_DIR . 'settings.conf.php');
 
 /**

fp-defaults/settings-defaults.php

@@ -21,7 +21,7 @@ $fp_config = array(
 		'dateformat' => '%A, %B %e, %Y',
 		'dateformatshort' => '%Y-%m-%d',
 		'charset' => 'utf-8',
-		'lang' => LANG_DEFAULT . $browserLang
+		'lang' => LANG_DEFAULT
 	),
 	'plugins' => array(
 		'blockparser' => array(

setup/main.php

@@ -1,4 +1,7 @@
 <?php
+error_reporting($_SERVER ["SERVER_NAME"] == "localhost" ? E_ALL : 0);
+chmod("./fp-content/", 0775);
+
 $language = @$_POST ['language']? $_POST ['language'] : $browserLang;
 
 $lf = "lang.$language.php";

setup/res/setup.css

@@ -1,273 +1,118 @@
-/* Default WordPress by Dave Shea || http://mezzoblue.com
+/*
-	Modifications by Matthew Mullenweg || http://photomatt.net
+===================
-	This is just a basic layout, with only the bare minimum defined.
+FlatPress Setup CSS
-	Please tweak this and make it your own. :)
+===================
+
+Name: Leggero v2
+Author: NoWhereMan, Dave Shea, Matthew Mullenweg and Fraenkiman
+Version: 1.0.1
+Module: setup.css
 */
 
-/*base blue: #263962*/
+@viewport { width: device-width }
-
-
-a {
-	color: #3b68bf;
-	text-decoration: none;
-}
-
-a img {
-	border: none;
-}
-
-a:visited {
-	color: #3b68bf;
-}
-
-a:hover {
-	color: #3b5d9f;
-	border-bottom: 1px solid #333;
-}
-
-acronym, abbr {
-	border-bottom: 1px dashed #333;
-}
-
-acronym, abbr, span.caps {
-	cursor: help;
-	font-size: 90%;
-	letter-spacing: .07em;
-}
-
-blockquote {
-	border-left: 5px solid #ccc;
-	margin-left: 1.5em;
-	padding-left: 5px;
-}
 
 body {
-	background: #fff ; /* url('../imgs/tile.png') repeat-x; */
+	background: #fff;
 	color: #535c6f;
 	font-family: 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif;
 	font-size: 70%;
 	text-align: center;
+	-webkit-text-size-adjust: none;
+	-moz-text-size-adjust: none;
+	text-size-adjust: none
 }
 
-#main {
-	margin: auto;
-	width: 500px;
-	text-align: left;
-}
-
-cite {
-	font-size: 90%;
-	font-style: normal;
-}
-
-h2 {
-	font: 160%, bold, Georgia, Times, 'Times New Roman', serif;
-	margin-top: 1em;
-}
-
-h3 {
-	border-bottom: dotted 1px #eee;
-	font: 200%, bold, Georgia, Times, 'Times New Roman', serif;
-	margin-top: 0;
-}
-
-big {
-	color:red;
-	font-weight: bold;
-}
-
-ol#comments li p {
-	font-size: 100%;
-	
-
-}
-
-ol#commentlist li {
-	padding-left: 8px;
-	padding-right: 8px;
-	margin: 4px;
-	border: thin dotted #e0e5ef;
-	background-color:#eff4ff;
-	
-}
-
-#pagesubtitle {
-	color: #ddd;
-	font-style: italic;
-	font-family: Georgia, Times, 'Times New Roman', serif;
-	text-align:center;
-}
-
-/* classes used by the_meta() */
-ul.post-meta {
-	list-style: none;
-}
-
-ul.post-meta span.post-meta-key {
-	font-weight: bold;
-}
-
-.credit {
-	/*background: #263962;
-	color: #fff;*/
-	font-size: 11px;
-	text-align: center;
-	clear:both;
-	
-	padding-top:20px;
-	
-	width: 85%	
-	
-}
-
-
-.feedback {
-	color: #ccc;
-	text-align: right;
-	margin-top: 2em;
-	font-size: .75em;
-}
-
-.meta {
-	font-size: .75em;
-}
-
-.meta li, ul.post-meta li {
-	display: inline;
-}
-
-.meta ul {
-	display: inline;
-	list-style: none;
-	margin: 0;
-	padding: 0;
-}
-
-.meta, .meta a {
-	color: #808080;
-	font-weight: normal;
-	letter-spacing: 0;
-}
-
-.storytitle {
-	margin: 0;
-}
-
-.storytitle a {
-	text-decoration: none;
-}
-
-
-.storycontent {
-	
-	/* clear floats */
-	
-	overflow: hidden;
-	_height:1%; /*ie hack*/
-}
-
-.post {
-	padding: 0.2em 1em;
-	background: #fff;
-	border: solid thin #ddd;
-}
-
-#navigation {
-	margin-left: 6.2%;
-	margin-top: 2em;
-	margin-bottom: 2em;
-}
-
-
-.alignleft {
-		float:left;
-}
-
- .alignright, #buttonbar {
-		float:right;
-}
-
-#buttonbar {
-	padding: 0;
-	margin-top: 1em;
-}
-
-#commentform #name, #commentform #email, #commentform #url, #commentform textarea {
-	background: #fff;
-	border: 1px solid #333;
-	padding: .2em;
-}
-
-
-fieldset {
-	padding: 0.4em;
-}
-
- textarea {
-	width: 99%;
-	font: normal 1em 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif;
-	background: #fff;
-	border: 1px solid #333;
-	padding: .2em;
-
-
-}
-
-#commentlist li ul {
-	border-left: 1px solid #ddd;
-	font-size: 110%;
-	list-style-type: none;
-}
-
-
-
 #header {
 	font-family: Georgia, Times, 'Times New Roman', serif;
 	font-weight: normal;
 	font-style: italic;
 	font-size: 300%;
 	text-align: center;
-	border-bottom: 1px solid #bbb;
+	border-bottom: 1px solid #bbb
 }
 
-#header a {
+#main {
-	color: #fff;
+	margin: auto;
-	text-decoration: none;
+	width: 500px;
+	text-align: left
 }
 
-#header a:hover {
+a { color: #aa4142; text-decoration: none }
-	text-decoration: underline;
+
+a img { border: none }
+
+a:hover { color: #aa4142; border-bottom: 1px solid #333 }
+
+a:visited { color: #aa5152 }
+
+h1 :nth-child(1) { /* logo-small.gif */
+	vertical-align: bottom;
+    width: 28px;
+    margin: 5px 0
 }
 
+h1 :nth-child(2) { color: #535c6f }
 
-input, select {
+h1 :nth-child(3) { color: #aa4142 }
-	font-size: 130%;
+
-	font-family: Georgia, Garamond, 'Times New Roman', Times, serif;
+pre, code {
-	border: 1px solid #bbb;
+    font-family: "Lucida Console", Monaco, monospace;
-	background-color: #eee;
+    font-size: 100%;
+    color: #3b68bf
 }
 
-.maxsize {
+.storycontent { overflow: hidden }
-	width: 99%;
-}
 
+.post {
+	padding: 0.2em 1em;
+	background: #eee;
+	border: solid thin #ddd;
+	font-size: 120%;
+	border-radius: 5px
+}
 
 dt {
-	width: 30%; 
+	width: 40%; 
 	margin-top: 1.8em; 
 	text-align: right; 
-	line-height: 1.5em;
+	line-height: 1.5em
 }
 
 dd {
     margin-top: -1.5em;
     margin-right: 10%;
-	line-height: 2em;
     float: right;
+    line-height: 1.5em
 }
 
-.info-notice {
+dl { margin: 1.8em 0 }
-	padding: 1em;
+
+.alignleft { float: left }
+
+.alignright, #buttonbar { float: right }
+
+input, select {
+	font-size: 130%;
+	font-family: sans-serif;
 	border: 1px solid #ddd;
-	background: #eee;
+	border-radius: 3px;
 }
+
+input[type=text],
+input[type=password] {
+	width: 16em;
+	font-size: 100%;
+	background-color: #fff;
+	vertical-align: middle
+}
+
+input:hover,
+input:focus,
+textarea:hover, 
+textarea:focus { border: 1px solid #aa4142 }
+
+#buttonbar { padding: 0; margin-top: 1.6em }
+
+input[type=submit] { cursor: pointer; font-size: 100% }
+
+#footer { padding-top: 20px }

setup/tpls/footer.tpl.php

@@ -1,5 +1,8 @@
 
 </form>
 </div>
+<div id="footer">
+	<p>FlatPress <?php echo SYSTEM_VER; ?></p>
+</div>
 </body>
 </html>

setup/tpls/header.tpl.php

@@ -1,15 +1,14 @@
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="<?php echo LANG_DEFAULT; ?>">
-<head><title>Flatpress installer</title>
+<head><title>FlatPress Installer</title>
-		<link href="setup/res/setup.css" type="text/css" rel="stylesheet" /></head>
+		<link href="setup/res/setup.css" type="text/css" rel="stylesheet"></head>
 <body>
 	<div id="rap">
-		<h1 id="header">FlatPress Installer</h1>
+		<h1 id="header"><img src="<?php echo BLOG_BASEURL; ?>setup/imgs/logo-small.gif" alt="logo-small.gif" title="logo-small.gif"><span> Flat</span><span>Press</span> Installer</h1>
+
 		</div>
 
 		<div id="main">
 		
 	
-<form class="storycontent" method="post" action="<?php
+<form class="storycontent" method="post" action="<?php echo BLOG_BASEURL; ?>setup.php">
-
-echo BLOG_BASEURL?>setup.php"> 

setup/tpls/step1.tpl.php

@@ -8,7 +8,7 @@
 
 <div class="post">
 
-<input type="hidden" name="setupid" value="<?php echo $setupid; ?>" />
+<input type="hidden" name="setupid" value="<?php echo $setupid; ?>">
 
 <?php 
 	echo wpautop(sprintf($l ['descr'], FP_CONTENT));
@@ -20,7 +20,7 @@
 ?>
 <div id="buttonbar">
 	<input type="submit" name="start" id="start" 
-	value="<?php echo $lang['buttonbar']['next']; ?>" />
+	value="<?php echo $lang ['buttonbar'] ['next']; ?>">
 </div>
 
 </div>

setup/tpls/step2.tpl.php

@@ -1,8 +1,8 @@
 <h2><?php echo $l ['head']; ?></h2>
 <div class="errors">
 
-<input type="hidden" name="setupid" value="<?php echo $setupid; ?>" />
+<input type="hidden" name="setupid" value="<?php echo $setupid; ?>">
-<input type="hidden" name="language" value="<?php echo $language; ?>" />
+<input type="hidden" name="language" value="<?php echo $language; ?>">
 
 <?php 
 	if ($err) {
@@ -33,14 +33,14 @@
 			<label for="username"> <?php echo $l ['fpuser']; ?> </label>
 		</dt>
 		<dd>	
-			<input type="text" id="username" name="fpuser" />
+			<input type="text" id="username" name="fpuser">
 		</dd>
 		
 		<dt>
 			<label for="password"> <?php echo $l ['fppwd']; ?> </label>
 		</dt>
 		<dd>
-			<input type="password" id="password" name="fppwd" />	
+			<input type="password" id="password" name="fppwd">	
 		</dd>
 		
 		<dt>
@@ -48,28 +48,28 @@
 		</dt>
 	
 		<dd>
-			<input type="password" id="password2" name="fppwd2" />	
+			<input type="password" id="password2" name="fppwd2">	
 		</dd>
 		
 		<dt>
 			<label for="www"> <?php echo $l ['www']; ?> </label>
 		</dt>
 		<dd>
-			<input type="text" id="www" name="www" value="<?php echo BLOG_BASEURL ; ?>" />	
+			<input type="text" id="www" name="www" value="<?php echo BLOG_BASEURL; ?>">	
 		</dd>
 		
 		<dt>
 			<label for="email">	<?php echo $l ['email']; ?> </label>
 		</dt>
 		<dd>
-			<input type="text" id="email" name="email" />	
+			<input type="text" id="email" name="email">	
 		</dd>
 		
 	</dl>
 
 <div id="buttonbar">
 	<input type="submit" name="start" id="start" 
-	value="<?php echo $lang['buttonbar']['next']; ?>" />
+	value="<?php echo $lang ['buttonbar'] ['next']; ?>">
 </div>
 
 </div>