From 11636e5785da724b07768d31c3efb6dd5f5ca4e2 Mon Sep 17 00:00:00 2001 From: Riccardo Di Dato Date: Thu, 7 Jan 2016 18:02:10 +0100 Subject: [PATCH] Bugfix su problemi di importazione --- buildLibs | 4 +- private/common/config.env.php | 37 +++++++++++ private/common/config.local.php | 37 +++++++++++ private/common/config.php | 67 +++++++++++++++++++ private/common/config.prod.php | 39 +++++++++++ private/lib/dao/DaoSaveableInterface.php | 1 + private/lib/gui/CatalogManager.php | 55 ++++++++++++++++ private/lib/gui/StaticCatalogManager.php | 25 +++++++ private/lib/gui/lib.inclusion.php | 19 ++++++ private/lib/lib.inclusions.php | 84 +++++++++++++----------- private/lib/lib.instances.php | 35 +++++----- private/lib/logger/lib.inclusion.php | 18 ++--- private/lib/system/lib.inclusion.php | 14 ---- private/load.php | 70 ++++++++++++++++++++ public/index.php | 1 + public/load.php | 9 +++ 16 files changed, 433 insertions(+), 82 deletions(-) create mode 100644 private/common/config.env.php create mode 100644 private/common/config.local.php create mode 100644 private/common/config.php create mode 100644 private/common/config.prod.php create mode 100644 private/lib/gui/CatalogManager.php create mode 100644 private/lib/gui/StaticCatalogManager.php create mode 100644 private/lib/gui/lib.inclusion.php create mode 100644 private/load.php create mode 100644 public/load.php diff --git a/buildLibs b/buildLibs index 138db39..eda0563 100644 --- a/buildLibs +++ b/buildLibs @@ -148,8 +148,8 @@ function deploy_test_env(){ function deploy_local_env(){ create_project_fs deploy - if [[ -f "$APPLICATION_CONFIG_PATH/config.local.php" ]];then - rm "$APPLICATION_CONFIG_PATH/config.local.php" + if [[ -f "$APPLICATION_CONFIG_PATH/config.prod.php" ]];then + rm "$APPLICATION_CONFIG_PATH/config.prod.php" fi if [[ -f "$APPLICATION_CONFIG_PATH/config.test.php" ]];then rm "$APPLICATION_CONFIG_PATH/config.test.php" diff --git a/private/common/config.env.php b/private/common/config.env.php new file mode 100644 index 0000000..961aa6f --- /dev/null +++ b/private/common/config.env.php @@ -0,0 +1,37 @@ +dbname = "cbs"; +// $dbconn->dbtype = "mysql"; +// $dbconn->location = "localhost"; +// $dbconn->username = "root"; +// $dbconn->password = "root"; + +$currentSystem = new stdClass(); +$currentSystem->storageBaseDir = "/home"; // Il path con storage ecc in cui mettere immagini, file temporanei ecc +$currentSystem->privateBaseDir = "/home/asdynamics"; // Il path in cui inserire la cartella con lib, task, binari ecc +$currentSystem->logBaseDir = "/var/log"; // Il path dei log.... +$currentSystem->xSendFileDir = "/tmp/xsend"; + +$currentSystem->safeStorage = "/home/cbs/storage"; + +$currentSystem->apache = new StdClass(); +$currentSystem->apache->user = "var-www"; +$currentSystem->apache->group = "var-www"; +$currentSystem->apache->workdir = "/var/www"; // Il path in cui inserire la cartella con le pagine html + +$currentSystem->remoteLocation = "http://$_SERVER[HTTP_HOST]"; + + + +// $config->locations = new stdClass(); + +// $config->application->applicationInterfacePath = "/tnc15"; + +// $config->application->systemTmp = "/tmp"; +?> \ No newline at end of file diff --git a/private/common/config.local.php b/private/common/config.local.php new file mode 100644 index 0000000..58af960 --- /dev/null +++ b/private/common/config.local.php @@ -0,0 +1,37 @@ +dbname = "cbs"; +// $dbconn->dbtype = "mysql"; +// $dbconn->location = "localhost"; +// $dbconn->username = "root"; +// $dbconn->password = "root"; + +$currentSystem = new stdClass(); +$currentSystem->storageBaseDir = "/home"; // Il path con storage ecc in cui mettere immagini, file temporanei ecc +$currentSystem->privateBaseDir = "/home/asdynamics"; // Il path in cui inserire la cartella con lib, task, binari ecc +$currentSystem->logBaseDir = "/var/log"; // Il path dei log.... +$currentSystem->xSendFileDir = "/tmp/xsend"; + +$currentSystem->safeStorage = "/home/cbs/storage"; + +$currentSystem->apache = new StdClass(); +$currentSystem->apache->user = "var-www"; +$currentSystem->apache->group = "var-www"; +$currentSystem->apache->workdir = "/var/www"; // Il path in cui inserire la cartella con le pagine html + +$currentSystem->remoteLocation = "http://$_SERVER[HTTP_HOST]"; + + + +// $config->locations = new stdClass(); + +// $config->application->applicationInterfacePath = "/tnc15"; + +// $config->application->systemTmp = "/tmp"; + +?> \ No newline at end of file diff --git a/private/common/config.php b/private/common/config.php new file mode 100644 index 0000000..b7ca8a0 --- /dev/null +++ b/private/common/config.php @@ -0,0 +1,67 @@ +name = "I Fatti di Napoli 2.0"; +$project->buildName = "fdn2"; + +$project->defaultLocale = "it"; + + +if (file_exists(dirname(__FILE__)."/config.local.php") ){ + require_once (dirname(__FILE__)."/config.local.php"); +} +else if (file_exists(dirname(__FILE__)."/config.env.php") ){ + require_once (dirname(__FILE__)."/config.env.php"); +} +else{ + require_once (dirname(__FILE__)."/config.prod.php"); +} + +// Generic voices +$config = new stdClass(); + +$config->locale = new stdClass(); +$config->locale->gui = $project->defaultLocale; +$config->locale->system = $project->defaultLocale; + +// PATHS +$config->paths = new StdClass(); +$config->paths->storage = $currentSystem->storageBaseDir . "/" . $project->buildName; +$config->paths->private = $currentSystem->privateBaseDir . "/" . $project->buildName; +$config->paths->public = $currentSystem->apache->workdir . "/" . $project->buildName; +$config->paths->log = $currentSystem->logBaseDir . "/" . $project->buildName; + + +$config->paths->backup = $config->paths->storage . "/backup"; +$config->paths->binaries = $config->paths->private . "/bin"; +$config->paths->common = $config->paths->private . "/common"; +$config->paths->libraries = $config->paths->private . "/lib"; +$config->paths->task = $config->paths->private . "/task"; + +$config->paths->pubImages = $config->paths->public . "/style/images"; + +$config->paths->media = $config->paths->storage . "/media"; +// $config->paths->defMedia = $config->paths->pubImages . "/defaults"; +$config->paths->tmp = $config->paths->storage . "/tmp"; +$config->paths->xsendfile = $currentSystem->xSendFileDir . "/" . $project->buildName; + + +// FILES +$config->files = new StdClass(); + +$config->files->core_log = $config->paths->log . "/core.log"; +$config->files->dao_log = $config->paths->log . "/dao.log"; +$config->files->task_log = $config->paths->log . "/task.log"; +$config->files->general_log = $config->paths->log . "/general.log"; + +// Pages +$config->pages = new StdClass(); +$config->pages->index = $config->remoteLocation . "/index.php"; +$config->pages->login = $config->remoteLocation . "/login.php"; +$config->pages->logout = $config->remoteLocation . "/logout.php"; + +?> \ No newline at end of file diff --git a/private/common/config.prod.php b/private/common/config.prod.php new file mode 100644 index 0000000..72de19b --- /dev/null +++ b/private/common/config.prod.php @@ -0,0 +1,39 @@ +dbname = "cbs"; +// $dbconn->dbtype = "mysql"; +// $dbconn->location = "localhost"; +// $dbconn->username = "root"; +// $dbconn->password = "root"; + +$currentSystem = new stdClass(); +$currentSystem->storageBaseDir = "/home"; // Il path con storage ecc in cui mettere immagini, file temporanei ecc +$currentSystem->privateBaseDir = "/home/asdynamics"; // Il path in cui inserire la cartella con lib, task, binari ecc +$currentSystem->logBaseDir = "/var/log"; // Il path dei log.... +$currentSystem->xSendFileDir = "/tmp/xsend"; + +$currentSystem->safeStorage = "/home/cbs/storage"; + +$currentSystem->apache = new StdClass(); +$currentSystem->apache->user = "var-www"; +$currentSystem->apache->group = "var-www"; +$currentSystem->apache->workdir = "/var/www"; // Il path in cui inserire la cartella con le pagine html + +$currentSystem->remoteLocation = "http://$_SERVER[HTTP_HOST]"; + + + +// $config->locations = new stdClass(); + +// $config->application->applicationInterfacePath = "/tnc15"; + +// $config->application->systemTmp = "/tmp"; + +?> \ No newline at end of file diff --git a/private/lib/dao/DaoSaveableInterface.php b/private/lib/dao/DaoSaveableInterface.php index eea4531..6880bf4 100644 --- a/private/lib/dao/DaoSaveableInterface.php +++ b/private/lib/dao/DaoSaveableInterface.php @@ -5,6 +5,7 @@ Creation Date: 23/dic/2015 */ interface DaoSaveable { + /** * @return stdClass L'oggetto da passare alla set di mongo */ diff --git a/private/lib/gui/CatalogManager.php b/private/lib/gui/CatalogManager.php new file mode 100644 index 0000000..349aadd --- /dev/null +++ b/private/lib/gui/CatalogManager.php @@ -0,0 +1,55 @@ +retrieveCatalog($index); + if($reval != null) { + if ($data!=null) $this->tokenize($reval,$data); + } + else $reval = $index; + } + return $reval; + } + + + /** + * Tokenizza la stringa di catalog + */ + protected function tokenize(&$catalog,&$data) { + $matches = array(); + //implementation 3 + if(preg_match_all("/\{([0-9]|c[0-9])\}/",$catalog,$matches)) { + $regas = $matches[1]; + if(!is_array($regas)) $regas = array($regas); +// var_dump($regas); + foreach( $regas as $idx) { + if(preg_match("/^c[0-9]$/",$idx)) { + $useidx = (int) substr($idx,1); + $useidx--; +// echo "useidx: $useidx $idx\n"; + $catalog = str_replace('{'. $idx . '}',$this->getCatalog((array_key_exists($useidx,$data)?$data[$useidx]:"")),$catalog); + } + else { + $useidx = (int) $idx; + $useidx--; +// echo "useidx: $useidx $idx\n"; + $catalog = str_replace('{'. $idx . '}',(array_key_exists($useidx,$data)?$data[$useidx]:""),$catalog); + } + } + } + + } + + + } + +?> diff --git a/private/lib/gui/StaticCatalogManager.php b/private/lib/gui/StaticCatalogManager.php new file mode 100644 index 0000000..cc56179 --- /dev/null +++ b/private/lib/gui/StaticCatalogManager.php @@ -0,0 +1,25 @@ +catalog = $copy; + + } + + protected function retrieveCatalog($index){ + + if(array_key_exists($index,$this->catalog)) + return $this->catalog[$index]; + else + return null; + + } + +} + +?> \ No newline at end of file diff --git a/private/lib/gui/lib.inclusion.php b/private/lib/gui/lib.inclusion.php new file mode 100644 index 0000000..9c75b68 --- /dev/null +++ b/private/lib/gui/lib.inclusion.php @@ -0,0 +1,19 @@ +locale->gui])); +// $systemCatalogManager = new StaticCatalogManager($catalog[$config->locale->system]); +$systemCatalogManager = new StaticCatalogManager(array()); +?> \ No newline at end of file diff --git a/private/lib/lib.inclusions.php b/private/lib/lib.inclusions.php index 66a3241..444c2d0 100644 --- a/private/lib/lib.inclusions.php +++ b/private/lib/lib.inclusions.php @@ -7,6 +7,12 @@ Creation Date: 14/nov/2013 require_once(dirname(__FILE__)."/CoreException.php"); +require_once(dirname(__FILE__)."/lib.instances.php"); + + + +require_once(dirname(__FILE__)."/gui/lib.inclusion.php"); + require_once(dirname(__FILE__)."/logger/lib.inclusion.php"); require_once(dirname(__FILE__)."/system/lib.inclusion.php"); @@ -16,54 +22,54 @@ require_once(dirname(__FILE__)."/system/lib.inclusion.php"); -require_once(dirname(__FILE__)."/Status.php"); -require_once(dirname(__FILE__)."/OperationStack.php"); -require_once(dirname(__FILE__)."/OperationChain.php"); -require_once(dirname(__FILE__)."/Context.php"); -require_once(dirname(__FILE__)."/ASDSessionHandler.php"); +// require_once(dirname(__FILE__)."/Status.php"); +// require_once(dirname(__FILE__)."/OperationStack.php"); +// require_once(dirname(__FILE__)."/OperationChain.php"); +// require_once(dirname(__FILE__)."/Context.php"); +// require_once(dirname(__FILE__)."/ASDSessionHandler.php"); -require_once(dirname(__FILE__)."/CoreException.php"); +// require_once(dirname(__FILE__)."/CoreException.php"); -require_once(dirname(__FILE__)."/PostHandler.php"); +// require_once(dirname(__FILE__)."/PostHandler.php"); -// Include Loggers -// require_once(dirname(__FILE__)."/logger/LoggingFacility.php"); -// require_once(dirname(__FILE__)."/logger/LoggingFacilityManager.php"); -// require_once(dirname(__FILE__)."/logger/SyslogLogger.php"); -// require_once(dirname(__FILE__)."/logger/FileLogger.php"); +// // Include Loggers +// // require_once(dirname(__FILE__)."/logger/LoggingFacility.php"); +// // require_once(dirname(__FILE__)."/logger/LoggingFacilityManager.php"); +// // require_once(dirname(__FILE__)."/logger/SyslogLogger.php"); +// // require_once(dirname(__FILE__)."/logger/FileLogger.php"); -// Include base UIComponents -require_once(dirname(__FILE__)."/gui/UIComponent.php"); -require_once(dirname(__FILE__)."/gui/uicomponents/GenericUIComponent.php"); -require_once(dirname(__FILE__)."/gui/uicomponents/TextComponent.php"); -require_once(dirname(__FILE__)."/gui/uicomponents/StandardComponents.php"); -require_once(dirname(__FILE__)."/gui/uicomponents/CDataComponent.php"); -require_once(dirname(__FILE__)."/gui/uicomponents/CDataComponents.php"); -require_once(dirname(__FILE__)."/gui/uicomponents/FormComponents.php"); -require_once(dirname(__FILE__)."/gui/uicomponents/DynForm.php"); -require_once(dirname(__FILE__)."/gui/uicomponents/DynComponents.php"); -require_once(dirname(__FILE__)."/gui/uicomponents/DynTables.php"); -require_once(dirname(__FILE__)."/gui/uicomponents/unhadbComponents.php"); +// // Include base UIComponents +// require_once(dirname(__FILE__)."/gui/UIComponent.php"); +// require_once(dirname(__FILE__)."/gui/uicomponents/GenericUIComponent.php"); +// require_once(dirname(__FILE__)."/gui/uicomponents/TextComponent.php"); +// require_once(dirname(__FILE__)."/gui/uicomponents/StandardComponents.php"); +// require_once(dirname(__FILE__)."/gui/uicomponents/CDataComponent.php"); +// require_once(dirname(__FILE__)."/gui/uicomponents/CDataComponents.php"); +// require_once(dirname(__FILE__)."/gui/uicomponents/FormComponents.php"); +// require_once(dirname(__FILE__)."/gui/uicomponents/DynForm.php"); +// require_once(dirname(__FILE__)."/gui/uicomponents/DynComponents.php"); +// require_once(dirname(__FILE__)."/gui/uicomponents/DynTables.php"); +// require_once(dirname(__FILE__)."/gui/uicomponents/unhadbComponents.php"); -// DAO Stuff -require_once(dirname(__FILE__)."/dao/DaoRegistry.php"); -require_once(dirname(__FILE__)."/dao/DatabaseConnection.php"); -require_once(dirname(__FILE__)."/dao/GenericDao.php"); +// // DAO Stuff +// require_once(dirname(__FILE__)."/dao/DaoRegistry.php"); +// require_once(dirname(__FILE__)."/dao/DatabaseConnection.php"); +// require_once(dirname(__FILE__)."/dao/GenericDao.php"); -require_once(dirname(__FILE__)."/dao/daos/GeneralConfigurationDao.php"); -require_once(dirname(__FILE__)."/dao/daos/AdminDao.php"); -require_once(dirname(__FILE__)."/dao/daos/ClientDao.php"); -require_once(dirname(__FILE__)."/dao/daos/BackupDao.php"); +// require_once(dirname(__FILE__)."/dao/daos/GeneralConfigurationDao.php"); +// require_once(dirname(__FILE__)."/dao/daos/AdminDao.php"); +// require_once(dirname(__FILE__)."/dao/daos/ClientDao.php"); +// require_once(dirname(__FILE__)."/dao/daos/BackupDao.php"); -require_once(dirname(__FILE__)."/GeneralConfiguration.php"); +// require_once(dirname(__FILE__)."/GeneralConfiguration.php"); -// Include GUI Handler -require_once(dirname(__FILE__)."/gui/GUIHandler.php"); -require_once(dirname(__FILE__)."/gui/ThumbnailGenerator.php"); -require_once(dirname(__FILE__)."/gui/CatalogManager.php"); -require_once(dirname(__FILE__)."/gui/StaticCatalogManager.php"); +// // Include GUI Handler +// require_once(dirname(__FILE__)."/gui/GUIHandler.php"); +// require_once(dirname(__FILE__)."/gui/ThumbnailGenerator.php"); +// require_once(dirname(__FILE__)."/gui/CatalogManager.php"); +// require_once(dirname(__FILE__)."/gui/StaticCatalogManager.php"); -require_once(dirname(__FILE__)."/LoginManager.php"); +// require_once(dirname(__FILE__)."/LoginManager.php"); diff --git a/private/lib/lib.instances.php b/private/lib/lib.instances.php index 22957ae..66adb50 100644 --- a/private/lib/lib.instances.php +++ b/private/lib/lib.instances.php @@ -4,15 +4,12 @@ Author: Riccardo Di Dato Creation Date: 05/mar/2015 */ -Context::setContextValue("sysconfig",$config); -ASDSessionHandler::setSessionValue("guilocale",$config->locale->gui); +// Context::setContextValue("sysconfig",$config); +// ASDSessionHandler::setSessionValue("guilocale",$config->locale->gui); -GUIHandler::setSystemUrl($config->systemUrl); +// GUIHandler::setSystemUrl($config->systemUrl); -GUIHandler::setCatalogManager(new StaticCatalogManager($catalog[$config->locale->gui])); -$systemCatalogManager = new StaticCatalogManager($catalog[$config->locale->system]); - -require_once(dirname(__FILE__)."/../common/html.include.php"); +// require_once(dirname(__FILE__)."/../common/html.include.php"); // // _____ ____ ___ // // | ___/ ___| / _ \ @@ -124,20 +121,20 @@ require_once(dirname(__FILE__)."/../common/html.include.php"); // | |_| / ___ \ |_| | // |____/_/ \_\___/ // -new GeneralConfigurationDao($config->dbConnection); -new AdminDao($config->dbConnection); -new ClientDao($config->dbConnection,$config->paths->pubkey); -new BackupDao($config->dbConnection); +// new GeneralConfigurationDao($config->dbConnection); +// new AdminDao($config->dbConnection); +// new ClientDao($config->dbConnection,$config->paths->pubkey); +// new BackupDao($config->dbConnection); -ASDSessionHandler::regenerateContext(); +// ASDSessionHandler::regenerateContext(); -$checkPath = $config->paths->tmp."/backup"; -if (!file_exists($checkPath)){ - mkdir($checkPath,0751,true); -} -else if (!is_dir($checkPath)){ - die("Impossible to run cbs... cannot create directory '$checkPath' (a file with this name exists)"); -} +// $checkPath = $config->paths->tmp."/backup"; +// if (!file_exists($checkPath)){ +// mkdir($checkPath,0751,true); +// } +// else if (!is_dir($checkPath)){ +// die("Impossible to run cbs... cannot create directory '$checkPath' (a file with this name exists)"); +// } ?> \ No newline at end of file diff --git a/private/lib/logger/lib.inclusion.php b/private/lib/logger/lib.inclusion.php index 6a45fba..89a82c8 100644 --- a/private/lib/logger/lib.inclusion.php +++ b/private/lib/logger/lib.inclusion.php @@ -19,11 +19,19 @@ require_once(dirname(__FILE__)."/FileLogger.php"); // LoggingFacilityManager::addLogger( "system", - new SyslogLogger("Core",$systemCatalogManager,true) + new SyslogLogger("System",$systemCatalogManager,true) ); LoggingFacilityManager::getLogger("system")->setLoggingLevel(LoggingFacility::$LEVEL_DEBUG); + +LoggingFacilityManager::addLogger( +"core", +new FileLogger("Core",$systemCatalogManager,$config->files->core_log,true) +); +LoggingFacilityManager::getLogger("core")->setLoggingLevel(LoggingFacility::$LEVEL_DEBUG); + + LoggingFacilityManager::addLogger( "dao", new FileLogger("DAO",$systemCatalogManager,$config->files->dao_log,true) @@ -31,19 +39,13 @@ LoggingFacilityManager::addLogger( LoggingFacilityManager::getLogger("dao")->setLoggingLevel(LoggingFacility::$LEVEL_DEBUG); -LoggingFacilityManager::addLogger( - "system", - new FileLogger("SAAM",$systemCatalogManager,$config->files->saam_log,true) -); -LoggingFacilityManager::getLogger("saam")->setLoggingLevel(LoggingFacility::$LEVEL_DEBUG); - - LoggingFacilityManager::addLogger( "task", new FileLogger("Task",$systemCatalogManager,$config->files->task_log,true) ); LoggingFacilityManager::getLogger("task")->setLoggingLevel(LoggingFacility::$LEVEL_DEBUG); + LoggingFacilityManager::addLogger( "general", new FileLogger("General",$systemCatalogManager,$config->files->general_log,true) diff --git a/private/lib/system/lib.inclusion.php b/private/lib/system/lib.inclusion.php index 0c45851..0bcc3df 100644 --- a/private/lib/system/lib.inclusion.php +++ b/private/lib/system/lib.inclusion.php @@ -60,19 +60,5 @@ SFSManager::addFilesystem(new LocallyMountedFS( $config->paths->xsendfile, "XSendFile Filesystem") ); -SFSManager::addFilesystem(new LocallyMountedFS( - FSObject::$DEVICE_TYPE_HARD_DRIVE, - FSObject::$WRITELAW_NORMALLY_W, - LocallyMountedFS::$ACCESSMODE_RW, - $config->paths->pubkey, - "Public Keys Filesystem") -); -SFSManager::addFilesystem(new LocallyMountedFS( - FSObject::$DEVICE_TYPE_HARD_DRIVE, - FSObject::$WRITELAW_NORMALLY_W, - LocallyMountedFS::$ACCESSMODE_RW, - $config->paths->sshDir, - "SSH Configuration directory") -); ?> \ No newline at end of file diff --git a/private/load.php b/private/load.php new file mode 100644 index 0000000..5f4eebc --- /dev/null +++ b/private/load.php @@ -0,0 +1,70 @@ +systemUrl = $currentSystem->remoteLocation . "/" . $project->buildName; + +// // Database Connection +// $config->dbConnection = $dbconn; + +// // Generic voices +// $config->locale = new stdClass(); +// $config->locale->gui = $project->defaultLocale; +// $config->locale->system = $project->defaultLocale; +// // TODO inserire controllo per modificare la current locale + +// // PATHS +// $config->paths = new StdClass(); +// $config->paths->storage = $currentSystem->storageBaseDir . "/" . $project->buildName; +// $config->paths->private = $currentSystem->privateBaseDir . "/" . $project->buildName; +// $config->paths->public = $currentSystem->apache->workdir . "/" . $project->buildName; +// $config->paths->log = $currentSystem->logBaseDir . "/" . $project->buildName; + +// $config->paths->backup = $currentSystem->safeStorage . "/" . $project->buildName; + +// $config->paths->binaries = $config->paths->private . "/bin"; +// $config->paths->common = $config->paths->private . "/common"; +// $config->paths->libraries = $config->paths->private . "/lib"; +// $config->paths->task = $config->paths->private . "/task"; + +// $config->paths->pubImages = $config->paths->public . "/style/images"; + +// $config->paths->media = $config->paths->storage . "/media"; +// $config->paths->defMedia = $config->paths->pubImages . "/defaults"; +// $config->paths->tmp = $config->paths->storage . "/tmp"; +// $config->paths->xsendfile = $currentSystem->xSendFileDir . "/" . $project->buildName; +// $config->paths->pubkey = $config->paths->storage . "/pubkeys"; + + +// $config->paths->sshDir = $currentSystem->os->homeDir . "/.ssh"; + +// // FILES +// $config->files = new StdClass(); + +// $config->files->dao_log = $config->paths->log . "/dao.log"; +// $config->files->saam_log = $config->paths->log . "/saam.log"; +// $config->files->task_log = $config->paths->log . "/task.log"; +// $config->files->general_log = $config->paths->log . "/general.log"; + +// $config->files->authKeys = $config->paths->sshDir . "/authorized_keys"; + +// // Pages +// $config->pages = new StdClass(); +// $config->pages->index = $config->systemUrl . "/index.php"; +// $config->pages->login = $config->systemUrl . "/login.php"; +// $config->pages->logout = $config->systemUrl . "/logout.php"; + +// require_once(dirname(__FILE__)."/lib/lib.instances.php"); + +?> \ No newline at end of file diff --git a/public/index.php b/public/index.php index 65f5d32..d075d21 100644 --- a/public/index.php +++ b/public/index.php @@ -4,6 +4,7 @@ Author: Riccardo Di Dato Creation Date: 22/dic/2015 */ +require_once(dirname(__FILE__)."/load.php"); echo "Index"; ?> \ No newline at end of file diff --git a/public/load.php b/public/load.php new file mode 100644 index 0000000..b00c980 --- /dev/null +++ b/public/load.php @@ -0,0 +1,9 @@ + \ No newline at end of file