implemented danube into system

bootstrap/css/bootstrap-responsive.css

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Responsive v2.3.1
+ * Bootstrap Responsive v2.3.0
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0

bootstrap/css/bootstrap-responsive.min.css

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Responsive v2.3.1
+ * Bootstrap Responsive v2.3.0
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0

bootstrap/css/bootstrap.css

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v2.3.1
+ * Bootstrap v2.3.0
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0

bootstrap/css/bootstrap.min.css

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v2.3.1
+ * Bootstrap v2.3.0
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0

bootstrap/js/bootstrap.js

@@ -1,5 +1,5 @@
 /* ===================================================
- * bootstrap-transition.js v2.3.1
+ * bootstrap-transition.js v2.3.0
  * http://twitter.github.com/bootstrap/javascript.html#transitions
  * ===================================================
  * Copyright 2012 Twitter, Inc.
@@ -58,7 +58,7 @@
   })
 
 }(window.jQuery);/* ==========================================================
- * bootstrap-alert.js v2.3.1
+ * bootstrap-alert.js v2.3.0
  * http://twitter.github.com/bootstrap/javascript.html#alerts
  * ==========================================================
  * Copyright 2012 Twitter, Inc.
@@ -156,7 +156,7 @@
   $(document).on('click.alert.data-api', dismiss, Alert.prototype.close)
 
 }(window.jQuery);/* ============================================================
- * bootstrap-button.js v2.3.1
+ * bootstrap-button.js v2.3.0
  * http://twitter.github.com/bootstrap/javascript.html#buttons
  * ============================================================
  * Copyright 2012 Twitter, Inc.
@@ -260,7 +260,7 @@
   })
 
 }(window.jQuery);/* ==========================================================
- * bootstrap-carousel.js v2.3.1
+ * bootstrap-carousel.js v2.3.0
  * http://twitter.github.com/bootstrap/javascript.html#carousel
  * ==========================================================
  * Copyright 2012 Twitter, Inc.
@@ -336,7 +336,7 @@
       if (!e) this.paused = true
       if (this.$element.find('.next, .prev').length && $.support.transition.end) {
         this.$element.trigger($.support.transition.end)
-        this.cycle(true)
+        this.cycle()
       }
       clearInterval(this.interval)
       this.interval = null
@@ -466,7 +466,7 @@
   })
 
 }(window.jQuery);/* =============================================================
- * bootstrap-collapse.js v2.3.1
+ * bootstrap-collapse.js v2.3.0
  * http://twitter.github.com/bootstrap/javascript.html#collapse
  * =============================================================
  * Copyright 2012 Twitter, Inc.
@@ -632,7 +632,7 @@
   })
 
 }(window.jQuery);/* ============================================================
- * bootstrap-dropdown.js v2.3.1
+ * bootstrap-dropdown.js v2.3.0
  * http://twitter.github.com/bootstrap/javascript.html#dropdowns
  * ============================================================
  * Copyright 2012 Twitter, Inc.
@@ -791,13 +791,13 @@
   $(document)
     .on('click.dropdown.data-api', clearMenus)
     .on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
-    .on('click.dropdown-menu', function (e) { e.stopPropagation() })
+    .on('.dropdown-menu', function (e) { e.stopPropagation() })
     .on('click.dropdown.data-api'  , toggle, Dropdown.prototype.toggle)
     .on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
 
 }(window.jQuery);
 /* =========================================================
- * bootstrap-modal.js v2.3.1
+ * bootstrap-modal.js v2.3.0
  * http://twitter.github.com/bootstrap/javascript.html#modals
  * =========================================================
  * Copyright 2012 Twitter, Inc.
@@ -946,7 +946,7 @@
       }
 
     , removeBackdrop: function () {
-        this.$backdrop && this.$backdrop.remove()
+        this.$backdrop.remove()
         this.$backdrop = null
       }
 
@@ -1044,7 +1044,7 @@
 
 }(window.jQuery);
 /* ===========================================================
- * bootstrap-tooltip.js v2.3.1
+ * bootstrap-tooltip.js v2.3.0
  * http://twitter.github.com/bootstrap/javascript.html#tooltips
  * Inspired by the original jQuery.tipsy by Jason Frame
  * ===========================================================
@@ -1125,15 +1125,7 @@
     }
 
   , enter: function (e) {
-      var defaults = $.fn[this.type].defaults
-        , options = {}
-        , self
-
-      this._options && $.each(this._options, function (key, value) {
-        if (defaults[key] != value) options[key] = value
-      }, this)
-
-      self = $(e.currentTarget)[this.type](options).data(this.type)
+      var self = $(e.currentTarget)[this.type](this._options).data(this.type)
 
       if (!self.options.delay || !self.options.delay.show) return self.show()
 
@@ -1405,7 +1397,7 @@
 
 }(window.jQuery);
 /* ===========================================================
- * bootstrap-popover.js v2.3.1
+ * bootstrap-popover.js v2.3.0
  * http://twitter.github.com/bootstrap/javascript.html#popovers
  * ===========================================================
  * Copyright 2012 Twitter, Inc.
@@ -1519,7 +1511,7 @@
 
 }(window.jQuery);
 /* =============================================================
- * bootstrap-scrollspy.js v2.3.1
+ * bootstrap-scrollspy.js v2.3.0
  * http://twitter.github.com/bootstrap/javascript.html#scrollspy
  * =============================================================
  * Copyright 2012 Twitter, Inc.
@@ -1680,7 +1672,7 @@
   })
 
 }(window.jQuery);/* ========================================================
- * bootstrap-tab.js v2.3.1
+ * bootstrap-tab.js v2.3.0
  * http://twitter.github.com/bootstrap/javascript.html#tabs
  * ========================================================
  * Copyright 2012 Twitter, Inc.
@@ -1823,7 +1815,7 @@
   })
 
 }(window.jQuery);/* =============================================================
- * bootstrap-typeahead.js v2.3.1
+ * bootstrap-typeahead.js v2.3.0
  * http://twitter.github.com/bootstrap/javascript.html#typeahead
  * =============================================================
  * Copyright 2012 Twitter, Inc.
@@ -2158,7 +2150,7 @@
 
 }(window.jQuery);
 /* ==========================================================
- * bootstrap-affix.js v2.3.1
+ * bootstrap-affix.js v2.3.0
  * http://twitter.github.com/bootstrap/javascript.html#affix
  * ==========================================================
  * Copyright 2012 Twitter, Inc.

css/special.css

@@ -0,0 +1,83 @@
+.Banner
+{
+
+}
+
+.logo
+{
+    width: 100%;
+    text-align: center;
+    margin-bottom: 20px;
+}
+
+.container#texts
+{
+    background: white;
+}
+
+#logo
+{
+    width: 180px;
+    float: left;
+    background: url(css/logo.png);
+    height: 65px;
+}
+.span4
+{
+    padding: 5px;
+    /*
+    border-left: 1px solid #DDDDDD;
+    border-top: 1px solid #DDDDDD;
+    */
+    border: 1px solid #DDDDDD;
+    background: #EFEFEF;
+    margin-bottom: 15px;
+    margin-top: 15px;
+}
+
+.span4
+{
+    padding: 5px;
+    /*
+    border-left: 1px solid #DDDDDD;
+    border-top: 1px solid #DDDDDD;
+    */
+    border: 1px solid #DDDDDD;
+    background: #FEFEFE;
+}
+
+.span12
+{
+    padding: 5px;
+    /*
+    border-left: 1px solid #DDDDDD;
+    border-top: 1px solid #DDDDDD;
+    */
+    border: 1px solid #DDDDDD;
+    background: #EFEFEF;
+}
+
+.span12#bot
+{
+    padding: 5px;
+    /*
+    border-left: 1px solid #DDDDDD;
+    border-top: 1px solid #DDDDDD;
+    */
+    border: 1px solid #DDDDDD;
+    background: #FEFEFE;
+}
+#wrap
+{
+    padding-top: 60px;
+}
+.navbar
+{
+    background: #212121;
+    color: #EFEFEF;
+}
+
+.row-fluid
+{
+
+}

