Added the ability to update System and apps seperatly

This commit is contained in:
kolaente 2016-11-10 22:45:17 +01:00
parent 03a2a088a2
commit 696f879a31
13 changed files with 325 additions and 186 deletions

View File

@ -149,132 +149,6 @@ if (hasPerm('manage_system'))
}
}
}
//Update
if (isset($_GET['update']))
{
printHeader($lang->get('general_update'));
if (hasPerm('update'))
{
$nextVersion = $MCONF['version_num'] + 1;
//Check for version.json on the remote server
$dUri = $MCONF['update_uri'] . 'v' . $nextVersion . '/';
if(remote_file_exists($dUri . 'version.json'))
{
$version_remote = json_decode(file_get_contents($dUri . 'version.json'));
//Check if the remote version is newer
if ($version_remote->versionNum > $MCONF['version_num'])
{
//Download the update
if (copy($dUri . 'update.v' . $version_remote->versionNum . '.incremental.zip', 'update.zip'))
{
//Check for md5 hash
if (md5_file('update.zip') == $version_remote->md5)
{
//unzip to temporary folder
$updateTmpDir = 'updateTmp/';
if (!file_exists($updateTmpDir))
{
if(mkdir($updateTmpDir, 0777) === false)
{
echo msg('fail', 'Error creating temporary folder.');
}
}
$zip = new ZipArchive;
$res = $zip->open('update.zip');
if ($res === true)
{
$zip->extractTo($updateTmpDir);
$zip->close();
$updateInfos = json_decode(file_get_contents($updateTmpDir . 'filesToUpdate.json'));
$isUp = false;
$fTU = [];
foreach ($updateInfos->files as $num => $file)
{
$fTU[] = $file;
$upNeu = $updateTmpDir . $file;
$upRem = '../' . $file;
if (copy($upNeu, $upRem))
{
echo msg('succes', sprintf($lang->get('action_update_item_succss'), $file));
$isUp = true;
} else
{
echo msg('fail', sprintf($lang->get('action_update_item_fail'), $file));
}
}
//Update Version in Config File
$config = Yaml::parse(file_get_contents('../inc/config.yml', FILE_USE_INCLUDE_PATH));
$config['Versioning']['version'] = $version_remote->version;
$config['Versioning']['version_num'] = $version_remote->versionNum;
$configfile = Yaml::dump($config);
if (!file_put_contents('../inc/config.yml', $configfile))
{
echo msg('fail', $lang->get('action_update_config_fail'));
}
//Remove "old" update
if (rrmdir($updateTmpDir) && $isUp && unlink('update.zip'))
{
echo msg('succes', $lang->get('action_update_succss') . ' <a href="general_config.php">' . $lang->get('back') . '</a>');
} else
{
echo msg('fail', $lang->get('action_update_fail') . ' <a href="general_config.php">' . $lang->get('back') . '</a>');
}
} else
{
echo msg('fail', $lang->get('action_update_fail_unzip'));
}
} else
{
echo msg('fail', $lang->get('action_update_md5_fake'));
}
} else
{
echo msg('fail', $lang->get('action_update_fail_copy'));
}
} else
{
echo msg('info', $lang->get('general_version_current_new'));
}
} else
{
echo msg('info', $lang->get('general_version_current_new'));
}
}
}
//Show Changelog
if(isset($_GET['showChangelog']))
{
printHeader($lang->get('general_showChangelog'));
echo '<div class="main">';
if(hasPerm('update'))
{
if(isset($_GET['v']))
{
if(remote_file_exists($MCONF['update_uri'] . 'v' . $_GET['v'] . '/changelog.md'))
{
require_once '../inc/libs/Parsedown.php';
$Parsedown = new Parsedown();
echo $Parsedown->text(file_get_contents($MCONF['update_uri'] . 'v' . $_GET['v'] . '/changelog.md'));
}
}
else
{
echo 'Missing Version.';
}
}
else
{
echo msg('info', $lang->get('missing_permission'));
}
echo '</div>';
}
} else
{
printHeader($lang->get('action_edit_content'));

View File

@ -7,8 +7,8 @@
.mce-toolbar .mce-btn { background: #fff; border: 0; }
.mce-toolbar .mce-btn i { color: #555; }
.mce-toolbar .mce-btn:hover i { color: #333; }
.mce-primary { background: #6ba72b; }
.mce-primary:hover { background: #68a029; }
.mce-primary { background: #4CAF50; }
.mce-primary:hover { background: #4CAF50; }
.mce-btn-group:not(:first-child) { border-left: 3px solid #fff; }
.mce-menu-item:hover { background: #eee; }
.mce-menu-item.mce-disabled * { color: #ddd !important; }

View File

@ -40,39 +40,29 @@ tinymce();
{
?>
<i class="divider"></i>
<h1><?php echo $lang->get('general_version'); ?></h1>
<p><?php echo $lang->get('general_version_current'); ?>:
<h1><?php echo $lang->get('update_version'); ?></h1>
<p><?php echo $lang->get('update_version_current'); ?>:
<?php
echo $MCONF['version'];
?>
</p>
<p>
<?php
//Check for newer Version
$nextVersion = $MCONF['version_num'] + 1;
if(remote_file_exists($MCONF['update_uri'] . 'v' . $nextVersion . '/version.json'))
{
$version_remote = json_decode(file_get_contents($MCONF['update_uri'] . 'v' . $nextVersion . '/version.json'));
if ($version_remote->versionNum > $MCONF['version_num'])
{
echo $lang->get('general_new_version') . ' <b>' . $version_remote->version . '</b> <a href="action.php?update" class="button">' . $lang->get('general_update') . '</a>';
//Check for Changelog
if(remote_file_exists($MCONF['update_uri'] . 'v' . $nextVersion . '/changelog.md'))
{
echo '<a href="action.php?showChangelog&v='.$nextVersion.'" class="button"><i class="fa fa-list-alt" aria-hidden="true"></i>&nbsp;&nbsp;Changelog</a>';
}
} else
{
echo $lang->get('general_version_current_new');
}
}else
{
echo $lang->get('general_version_current_new');
}
?>
<div id="checkUpdate">
<div class="spinner-container" style="margin: 0;">
<svg class="spinner" style="width:41px;height:40px;" viewBox="0 0 44 44">
<circle class="path" cx="22" cy="22" r="20" fill="none" stroke-width="4"></circle>
</svg>
</div>
<div style="margin: -35px 0 0 55px;padding-bottom: 10px;">Überprüfe auf Updates...</div>
</div>
</p>
<script>
$.get('update.php?checkUpdate', function (data) {
$('#checkUpdate').html('');
$('#checkUpdate').html(data);
});
</script>
<?php
}
@ -110,8 +100,8 @@ tinymce();
<i class="divider"></i>
<input type="submit" class="speichern" value="<?php echo $lang->get('general_save_changes'); ?>"
style="width: auto;"/>
</div>
</form>
<?php
echo '</div>';
require_once '../inc/footer.php';
?>

View File

@ -71,7 +71,7 @@ if (isset($_POST['submit']))
$CONFIG['Templating']['tpl_webUri'] = 'website_uri';
$CONFIG['Versioning']['version'] = '0.94 Beta';
$CONFIG['Versioning']['version_num'] = 5;
$CONFIG['Versioning']['update_uri'] = 'https://cdn.kola-entertainments.de/cms/';
$CONFIG['Versioning']['update_uri'][] = 'https://cdn.kola-entertainments.de/cms/';
$CONFIG['Mail']['smtp'] = false;
//Mail Settings

View File

@ -81,15 +81,9 @@ $lang['general_construction_mode'] = 'Baustellenzustand';
$lang['general_end_construction_mode'] = 'Baustellenzustand aufheben';
$lang['general_start_construction_mode'] = 'Seite in Baustellenzustand versetzen';
$lang['general_edit_message'] = 'Meldung bearbeiten';
$lang['general_version'] = 'Version';
$lang['general_version_current'] = 'Installierte Version';
$lang['general_new_version'] = 'Neue Version verfügbar!';
$lang['general_version_current_new'] = 'Die installierte Version ist aktuell.';
$lang['general_update'] = 'Update';
$lang['general_database'] = 'Datenbank';
$lang['general_create_backup'] = 'Datenbank Backup erstellen';
$lang['general_go_phpmyadmin'] = 'Zu phpmyadmin';
$lang['general_showChangelog'] = 'Changelog anzeigen';
/*
* Manage Admins
@ -200,11 +194,21 @@ $lang['action_construction_confirm'] = 'Wollen Sie die Webseite wirklich in den
$lang['action_construction_removed_success'] = 'Der Baustellenzustand wurde erfolgreich aufgehoben.';
$lang['action_construction_remove'] = 'Wollen Sie den Baustellenzustand wirklich aufheben?';
$lang['action_change_page_title_success'] = 'Die Änderungen des Seitentitels wurden erfolgreich gespeichert.';
$lang['action_update_item_succss'] = '"%1$s" wurde erfolgreich upgedatet.';
$lang['action_update_item_fail'] = 'Fehler beim Updaten von "%1$s"';
$lang['action_update_succss'] = 'Mowie CMS wurde erfolgreich upgedatet.';
$lang['action_update_fail'] = 'Fehler beim Updaten.';
$lang['action_update_config_fail'] = 'Beim Bearbeiten der Configdatei ist ein Fehler aufgetreten.';
$lang['action_update_fail_unzip'] = 'Fehler beim Entpacken des Updates.';
$lang['action_update_md5_fake'] = 'Die Heruntergeladene Datei ist vermutlich falsch.';
$lang['action_update_fail_copy'] = 'Fehler beim Herunterladen des Updates. <b>Hinweis:</b> Der Nutzer, unter welchem der Webserver läuft, muss im Verzeichnis /admin Schreibrechte haben!';
//Update
$lang['update_title'] = 'Update';
$lang['update_showChangelog'] = 'Changelog anzeigen';
$lang['update_item_succss'] = '"%1$s" wurde erfolgreich upgedatet.';
$lang['update_item_fail'] = 'Fehler beim Updaten von "%1$s"';
$lang['update_succss'] = 'Mowie CMS wurde erfolgreich upgedatet.';
$lang['update_app_succss'] = '"%1$s" wurde erfolgreich upgedatet.';
$lang['update_fail'] = 'Fehler beim Updaten.';
$lang['update_config_fail'] = 'Beim Bearbeiten der Configdatei ist ein Fehler aufgetreten.';
$lang['update_fail_unzip'] = 'Fehler beim Entpacken des Updates.';
$lang['update_md5_fake'] = 'Die Heruntergeladene Datei ist vermutlich falsch.';
$lang['update_fail_copy'] = 'Fehler beim Herunterladen des Updates. <b>Hinweis:</b> Der Nutzer, unter welchem der Webserver läuft, muss im Verzeichnis /admin Schreibrechte haben!';
$lang['update_version'] = 'Version';
$lang['update_version_current'] = 'Installierte Version';
$lang['update_new_version'] = 'Neue Version verfügbar!';
$lang['update_version_current_new'] = 'Die installierte Version ist aktuell.';
$lang['update_app_update_available'] = 'App-Update - Neue Version für "%1$s" verfügbar: %2$s';

View File

@ -82,14 +82,9 @@ $lang['general_end_construction_mode'] = 'End Construction Mode';
$lang['general_start_construction_mode'] = 'Start Construction Mode';
$lang['general_edit_message'] = 'Edit Construction Message';
$lang['general_version'] = 'Version';
$lang['general_version_current'] = 'Installed Version';
$lang['general_new_version'] = 'New Version Available!';
$lang['general_version_current_new'] = 'Installed Version is up-to-date';
$lang['general_update'] = 'Update';
$lang['general_database'] = 'Database';
$lang['general_create_backup'] = 'Create Database Backup';
$lang['general_go_phpmyadmin'] = 'phpmyadmin';
$lang['general_showChangelog'] = 'Show Changelog';
/*
* Manage Admins
@ -200,11 +195,22 @@ $lang['action_construction_confirm'] = 'Are you sure you want to enable construc
$lang['action_construction_removed_success'] = 'Construction Mode was successfully disabled.';
$lang['action_construction_remove'] = 'Are you sure you want to disable construction mode?';
$lang['action_change_page_title_success'] = 'Page Title was successfully edited.';
$lang['action_update_item_succss'] = '"%1$s" was successfully updated.';
$lang['action_update_item_fail'] = 'An error occured while updating "%1$s"';
$lang['action_update_succss'] = 'Mowie CMS was updated successfully.';
$lang['action_update_fail'] = 'An error occured while updating.';
$lang['action_update_config_fail'] = 'An error occured while updating the config file.';
$lang['action_update_fail_unzip'] = 'An error occured while unpacking the update.';
$lang['action_update_md5_fake'] = 'The downloaded file has a wrong checksum.';
$lang['action_update_fail_copy'] = 'An error occured while downloading the update. <b>Hint:</b> The webserver needs writing permissions in the folder /admin!';
//Update
$lang['update_title'] = 'Update';
$lang['update_showChangelog'] = 'Show Changelog';
$lang['update_item_succss'] = '"%1$s" was successfully updated.';
$lang['update_item_fail'] = 'An error occured while updating "%1$s"';
$lang['update_succss'] = 'Mowie CMS was updated successfully.';
$lang['update_app_succss'] = '"%1$s" was updated successfully.';
$lang['update_fail'] = 'An error occured while updating.';
$lang['update_config_fail'] = 'An error occured while updating the config file.';
$lang['update_fail_unzip'] = 'An error occured while unpacking the update.';
$lang['update_md5_fake'] = 'The downloaded file has a wrong checksum.';
$lang['update_fail_copy'] = 'An error occured while downloading the update. <b>Hint:</b> The webserver needs writing permissions in the folder /admin!';
$lang['update_version'] = 'Version';
$lang['update_version_current'] = 'Installed Version';
$lang['update_new_version'] = 'New Version Available!';
$lang['update_version_current_new'] = 'Installed Version is up-to-date';
$lang['update_app_update_available'] = 'App-Update - New Version for "%1$s" available: %2$s';

255
admin/update.php Normal file
View File

@ -0,0 +1,255 @@
<?php
require_once '../inc/autoload_adm.php';
//Update-Checker
if (isset($_GET['checkUpdate']))
{
//sleep(50);
if (hasPerm('update'))
{
//Check for newer Version
$nextVersion = $MCONF['version_num'] + 1;
$foundNewVersion = false;
$hasChangelog = false;
foreach ($MCONF['update_uri'] as $update_server)
{
$updateUrl = $update_server . 'System/v' . $nextVersion;
if (remote_file_exists($updateUrl . '/version.json'))
{
$version_remote = json_decode(file_get_contents($updateUrl . '/version.json'));
if ($version_remote->versionNum > $MCONF['version_num'])
{
$foundNewVersion = true;
//Check for Changelog
if (remote_file_exists($updateUrl . '/changelog.md'))
{
$hasChangelog = $update_server;
}
}
}
}
if ($foundNewVersion)
{
echo $lang->get('update_new_version') . ' <b>' . $version_remote->version . '</b> <a href="update.php?update" class="button">' . $lang->get('update_title') . '</a>';
if ($hasChangelog !== false)
{
echo '<a href="update.php?showChangelog&server=' . urlencode($hasChangelog) . '&v=' . $nextVersion . '" class="button"><i class="fa fa-list-alt" aria-hidden="true"></i>&nbsp;&nbsp;Changelog</a>';
}
} else
{
echo $lang->get('update_version_current_new');
}
//Check for App-Updates
foreach ($apps->getApps() as $appdir => $app)
{
if(isset($app['app_build']))
{
$nextVersion = $app['app_build'] + 1;
$foundNewVersion = false;
$hasChangelog = false;
foreach ($MCONF['update_uri'] as $update_server)
{
$updateUrl = $update_server . 'apps/' . str_replace(' ', '-', $app['app_name']) . '/v' . $nextVersion;
if (remote_file_exists($updateUrl . '/version.json'))
{
$version_remote = json_decode(file_get_contents($updateUrl . '/version.json'));
if ($version_remote->versionNum > $app['app_build'])
{
$foundNewVersion = true;
//Check for Changelog
if (remote_file_exists($updateUrl . '/changelog.md'))
{
$hasChangelog = $update_server;
}
}
}
}
if ($foundNewVersion)
{
echo '<br/>'.sprintf($lang->get('update_app_update_available'), $app['app_name'], $version_remote->version). ' <a href="update.php?update&appUpdate='.urlencode($appdir).'" class="button">' . $lang->get('update_title') . '</a>';
if ($hasChangelog !== false)
{
echo '<a href="update.php?showChangelog&app='.str_replace(' ', '-', $app['app_name']).'&server=' . urlencode($hasChangelog) . '&v=' . $nextVersion . '" class="button"><i class="fa fa-list-alt" aria-hidden="true"></i>&nbsp;&nbsp;Changelog</a>';
}
}
}
}
}
exit;
}
//Show Changelog
if (isset($_GET['showChangelog']))
{
printHeader($lang->get('update_showChangelog'));
echo '<div class="main">';
if (hasPerm('update'))
{
if(isset($_GET['server']))
{
//If we want to see the changelog for an app, we need to look in a different directory
$remoteSubDir = 'System';
if(isset($_GET['app']))
{
$remoteSubDir = 'apps/'.$_GET['app'];
}
if (isset($_GET['v']))
{
if (remote_file_exists(urldecode($_GET['server']) . $remoteSubDir . '/v' . $_GET['v'] . '/changelog.md'))
{
require_once '../inc/libs/Parsedown.php';
$Parsedown = new Parsedown();
echo $Parsedown->text(file_get_contents(urldecode($_GET['server']) . $remoteSubDir . '/v' . $_GET['v'] . '/changelog.md'));
}
} else
{
echo 'Missing Version.';
}
}
else
{
echo 'Missing Server';
}
} else
{
echo msg('info', $lang->get('missing_permission'));
}
echo '<a href="general_config.php">'.$lang->get('back').'</a> </div>';
exit;
}
//Update
if (isset($_GET['update']))
{
printHeader($lang->get('update_title'));
if (hasPerm('update'))
{
$updated = false;
foreach ($MCONF['update_uri'] as $update_server)
{
$nextVersion = $MCONF['version_num'] + 1;
$installedVersion = $MCONF['version_num'];
//If we want to see the changelog for an app, we need to look in a different directory
$remoteSubDir = 'System';
$systemSubDir = '../';
if (isset($_GET['appUpdate']))
{
require '../apps/' . urldecode($_GET['appUpdate']) . '/config.php';
$remoteSubDir = 'apps/' . str_replace(' ', '-', $_CONF['app_name']);
$nextVersion = $_CONF['app_build'] + 1;
$systemSubDir = '../apps/' . urldecode($_GET['appUpdate']) . '/';
$installedVersion = $_CONF['app_build'];
}
//Check for version.json on the remote server
$dUri = $update_server . $remoteSubDir . '/v' . $nextVersion . '/';
if (remote_file_exists($dUri . 'version.json'))
{
$version_remote = json_decode(file_get_contents($dUri . 'version.json'));
//Check if the remote version is newer
if ($version_remote->versionNum > $installedVersion)
{
//Download the update
if (copy($dUri . 'update.v' . $version_remote->versionNum . '.incremental.zip', 'update.zip'))
{
$updated = true;
//Check for md5 hash
if (md5_file('update.zip') == $version_remote->md5)
{
//unzip to temporary folder
$updateTmpDir = 'updateTmp/';
if (!file_exists($updateTmpDir))
{
if (mkdir($updateTmpDir, 0777) === false)
{
echo msg('fail', 'Error creating temporary folder.');
}
}
$zip = new ZipArchive;
$res = $zip->open('update.zip');
if ($res === true)
{
$zip->extractTo($updateTmpDir);
$zip->close();
$updateInfos = json_decode(file_get_contents($updateTmpDir . 'filesToUpdate.json'));
$isUp = false;
$fTU = [];
foreach ($updateInfos->files as $num => $file)
{
$fTU[] = $file;
$upNeu = $updateTmpDir . $file;
$upRem = $systemSubDir . $file;
if (copy($upNeu, $upRem))
{
echo msg('succes', sprintf($lang->get('update_item_succss'), $file));
$isUp = true;
} else
{
echo msg('fail', sprintf($lang->get('update_item_fail'), $file));
}
}
//Update Version in Config File - only if we don't update an app
if (!isset($_GET['appUpdate']))
{
$config = Yaml::parse(file_get_contents('../inc/config.yml', FILE_USE_INCLUDE_PATH));
$config['Versioning']['version'] = $version_remote->version;
$config['Versioning']['version_num'] = $version_remote->versionNum;
$configfile = Yaml::dump($config);
if (!file_put_contents('../inc/config.yml', $configfile))
{
echo msg('fail', $lang->get('general_config_fail'));
}
}
//Remove "old" update
if (rrmdir($updateTmpDir) && $isUp && unlink('update.zip'))
{
if(isset($_GET['appUpdate']))
{
echo msg('succes', sprintf($lang->get('update_app_succss'), $_CONF['app_name']) . ' <a href="general_config.php">' . $lang->get('back') . '</a>');
}
else
{
echo msg('succes', $lang->get('update_succss') . ' <a href="general_config.php">' . $lang->get('back') . '</a>');
}
} else
{
echo msg('fail', $lang->get('update_fail') . ' <a href="general_config.php">' . $lang->get('back') . '</a>');
}
} else
{
echo msg('fail', $lang->get('update_fail_unzip'));
}
} else
{
echo msg('fail', $lang->get('update_md5_fake'));
}
} else
{
echo msg('fail', $lang->get('update_fail_copy'));
}
} else
{
echo msg('info', $lang->get('update_version_current_new'));
}
}
}
if(!$updated)
{
echo msg('info', $lang->get('update_version_current_new'));
}
}
}

View File

@ -4,6 +4,8 @@ $GLOBALS['lang']->set('Manage Files', 'files_title', 'en');
$_CONF['app_name'] = 'Files';
$_CONF['app_desc'] = 'Ein Modul zum Anzeigen & Uploaden von Dateien';
$_CONF['app_build'] = 1;
$_CONF['app_version'] = 'v0.9 Beta';
$_CONF['menu_top'] = '<i class="fa fa-folder"></i> '.$GLOBALS['lang']->get('files_title');
$_CONF['menu'] = ['menu_top' => 'index.php'];
$_CONF['type'] = 'none';

View File

@ -12,6 +12,8 @@ $GLOBALS['lang']->set('Create New Page', 'sp_create_new', 'en');
$_CONF['app_name'] = 'SimplePages';
$_CONF['app_desc'] = 'Wird benutzt, um Einfache statische Seitn zu erzeugen und zu verwalten.';
$_CONF['app_build'] = 1;
$_CONF['app_version'] = 'v0.9 Beta';
$_CONF['base_url'] = '/'; //Basisurl des moduls, wenn es über das Frontend aufgerufen wird
$_CONF['base_file'] = 'front/page.php'; //Datei, die angezeigt wird, wenn die basisurl aufgerufen wird
$_CONF['menu_top'] = '<i class="fa fa-file-text"></i> '.$GLOBALS['lang']->get('sp_pages'); //Name des Moduls, wie es im Adminbereich im Hauptmenü auftaucht
@ -42,5 +44,3 @@ if(file_exists($iniFile))
$db->get();
if(isset($db->data[0])) $confirmationUserMail = $db->data[0]['mail'];*/
}
//print_r($config);

View File

@ -5,6 +5,8 @@ $GLOBALS['lang']->set('Logfiles', 'log_title', 'en');
$_CONF['app_name'] = 'Logfiles';
$_CONF['app_desc'] = 'Logfiles';
$_CONF['app_build'] = 1;
$_CONF['app_version'] = 'v0.9 Beta';
//$_CONF['base_url'] = 'demomodul/'; //Basisurl des moduls, wenn es über das Frontend aufgerufen wird
$_CONF['base_file'] = 'log.php'; //Datei, die angezeigt wird, wenn die basisurl aufgerufen wird
$_CONF['menu_top'] = '<i class="fa fa-server"></i> '.$GLOBALS['lang']->get('log_title'); //Name des Moduls, wie es im Adminbereich im Hauptmenü auftaucht

View File

@ -1,6 +1,8 @@
<?php
$_CONF['app_name'] = 'Meta';
$_CONF['app_desc'] = 'Sorgt dafür, das Metadaten auf der Homepage angezeigt werden.';
$_CONF['app_build'] = 1;
$_CONF['app_version'] = 'v0.9 Beta';
$_CONF['menu_top'] = '';
$_CONF['base_file'] = 'meta.php';
$_CONF['type'] = 'static';

View File

@ -1,6 +1,8 @@
<?php
$_CONF['app_name'] = 'Sidebar';
$_CONF['app_desc'] = 'Baut (falls aktiviert) eine Sidebar mit beliebigem Inhalt auf der Seite ein';
$_CONF['app_build'] = 1;
$_CONF['app_version'] = 'v0.9 Beta';
$_CONF['base_file'] = 'sidebar.php';
$_CONF['type'] = 'static';
$_CONF['general_conf'] = 'genConf.php';

View File

@ -1,6 +1,8 @@
<?php
$_CONF['app_name'] = 'Appname';
$_CONF['app_desc'] = 'Appbeschreibung';
$_CONF['app_build'] = 1;
$_CONF['app_version'] = 'v0.9 Beta';
//$_CONF['base_url'] = 'demoapp/';
$_CONF['base_file'] = 'test.php';