projects / efiction3-v4 / commitdiff
search:
summary | shortlog | log | commit | commitdiff | tree
side by side | plain
fix for PHP notices during install process
fix for PHP notices during install process

file:a/admin/settings.php -> file:b/admin/settings.php 
--- a/admin/settings.php
+++ b/admin/settings.php
@@ -49,7 +49,7 @@
 	}
 }
 
-if($action == "settings") {
+if(isset($action) && $action == "settings") {
 $output .= "<h1>"._SETTINGS."</h1><div style='text-align: center;'>
 	<a href='admin.php?action=settings&amp;sect=main'>"._MAINSETTINGS."</a> |
 	<a href='admin.php?action=settings&amp;sect=submissions'>"._SUBMISSIONSETTINGS."</a> |
@@ -182,7 +182,7 @@
 		$$var = stripslashes($val);
 	}
 
-	$output .= "<form method='POST' class='tblborder' style='' enctype='multipart/form-data' action='".($action == "settings" ? "admin.php?action=settings" : $_SERVER['PHP_SELF']."?step=".$_GET['step'])."&amp;sect=$sect'>";
+	$output .= "<form method='POST' class='tblborder' style='' enctype='multipart/form-data' action='".(isset($action) &&  $action == "settings" ? "admin.php?action=settings" : $_SERVER['PHP_SELF']."?step=".$_GET['step'])."&amp;sect=$sect'>";
 	if($sect == "main") {
 		$output .= "<h2>"._SITEINFO."</h2>
 		<table class='acp'>
file:a/install/install.php -> file:b/install/install.php 
--- a/install/install.php
+++ b/install/install.php
@@ -60,20 +60,21 @@
 header ("Expires: 0"); 
 
 $output = "";
+$language = "en";
 
 include ("../includes/class.TemplatePower.inc.php");
 
-if(!isset($_GET['step']) || $_GET['step'] == 2) {
+if(!isset($_GET['step']) || $_GET['step'] == 2) {   
 	include ("../languages/en.php");
 	include ("../languages/en_admin.php");
 	include ("languages/en.php");
 }
 else if(isset($_REQUEST['language'])) {
 	$language = $_REQUEST['language'];
-	if(file_exists("../languages/".$language.".php")) include ("../languages/".$language.".php");
-	else include ("../languages/en.php");
-	if(file_exists("../languages/".$language."_admin.php")) include("../languages/".$language."_admin.php");
-	else include ("../languages/en_admin.php");
+ 	if(file_exists("../languages/".$language.".php")) include ("../languages/".$language.".php");
+ 	else include ("../languages/en.php");
+ 	if(file_exists("../languages/".$language."_admin.php")) include("../languages/".$language."_admin.php");
+ 	else include ("../languages/en_admin.php");
 	if(file_exists("languages/".$language.".php")) include("languages/".$language.".php");
 	else include ("languages/en.php");
 }
@@ -146,14 +147,15 @@
 $tpl->assign( "footer", "eFiction $version &copy; 2007. <a href='http://efiction.org/'>http://efiction.org/</a>");
 $tpl->gotoBlock( "_ROOT" );
 
-switch($_GET['step']) {
+$step = isset($_GET["step"]) ? $_GET["step"] : "";
+switch($step) {
 	case "9":
 		if(isset($_POST['submit'])) {
 			$penname = descript($_POST['newpenname']);
 			if((!$_POST['email']) && !isADMIN) $fail .= "<div style='text-align: center;'>"._EMAILREQUIRED." "._TRYAGAIN."</div>";
 			if($penname && !preg_match("!^[a-z0-9_ ]{3,30}$!i", $penname)) $fail = "<div style='text-align: center;'>"._BADUSERNAME." "._TRYAGAIN."</div>";
-			if(!preg_match("/^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9.-]+$/", $_POST[email])) $fail = "<div style='text-align: center;'>"._INVALIDEMAIL." "._TRYAGAIN."</div>";
-			if($_POST['password'] == $_POST['password2']) $encryptpassword = md5($_POST[password]);
+			if(!preg_match("/^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9.-]+$/", $_POST['email'])) $fail = "<div style='text-align: center;'>"._INVALIDEMAIL." "._TRYAGAIN."</div>";
+			if($_POST['password'] == $_POST['password2']) $encryptpassword = md5($_POST['password']);
 			else $fail =  write_message(_PASSWORDTWICE);
 			if(!isset($fail)) {
 				$result = dbquery("INSERT INTO ".$tableprefix."fanfiction_authors(`penname`, `email`, `password`, `date`) VALUES('$penname', '".$_POST['email']."', '$encryptpassword', now( ))");
@@ -161,11 +163,13 @@
 				$skinquery = dbquery("SELECT skin FROM ".$settingsprefix."fanfiction_settings WHERE sitekey = '".SITEKEY."'");
 				list($skin) = dbrow($skinquery);
 				$result2 = dbquery("INSERT INTO ".$tableprefix."fanfiction_authorprefs(`uid`, `userskin`, `level`) VALUES('".USERUID."', '$skin', '1')");
-				if($result && $result2) $output .= write_message(_ACTIONSUCCESSFUL."<br /><br />Installation complete!  <a href='../user.php?action=login'>Log in</a> to your site and go to the Admin area to configure your archive. <strong>Note:</strong> Please delete the install/ folder!");
+				if($result && $result2) $output .= write_message(_ACTIONSUCCESSFUL."<br /><br />Installation complete!  <a href='../member.php?action=login'>Log in</a> to your site and go to the Admin area to configure your archive. <strong>Note:</strong> Please delete the install/ folder!");
 			}
 			else $output .= $fail;
 		}
 		else {
+            if(!isset($user['penname'])) $user['penname'] = '';
+            if(!isset($user['email'])) $user['email'] = '';
 			$output .= "<div id='pagetitle'>"._ADMINACCT."</div><form method=\"POST\" class='tblborder' style='margin: 1em auto; width: 400px;' enctype=\"multipart/form-data\" action=\"install.php?step=9\">
 			<div class='row'><label for='newpenname'>"._PENNAME.":</label> <INPUT name=\"newpenname\" type=\"text\" class=\"textbox\" maxlength=\"200\" value=\"$user[penname]\"></div>
 		 	<div class='row'><label for='email'>"._EMAIL.":</label> <INPUT  type=\"text\" class=\"textbox=\" name=\"email\" value=\"$user[email]\" maxlength=\"200\"></div>
@@ -784,7 +788,7 @@
 				$settingsresults = dbquery("SELECT * FROM ".$settingsprefix."fanfiction_settings WHERE sitekey = '".SITEKEY."'");
 			}
 			$settings = dbassoc($settingsresults);
-			define("_BASEDIR", "../");
+            if (!defined("_BASEDIR")) define('constant', define("_BASEDIR", "../"));
 			foreach($settings as $var => $val) {
 				$$var = $val;
 			}
@@ -814,7 +818,7 @@
 			else include("../admin/settings.php");
 		}
 		else {
-			if($_GET['install']) {
+			if(isset($_GET['install'])) {
 				if($_GET['install'] == "automatic") {
 			
 								$settings = dbquery("CREATE TABLE IF NOT EXISTS `".$settingsprefix."fanfiction_settings` (
file:a/languages/en.php -> file:b/languages/en.php 
--- a/languages/en.php
+++ b/languages/en.php
@@ -8,6 +8,19 @@
 $alphabet = array('A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', _OTHER);
 
 // General...used in many pages.
+if(!isset($allowed_tags)) $allowed_tags = '';
+if(!isset($recentdays)) $recentdays = '7';
+if(!isset($sitename )) $sitename  = '';
+if(!isset($url )) $url  = '';
+if(!isset($multiplecats )) $multiplecats  = '';
+if(!isset($minwords )) $minwords  = '';
+if(!isset($maxwords )) $maxwords  = '';
+if(!isset($action )) $action  = '';
+if(!isset($pwdsetting )) $pwdsetting  = '';
+if(!isset($imagewidth )) $imagewidth  = '';
+if(!isset($imageheight )) $imageheight = '';
+if(!isset($version)) $version  = '';
+
 
 define('_ACTIONSUCCESSFUL', 'The action was successful.');
 define('_ACTIONCANCELLED', 'The requested action was cancelled.');
Hard 'fork' of https://github.com/e107-eFiction/efiction_noconflict , mainly to preserve commits for reference only.
GitPHP by Chris Han