danube/autoload.inc.php

@@ -0,0 +1,5 @@
+<?php
+
+//keep this
+require_once dirname(__FILE__).'/path/register_path_classes.php';
+require_once dirname(__FILE__).'/page/register_page_classes.php';

danube/index.php

@@ -1,51 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>blue-danube-massage</title>
-        <meta http-equiv="Content-Type" content="width=device-width, initial-scale=1.0">
-        <!-- Bootstrap -->
-        <link href="bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen">
-    </head>
-    <body>
-    <!-- NAVBAR -->
-    <div class="navbar-wrapper">
-      <!-- Wrap the .navbar in .container to center it within the absolutely positioned parent. -->
-      <div class="container">
-
-        <div class="navbar navbar-inverse">
-          <div class="navbar-inner">
-            <!-- Responsive Navbar Part 1: Button for triggering responsive navbar (not covered in tutorial). Include responsive CSS to utilize. -->
-            <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-              <span class="icon-bar"></span>
-              <span class="icon-bar"></span>
-              <span class="icon-bar"></span>
-            </button>
-            <a class="brand" href="#">Project name</a>
-            <!-- Responsive Navbar Part 2: Place all navbar contents you want collapsed withing .navbar-collapse.collapse. -->
-            <div class="nav-collapse collapse">
-              <ul class="nav">
-                <li class="active"><a href="#">Home</a></li>
-                <li><a href="#about">About</a></li>
-                <li><a href="#contact">Contact</a></li>
-                <!-- Read about Bootstrap dropdowns at http://twitter.github.com/bootstrap/javascript.html#dropdowns -->
-                <li class="dropdown">
-                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
-                  <ul class="dropdown-menu">
-                    <li><a href="#">Action</a></li>
-                    <li><a href="#">Another action</a></li>
-                    <li><a href="#">Something else here</a></li>
-                    <li class="divider"></li>
-                    <li class="nav-header">Nav header</li>
-                    <li><a href="#">Separated link</a></li>
-                    <li><a href="#">One more separated link</a></li>
-                  </ul>
-                </li>
-              </ul>
-            </div><!--/.nav-collapse -->
-          </div><!-- /.navbar-inner -->
-        </div><!-- /.navbar -->
-
-      </div> <!-- /.container -->
-    </div><!-- /.navbar-wrapper -->
-    </body>
-</html>

