m17hr1l/nibiru-framework.com
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CORE UPDATE: Minor update concerning the autoloading class in the core, now it is also possible to give a loading order through the configuration

Browse Source 
Minor update concerning the form factory classes in the core, now some javascript events are implemented as well, another update concerning functinoallity will follow soon.
             Update on the example configuration file, implementing the autoloading order of interfaces, moduels and traits.
             Update for multidatabase support, see the documentation on http://www.nibiru-framework.com
This commit is contained in:
Stephan Kasdorf
2018-08-28 11:50:22 +02:00
parent 50ee482b9e
commit aff8730316
15 changed files with 343 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

205
core/c/autoloader.php
View File

@@ -12,25 +12,114 @@ require_once __DIR__ . '/../i/db.php';
*/
class Autoloader
{
const MY_FILE_NAME = "autoloader.php";
const DB_MODEL_FOLDER = "dbmodel";
const MODULE_FOLDER = "module";
const MY_FILE_NAME = "autoloader.php";
const DB_MODEL_FOLDER = "dbmodel";
const MODULE_FOLDER = "module";
const INTERFACE_FOLDER = "interfaces";
const TRAIT_FOLDER = "trait";
const SETTINGS_SECTION = "AUTOLOADER";
const SETTINGS_CLASS_POS = "class.pos";
const SETTINGS_TRAIT_POS = "trait.pos";
const SETTINGS_IFACE_POS = "iface.pos";
private static $_filesInFoler = array();
private static $_instance;
private static $_debug = false;
private static $_modules = array();
protected function __construct()
{
self::_setFilesInFoler();
}
public static function getInstance()
{
$className = get_called_class();
if(self::$_instance==null) self::$_instance = new $className();
return self::$_instance;
}
/**
* @return bool
*/
protected static function isDebug(): bool
{
return self::$_debug;
}
/**
* @desc activate debug into the debugbar, before calling the autoloader
* Autoloader::getInstance()->debug( true );
* @param bool $debug
*/
public static function debug( bool $debug ): void
{
self::$_debug = $debug;
}
/**
* @desc will sort the array by a given sort order from the configuration file
* just provided in the AUTOLOADER section.
* @param array $modules
* @return array
*/
private static function sortOrderModules( array $modules, $section ): array
{
(bool) $skip = false;
(array) $normal = array();
if($section == self::SETTINGS_CLASS_POS)
{
$moduleSortOrder = Config::getInstance()->getConfig()[self::SETTINGS_SECTION][self::SETTINGS_CLASS_POS];
}
if($section == self::SETTINGS_TRAIT_POS)
{
$moduleSortOrder = Config::getInstance()->getConfig()[self::SETTINGS_SECTION][self::SETTINGS_TRAIT_POS];
}
if($section == self::SETTINGS_IFACE_POS)
{
$moduleSortOrder = Config::getInstance()->getConfig()[self::SETTINGS_SECTION][self::SETTINGS_IFACE_POS];
}
if(sizeof($moduleSortOrder)>0)
{
foreach ($modules as $module)
{
foreach ($moduleSortOrder as $sortOrder)
{
if($module['nfilename'] == $sortOrder)
{
$first[] = $module;
}
else
{
$skip = true;
}
}
if($skip)
{
$normal[] = $module;
$skip = false;
}
}
if(array_key_exists(0, $first))
{
$sorted = array();
foreach($moduleSortOrder as $item)
{
foreach ($first as $fmodule)
{
if($item==$fmodule['nfilename'])
{
$sorted[] = $fmodule;
}
}
}
}
$modules = array_merge($sorted, $normal);
}
return $modules;
}
/**
* @desc includes all database model files in preparation for the
* database factory model
@@ -39,10 +128,19 @@ class Autoloader
{
foreach (self::getFilesInFoler() as $file)
{
$required[] = $file;
require_once $file;
}
if(self::isDebug())
{
View::getInstance()->assign(
array(
'ndbraw_output' => '<pre>' . print_r($required, true) . '</pre>'
)
);
}
}
/**
* @return array
*/
@@ -50,47 +148,106 @@ class Autoloader
{
return self::$_filesInFoler;
}
/**
* @return array
*/
protected static function getModules(): array
{
return self::$_modules;
}
/**
* @param array $filesInFoler
*/
private static function _setFilesInFoler( )
{
$modelFolder = Config::getInstance()->getConfig()[View::NIBIRU_SETTINGS][self::DB_MODEL_FOLDER];
if(is_array($modelFolder))
/**
* @desc arrays for sorting the module order, so they will load
* alphabetically
*/
$modules = array();
if( is_array( Config::getInstance()->getConfig()[View::NIBIRU_SETTINGS][self::DB_MODEL_FOLDER] ) )
{
foreach ($modelFolder as $folder)
foreach ( Config::getInstance()->getConfig()[View::NIBIRU_SETTINGS][self::DB_MODEL_FOLDER] as $modelfolder )
{
$iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator(__DIR__ . $folder ));
foreach ($iterator as $item)
$iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator( __DIR__ . $modelfolder ));
foreach ( $iterator as $item )
{
if($item->getFileName()!= self::MY_FILE_NAME && $item->getFileName()!="." && $item->getFileName()!="..")
{
self::$_filesInFoler[] = $item->getPathName();
}
}
}
}
}
else
{
$iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator(__DIR__ . $modelFolder ));
foreach ($iterator as $item)
$iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator(__DIR__ . Config::getInstance()->getConfig()[View::NIBIRU_SETTINGS][self::DB_MODEL_FOLDER] ));
foreach ( $iterator as $item )
{
if($item->getFileName()!= self::MY_FILE_NAME && $item->getFileName()!="." && $item->getFileName()!="..")
{
self::$_filesInFoler[] = $item->getPathName();
}
}
}
$iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator(__DIR__ . Config::getInstance()->getConfig()[View::NIBIRU_SETTINGS][self::MODULE_FOLDER] ));
foreach ($iterator as $item)
}
}
/**
* @desc run check on modules that should provide an interface as well as a trait
*/
$iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator(__DIR__ . Config::getInstance()->getConfig()[View::NIBIRU_SETTINGS][self::INTERFACE_FOLDER] ));
foreach ( $iterator as $item )
{
if($item->getFileName()!= self::MY_FILE_NAME && $item->getFileName()!="." && $item->getFileName()!="..")
{
self::$_filesInFoler[] = $item->getPathName();
$interfaces[] = array(
'nfilename' => str_replace('.php', '', $item->getFileName()),
'filepathname' => $item->getPath() . '/' . $item->getFileName()
);
}
}
asort($interfaces);
$Sinterfaces = self::sortOrderModules($interfaces, self::SETTINGS_IFACE_POS);
foreach ($Sinterfaces as $interface)
{
self::$_filesInFoler[] = $interface['filepathname'];
}
$iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator(__DIR__ . Config::getInstance()->getConfig()[View::NIBIRU_SETTINGS][self::TRAIT_FOLDER] ));
foreach ( $iterator as $item )
{
if($item->getFileName()!= self::MY_FILE_NAME && $item->getFileName()!="." && $item->getFileName()!="..")
{
$traits[] = array(
'nfilename' => str_replace('.php', '', $item->getFileName()),
'filepathname' => $item->getPath() . '/' . $item->getFileName()
);
}
}
asort($traits);
$Straits = self::sortOrderModules($traits, self::SETTINGS_TRAIT_POS);
foreach($Straits as $trait)
{
self::$_filesInFoler[] = $trait['filepathname'];
}
$iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator(__DIR__ . Config::getInstance()->getConfig()[View::NIBIRU_SETTINGS][self::MODULE_FOLDER] ));
foreach ( $iterator as $item )
{
if($item->getFileName()!= self::MY_FILE_NAME && $item->getFileName()!="." && $item->getFileName()!="..")
{
$modules[] = array(
'nfilename' => str_replace('.php', '', $item->getFileName()),
'filepathname' => $item->getPath() . '/' . $item->getFileName()
);
}
}
asort($modules);
$Smodules = self::sortOrderModules($modules, self::SETTINGS_CLASS_POS);
foreach ($Smodules as $module)
{
self::$_filesInFoler[] = $module['filepathname'];
}
}
}

