From 713b3dda18fa095b8d11d37d7636360b5e3a7ae9 Mon Sep 17 00:00:00 2001
From: kolaente <konrad@kola-entertainments.de>
Date: Sat, 29 Apr 2017 19:25:18 +0200
Subject: [PATCH] Updated Installer

---
 admin/assets/bootstrap.min.css                      |   0
 admin/assets/font-awesome.css                       |   0
 admin/assets/fonts/font-awesome/FontAwesome.otf     | Bin
 .../fonts/font-awesome/fontawesome-webfont.eot      | Bin
 .../fonts/font-awesome/fontawesome-webfont.svg      |   0
 .../fonts/font-awesome/fontawesome-webfont.ttf      | Bin
 .../fonts/font-awesome/fontawesome-webfont.woff     | Bin
 .../fonts/font-awesome/fontawesome-webfont.woff2    | Bin
 admin/assets/js/bootstrap.min.js                    |   0
 admin/assets/js/moment.js                           |   0
 admin/assets/js/page.bodyparser.js                  |   0
 admin/assets/js/page.js                             |   0
 admin/index.php                                     |   4 ++--
 admin/install-dev.php                               |   6 +++---
 admin/lang.php                                      |   0
 admin/reset-pw.php                                  |   0
 admin/stream.php                                    |   0
 admin/update.php                                    |   0
 apps/Files/css/files.css                            |   0
 apps/Navigation/action.php                          |   0
 apps/Navigation/config.php                          |   0
 apps/Navigation/css/nav.css                         |   0
 apps/Navigation/index.php                           |   0
 apps/Navigation/js/jquery-ui.js                     |   0
 apps/Navigation/js/nav.js                           |   0
 apps/Navigation/lang/lang.de.php                    |   0
 apps/Navigation/lang/lang.en.php                    |   0
 apps/Navigation/nav.php                             |   0
 apps/Navigation/permissions.json                    |   0
 apps/SimplePages/backend/confirmConfig.php          |   0
 apps/SimplePages/config.php                         |   2 +-
 apps/logfiles/config.php                            |   2 +-
 apps/logfiles/install-dev.php                       |   0
 apps/meta/config.php                                |   2 +-
 apps/meta/install-dev.php                           |   0
 apps/meta/lang/lang.de.php                          |   0
 apps/meta/lang/lang.en.php                          |   0
 apps/sidebar/config.php                             |   2 +-
 apps/sidebar/install-dev.php                        |   0
 apps/sidebar/lang/lang.de.php                       |   0
 apps/sidebar/lang/lang.en.php                       |   0
 inc/apps.php                                        |   0
 inc/libs/PHP-mailer/class.phpmailer.php             |   0
 inc/libs/PHP-mailer/class.smtp.php                  |   0
 inc/libs/Parsedown.php                              |   0
 index.php                                           |   2 +-
 46 files changed, 10 insertions(+), 10 deletions(-)
 mode change 100644 => 100755 admin/assets/bootstrap.min.css
 mode change 100644 => 100755 admin/assets/font-awesome.css
 mode change 100644 => 100755 admin/assets/fonts/font-awesome/FontAwesome.otf
 mode change 100644 => 100755 admin/assets/fonts/font-awesome/fontawesome-webfont.eot
 mode change 100644 => 100755 admin/assets/fonts/font-awesome/fontawesome-webfont.svg
 mode change 100644 => 100755 admin/assets/fonts/font-awesome/fontawesome-webfont.ttf
 mode change 100644 => 100755 admin/assets/fonts/font-awesome/fontawesome-webfont.woff
 mode change 100644 => 100755 admin/assets/fonts/font-awesome/fontawesome-webfont.woff2
 mode change 100644 => 100755 admin/assets/js/bootstrap.min.js
 mode change 100644 => 100755 admin/assets/js/moment.js
 mode change 100644 => 100755 admin/assets/js/page.bodyparser.js
 mode change 100644 => 100755 admin/assets/js/page.js
 mode change 100644 => 100755 admin/install-dev.php
 mode change 100644 => 100755 admin/lang.php
 mode change 100644 => 100755 admin/reset-pw.php
 mode change 100644 => 100755 admin/stream.php
 mode change 100644 => 100755 admin/update.php
 mode change 100644 => 100755 apps/Files/css/files.css
 mode change 100644 => 100755 apps/Navigation/action.php
 mode change 100644 => 100755 apps/Navigation/config.php
 mode change 100644 => 100755 apps/Navigation/css/nav.css
 mode change 100644 => 100755 apps/Navigation/index.php
 mode change 100644 => 100755 apps/Navigation/js/jquery-ui.js
 mode change 100644 => 100755 apps/Navigation/js/nav.js
 mode change 100644 => 100755 apps/Navigation/lang/lang.de.php
 mode change 100644 => 100755 apps/Navigation/lang/lang.en.php
 mode change 100644 => 100755 apps/Navigation/nav.php
 mode change 100644 => 100755 apps/Navigation/permissions.json
 mode change 100644 => 100755 apps/SimplePages/backend/confirmConfig.php
 mode change 100644 => 100755 apps/logfiles/install-dev.php
 mode change 100644 => 100755 apps/meta/install-dev.php
 mode change 100644 => 100755 apps/meta/lang/lang.de.php
 mode change 100644 => 100755 apps/meta/lang/lang.en.php
 mode change 100644 => 100755 apps/sidebar/install-dev.php
 mode change 100644 => 100755 apps/sidebar/lang/lang.de.php
 mode change 100644 => 100755 apps/sidebar/lang/lang.en.php
 mode change 100644 => 100755 inc/apps.php
 mode change 100644 => 100755 inc/libs/PHP-mailer/class.phpmailer.php
 mode change 100644 => 100755 inc/libs/PHP-mailer/class.smtp.php
 mode change 100644 => 100755 inc/libs/Parsedown.php