danube/page/PageApi.php

@@ -0,0 +1,17 @@
+<?php
+
+class PageApi extends \SYSTEM\PAGE\PageClass {
+
+    public static function default_page(){
+        return new default_page();
+    }
+    
+    public static function action_media(){      
+        throw new ERROR("test");
+    }
+    
+    public static function action_abc(){      
+        throw new ERROR("test2");
+    }
+    
+}

danube/page/default_page/danube.tpl

@@ -7,16 +7,16 @@
         <link href="bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen">
     </head>
     <body style="background: beige;">
-        <div style="width: 900px; margin-right: auto; margin-left: auto;"><img src="pics/css/font.png" /></div>
+        <div style="width: 900px; margin-right: auto; margin-left: auto;"><img src="danube/page/default_page/pics/css/font.png" /></div>
         <div class="hero-unit" style="width: 934px; padding: 0px; margin: 0; margin-bottom: 15px; background: black; border: 5px solid black; padding-bottom: -10px; margin-left: auto; margin-right: auto; margin-top: -2px; box-shadow: 3px 3px 2px grey;">
-            
+             
 <!--            <div class="hero-unit" style=" height: 700px; margin-top: 0px; padding: 0;">
                 <div class="hero-unit" style=" margin-top: 0px; padding:7px; height: 200;">
                     <img src="banner2.png" style="">
                 </div>-->
 
                 <div class="navbar navbar-inverse" style="height: 32px;">
-                <div class="navbar-inner" style=" background: url(pics/css/verlauf_header.png); -webkit-border-bottom-right-radius: 0; -webkit-border-bottom-left-radius: 0; -moz-border-bottom-left-radius: 0; -moz-border-bottom-right-radius: 0; border-bottom-left-radius: 0;border-bottom-right-radius: 0;">
+                <div class="navbar-inner" style=" background: url(danube/page/default_page/pics/css/verlauf_header.png); -webkit-border-bottom-right-radius: 0; -webkit-border-bottom-left-radius: 0; -moz-border-bottom-left-radius: 0; -moz-border-bottom-right-radius: 0; border-bottom-left-radius: 0;border-bottom-right-radius: 0;">
                     <div class="1container">
                         <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
                             <span class="icon-bar"></span>
