one click installer

sql prefix handling
daipratt · Mar 23, 2013 · 0fce70c · 0fce70c
1 parent c35150c
commit 0fce70c
Show file tree

Hide file tree

Showing 23 changed files with 656 additions and 122 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,5 @@
 /docs/
 /tests/
 /demo/
-/modules/Test/
+/modules/Test/
+/inc/config_1.php
diff --git a/ajax.php b/ajax.php
@@ -9,7 +9,11 @@
  * 
  * Redistributions of files must retain the above notice.
  */
-include('inc/config.php');
+if(!file_exists('inc/config.php')){
+    header("Location: install/",TRUE,302);
+    die();
+}
+require('inc/config.php');
 include('inc/define.php');
 include('inc/common.php');
 

diff --git a/cron.php b/cron.php
@@ -115,7 +115,7 @@ function my_ob_logs($str){
 
     $date = "NOW()";
     //$date = "DATE_SUB(NOW(),INTERVAL ".$interval." DAY)";
-    $qRun = "INSERT INTO `".SQL_PREFIX."check`(idGroup,date) VALUES(".intval($row['idGroup']).",".$date.")";
+    $qRun = "INSERT INTO `".SQL_PREFIX."check`(idGroup,idRun,date) VALUES(".intval($row['idGroup']).",".intval($runid).",".$date.")";
 
     mysql_query($qRun);
     $id=  mysql_insert_id();

diff --git a/edit.php b/edit.php
@@ -9,7 +9,11 @@
  * 
  * Redistributions of files must retain the above notice.
  */
-include('inc/config.php');
+if(!file_exists('inc/config.php')){
+    header("Location: install/",TRUE,302);
+    die();
+}
+require('inc/config.php');
 include('inc/define.php');
 include('inc/common.php');
 

diff --git a/import.php b/import.php
@@ -9,7 +9,11 @@
  * 
  * Redistributions of files must retain the above notice.
  */
-include('inc/config.php');
+if(!file_exists('inc/config.php')){
+    header("Location: install/",TRUE,302);
+    die();
+}
+require('inc/config.php');
 include('inc/define.php');
 include('inc/common.php');
 

diff --git a/inc/common.php b/inc/common.php
@@ -39,8 +39,22 @@
 mysql_select_db(SQL_DATABASE) or die("Can't select ".SQL_DATABASE." database");
 mysql_query("set names 'utf8'");
 
-if(mysql_query('select 1 from `group`') === false){
-    die("Database ".SQL_DATABASE." ok but can't find tables, check <a href='http://serphacker.com/serposcope/doc/install.html' >install instruction</a>"); }
+if(mysql_query('select 1 from `'.SQL_PREFIX.'group`') === false){
+    die("Database ".SQL_DATABASE." ok but can't find tables, check <a href='http://serphacker.com/serposcope/doc/install.html' >install instruction</a>"); 
+}
+
+$dbversion=1;
+$result=@mysql_query("SELECT version FROM `".SQL_PREFIX."version`");
+if($result){
+    $array =  mysql_fetch_assoc($result);
+    if($array){
+        $dbversion=$array['version'];
+    }
+}
+
+if($dbversion != SQL_VERSION){
+    die("You need to upgrade your SQL tables to use this version, delete <code>inc/config.php</code> and go to <a href='".dirname($_SERVER['PHP_SELF'])."/install/' >installer</a>");
+}
 
 $modules = Array();
 

diff --git a/inc/define.php b/inc/define.php
@@ -1,6 +1,7 @@
 <?php
 
-define('VERSION','0.9.7'); 
+define('VERSION','0.9.8'); 
+define('SQL_VERSION',2); 
 define('INCLUDE_OK',1);
 
 define('IMPORT_SERPOSCOPE_CSV',1);

diff --git a/inc/header.php b/inc/header.php
@@ -14,8 +14,9 @@
 <!DOCTYPE html>
 <html lang="fr">
     <head>
-        <title></title>
+        <title>Serposcope</title>
         <meta charset="utf-8" />
+        <meta name="robots" content="noindex" />
 
         <link href="lib/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
         <link href="lib/datepicker/css/datepicker.css" rel="stylesheet" type="text/css" />

diff --git a/index.php b/index.php
@@ -10,10 +10,10 @@
  * Redistributions of files must retain the above notice.
  */
 if(!file_exists('inc/config.php')){
-    die("Can't find inc/config.php, check <a href='http://serphacker.com/serposcope/doc/install.html' >install instructions</a>");
+    header("Location: install/",TRUE,302);
+    die();
 }
-
-include('inc/config.php');
+require('inc/config.php');
 include('inc/define.php');  
 include('inc/common.php');
 include("inc/header.php");
@@ -74,7 +74,7 @@ function cmpBadChange($a,$b){
 $unchanged=array();
 
 foreach ($groupsCheck as $check) {
-    $q="SELECT idCheck,rank.idTarget,keyword.name name,target.name url,position ".
+    $q="SELECT idCheck, `".SQL_PREFIX."rank`.idTarget, `".SQL_PREFIX."keyword`.name name, `".SQL_PREFIX."target`.name url, position ".
             " FROM `".SQL_PREFIX."rank` ".
             " JOIN `".SQL_PREFIX."keyword` USING(idKeyword) ".
             " JOIN `".SQL_PREFIX."target` USING(idTarget) ".

diff --git a/install/database.sql b/install/database.sql
diff --git a/install/index.html b/install/index.html
diff --git a/install/index.php b/install/index.php
@@ -0,0 +1,72 @@
+<?php
+
+$incdir=dirname(dirname($_SERVER['SCRIPT_FILENAME'])."..")."/inc/";
+
+
+function h8($str){
+    return htmlentities($str, ENT_QUOTES, "UTF-8");
+}
+
+include('../inc/define.php');
+include('install-inc/db.php');
+
+ini_set("default_charset", 'utf-8');
+
+function check_db_co($host,$login,$pass,$db){
+    return @mysql_connect($host, $login, $pass) && @mysql_select_db($db) && @mysql_query("set names 'utf8'");
+}
+
+if(isset($_GET['do'])){
+    if($_GET['do'] === "info"){
+        die(phpinfo());
+    }
+}
+?>
+<html>
+    <head>
+        <title>Serposcope installer</title>
+        <meta name="robots" content="noindex">
+        <link href="../lib/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
+        <style>
+            .container-narrow {
+                margin: 0 auto;
+                max-width: 700px;
+              }
+        </style>
+    </head>
+    <body>
+        <div class="container">
+            <div class="masthead">
+                <div class="pull-right" >
+                    <b>PHP version : <?php echo phpversion(); ?></b>
+                    <a href='?do=info' >phpinfo</a>
+                </div>
+                <h3><a href='?step=1' class="muted" >Serposcope Installer</a></h3>
+            </div>
+
+            <hr/>
+            <div style='text-align:center;' ><h4>Before updating be sure to have done a SQL backup of your serposcope DB</h4></div>
+            <hr/>
+
+            <div>
+                <?php
+
+                    if(file_exists($incdir."/config.php")){
+
+//                        echo "<h3>Installation done !</h3>";
+//                        echo "<a href='".dirname(dirname($_SERVER['PHP_SELF'])."..")."' >Go ninja go</a><br/><br/>";
+                        echo "For security purpose, if you want to reinstall or upgrade the current installation, you must first remove <code>inc/config.php</code>.<br/>";
+                    }else{
+
+                        if(!isset($_GET['step']) || !is_numeric($_GET['step'])){
+                            $_GET['step'] = 1;
+                        }
+                        echo '<div style="text-align:center" ><h2>Step '.$_GET['step'].'</h2></div>';
+                        @include("step/step".intval($_GET['step']).".php");
+
+                    }
+                ?>
+            </div>
+        </div>
+    </body>
+</html>