From 7dd863bba35391c84591c407e5d6df7e1143924b Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Sat, 17 Jan 2015 21:21:28 +0100
Subject: [PATCH] neo working

---
 .htaccess                                     |  3 ++
 api.php                                       |  2 +-
 config.php                                    | 35 +++++++++----------
 index.php                                     |  2 +-
 neopolimatrix/autoload.inc                    |  6 ++--
 neopolimatrix/files/autoload.inc              |  2 ++
 neopolimatrix/files/log/dummy                 |  0
 .../page/default_page/default_page.php        |  5 +++
 neopolimatrix/page/page_neopolimatrix.php     |  9 ++---
 ...register_path_classes.php => autoload.inc} |  0
 sai.php                                       |  2 +-
 system                                        |  2 +-
 12 files changed, 35 insertions(+), 33 deletions(-)
 create mode 100644 .htaccess
 create mode 100644 neopolimatrix/files/autoload.inc
 create mode 100644 neopolimatrix/files/log/dummy
 create mode 100644 neopolimatrix/page/default_page/default_page.php
 rename neopolimatrix/path/{register_path_classes.php => autoload.inc} (100%)

diff --git a/.htaccess b/.htaccess
new file mode 100644
index 0000000..91de882
--- /dev/null
+++ b/.htaccess
@@ -0,0 +1,3 @@
+RewriteEngine On
+RewriteCond %{HTTP_HOST} !^www\.
+RewriteRule ^(.*)$ http://www.%{HTTP_HOST}%{REQUEST_URI}$1 [R=301,L]
\ No newline at end of file
diff --git a/api.php b/api.php
index 1a14d4a..997c65a 100644
--- a/api.php
+++ b/api.php
@@ -1,6 +1,6 @@
 <?php
 require_once 'system/autoload.inc.php';                                      //SYSTEM Classes
-require_once 'neopolimatrix/autoload.inc.php';                                       //Project Classes
+require_once 'neopolimatrix/autoload.inc';                                       //Project Classes
 
 require_once 'config.php';
 SYSTEM\system::start($neopolimatrix_config);
diff --git a/config.php b/config.php
index 1d4cd79..b4a323f 100644
--- a/config.php
+++ b/config.php
@@ -1,19 +1,18 @@
 <?php
-$neopolimatrix_config =    array(   array(config_ids::SYS_CONFIG_ERRORREPORTING,        E_ALL | E_STRICT),
-                            array(config_ids::SYS_CONFIG_PATH_BASEURL,          'http://mojotrollz.eu/web/neopolimatrix'),
-                            array(config_ids::SYS_CONFIG_PATH_BASEPATH,         '/home/web/webdir/neopolimatrix/'),
-                            array(config_ids::SYS_CONFIG_DB_TYPE,               SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE_MYS),
-                            array(config_ids::SYS_CONFIG_DB_HOST,               '127.0.0.1'),
-                            array(config_ids::SYS_CONFIG_DB_PORT,               ''),
-                            array(config_ids::SYS_CONFIG_DB_USER,               'mojotrolls_mysql'),
-                            array(config_ids::SYS_CONFIG_DB_PASSWORD,           'dajsabeaisvd345'),
-                            array(config_ids::SYS_CONFIG_DB_DBNAME,             'host_neopolimatrix'),
-                            array(config_ids::SYS_SAI_CONFIG_NAVIMG,            '/web/system/sai/page/img/logo.png'),//not working, cuz paths are not set yet! \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/default_page/img/logo.png')),
-                            array(config_ids::SYS_SAI_CONFIG_BASEURL,           'http://mojotrollz.eu/web/neopolimatrix/sai.php?'),
-                            array(config_ids::SYS_SAI_CONFIG_TITLE,             'Neopolimatrix - Admin Bereich'),
-                            array(config_ids::SYS_SAI_CONFIG_COPYRIGHT,         '<a href="" target="_blank"></a> &copy; WebCraft Media 2013'),
-                            array(config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL,    'system/'),
-                            array(config_ids::SYS_CONFIG_LANGS,                 array('deDE')),
-                            array(config_ids::SYS_CONFIG_DEFAULT_LANG,          'deDE'),
-                            array(config_ids::WEBCRAFT_BILLING_TOKEN,           ''),
-                            array(config_ids::SYS_CRON_LOG2SQLITE_PATH,         '/home/web/webdir/neopolimatrix/neopolimatrix/files/log/'));   
\ No newline at end of file
+$neopolimatrix_config=array(array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_ERRORREPORTING,        E_ALL | E_STRICT),
+                            array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL,          'http://www.mojotrollz.eu/web/Neopolimatrix/'),
+                            array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEPATH,         '/home/web/webdir/Neopolimatrix/'),
+                            array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE,               \SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE_MYS),
+                            array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_HOST,               '127.0.0.1'),
+                            array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PORT,               ''),
+                            array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_USER,               'mojotrolls_mysql'),
+                            array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PASSWORD,           'dajsabeaisvd345'),
+                            array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_DBNAME,             'host_neopolimatrix'),
+                            array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_NAVIMG,            '/web/system/sai/page/img/logo.png'),//not working, cuz paths are not set yet! \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/default_page/img/logo.png')),
+                            array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_BASEURL,           'http://www.mojotrollz.eu/web/Neopolimatrix/sai.php?'),
+                            array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE,             'Neopolimatrix - Admin Bereich'),
+                            array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_COPYRIGHT,         '<a href="" target="_blank"></a> &copy; WebCraft Media 2013'),
+                            array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL,    'system/'),
+                            array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS,                 array('deDE')),
+                            array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG,          'deDE'),
+                            array(\SYSTEM\CONFIG\config_ids::SYS_CRON_LOG2SQLITE_PATH,         '/home/web/webdir/Neopolimatrix/neopolimatrix/files/log/'));   
\ No newline at end of file
diff --git a/index.php b/index.php
index 0290853..093ea24 100644
--- a/index.php
+++ b/index.php
@@ -1,6 +1,6 @@
 <?php
 require_once 'system/autoload.inc.php';                                         //SYSTEM Classes