@@ -52,9 +52,9 @@
                     <!-- Carousel -->
                    <div id="myCarousel" class="carousel slide" style="width: 100%; padding: 0; margin: 0;">
                      <div class="carousel-inner">
-                       <div class="hero-unit" style="background: url(pics/photos/hotstone_topf.jpg) no-repeat; margin: 0; padding: 0; border-top-left-radius: 0; border-top-right-radius: 0;">
+                       <div class="hero-unit" style="background: url(danube/page/default_page/pics/photos/hotstone_topf.jpg) no-repeat; margin: 0; padding: 0; border-top-left-radius: 0; border-top-right-radius: 0;">
                             
-                       <div class="item active" style="height: 418px; width: 100%; text-align: right; padding-top: 5px; border: 1px solid red;">
+                       <div class="item active" style="height: 418px; width: 100%; text-align: right; padding-top: 5px;">
                         <iframe src="http://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.test.de&amp;layout=button_count&amp;show_faces=true&amp;width=450&amp;action=like&amp;colorscheme=light&amp;height=80" 
                                 scrolling="no" frameborder="0" style="border:none; overflow:hidden; height:80px; margin: 0; padding: 0; width: 140px;" allowTransparency="true">
                         
@@ -79,11 +79,11 @@
             Donec sed odio dui. Etiam porta sem malesuada magna mollis euismod. 
             
             
-        </div>
+        </div> 
     
     
-    <div class="hero-unit" style="background: url(pics/css/verlauf_footer.png)no-repeat; height: 25px; padding: 0; margin: 0; border-top-left-radius: 0; border-top-right-radius: 0;">
-                
+    <div class="hero-unit" style="background: url(danube/page/default_page/pics/css/verlauf_footer.png)no-repeat; text-align: right; font-size: 75%; color: grey; height: 25px; padding: 0; margin: 0; border-top-left-radius: 0; border-top-right-radius: 0;">
+                Development by WebCraft Media
             </div>
         </div>
      

danube/page/default_page/default_page.php

@@ -0,0 +1,9 @@
+<?php
+
+class default_page extends SYSTEM\PAGE\Page {
+    public function html(){
+        $vars = array();                        
+        $vars['content'] = "";
+        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/danube.tpl'), $vars);
+    }
+}

danube/page/register_page_classes.php

@@ -0,0 +1,6 @@
+<?php
+
+$autoload = SYSTEM\autoload::getInstance();
+
+$autoload->registerFolder(dirname(__FILE__),'');
+$autoload->registerFolder(dirname(__FILE__).'/default_page','');

danube/path/PPAGE.php

@@ -0,0 +1,5 @@
+<?php
+class PPAGE extends \SYSTEM\PATH {
+    public static function getPath(){
+        return \SYSTEM\C_ROOT.'danube/page/'.\SYSTEM\C_SUBPATH;}
+}

danube/path/register_path_classes.php

@@ -0,0 +1,5 @@
+<?php
+
+$autoload = SYSTEM\autoload::getInstance();
+
+$autoload->registerFolder(dirname(__FILE__),'');

dbd/autoload.inc.php

@@ -0,0 +1,9 @@
+<?php
+
+$autoload = SYSTEM\autoload::getInstance();
+
+$autoload->registerFolder(dirname(__FILE__).'/db/','DBD');
+$autoload->registerFolder(dirname(__FILE__).'/tbl/system/','DBD\SYSTEM');
+//$autoload->registerFolder(dirname(__FILE__).'/tbl/definitions/','DBD\DEFINITIONS');
+//$autoload->registerFolder(dirname(__FILE__).'/tbl/data/','DBD\DATA');
+//$autoload->registerFolder(dirname(__FILE__).'/tbl/data_processed/','DBD\DATA_PROCESSED');

dbd/db/system.php

@@ -0,0 +1,8 @@
+<?php
+namespace DBD;
+
+class system extends \SYSTEM\DB\DBInfoMYS {
+    
+    public function  __construct() {                                      
+        parent::__construct('host_unet', 'mojotrolls_mysql', 'dajsabeaisvd345', '127.0.0.1');}
+}

