소스 검색

Add lib bootstrap - load common classes

Piotr Labudda 10 년 전
부모
커밋
ddf619d6b8
5개의 변경된 파일29개의 추가작업 그리고 64개의 파일을 삭제
  1. 1 15
      SE/index-ajax.php
  2. 4 24
      SE/index.php
  3. 1 13
      SE/procesy/index.php
  4. 2 12
      SE/procesy5.php
  5. 21 0
      SE/se-lib/bootstrap.php

+ 1 - 15
SE/index-ajax.php

@@ -1,10 +1,6 @@
 <?php
 
-define('DS', DIRECTORY_SEPARATOR);
-define('APP_PATH_ROOT', dirname(__FILE__));
-define('APP_PATH_LIB', APP_PATH_ROOT . '/se-lib');
-define('APP_PATH_WWW', APP_PATH_ROOT);
-define('APP_PATH_CONFIG', APP_PATH_ROOT . DS . 'config');
+require_once dirname(__FILE__) . '/se-lib/bootstrap.php';
 
 //session_save_path("./tmp") ;
 session_start();
@@ -29,16 +25,6 @@ if (file_exists(APP_PATH_ROOT . "/.config.php")) include APP_PATH_ROOT . "/.conf
 
 require_once APP_PATH_ROOT . "/superedit-SEF.php";
 
-
-require_once APP_PATH_LIB . '/' . 'Lib.php';
-Lib::loadClass('V');
-Lib::loadClass('DB');
-Lib::loadClass('User');
-Lib::loadClass('Http');
-Lib::loadClass('HttpException');
-Lib::loadClass('StorageException');
-Lib::loadClass('S');
-
 if (!User::logged()) {
 	die('NotAuthenticated');
 }

+ 4 - 24
SE/index.php

@@ -1,11 +1,6 @@
 <?php
 
-define('DS', DIRECTORY_SEPARATOR);
-define('APP_PATH_ROOT', dirname(__FILE__));
-define('APP_PATH_LIB', APP_PATH_ROOT . '/se-lib');
-define('APP_PATH_WWW', APP_PATH_ROOT);
-define('APP_PATH_CONFIG', APP_PATH_ROOT . DS . 'config');
-define('APP_PATH_SCHEMA', APP_PATH_ROOT . DS . 'schema');
+require_once dirname(__FILE__) . '/se-lib/bootstrap.php';
 
 //session_save_path("./tmp") ;
 session_start();
@@ -19,29 +14,14 @@ ini_set('error_reporting', $errorReportingLevel);
 #TEST $_SESSION['DEBUG'] = 3;// TODO: TEST
 if (!isset($_SESSION['DEBUG'])) $_SESSION['DEBUG'] = 0;// set default value
 
