libs/phplibrary
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of http://gitlab.edu.yar.ru/composer/PHP_Library

Browse source
This commit is contained in:
origami11 2017-07-25 11:02:27 +03:00
commit 7d865fbf46
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/Controller/Installer.php
View file

@ -69,6 +69,7 @@ class Controller_Installer
{ {
$result = array(); $result = array();
$setup = $this->getSetupFile($name); $setup = $this->getSetupFile($name);
if (file_exists($setup) && ($this->isChanged($name) || $force)) { if (file_exists($setup) && ($this->isChanged($name) || $force)) {
$registry = $this->_registry; $registry = $this->_registry;
$settings = new Settings($setup); $settings = new Settings($setup);
@ -91,20 +92,21 @@ class Controller_Installer
$result[]=$res; $result[]=$res;
} }
} }
}
// Обновление версии меню // Обновление версии меню
$registry->removeKey($name); $registry->removeKey($name);
$registry->writeKey(array($name), $settings->get('settings')); $registry->writeKey(array($name), $settings->get('settings'));
$registry->writeKey(array($name), $registry->writeKey(array($name),
array('version' => $version_new, array('version' => $version_new,
'time' => filemtime($setup))); 'time' => filemtime($setup)));
}
$registry->write(); $registry->write();
} }
return $result; return $result;
} }
function install($dbinit_path,$dbfill_path=null){ function install($dbinit_path, $dbfill_path = null) {
$json_installer = new Database_JsonInstall($this->db_manager); $json_installer = new Database_JsonInstall($this->db_manager);
$json_installer->install($dbinit_path,$dbfill_path); $json_installer->install($dbinit_path,$dbfill_path);
} }

4
src/Database/JsonInstall.php
View file

@ -14,11 +14,11 @@ class Database_JsonInstall {
if (is_string($dbinit_file)) { if (is_string($dbinit_file)) {
$initActions = json_decode($dbinit_file, true); $initActions = json_decode($dbinit_file, true);
if (!$initActions) { if (!$initActions) {
echo "Invalid dbinit.json ".$dbinit_file; echo "Invalid ".$dbinit_path;
return 0; return 0;
} }
} else { } else {
echo "No dbinit.json"; echo "No ".$dbinit_path;
return 0; return 0;
} }