dbd/db/unet.php

@@ -0,0 +1,8 @@
+<?php
+namespace DBD;
+
+class unet extends \SYSTEM\DB\DBInfoMYS {
+
+    public function  __construct() {
+        parent::__construct('', '', '', '', '');}
+}

dbd/tbl/system/APITable.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace DBD\SYSTEM;
+
+class APITable {
+
+    const NAME = 'system.api_calls';
+
+    const FIELD_ID = 'ID';
+    const FIELD_FLAG = 'flag';
+    const FIELD_PARENTID = 'parentID';
+    const FIELD_PARENTVALUE = 'parentValue';
+    const FIELD_NAME = 'name';
+    // const FIELD_ISCHACHED = 'IsCached'; use flagfield!
+    const FIELD_ALLOWEDVALUES = 'allowedValues';
+
+    const VALUE_FLAG_COMMAND = 0;
+    const VALUE_FLAG_PARAM = 1;
+}

dbd/tbl/system/PAGETable.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace DBD\SYSTEM;
+
+class PAGETable {
+
+    const NAME = 'system_page_calls';
+
+    const FIELD_ID = 'ID';
+    const FIELD_FLAG = 'flag';
+    const FIELD_PARENTID = 'parentID';
+    const FIELD_PARENTVALUE = 'parentValue';
+    const FIELD_NAME = 'name';
+    // const FIELD_ISCHACHED = 'IsCached'; use flagfield!
+    const FIELD_ALLOWEDVALUES = 'allowedValues';
+
+    const VALUE_FLAG_COMMAND = 0;
+    const VALUE_FLAG_PARAM = 1;
+}

dbd/tbl/system/UserLoginsTable.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace DBD\SYSTEM;
+
+class UserLoginsTable {
+
+    const NAME = 'system.user_logins';
+
+    const FIELD_ID = 'id';
+    const FIELD_USERID = 'userID';    
+    const FIELD_IP = 'IP';
+    const FIELD_SUCC = 'succ';
+    const FIELD_TIMESTAMP = 'timestamp';
+}

dbd/tbl/system/UserRightsTable.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace DBD\SYSTEM;
+
+class UserRightsTable {
+
+    const NAME = 'system.user_to_rights';
+
+    const FIELD_USERID = 'userID';
+    const FIELD_RIGHTID = 'rightID';
+}

dbd/tbl/system/UserTable.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace DBD\SYSTEM;
+
+class UserTable {
+
+    const NAME = 'system.user';
+
+    const FIELD_ID = 'id';
+    const FIELD_USERNAME = 'username';
+    const FIELD_PASSWORD_SHA = 'password_sha';
+    const FIELD_PASSWORD_MD5 = 'password_md5';
+    const FIELD_EMAIL = 'email';
+    const FIELD_JOINDATE = 'joindate';
+    const FIELD_LOCALE = 'locale';
+    const FIELD_LAST_ACTIVE = 'last_active';
+    const FIELD_ACCOUNT_FLAG = 'account_flag';
+}