-require_once 'neopolimatrix/autoload.inc.php';                                           //Project Classes
+require_once 'neopolimatrix/autoload.inc';                                           //Project Classes
 
 require_once 'config.php';
 \SYSTEM\system::start($neopolimatrix_config);
diff --git a/neopolimatrix/autoload.inc b/neopolimatrix/autoload.inc
index 1dd94c5..3ebfe65 100644
--- a/neopolimatrix/autoload.inc
+++ b/neopolimatrix/autoload.inc
@@ -1,8 +1,6 @@
 <?php
 
 //keep this
-require_once dirname(__FILE__).'/path/register_path_classes.php';
+require_once dirname(__FILE__).'/path/autoload.inc';
 require_once dirname(__FILE__).'/page/autoload.inc';
-require_once dirname(__FILE__).'/dbd/autoload.inc.php';
-require_once dirname(__FILE__).'/files/autoload.inc.php';
-require_once dirname(__FILE__).'/api/autoload.inc.php';
\ No newline at end of file
+require_once dirname(__FILE__).'/files/autoload.inc';
\ No newline at end of file
diff --git a/neopolimatrix/files/autoload.inc b/neopolimatrix/files/autoload.inc
new file mode 100644
index 0000000..aa253be
--- /dev/null
+++ b/neopolimatrix/files/autoload.inc
@@ -0,0 +1,2 @@
+<?php
+//include here
\ No newline at end of file
diff --git a/neopolimatrix/files/log/dummy b/neopolimatrix/files/log/dummy
new file mode 100644
index 0000000..e69de29
diff --git a/neopolimatrix/page/default_page/default_page.php b/neopolimatrix/page/default_page/default_page.php
new file mode 100644
index 0000000..ccdf57a
--- /dev/null
+++ b/neopolimatrix/page/default_page/default_page.php
@@ -0,0 +1,5 @@
+<?php
+class default_page extends \SYSTEM\PAGE\Page {
+    public function html(){
+        return 'test';}
+}
diff --git a/neopolimatrix/page/page_neopolimatrix.php b/neopolimatrix/page/page_neopolimatrix.php
index ba7ad35..c44daaa 100644
--- a/neopolimatrix/page/page_neopolimatrix.php
+++ b/neopolimatrix/page/page_neopolimatrix.php
@@ -1,10 +1,5 @@
 <?php
-
-class page_whw extends \SYSTEM\API\api_default {
-
+class page_neopolimatrix extends \SYSTEM\API\api_default {
     public static function default_page(){
-
-        return new default_page();
-    }
-                   
+        return new default_page();}
 }
\ No newline at end of file
diff --git a/neopolimatrix/path/register_path_classes.php b/neopolimatrix/path/autoload.inc
similarity index 100%
rename from neopolimatrix/path/register_path_classes.php
rename to neopolimatrix/path/autoload.inc
diff --git a/sai.php b/sai.php
index 05cf1b6..c4562c6 100644
--- a/sai.php
+++ b/sai.php
@@ -1,6 +1,6 @@
 <?php
 require_once 'system/autoload.inc.php';                                         //SYSTEM Classes
-require_once 'neopolimatrix/autoload.inc.php';                                        //Project Classes
+require_once 'neopolimatrix/autoload.inc';                                        //Project Classes
 
 require_once 'config.php';                                                      //Server config
 SYSTEM\system::start($neopolimatrix_config);                                          //Start System time + config
diff --git a/system b/system
index 5b3346f..96078ca 160000
--- a/system
+++ b/system
@@ -1 +1 @@
-Subproject commit 5b3346f6c91644dfd5eb1acf16e5793401d414e2
+Subproject commit 96078ca1bd00f6750a4a3bf16d84c7d3cc431dfa