diff --git a/admin/assets/bootstrap.min.css b/admin/assets/bootstrap.min.css
old mode 100644
new mode 100755
diff --git a/admin/assets/font-awesome.css b/admin/assets/font-awesome.css
old mode 100644
new mode 100755
diff --git a/admin/assets/fonts/font-awesome/FontAwesome.otf b/admin/assets/fonts/font-awesome/FontAwesome.otf
old mode 100644
new mode 100755
diff --git a/admin/assets/fonts/font-awesome/fontawesome-webfont.eot b/admin/assets/fonts/font-awesome/fontawesome-webfont.eot
old mode 100644
new mode 100755
diff --git a/admin/assets/fonts/font-awesome/fontawesome-webfont.svg b/admin/assets/fonts/font-awesome/fontawesome-webfont.svg
old mode 100644
new mode 100755
diff --git a/admin/assets/fonts/font-awesome/fontawesome-webfont.ttf b/admin/assets/fonts/font-awesome/fontawesome-webfont.ttf
old mode 100644
new mode 100755
diff --git a/admin/assets/fonts/font-awesome/fontawesome-webfont.woff b/admin/assets/fonts/font-awesome/fontawesome-webfont.woff
old mode 100644
new mode 100755
diff --git a/admin/assets/fonts/font-awesome/fontawesome-webfont.woff2 b/admin/assets/fonts/font-awesome/fontawesome-webfont.woff2
old mode 100644
new mode 100755
diff --git a/admin/assets/js/bootstrap.min.js b/admin/assets/js/bootstrap.min.js
old mode 100644
new mode 100755
diff --git a/admin/assets/js/moment.js b/admin/assets/js/moment.js
old mode 100644
new mode 100755
diff --git a/admin/assets/js/page.bodyparser.js b/admin/assets/js/page.bodyparser.js
old mode 100644
new mode 100755
diff --git a/admin/assets/js/page.js b/admin/assets/js/page.js
old mode 100644
new mode 100755
diff --git a/admin/index.php b/admin/index.php
index e18cab2..37ce68e 100755
--- a/admin/index.php
+++ b/admin/index.php
@@ -4,9 +4,9 @@ require_once '../inc/autoload_adm.php';
 printHeader($lang->get('dashboard_title'));
 
 //Delete installation files