dbd/tbl/system/locale_string.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace DBD\SYSTEM;
+
+class locale_string {
+    const NAME = 'system.locale_string';
+
+    const FIELD_ID = 'id';
+    const FIELD_CATEGORY = 'category';
+    const FIELD_EN_US = 'enUS';
+    const FIELD_DE_DE = 'deDE';
+
+    const VALUE_CATEGORY_TEST1                  = 1;
+    const VALUE_CATEGORY_TEST2                  = 2;
+
+    const VALUE_CATEGORY_SYSTEM                 = 10;
+    const VALUE_CATEGORY_SYSTEM_ERROR           = 11;
+
+    const VALUE_CATEGORY_DASENSE                = 100;
+    const VALUE_CATEGORY_DASENSE_DEFAULTPAGE    = 110;
+    const VALUE_CATEGORY_DASENSE_GEOPOINT       = 111;
+    const VALUE_CATEGORY_DASENSE_IMPRESSUM      = 112;
+    const VALUE_CATEGORY_DASENSE_PROJECT        = 113;
+    const VALUE_CATEGORY_DASENSE_SENSOR         = 114;
+    const VALUE_CATEGORY_DASENSE_USERLOGIN      = 115;
+    const VALUE_CATEGORY_DASENSE_USERLOGOUT     = 116;
+    const VALUE_CATEGORY_DASENSE_USER           = 117;
+    const VALUE_CATEGORY_DASENSE_PRESS          = 118;
+    const VALUE_CATEGORY_DASENSE_CONTACT        = 119;
+    const VALUE_CATEGORY_DASENSE_USERSTATISTICS = 120;
+    const VALUE_CATEGORY_DASENSE_HIGHSCORE      = 121;
+    const VALUE_CATEGORY_DASENSE_DEVS           = 122;
+    
+    const VALUE_CATEGORY_DB_ADMIN_LEVEL         = 200;
+    const VALUE_CATEGORY_DB_BADGE_CATEGORY      = 201;
+    const VALUE_CATEGORY_DB_BADGE               = 202;
+    const VALUE_CATEGORY_DB_TITLE               = 203;
+    const VALUE_CATEGORY_DB_LOCALITY            = 204;
+    
+    const VALUE_CATEGORY_APP_ALL                = 300;
+    const VALUE_CATEGORY_APP_ANDROID            = 301;
+    const VALUE_CATEGORY_APP_IOS                = 302;
+}

dbd/tbl/system/systemPostgres.php

@@ -0,0 +1,7 @@
+<?php
+namespace DBD\SYSTEM;
+
+class systemPostgres extends \SYSTEM\DB\DBInfoPG {
+    public function  __construct() {
+        parent::__construct('dasense', 'dasense', 'dasenseopendataserver', '212.72.183.108', '5432');}
+}

index.php

@@ -0,0 +1,13 @@
+<?php
+
+error_reporting(E_ALL | E_STRICT);
+
+require_once 'system/autoload.inc.php';                                         //SYSTEM Classes
+require_once 'dbd/autoload.inc.php';                                            //Database Definitions
+require_once 'danube/autoload.inc.php';                                           //Project Classes
+require_once 'system/log/register_exception_shortcut.php';                      //allow ERROR() instead of \SYSTEM\LOG\ERROR()
+//require_once 'dasense/log/register_errorhandler_dbwriter_dasensedata.php';      //write errors to database (must be first errorhandler to register)
+require_once 'system/log/register_errorhandler_jsonoutput.php';                 //print errors as json to caller
+
+$page = new \SYSTEM\PAGE\PageApi( new DBD\system(), new SYSTEM\verifyclass(), new PageApi());
+echo $page->CALL(array_merge($_POST,$_GET))->html();

nbproject/project.properties

@@ -1,5 +1,7 @@
-include.path=${php.global.include.path}
-php.version=PHP_53
+ignore.path=
+include.path=\
+    ${php.global.include.path}
+php.version=PHP_54
 source.encoding=UTF-8
 src.dir=.
 tags.asp=false

src/instroductions.txt

@@ -1,46 +0,0 @@
-Szilvia Farsang
-Dear Ole,
-can I send the webside details? 
-Have a nice evening, 
-regards: 
-Szilvia 
-Heute
-
-02:28
-Szilvia Farsang
-If you have time, you can start my webside organising . I would like 3 language (German, English, Ungarn) 
-Please tell me when and how much shall I pay for you !!!!
-Now I send 15 pictures about the massagestudio, my certificates, and the text about me will come soon. Please tell me always, if you have different opinion about anything, what I send you !! OK? 
-
-02:50
-Szilvia Farsang
-6 Certificates (the first 3photos = one, just the official translation )
-(the pictures and the certificates should come this sequence ,how I sent them.) 
-
-02:53
-Szilvia Farsang
-This is my reklam on the wall of our house.
-
-
-02:58
-Szilvia Farsang
-this reklám would be nice somehow appier on the webside too.  
-and now the Gutschein "logo" (do you remember , you made it for me one year ago? ) 
-
-
-03:09
-Szilvia Farsang
-and at last I am working for an american Stage Hands Massage Service , who regulary send me to the concerts to massage the band-members and crew. Here is their logo and my two working-cards about which concerts I was masseus. (but I will sen you better instad of these two.)
-
-03:32
-Erweitern
-Szilvia Farsang
-
-Pricelist.docöffnen · herunterladen
-ANGEBOTE.docöffnen · herunterladen
-frühling Rabatt.docöffnen · herunterladen
-
-03:43
-Szilvia Farsang
-Sorry, I sent you an email , in what is a "Frühling Rabatt" ,but instad of that enough just this . OK? 
-Thank you very much !!! 