-
-if (file_exists(APP_PATH_ROOT . "/config/.config_{$_SERVER['SERVER_NAME']}.php")) {
-	require APP_PATH_ROOT . "/config/.config_{$_SERVER['SERVER_NAME']}.php";
+if (file_exists(APP_PATH_CONFIG . DS . ".config_{$_SERVER['SERVER_NAME']}.php")) {
+	require APP_PATH_CONFIG . DS . ".config_{$_SERVER['SERVER_NAME']}.php";
 }
-
-if (file_exists(APP_PATH_ROOT . "/.config.php")) include APP_PATH_ROOT . "/.config.php";
-
+if (file_exists(APP_PATH_ROOT . DS . ".config.php")) include APP_PATH_ROOT . DS . ".config.php";
 
 require_once APP_PATH_ROOT . "/superedit-SEF.php";
 SEF('DEBUG_S');
 
-require_once APP_PATH_LIB . '/' . 'Lib.php';
-Lib::loadClass('DBG');
-Lib::loadClass('V');
-Lib::loadClass('DB');
-Lib::loadClass('User');
-Lib::loadClass('SE_Layout');
-Lib::loadClass('S');
-Lib::loadClass('Http');
-Lib::loadClass('HttpException');
-Lib::loadClass('StorageException');
-Lib::loadClass('Router');
-
 S::init();// init session variables if not exists
 User::auth();// die if not logged in
 

+ 1 - 13
SE/procesy/index.php

@@ -1,13 +1,9 @@
 <?php
 
+require_once dirname(__FILE__) . '/../se-lib/bootstrap.php';
 
 error_reporting(E_ALL & ~E_NOTICE);
 
-define('DS', DIRECTORY_SEPARATOR);
-define('APP_PATH_ROOT', realpath( dirname(__FILE__) . DS . '..' ));
-define('APP_PATH_WWW', dirname(__FILE__));
-define('APP_PATH_CONFIG', APP_PATH_ROOT . DS . 'config');
-
 //session_save_path("../session") ;
 session_start();
 
@@ -17,14 +13,6 @@ if (file_exists(APP_PATH_ROOT . DS . 'config' . DS . '.config_'.$_SERVER['SERVER
 	require APP_PATH_ROOT . DS . 'config' . DS . '.config_'.$_SERVER['SERVER_NAME'].'.php';
 }
 
-require_once APP_PATH_ROOT . DS . 'se-lib' . DS . 'Lib.php';
-Lib::loadClass('V');
-Lib::loadClass('User');
-Lib::loadClass('Config');
-Lib::loadClass('App');
-Lib::loadClass('DB');
-Lib::loadClass('S');
-
 if (($function_init = V::get('function_init', '', $_GET))) {
 	if (function_exists($function_init)) {
 		$function_init();

+ 2 - 12
SE/procesy5.php

@@ -6,14 +6,10 @@
 //version 2010-09-30 - by abinder, drobne poprawki z wyszukiwanie w PROCESACH do edycji...      
 //version 2011-09-12 - by pl, TODO: Obowiazki - menu
 
+require_once dirname(__FILE__) . '/se-lib/bootstrap.php';
 
 error_reporting(E_ALL & ~E_NOTICE);
 
-define('DS', DIRECTORY_SEPARATOR);
-define('APP_PATH_ROOT', dirname(__FILE__));
-define('APP_PATH_WWW', dirname(__FILE__));
-define('APP_PATH_CONFIG', APP_PATH_ROOT . DS . 'config');
-
 //session_save_path("../session") ;
 session_start();
 
@@ -27,14 +23,8 @@ SEF('ZAP_SQL_UPDATE');
 SEF('USERS_COLUMN_INIT');
 SEF('GETFORMITEM');
 SEF('T_WORKPOINTS_USER_SELECT');
-require_once dirname(__FILE__) . '/' . 'se-lib' . '/' . 'Lib.php';
-Lib::loadClass('V');
-Lib::loadClass('User');
-Lib::loadClass('Config');
-Lib::loadClass('App');
-Lib::loadClass('DB');
-Lib::loadClass('S');
 
+Lib::loadClass('App');
 Lib::loadClass('ProcesHelper');
 Lib::loadClass('Tree');
 Lib::loadClass('TreeHelper');

+ 21 - 0
SE/se-lib/bootstrap.php

@@ -0,0 +1,21 @@
+<?php
+
+define('DS', DIRECTORY_SEPARATOR);
+define('APP_PATH_LIB', dirname(__FILE__));
+define('APP_PATH_ROOT', APP_PATH_LIB . DS . '..');
+define('APP_PATH_WWW', APP_PATH_ROOT);
+define('APP_PATH_CONFIG', APP_PATH_ROOT . DS . 'config');
+define('APP_PATH_SCHEMA', APP_PATH_ROOT . DS . 'schema');
+
+require_once APP_PATH_LIB . '/' . 'Lib.php';
+Lib::loadClass('DBG');
+Lib::loadClass('V');
+Lib::loadClass('Config');
+Lib::loadClass('DB');
+Lib::loadClass('User');
+Lib::loadClass('SE_Layout');
+Lib::loadClass('S');
+Lib::loadClass('Http');
+Lib::loadClass('HttpException');
+Lib::loadClass('StorageException');
+Lib::loadClass('Router');