Moved utils.php into the utils folder and fixed references to it

Esse commit está contido em:
FelipeNMoura
2012-04-04 20:30:52 -03:00
commit 66a6151f3b
5 arquivos alterados com 21 adições e 21 exclusões
+3 -3
Ver Arquivo
@@ -1,7 +1,7 @@
<?php
/**
* This file is part of TheWebMind 3rd generation.
*
*
* @author Felipe Nascimento de Moura <felipenmoura@gmail.com>
* @license licenses/mind3rd.license
*/
@@ -15,10 +15,10 @@
break;
case 'POST': $_REQ['data']= $_POST;
break;
case 'PUT' : parse_str(file_get_contents('php://input'), $put_vars);
case 'PUT' : parse_str(file_get_contents('php://input'), $put_vars);
$_REQ['data'] = $put_vars;
break;
default:
$_REQ['data']= null;
}
include('mind3rd/API/utils.php');
include('mind3rd/API/utils/utils.php');
+3 -3
Ver Arquivo
@@ -2,10 +2,10 @@
<?php
/**
* This file is part of TheWebMind 3rd generation.
*
*
* @author Felipe Nascimento de Moura <felipenmoura@gmail.com>
* @license licenses/mind3rd.license
*
*
* this file will be only accessed trhough the console
* if you pass the parameter install to it, it will
* create the SQLite database, start it, and try to
@@ -40,4 +40,4 @@
$_REQ= Array();
$_REQ["env"]= "shell";
define("_MINDSRC_", dirname($_SERVER['PHP_SELF']));
include(_MINDSRC_.'/mind3rd/API/utils.php');
include(_MINDSRC_.'/mind3rd/API/utils/utils.php');
Arquivo executável → Arquivo normal
+10 -10
Ver Arquivo
@@ -1,19 +1,19 @@
<?php
/**
* This file is part of TheWebMind 3rd generation.
*
*
* This file corresponds to the bootstrap.
* Every requisition should pass here
* This file decides which environment will be used
* and also some permissions, starting some environmental
* variables, such as language for localization
*
*
* @author Felipe Nascimento de Moura <felipenmoura@gmail.com>
* @license licenses/mind3rd.license
*/
require(_MINDSRC_.'/mind3rd/API/utils/header.php');
if(!Mind::isInstalled()){
if($_REQ['env']=='shell'){
echo "You have to install the application!\nTo install it, please run: sudo php mind install";
@@ -22,10 +22,10 @@
}
exit;
}
include(_MINDSRC_.'/mind3rd/API/utils/constants.php');
require(_MINDSRC_.'/mind3rd/env/setup/Setup.php');
/**
* @global Mind $_MIND This variable contains many information about the proect, the system and also have some methods an attributes to deal with such data
*/
@@ -46,11 +46,11 @@
}
$d->close();
}
// building the application
define('SYSTEM_NAME', 'mind');
$app= new Symfony\Component\Console\Application(SYSTEM_NAME);
// defining the programs/commands to be used
$programs= Array();
$d = dir(_MINDSRC_.'/mind3rd/API/programs');
@@ -68,7 +68,7 @@
\MIND::$programs= $programs;
// starting the application
if($_REQ['env']=='shell'){
include('shell.php');
include(_MINDSRC_.'/mind3rd/API/shell.php');
}else{
include('http.php');
include(_MINDSRC_.'/mind3rd/API/http.php');
}
+2 -2
Ver Arquivo
@@ -1,7 +1,7 @@
<?php
/**
* This file is part of TheWebMind 3rd generation.
*
*
* @author Felipe Nascimento de Moura <felipenmoura@gmail.com>
* @license licenses/mind3rd.license
*/
@@ -38,7 +38,7 @@ class UnixSetup extends Setup{
$_REQ= Array();
$_REQ["env"]= "shell";
define("_MINDSRC_", "'.getcwd().'");
require("'.getcwd().'/mind3rd/API/utils.php");';
require("'.getcwd().'/mind3rd/API/utils/utils.php");';
echo " starting the installation...\n";
echo " creating the file...\n";
+3 -3
Ver Arquivo
@@ -1,7 +1,7 @@
<?php
/**
* This file is part of TheWebMind 3rd generation.
*
*
* @author Felipe Nascimento de Moura <felipenmoura@gmail.com>
* @license licenses/mind3rd.license
*/
@@ -32,7 +32,7 @@ abstract class WinSetup extends Setup{
/*
$runDir= str_replace('cmd.exe', '', getenv('COMSPEC'));
$phpBin= '';
if(!isset($_SERVER))
{
while(!file_exists($phpBin) || basename($phpBin)!='php.exe')
@@ -66,7 +66,7 @@ abstract class WinSetup extends Setup{
$cwd= str_replace('\\', '/', getcwd());
$phpContent= '$_REQ= Array(); $_REQ["env"]= "shell"; define("_MINDSRC_", "'.$cwd.'"); require("'.$cwd.'/mind3rd/API/utils.php"); ';
$phpContent= '$_REQ= Array(); $_REQ["env"]= "shell"; define("_MINDSRC_", "'.$cwd.'"); require("'.$cwd.'/mind3rd/API/utils/utils.php"); ';
@shell_exec('echo ^<?php '.$phpContent.' > '.$runDir.'mind3rd.php');
*/
// </editor-fold>