Merge pull request #266 from ostepu/version_0.5.0

Version 0.5.0

Author: tilluhlig

.gitignore

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

Assistants/CConfig.php

@@ -546,6 +546,9 @@ public static function getLinks(
                                     $name
                                     )
     {
+        // wenn NULL übergeben wird, soll es keinen Absturz geben
+        if (!isset($linkList)) $linkList = array();
+
         $result = array( );
         foreach ( $linkList as $link ){
 

Assistants/Language.php

@@ -144,12 +144,13 @@ public static function loadLanguage($lang, $name='default', $type='json', $path=
      */
     public static function Get($area, $cell, $name='default', $params=array())
     {        
-        if (self::$selectedLanguage != null && isset(self::$language[$name]) && isset(self::$language[$name][$area]) && isset(self::$language[$name][$area][$cell])){
+        if (self::$selectedLanguage !== null && isset(self::$language[$name]) && isset(self::$language[$name][$area]) && isset(self::$language[$name][$area][$cell])){
             $res = self::$language[$name][$area][$cell];
-        } elseif (self::$selectedDefaultLanguage != null && isset(self::$defaultLanguage[$name]) && isset(self::$defaultLanguage[$name][$area]) && isset(self::$defaultLanguage[$name][$area][$cell])){
+        } elseif (self::$selectedDefaultLanguage !== null && isset(self::$defaultLanguage[$name]) && isset(self::$defaultLanguage[$name][$area]) && isset(self::$defaultLanguage[$name][$area][$cell])){
             $res = self::$defaultLanguage[$name][$area][$cell];
-        } else
+        } else {
             $res = self::$errorValue;
+        }
 
         $matches = array();
         preg_match_all('/[^\\\\]\$\[([\w,]+)\]/', $res, $matches);

Assistants/Logger.php

@@ -140,16 +140,16 @@ public static function Log($message,
             // or overwriting each other
             //do{} while(!flock($fp, LOCK_EX);
 
-            if (flock($fp, LOCK_EX)) {
+           /// if (flock($fp, LOCK_EX)) {
                 // print the message to the file
                 fwrite($fp, $infoString);
 
                 // unlock and close the file
-                flock($fp, LOCK_UN);
+             ///   flock($fp, LOCK_UN);
 
-            } else {
+          ///  } else {
                 //die("Getting lock on " . $logFile . " failed!\n");
-            }
+           /// }
 
             fclose($fp);
             return true;

Assistants/Model.php

@@ -182,6 +182,8 @@ public function run()
                 $placeholder[$holder['name']] = $holder['regex'];
             }
 
+            // hier werden die eigentlichen Bedingungen der Platzhalter geprüft
+            // todo: muss wieder genutzt werden
             /*foreach ($params as $key => $value){
                 if (isset($placeholder[$key])){
                     if (is_array($value)){

Assistants/Request.php

@@ -40,7 +40,15 @@ public static function http_parse_headers( $header )
         $fields = explode("\r\n", preg_replace('/\x0D\x0A[\x09\x20]+/', ' ', $header));
         foreach( $fields as $field ) {
             if( preg_match('/([^:]+): (.+)/m', $field, $match) ) {
-                $match[1] = preg_replace('/(?<=^|[\x09\x20\x2D])./e', 'strtoupper("\0")', strtolower(trim($match[1])));
+                //$match[1] = preg_replace('/(?<=^|[\x09\x20\x2D])./e', 'strtoupper("\0")', strtolower(trim($match[1])));
+                $match[1] = preg_replace_callback(
+                    '/(?<=^|[\x09\x20\x2D])./',
+                    function ($treffer) {
+                      return strtoupper($treffer[0]);
+                    },
+                    strtolower(trim($match[1]))
+                );
+                
                 if( isset($retVal[$match[1]]) ) {
                     if (!is_array($retVal[$match[1]])) {
                         $retVal[$match[1]] = array($retVal[$match[1]]);
@@ -59,7 +67,15 @@ public static function http_parse_headers_short( $fields )
         $retVal = array();
         foreach( $fields as $field ) {
             if( preg_match('/([^:]+): (.+)/m', $field, $match) ) {
-                $match[1] = preg_replace('/(?<=^|[\x09\x20\x2D])./e', 'strtoupper("\0")', strtolower(trim($match[1])));
+                ///$match[1] = preg_replace('/(?<=^|[\x09\x20\x2D])./e', 'strtoupper("\0")', strtolower(trim($match[1])));
+                $match[1] = preg_replace_callback(
+                    '/(?<=^|[\x09\x20\x2D])./',
+                    function ($treffer) {
+                      return strtoupper($treffer[0]);
+                    },
+                    strtolower(trim($match[1]))
+                );
+  
                 if( isset($retVal[$match[1]]) ) {
                     if (!is_array($retVal[$match[1]])) {
                         $retVal[$match[1]] = array($retVal[$match[1]]);

Assistants/Structures.php

@@ -41,6 +41,7 @@
 include_once ( dirname( __FILE__ ) . '/Structures/Plugin.php' );
 include_once ( dirname( __FILE__ ) . '/Structures/Process.php' );
 include_once ( dirname( __FILE__ ) . '/Structures/Query.php' );
+include_once ( dirname( __FILE__ ) . '/Structures/Redirect.php' );
 include_once ( dirname( __FILE__ ) . '/Structures/Reference.php' );
 include_once ( dirname( __FILE__ ) . '/Structures/SelectedSubmission.php' );
 include_once ( dirname( __FILE__ ) . '/Structures/Session.php' );