system/api/Api.php

@@ -0,0 +1,154 @@
+<?php
+/*
+API CALL:
+COMMANDS OPTIONS PARAMETERS via post/get
+
+COMMANDS:
+Handled by the Api, verified and processed via database table
+COMMAND(ID,VALUE)
+
+PARAMS:
+Verified and typechecked by the api
+PARAM(ID,VALUE)
+ */
+
+// $api = new \API\API(..);
+// return $api->CALL($call);
+
+/*
+     * Table:
+     * ID   FLAG    C/P            PARENTCOMMANDID  ISCHACHED   ALLOWEDVALUES (cache only for commands, null on command = dont care)
+     * 0    C       'CALL'          -1              null        null (calculated by the api for commands)
+     * 1    C       'ALGO'          0               true        null
+     * 2    P       'x'             1               null        GOOGLEMAPXY (function in MYVERIFY::func)
+     * 3    P       'y'             1               null        GOOGLEMAPXY
+     * 4    P       'zoom'          1               null        GOOGLEMAPZOOM
+     * 5    P       'from'          1               null        TIMEWIERDFORMAT
+     * 6    P       'to'            1               null        TIMEWIERDFORMAT
+     * 7    P       'type'          1               null        SENSORTYPE
+     * 8    P       'provider'      1               null        SENSORPROVIDER
+     * 9    P       'visibility'    1               null        SENSORVISIBILITY
+     * 10   C       'markers'       1               null        BOOL
+     *
+     * MYAPI::map_heatmap($PARAMS,$OPTIONS)
+     * MYAPI::map_heatmap_key
+     */
+
+namespace SYSTEM\API;
+
+class Api {
+
+    private $m_dbinfo = null;
+    private $m_verifyclass = null;
+    private $m_apiclass = null;
+
+    public function __construct($DBInfo,\SYSTEM\verifyclass $VerifyClass, \SYSTEM\API\apiclass $ApiClass){
+        $this->m_dbinfo = $DBInfo;
+        $this->m_verifyclass = $VerifyClass;
+        $this->m_apiclass = $ApiClass;
+    }
+
+    // $call = post + get params
+    // returns resultstring
+    public function CALL($call = array()){
+
+        if( !isset($call) || !is_array($call) || count($call) <= 0){
+            throw new \SYSTEM\LOG\ERROR("No call given for the api");}
+
+        //Get the Databasetree
+        $tree = array();
+        if($this->m_dbinfo instanceof \SYSTEM\DB\DBInfo){
+            $tree = self::getApiTree();
+            if(!is_array($tree)){
+                throw new \SYSTEM\LOG\ERROR("Database Tree for Api empty - cannot proced!");}
+        } else {
+            if(!is_array($this->m_dbinfo)){
+                throw new \SYSTEM\LOG\ERROR('No Connectioninfo and no call table given to the api');}
+            $tree = $this->m_dbinfo;
+        }        
+
+        //Commands
+        $commands = array();
+        $parentid = -1;
+        
+        foreach($tree as $item){ 
+            if( intval($item[\DBD\SYSTEM\APITable::FIELD_FLAG]) == \DBD\SYSTEM\APITable::VALUE_FLAG_COMMAND &&
+                intval($item[\DBD\SYSTEM\APITable::FIELD_PARENTID]) == $parentid &&
+                isset($call[$item[\DBD\SYSTEM\APITable::FIELD_NAME]])){
+                
+                if( isset($item[\DBD\SYSTEM\APITable::FIELD_PARENTVALUE]) &&
+                    $commands[count($commands)-1][1] != $item[\DBD\SYSTEM\APITable::FIELD_PARENTVALUE]){
+                    continue;
+                }
+                
+                $commands[] = array($item,$call[$item[\DBD\SYSTEM\APITable::FIELD_NAME]]);
+                $parentid = intval($item[\DBD\SYSTEM\APITable::FIELD_ID]);                
+            }
+        }
+        
+        //Parameters
+        $parameters = array();
+        $lastCommand = $commands[count($commands)-1][0];
+        foreach($tree as $item){
+            if( intval($item[\DBD\SYSTEM\APITable::FIELD_FLAG]) == \DBD\SYSTEM\APITable::VALUE_FLAG_PARAM &&
+                intval($item[\DBD\SYSTEM\APITable::FIELD_PARENTID]) == $lastCommand[\DBD\SYSTEM\APITable::FIELD_ID]){
+                
+                if( isset($item[\DBD\SYSTEM\APITable::FIELD_PARENTVALUE]) &&
+                    $commands[count($commands)-1][1] != $item[\DBD\SYSTEM\APITable::FIELD_PARENTVALUE]){
+                    continue;}
+
+                if(!isset($call[$item[\DBD\SYSTEM\APITable::FIELD_NAME]])){
+                    throw new \SYSTEM\LOG\ERROR('Parameter missing: '.$item[\DBD\SYSTEM\APITable::FIELD_NAME]);}
+
+
+                if( !method_exists($this->m_verifyclass, $item[\DBD\SYSTEM\APITable::FIELD_ALLOWEDVALUES]) ||
+                    !$this->m_verifyclass->$item[\DBD\SYSTEM\APITable::FIELD_ALLOWEDVALUES]($call[$item[\DBD\SYSTEM\APITable::FIELD_NAME]])){
+                    throw new \SYSTEM\LOG\ERROR('Parameter type missmacht or Missing Verifier. Param: '.$item[\DBD\SYSTEM\APITable::FIELD_NAME].' Verifier: '.$item[\DBD\SYSTEM\APITable::FIELD_ALLOWEDVALUES]);}
+
+                $parameters[] = array($item, $call[$item[\DBD\SYSTEM\APITable::FIELD_NAME]]);
+            }
+        }        
+        if(count($call) != (count($parameters) + count($commands)) ){
+            throw new \SYSTEM\LOG\ERROR('Unhandled or misshandled parameters - api query is invalid');}
+
+        //Function Name
+        $command_call = "";       
+        foreach($commands as $com){                        
+            if(!\preg_match('^[0-9A-Za-z_]+$^', $com[1])){
+                throw new \SYSTEM\LOG\ERROR('Call Command can only have letters!');}
+
+            if($com[0][\DBD\SYSTEM\APITable::FIELD_ALLOWEDVALUES] == 'FLAG'){
+                $command_call .= '_flag_'.$com[0][\DBD\SYSTEM\APITable::FIELD_NAME];
+            } else {
+                $command_call .= '_'.$com[0][\DBD\SYSTEM\APITable::FIELD_NAME].'_'.\strtolower($com[1]);}
+        }
+        $command_call = substr($command_call, 1);
+
+        //Function parameters
+        $parameter_call = array();
+        foreach($parameters as $param){
+            $parameter_call[] = $param[1];}        
+
+        if(!\method_exists($this->m_apiclass, $command_call)){
+            throw new \SYSTEM\LOG\ERROR("API call is not implemented in API: ".$command_call);}
+
+        //Call Function            
+        return \call_user_func_array(array($this->m_apiclass,$command_call),$parameter_call);
+    }
+    
+    private function getApiTree(){
+
+        $con = new \SYSTEM\DB\Connection($this->m_dbinfo);
+        $res = $con->query('SELECT * FROM '.\DBD\SYSTEM\APITable::NAME.' ORDER BY "'.\DBD\SYSTEM\APITable::FIELD_ID.'"');
+        unset($con);
+
+        if(!$res){
+            throw new \SYSTEM\LOG\ERROR('Database Error '.pg_last_error($con));}
+
+        $result = array();        
+        while($row = $res->next()){
+            $result[] = $row;}        
+
+        return $result;
+    }
+}

system/api/apiclass.php

@@ -0,0 +1,5 @@
+<?php
+
+namespace SYSTEM\API;
+
+class apiclass {}