Merge branch 'master' into noglob

This commit is contained in:
origami11@yandex.ru 2022-11-18 16:07:32 +03:00
commit 7d35a8f3f0
27 changed files with 430 additions and 288 deletions

View file

@ -5,6 +5,7 @@
*/
namespace ctiso\Controller;
use ctiso\Path,
ctiso\File,
ctiso\Registry,
ctiso\Database\PDOStatement;
@ -16,7 +17,7 @@ class Service
public $template;
public $templatePath;
public $COMPONENTS_WEB;
public $db;
public function getTemplatePath($name)
@ -30,7 +31,7 @@ class Service
}
/**
* @param $name Имя модели
* @param string $name Имя модели
*/
private function getModelPath($name)
{
@ -40,7 +41,7 @@ class Service
/**
* Создает модель
* @param string $name
* @return model
* @return Model
*/
public function getModel($name)
{
@ -66,5 +67,14 @@ class Service
}
return $result;
}
function getInfo() {
$filename = Path::join($this->viewPath[0], 'install.json');
if (file_exists($filename)) {
$settings = json_decode(File::getContents($filename), true);
return $settings;
}
return array();
}
}