6
core/c/formattributes.php
View File

@@ -60,17 +60,23 @@ class FormAttributes
$this->_element = str_replace(' CLASS', '', $this->_element);
$this->_element = str_replace(' enctype="ENCTYPE"', '', $this->_element);
$this->_element = str_replace(' onsubmit="ONSUBMIT"', '', $this->_element);
$this->_element = str_replace(' onclick="ONCLICK"', '', $this->_element);
$this->_element = str_replace(' action="ACTION"', '', $this->_element);
$this->_element = str_replace(' SPEECH', '', $this->_element);
$this->_element = str_replace(' FORM', '', $this->_element);
$this->_element = str_replace(' placeholder="PLACEHOLDER"', '', $this->_element);
$this->_element = str_replace(' required="REQUIRED"', '', $this->_element);
$this->_element = str_replace(' value="VALUE"', '', $this->_element);
$this->_element = str_replace(' name="NAME"', '', $this->_element);
$this->_element = str_replace(' ', ' ', $this->_element);
$this->_element = str_replace(' type="TYPE"', '', $this->_element);
$this->_element = str_replace(' onchange="ONCHANGE"', '', $this->_element);
$this->_element = str_replace(' target="TARGET"', '', $this->_element);
$this->_element = str_replace(' method="METHOD"', '', $this->_element);
$this->_element = str_replace(' data-toggle="DATA-TOGGLE"', '', $this->_element);
$this->_element = str_replace(' SELECTED', '', $this->_element);
$this->_element = str_replace(' CONTEXT', '', $this->_element);
$this->_element = str_replace(' CHECKED', '', $this->_element);
}
/**

16
core/c/mysql.php
View File

@@ -24,10 +24,16 @@ class Mysql implements IMysql
protected $_conn = self::PLACE_CONNECTION;
protected function __construct( )
protected function __construct( $section = false )
{
$settings = Config::getInstance()->getConfig()[self::SETTINGS_DATABASE];
if($section)
{
$settings = Config::getInstance()->getConfig()[$section];
}
else
{
$settings = Config::getInstance()->getConfig()[self::SETTINGS_DATABASE];
}
$this->_setUsername($settings[self::PLACE_USERNAME]);
$this->_setPassword($settings[self::PLACE_PASSWORD]);
$this->_setDbname($settings[self::PLACE_DATABASE]);
@@ -38,10 +44,10 @@ class Mysql implements IMysql
$this->_setConn();
}
public static function getInstance()
public static function getInstance( $section = false )
{
$className = get_called_class();
if(self::$_instance==null) self::$_instance = new $className();
if(self::$_instance==null) self::$_instance = new $className( $section );
return self::$_instance;
}

16
core/c/odbc.php
View File

@@ -17,10 +17,16 @@ class Odbc extends Mysql implements IOdbc
private static $_instance;
protected function __construct( )
protected function __construct( $section = false )
{
$settings = Config::getInstance()->getConfig()[self::SETTINGS_DATABASE];
if($section)
{
$settings = Config::getInstance()->getConfig()[$section];
}
else
{
$settings = Config::getInstance()->getConfig()[self::SETTINGS_DATABASE];
}
$this->_setUsername($settings[self::PLACE_USERNAME]);
$this->_setPassword($settings[self::PLACE_PASSWORD]);
$this->_setDbname($settings[self::PLACE_DATABASE]);
@@ -32,10 +38,10 @@ class Odbc extends Mysql implements IOdbc
$this->_setConn();
}
public static function getInstance()
public static function getInstance( $section = false )
{
$className = get_called_class();
if(self::$_instance==null) self::$_instance = new $className();
if(self::$_instance==null) self::$_instance = new $className( $section );
return self::$_instance;
}

26
core/c/pdo.php
View File

@@ -10,7 +10,17 @@ namespace Nibiru;
*/
final class Pdo extends Mysql implements IPdo
{
private static $section = false;
public static function settingsSection( $section = IOdbc::SETTINGS_DATABASE )
{
self::$section = $section;
}
private static function getSettingsSection()
{
return self::$section;
}
/**
* @param string $string
*
@@ -18,7 +28,7 @@ final class Pdo extends Mysql implements IPdo
*/
public static function query( $string = self::PLACE_NO_QUERY )
{
$query = parent::getInstance()->getConn()->query( $string );
$query = parent::getInstance( self::getSettingsSection() )->getConn()->query( $string );
while($row = $query->fetch())
{
$keys = array_keys($row);
@@ -35,7 +45,7 @@ final class Pdo extends Mysql implements IPdo
public static function selectDatasetByFieldAndValue($tablename = self::PLACE_TABLE_NAME, $fieldAndValue = array() )
{
$result = parent::getInstance()->getConn()->query("SELECT * FROM " . $tablename . " WHERE " . $fieldAndValue['name'] . " = '" . $fieldAndValue['value'] . "';");
$result = parent::getInstance( self::getSettingsSection() )->getConn()->query("SELECT * FROM " . $tablename . " WHERE " . $fieldAndValue['name'] . " = '" . $fieldAndValue['value'] . "';");
return $result->fetchAll();
}
@@ -45,7 +55,7 @@ final class Pdo extends Mysql implements IPdo
$field_name = IMysql::PLACE_FIELD_NAME,
$where_value = IMysql::PLACE_WHERE_VALUE )
{
$statement = parent::getInstance()->getConn();
$statement = parent::getInstance( self::getSettingsSection() )->getConn();
$query = "UPDATE " . $tablename . " SET " . $column_name . " = :" . $column_name . " WHERE " . $field_name . " = :". $field_name;
$insert = $statement->prepare($query);
$insert->bindParam( ':'.$column_name, $parameter_name );
@@ -56,7 +66,7 @@ final class Pdo extends Mysql implements IPdo
public static function fetchRowInArrayById($tablename = self::PLACE_TABLE_NAME, $id = self::NO_ID )
{
$result = array();
$statement = parent::getInstance()->getConn();
$statement = parent::getInstance( self::getSettingsSection() )->getConn();
$describe = $statement->query('DESC ' . $tablename);
$describe->execute();
$tableInformation = $describe->fetchAll( \PDO::FETCH_ASSOC );
@@ -93,7 +103,7 @@ final class Pdo extends Mysql implements IPdo
$column_name = IMysql::PLACE_COLUMN_NAME,
$parameter_name = IMysql::PLACE_SEARCH_TERM)
{
$statement = parent::getInstance()->getConn();
$statement = parent::getInstance( self::getSettingsSection() )->getConn();
$prepare = $statement->prepare("SELECT * FROM " . $tablename . " WHERE " . $column_name . " = :" . $column_name . ";");
$prepare->bindParam(":".$column_name, $parameter_name, \PDO::PARAM_STR);
$prepare->execute();
@@ -116,7 +126,7 @@ final class Pdo extends Mysql implements IPdo
public static function fetchTableAsArray( $tablename = self::PLACE_TABLE_NAME )
{
$statement = parent::getInstance()->getConn()->query('SElECT * FROM ' . $tablename);
$statement = parent::getInstance( self::getSettingsSection() )->getConn()->query('SElECT * FROM ' . $tablename);
$statement->execute();
$result = $statement->fetchAll( \PDO::FETCH_ASSOC );
return $result;
@@ -131,7 +141,7 @@ final class Pdo extends Mysql implements IPdo
*/
public static function insertArrayIntoTable( $tablename = IMysql::PLACE_TABLE_NAME, $array_name = IMysql::PLACE_ARRAY_NAME, $encrypted = IMysql::PLACE_DES_ENCRYPT )
{
$statement = parent::getInstance()->getConn();
$statement = parent::getInstance( self::getSettingsSection() )->getConn();
if(is_array($array_name))
{

19
core/c/postgres.php
View File

@@ -9,6 +9,17 @@ namespace Nibiru;
*/
class Postgres extends Odbc implements IPostgres
{
private static $section = false;
public static function settingsSection( $section = IOdbc::SETTINGS_DATABASE )
{
self::$section = $section;
}
private static function getSettingsSection()
{
return self::$section;
}
/**
* @desc does a plain SQL query on a postgres database, and returns the
* result as an array
@@ -18,7 +29,7 @@ class Postgres extends Odbc implements IPostgres
public static function query($string = IOdbc::PLACE_NO_QUERY)
{
$all = array();
$result = \odbc_exec(parent::getInstance()->getConn(), $string);
$result = \odbc_exec(parent::getInstance( self::getSettingsSection() )->getConn(), $string);
for($i=1;$row=\odbc_fetch_object($result,$i);$i++)
{
$row_values = array();
@@ -54,7 +65,7 @@ class Postgres extends Odbc implements IPostgres
public static function fetchTableFieldsAsArray($tablename = IOdbc::PLACE_TABLE_NAME)
{
$columns = array();
$result = \odbc_columns(parent::getInstance()->getConn(), null, null, $tablename);
$result = \odbc_columns(parent::getInstance( self::getSettingsSection() )->getConn(), null, null, $tablename);
for($i=0;$row=\odbc_fetch_object($result, $i);$i++)
{
foreach ($row as $key=>$entry)
@@ -112,7 +123,7 @@ class Postgres extends Odbc implements IPostgres
$row .= " )";
$sql = 'INSERT INTO ' . $tablename . $row . ';';
\odbc_exec(parent::getInstance()->getConn(), $sql);
\odbc_exec(parent::getInstance( self::getSettingsSection() )->getConn(), $sql);
}
}
else
@@ -148,7 +159,7 @@ class Postgres extends Odbc implements IPostgres
$row .= " )";
$sql = 'INSERT INTO ' . $tablename . $row . ';';
\odbc_exec(parent::getInstance()->getConn(), $sql);
\odbc_exec(parent::getInstance( self::getSettingsSection() )->getConn(), $sql);
}
}

11
core/c/typecheckbox.php
View File

@@ -12,10 +12,11 @@ use Nibiru\Adapter;
class TypeCheckbox extends FormAttributes implements IForm
{
private $_attributes = array(
self::FORM_NAME => '',
self::FORM_VALUE => '',
self::FORM_ATTRIBUTE_ID => '',
self::FORM_ATTRIBUTE_CLASS => ''
self::FORM_NAME => '',
self::FORM_VALUE => '',
self::FORM_ATTRIBUTE_ID => '',
self::FORM_ATTRIBUTE_CLASS => '',
self::FORM_ATTRIBUTE_CHECKED => ''
);
public function loadElement( $attributes )
@@ -32,7 +33,7 @@ class TypeCheckbox extends FormAttributes implements IForm
*/
private function _setElement( )
{
$this->_element = '<input type="checkbox" name="NAME" value="VALUE" ID CLASS>' . 'VALUE<br>' . "\n";
$this->_element = '<input type="checkbox" name="NAME" value="VALUE" CHECKED ID CLASS>' . 'VALUE<br>' . "\n";
}

3
core/f/db.php
View File

@@ -9,7 +9,8 @@ namespace Nibiru\Factory;
*/
class Db
{
protected static $_model = null;
const DATABASE_DRIVER_NS = "driver";
protected static $_model = null;
/**
* @desc loads the database model through the correct Factory,

1
core/i/form.php
View File

@@ -39,6 +39,7 @@ interface IForm
const FORM_ATTRIBUTE_ONSUBMIT = 'onsubmit';
const FORM_ATTRIBUTE_SELECTED = 'selected';
const FORM_ATTRIBUTE_CONTEXT = 'context';
const FORM_ATTRIBUTE_CHECKED = 'checked';
/**
* @desc loads the current Form element to the form