Version 0.7.0

.gitignore

@@ -18,3 +18,4 @@ vendor/
 install/segments/ext_*
 Assistants/QEPGenerator/config.json
 install/config*
+install/logs/

Assistants/CConfig.php

@@ -79,6 +79,7 @@ public function setPrefix( $value )
     private $_defaultLanguage = null;
     private $_getAndHead = false;
     private $_allowOptions = false;
+    private $_getContent = true;
 
     /**
      * the CConfig constructor
@@ -93,6 +94,7 @@ public function __construct( $prefix, $callPath = null, $noInfo = false, $noHelp
 
         if (isset($options['getAndHead'])) $this->_getAndHead = $options['getAndHead'];
         if (isset($options['allowOptions'])) $this->_allowOptions = $options['allowOptions'];
+        if (isset($options['getContent'])) $this->_getContent = $options['getContent'];
 
         $this->_noInfo = $noInfo;
         $this->_noHelp = $noHelp;
@@ -113,8 +115,9 @@ public function __construct( $prefix, $callPath = null, $noInfo = false, $noHelp
         $pregC = @preg_match("%^((/[a-zA-Z0-9_\x7f-\xff]*)?|(/profile/[a-zA-Z0-9_\x7f-\xff]*)?)/info/links(/?)$%", $path);
         $pregD = @preg_match("%^((/[a-zA-Z0-9_\x7f-\xff]*)?|(/profile/[a-zA-Z0-9_\x7f-\xff]*)?)/info/([a-zA-Z0-9_\x7f-\xff]*)(/?)$%", $path);
         $pregE = @preg_match("%^((/[a-zA-Z0-9_\x7f-\xff]*)?|(/profile/[a-zA-Z0-9_\x7f-\xff]*)?)/help/([a-zA-Z0-9_\x7f-\xff]*)/%", $path);
+        $pregF = @preg_match("%^((/[a-zA-Z0-9_\x7f-\xff]*)?|(/profile/[a-zA-Z0-9_\x7f-\xff]*)?)/content/([a-zA-Z0-9_\x7f-\xff]*)/%", $path);
 
-        if ( $pregA || $pregB || $pregC || (!$noInfo && $pregD )  || (!$noHelp && $pregE ) ) {
+        if ( $pregA || $pregB || $pregC || (!$noInfo && $pregD )  || (!$noHelp && $pregE ) || ($this->_getContent && $pregF) ) {
 
             $this->_app = new \Slim\Slim( array('debug' => true) );
 
@@ -190,6 +193,17 @@ public function __construct( $prefix, $callPath = null, $noInfo = false, $noHelp
                                  );
             }
 
+            if ($this->_getContent){
+                // GET Content
+                $this->_app->get(
+                                 '((/profile)/:pre)/content/:contentPath+',
+                                 array(
+                                       $this,
+                                       'getContent'
+                                       )
+                                 );
+            }
+
         // run Slim
         $this->_used = true;
         $this->_app->run( );
@@ -248,6 +262,26 @@ public function getHelp( $pre = '', $language, $helpPath)
         }
     }
 
+    public function getContent( $pre = '', $contentPath)
+    {
+        $path = ($this->callPath!=null ? $this->callPath.'/' : '');
+        $path = str_replace("\\",'/',$path);
+        $path .= 'content/';
+
+        $fileName = array_pop($contentPath);
+        $path_parts = pathinfo($fileName);
+        $extension = (isset($path_parts['extension']) ? ('.'.strtolower($path_parts['extension'])) : '');
+        $contentPath[] = $path_parts['filename'].$extension;
+
+        if (file_exists($path.implode('/',$contentPath))){
+            $this->_app->response->setStatus( 200 );
+            $this->_app->response->setBody( file_get_contents($path.implode('/',$contentPath)) );
+        }else{
+            $this->_app->response->setStatus( 404 );
+            $this->_app->response->setBody( '' );
+        }
+    }
+
     public function instruction( $pre ='', $returnData=false)
     {
         if ($pre != ''){

Assistants/DBRequest.php

@@ -42,120 +42,7 @@ public static function request(
                                    $useDbOperator = false
                                    )
     {
-
-        if ($config===null){
-            // loads the mysql server config from file
-            $config = parse_ini_file( 
-                                     'config.ini',
-                                     TRUE
-                                     );
-        }
-
-        //ini_set('mysql.connect_timeout','60');
-
-        // creates a new connection to database
-        if (!isset($config['ZV']['zv_type']) || (isset($config['ZV']['zv_type']) && $config['ZV']['zv_type']=='local')){
-            $path = (strpos($config['PL']['urlExtern'],$config['DB']['db_path'])===false ? $config['DB']['db_path'] : 'localhost');
-        } else 
-            $path = $config['DB']['db_path'];
-
-        $dbconn = @mysql_connect( 
-                                $path,
-                                $config['DB']['db_user'],
-                                $config['DB']['db_passwd'],
-                                false,
-                                MYSQL_CLIENT_COMPRESS
-                                );
-        if (!$dbconn){
-            $query_result['errno'] = mysql_errno( );
-            $query_result['error'] = mysql_error( );
-            return $query_result;
-        }
-
-	// use UTF8
-	mysql_query("SET NAMES 'utf8'");
-
-        // selects the database
-        if ($config['DB']['db_name'] !== null)
-            mysql_select_db( $config['DB']['db_name'] );
-
-        // check session
-        ///if (error_reporting() & E_NOTICE)
-            $checkSession = false; // remove the comment this line to disable the session examination
-
-        // Storing whether or not a session condition is not satisfied
-        $sessionFail = false;
-        if ( $checkSession === true ){
-            Logger::Log( 
-                        'starts session validation',
-                        LogLevel::DEBUG
-                        );
-            if ( isset( $_SERVER['HTTP_SESSION'] ) && 
-                 isset( $_SERVER['HTTP_USER'] ) && 
-                 isset( $_SERVER['HTTP_DATE'] ) && 
-                 ctype_digit( $_SERVER['HTTP_USER'] ) && 
-                 ( int )$_SERVER['REQUEST_TIME'] <= ( int )$_SERVER['HTTP_DATE'] + 10 * 60 ){
-                $content = mysql_query( 
-                                       'select SE_sessionID from Session where U_id = ' . $_SERVER['HTTP_USER'],
-                                       $dbconn
-                                       );
-
-                // evaluates the session
-                $errno = mysql_errno( );
-                if ( $errno == 0 && 
-                     gettype( $content ) != 'boolean' ){
-                    $data = DBJson::getRows( $content );
-                    if ( $data != null && 
-                         $data[0]['SE_sessionID'] == $_SERVER['HTTP_SESSION'] ){
-                        $sessionFail = false;
-                        $query_result['error'] = 'access denied V';
-
-                    } else {
-                        $sessionFail = true;
-                        $query_result['error'] = 'access denied IV';
-                    }
-                } else {
-                    $sessionFail = true;
-                    $query_result['error'] = 'access denied III';
-                }
-
-            } else {
-                $sessionFail = true;
-                $query_result['error'] = "access denied II";
-            }
-        }
-
-        // if a condition is not met, the request is invalid
-        if ( $sessionFail == true ){
-            $query_result['content'] = '';
-            $query_result['errno'] = 401;
-            if (!isset($query_result['error'])) $query_result['error'] = 'unknown access denied';
-            $query_result['numRows'] = 0;
-            mysql_close( $dbconn );
-            $dbconn = null;
-            return $query_result;
-        }
-
-        // performs the request
-        $query_result['content'] = mysql_query( 
-                                               $sqlStatement,
-                                               $dbconn
-                                               );
-
-        // evaluates the request
-        $query_result['affectedRows'] = mysql_affected_rows( );
-        $query_result['insertId'] = mysql_insert_id( );
-        $query_result['errno'] = mysql_errno( );
-        $query_result['error'] = mysql_error( );
-
-        if ( gettype( $query_result['content'] ) != 'boolean' ){
-            $query_result['numRows'] = mysql_num_rows( $query_result['content'] );
-        }
-
-        // closes the connection and returns the result
-        mysql_close( $dbconn );
-        $dbconn = null;
-        return $query_result;
+        throw new Exception("DBRequest::request is deprecated");
     }
 
     // benutzt die mysqli-Erweiterung, wobei mehrere Anfragen in einem sqlStatement erlaubt sind