-if (file_exists('install.php'))
+if (file_exists('install-dev.php'))
 {
-	if (unlink('install.php'))
+	if (unlink('install-dev.php'))
 	{
 		echo msg('info', $lang->get('delete_config_success'));
 	}
diff --git a/admin/install-dev.php b/admin/install-dev.php
old mode 100644
new mode 100755
index b89b95b..bb71984
--- a/admin/install-dev.php
+++ b/admin/install-dev.php
@@ -29,7 +29,7 @@ $lang->setLangFolder('lang/');
     </script>
 </head>
 <body style="background: url('assets/bglogin.jpg') no-repeat center fixed;">
-<img src="http://server/SelfCMS/Version2/admin/assets/Logo.svg" alt="Mowie" class="install-logo"/>
+<img src="assets/Logo.svg" alt="Mowie" class="install-logo"/>
 <h1 style="text-align: center; color: #E8E8E8;">Installation</h1>
 <?php
 if (isset($_POST['submit']))
@@ -288,11 +288,11 @@ RewriteRule ^(.*)$ /index.php?$1 [QSA,L]
             <h2>Website</h2>
             <span>Page Title</span><input type="text" placeholder="Page Title" name="general_page_title"/><br/>
             <span>Website Url</span><input type="text" placeholder="Website Url" name="general_webUrl"
-                                           value="http://<?php echo $_SERVER['SERVER_NAME'] . str_replace('admin/install.php', '', $_SERVER['REQUEST_URI']); ?>"/><br/>
+                                           value="http://<?php echo $_SERVER['SERVER_NAME'] . str_replace('admin/install-dev.php', '', $_SERVER['REQUEST_URI']); ?>"/><br/>
             <span>&nbsp;</span><a onclick="fadeInput('more');" style="display: block;">More Options</a><br/>
             <div id="more" style="display: none;">
                 <span>Home Url</span><input type="text" placeholder="Home Url" name="general_home_url"
-                                            value="<?php echo str_replace('admin/install.php', '', $_SERVER['REQUEST_URI']); ?>"/><br/>
+                                            value="<?php echo str_replace('admin/install-dev.php', '', $_SERVER['REQUEST_URI']); ?>"/><br/>
                 <span>Phpmyadmin Url (optional)</span><input type="text" placeholder="Phpmyadmin Url" name="general_pma"/><br/>
                 <span>Editor CSS (optional)</span><input type="text" placeholder="Editor CSS" name="general_editor_css"/><br/>
                 <span>Template</span><input type="text" placeholder="Template" name="general_template"
diff --git a/admin/lang.php b/admin/lang.php
old mode 100644
new mode 100755
diff --git a/admin/reset-pw.php b/admin/reset-pw.php
old mode 100644
new mode 100755
diff --git a/admin/stream.php b/admin/stream.php
old mode 100644
new mode 100755
diff --git a/admin/update.php b/admin/update.php
old mode 100644
new mode 100755
diff --git a/apps/Files/css/files.css b/apps/Files/css/files.css
old mode 100644
new mode 100755
diff --git a/apps/Navigation/action.php b/apps/Navigation/action.php
old mode 100644
new mode 100755
diff --git a/apps/Navigation/config.php b/apps/Navigation/config.php
old mode 100644
new mode 100755
diff --git a/apps/Navigation/css/nav.css b/apps/Navigation/css/nav.css
old mode 100644
new mode 100755
diff --git a/apps/Navigation/index.php b/apps/Navigation/index.php
old mode 100644
new mode 100755
diff --git a/apps/Navigation/js/jquery-ui.js b/apps/Navigation/js/jquery-ui.js
old mode 100644
new mode 100755
diff --git a/apps/Navigation/js/nav.js b/apps/Navigation/js/nav.js
old mode 100644
new mode 100755
diff --git a/apps/Navigation/lang/lang.de.php b/apps/Navigation/lang/lang.de.php
old mode 100644
new mode 100755
diff --git a/apps/Navigation/lang/lang.en.php b/apps/Navigation/lang/lang.en.php
old mode 100644
new mode 100755
diff --git a/apps/Navigation/nav.php b/apps/Navigation/nav.php
old mode 100644
new mode 100755
diff --git a/apps/Navigation/permissions.json b/apps/Navigation/permissions.json
old mode 100644
new mode 100755
diff --git a/apps/SimplePages/backend/confirmConfig.php b/apps/SimplePages/backend/confirmConfig.php
old mode 100644
new mode 100755
diff --git a/apps/SimplePages/config.php b/apps/SimplePages/config.php
index 1f9c7a5..b2e70a9 100755
--- a/apps/SimplePages/config.php
+++ b/apps/SimplePages/config.php
@@ -21,7 +21,7 @@ $_CONF['menu'] = ['<i class="fa fa-th-list"></i>  '.$GLOBALS['lang']->get('sp_ma
 	'<i class="fa fa-file"></i>  '.$GLOBALS['lang']->get('sp_create_new') => 'backend/edit.php?new']; //Ein Array mit menüpunkten im adminbereich
 $_CONF['dashboard'] = 'backend/dashboard.php';
 $_CONF['type'] = 'page';
-$_CONF['install'] = 'install.php';
+$_CONF['install'] = 'install-dev.php';
 
 $confirmationRequierd = false;
 $iniFile = 'confirm.ini';
diff --git a/apps/logfiles/config.php b/apps/logfiles/config.php
index cefa15c..c3095c2 100755
--- a/apps/logfiles/config.php
+++ b/apps/logfiles/config.php
@@ -13,5 +13,5 @@ $_CONF['menu_top'] = '<i class="fa fa-server"></i>  '.$GLOBALS['lang']->get('log
 $_CONF['menu'] = ['menu_top' => 'index.php']; //Ein Array mit menüpunkten im Backoffice
 //$_CONF['dashboard'] = 'dashboard.php'; //Optional, eine Datei, welche im admindashboard angezeigt wird
 $_CONF['type'] = 'static';
-$_CONF['install'] = 'install.php';
+$_CONF['install'] = 'install-dev.php';
 ?>
\ No newline at end of file
diff --git a/apps/logfiles/install-dev.php b/apps/logfiles/install-dev.php
old mode 100644
new mode 100755
diff --git a/apps/meta/config.php b/apps/meta/config.php
index 8d4ead1..9a4ff94 100755
--- a/apps/meta/config.php
+++ b/apps/meta/config.php
@@ -7,5 +7,5 @@ $_CONF['menu_top'] = '';
 $_CONF['base_file'] = 'meta.php';
 $_CONF['type'] = 'static';
 $_CONF['general_conf'] = 'genConf.php';
-$_CONF['install'] = 'install.php';
+$_CONF['install'] = 'install-dev.php';
 ?>
\ No newline at end of file
diff --git a/apps/meta/install-dev.php b/apps/meta/install-dev.php
old mode 100644
new mode 100755
diff --git a/apps/meta/lang/lang.de.php b/apps/meta/lang/lang.de.php
old mode 100644
new mode 100755
diff --git a/apps/meta/lang/lang.en.php b/apps/meta/lang/lang.en.php
old mode 100644
new mode 100755
diff --git a/apps/sidebar/config.php b/apps/sidebar/config.php
index dc2ca3a..7c01b00 100755
--- a/apps/sidebar/config.php
+++ b/apps/sidebar/config.php
@@ -6,4 +6,4 @@ $_CONF['app_version'] = 'v0.9 Beta';
 $_CONF['base_file'] = 'sidebar.php';
 $_CONF['type'] = 'static';
 $_CONF['general_conf'] = 'genConf.php';
-$_CONF['install'] = 'install.php';
\ No newline at end of file
+$_CONF['install'] = 'install-dev.php';
\ No newline at end of file
diff --git a/apps/sidebar/install-dev.php b/apps/sidebar/install-dev.php
old mode 100644
new mode 100755
diff --git a/apps/sidebar/lang/lang.de.php b/apps/sidebar/lang/lang.de.php
old mode 100644
new mode 100755
diff --git a/apps/sidebar/lang/lang.en.php b/apps/sidebar/lang/lang.en.php
old mode 100644
new mode 100755
diff --git a/inc/apps.php b/inc/apps.php
old mode 100644
new mode 100755
diff --git a/inc/libs/PHP-mailer/class.phpmailer.php b/inc/libs/PHP-mailer/class.phpmailer.php
old mode 100644
new mode 100755
diff --git a/inc/libs/PHP-mailer/class.smtp.php b/inc/libs/PHP-mailer/class.smtp.php
old mode 100644
new mode 100755
diff --git a/inc/libs/Parsedown.php b/inc/libs/Parsedown.php
old mode 100644
new mode 100755
diff --git a/index.php b/index.php
index 25743fb..350cdac 100755
--- a/index.php
+++ b/index.php
@@ -108,5 +108,5 @@ if (file_exists('inc/config.yml'))
 	}
 } else
 {
-	header('Location: admin/install.php');
+	header('Location: admin/install-dev.php');
 }
\ No newline at end of file