Identification works on local machine, not remote

0ec87ba2 · llaffont · 62c3fa52 · 0ec87ba2 · 0ec87ba2
Commit 0ec87ba2 authored 11 years ago by llaffont
--- a/cosmogramme/php/_identification.php
+++ b/cosmogramme/php/_identification.php
@@ -18,7 +18,8 @@
 * along with AFI-OPAC 2.0; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA 
 */
-// Arguments de la ligne de commande ou retour de la form de saisie
+
+xdebug_break();
 if(isset($_REQUEST["admin_login"]))
 {
 	$user = trim($_REQUEST["admin_login"]);
@@ -46,9 +47,6 @@ if($argc > 1) return true ;
 // Mode web_service on renvoie une erreur
 if($mode_web_service == true)
 {
-	// Add CG
-	if($_SERVER['REMOTE_ADDR'] == "87.98.197.227"  or $_SERVER['REMOTE_ADDR'] == "217.128.119.22") return true ;
-	// EndAdd CG
 	require_once("classe_transaction_opac.php");
 	$transac=new transaction_opac();
 	$transac->erreur("Identification user ou mot de passe incorrect");
@@ -56,11 +54,6 @@ if($mode_web_service == true)

 // On demande l'identification
 if( !defined("APPLI") ) exit;
-while( true )
-{ 
-	if( file_exists("config.php") ) break;
-	if(chdir("../") == false) exit;
-}
 ?>
 <html>
 <head>

--- a/cosmogramme/php/_init.php
+++ b/cosmogramme/php/_init.php
@@ -18,7 +18,7 @@ define('COM_ORPHEE', 8);
 define('COM_MICROBIB', 9);
 define('COM_BIBLIXNET', 10);
 define('COM_DYNIX', 11);
-
+xdebug_break();

 if (!function_exists('xdebug_break')) {
 	function xdebug_break(){};
@@ -27,52 +27,54 @@ if (!function_exists('xdebug_break')) {
 date_default_timezone_set('Europe/Paris');


-// Go to deploy directory
-while( true ){ 
-	if (file_exists("config.php")) break;
-	if (chdir("../") == false) exit;
-}
-
-$parts = explode('/', dirname(realpath('.')));
-define('BASE_URL', '/'.end($parts));
-define('USERFILESPATH', '..' . '/userfiles');
-
-
 $argc = isset($argc) ? $argc : 0;
 if ($argc < 3) {
 	if (isset($_SERVER['SERVER_ADDR']) and $_SERVER['SERVER_ADDR'] != "127.0.0.1" and $_SERVER['SERVER_ADDR'] != "::1")
 	{
 		$site= "/" . substr($_SERVER['SCRIPT_NAME'], 1, strpos($_SERVER['SCRIPT_NAME'], "/" . APPLI . "/") -1) . "/" ;
 		$cfgfile= COSMOPATH . $site . APPLI . "/config.php" ;
+		chdir(COSMOPATH . $site);
+		define('BASE_URL', $site);
+		define('USERFILESPATH',  COSMOPATH . $site . 'userfiles');
 	}
 	else
 	{
 		$site = '/'.substr($_SERVER['SCRIPT_NAME'], 1, strpos($_SERVER['SCRIPT_NAME'], "cosmogramme") - 1);
-		$cfgfile= "config.php";
+		$cfgfile= "cosmogramme/config.php";
+
+		chdir('..');
+		define('BASE_URL', $site);
+		define('USERFILESPATH', '../userfiles');
 	}
 }

 if (!isset($cfgfile) || !file_exists($cfgfile)) {
  $cfgfile="./config.php";
  $site = "/";
+
+	$parts = explode('/', dirname(realpath('.')));
+	define('BASE_URL', '/'.end($parts));
+	define('USERFILESPATH', '..' . '/userfiles');
 }

 define("URL_BASE","http://" . $_SERVER["HTTP_HOST"] . $site . APPLI . "/");
 define("URL_IMG", URL_BASE ."images/");

 // Includes
-set_include_path(get_include_path().PATH_SEPARATOR.'./php/' . PATH_SEPARATOR . "./php/classes/");
+set_include_path(get_include_path()                                          
+								 .PATH_SEPARATOR.dirname(realpath(__FILE__))
+                 .PATH_SEPARATOR.dirname(realpath(__FILE__))."/classes/");   

-require("fonctions/fonctions_base.php");
-require("fonctions/string.php");
-require("fonctions/erreur.php");
-require("fonctions/date_heure.php");
-require("fonctions/variables.php");
+require_once("fonctions/fonctions_base.php");
+require_once("fonctions/string.php");
+require_once("fonctions/erreur.php");
+require_once("fonctions/date_heure.php");
+require_once("fonctions/variables.php");

 require_once(realpath(dirname(__FILE__)).'/../storm_init.php');

-require("classe_sql.php");
-require("fonctions/sql.php");
+require_once("classe_sql.php");
+require_once("fonctions/sql.php");

 // Lire la config
 $cfg=lireConfig($cfgfile);