Explorar o código

Merge z mojego repozytorium ktore sie nie dorzucalo. Chyba nie wybuchnie

a.binder %!s(int64=11) %!d(string=hai) anos
pai
achega
f915f2c8a6

BIN=BIN
SE/icon/doc10.gif


BIN=BIN
SE/icon/doc9.gif


BIN=BIN
SE/icon/off.gif


BIN=BIN
SE/icon/ok2.gif


BIN=BIN
SE/icon/szukaj2.gif


+ 11 - 4
SE/se-lib/DB.php

@@ -21,6 +21,8 @@ class DB {
 			$dbConfName = "import_db";
 		} else if ($db == 'test_db') {
 			$dbConfName = "test_db";
+		}  else if ($db == 'billing_db') {
+			$dbConfName = "billing_db";
 		} 
 		
 
@@ -35,6 +37,8 @@ class DB {
 				$port = V::get('port', '', $conf);
 				$user = V::get('user', '', $conf);
 				$pass = V::get('pass', '', $conf);
+				$zasob_id = V::get('zasob_id', '', $conf);
+
 				$database = V::get('database', '', $conf);
 				if ($port && $host) {
 					$host .= ":{$port}";
@@ -49,6 +53,9 @@ class DB {
 					if (!empty($tdsver)) {
 						$params['tdsver'] = $tdsver;
 					}
+					if(!empty($zasob_id)) {
+						$params['zasob_id'] = $zasob_id;
+					}
 
 					$_instance[$dbConfName] = new $db_class($host, $user, $pass, $database, $names, $params);
 				}
@@ -135,7 +142,7 @@ public static function fetch_assoc($res) {
 
 
 public static function _($str) {
-	//PHP >= 4.3.0; dodaje lewe uko¶niki (backslash) do nastêpuj±cych znaków: \x00, \n, \r, \, ', " and \x1a
+	//PHP >= 4.3.0; dodaje lewe ukoᄊniki (backslash) do nast↑pujᄆcych znak￳w: \x00, \n, \r, \, ', " and \x1a
 	return mysql_real_escape_string($str, self::connect());
 }
 
@@ -146,19 +153,19 @@ public static function error() {
 }
 
 
-// Pobiera liczbê wierszy przetworzonych w ostatnim zapytaniu INSERT, UPDATE, REPLACE lub DELETE skojarzonym z identyfikator_po³±czenia.
+// Pobiera liczb↑ wierszy przetworzonych w ostatnim zapytaniu INSERT, UPDATE, REPLACE lub DELETE skojarzonym z identyfikator_poᄈᄆczenia.
 public static function affected_rows() {
 	return mysql_affected_rows(self::connect());
 }
 
 
-// Zwraca ID wygenerowane dla pola z w³asno¶ci± AUTO_INCREMENT lub 0 jesli error
+// Zwraca ID wygenerowane dla pola z wï¾³asnoï¾¶ciï¾± AUTO_INCREMENT lub 0 jesli error
 public static function insert_id() {
 	return mysql_insert_id(self::connect());
 }
 
 
-// Zwraca liczbê wierszy w wyniku. Tê funkcjê stosuje siê tylko do operacji SELECT.
+// Zwraca liczb↑ wierszy w wyniku. T↑ funkcj↑ stosuje si↑ tylko do operacji SELECT.
 public static function num_rows($res) {
 	return mysql_num_rows($res);
 }

+ 20 - 6
SE/se-lib/Data_Source.php

@@ -349,6 +349,9 @@ if(V::get('DBG_DS', 0, $_GET) > 0){echo'<pre style="max-height:200px;overflow:au
 					$v = $this->_db->_(substr($v, 1));
 					if (strlen($v)) $sql_where_and[] = "t.`{$fldName}`='{$v}'";
 				}
+				else if ($v == '!NULL' || $v == 'IS NOT NULL') {
+					$sql_where_and[] = "t.`{$fldName}` is not null";
+				}
 				else if (substr($v, 0, 1) == '!') {
 					$v = $this->_db->_(substr($v, 1));
 					if (strlen($v)) $sql_where_and[] = "t.`{$fldName}` not like '{$v}'";
@@ -464,14 +467,19 @@ if(V::get('DBG_DS', 0, $_GET) > 0){echo'<pre style="max-height:200px;overflow:au
 		$this->getItem($id);
 	}
 
-	public function getItem($id) {
+	/**
+	 * @returns object
+	 */
+	public function getItem($primaryKey) {
+		$primaryKeyField = $this->getPrimaryKeyField();
 		$ret = null;
 		$sql_cols = $this->_get_sql_cols();
-		$id = intval($id);
+		$primaryKey = intval($primaryKey);// TODO: validate $primaryKey
 		$sql = "select {$sql_cols}
-			from {$this->_tbl} as t
-			where t.`ID`='{$id}'
+			from `{$this->_tbl}` as t
+			where t.`{$primaryKeyField}`='{$primaryKey}'
 		";
+		// TODO: use PDO
 		$res = $this->_db->query($sql);
 		if ($r = $this->_db->fetch($res)) {
 			$ret = $r;
@@ -484,6 +492,7 @@ if(V::get('DBG_DS', 0, $_GET) > 0){echo'<pre style="max-height:200px;overflow:au
 	}
 
 	public function getItems($params = array()) {
+		$primaryKeyField = $this->getPrimaryKeyField();
 		$items = array();
 		$sql_limit = V::get('limit', $this->_default_sql_limit, $params, 'int');
 		$sql_offset = V::get('limitstart', 0, $params, 'int');
@@ -514,7 +523,7 @@ if(V::get('DBG_DS', 0, $_GET) > 0){echo'<pre style="max-height:200px;overflow:au
 		if(V::get('DBG_DS', 0, $_GET) > 2){echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">sql (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($sql);echo'</pre>'."\n\n";}
 		$res = $this->_db->query($sql);
 		while ($r = $this->_db->fetch($res)) {
-			$items[$r->ID] = $r;
+			$items[$r->{$primaryKeyField}] = $r;
 		}
 		return $items;
 	}
@@ -644,6 +653,7 @@ if(V::get('DBG_DS', 0, $_GET) > 2){echo'<pre style="max-height:200px;overflow:au
 	}
 
 	function fetch_list($limit = 10, $offset = 0) {
+		$primaryKeyField = $this->getPrimaryKeyField();
 		$ret = array();
 		$this->_sql_limit = $limit;
 		$this->_sql_offset = $offset;
@@ -657,7 +667,7 @@ if(V::get('DBG_DS', 0, $_GET) > 2){echo'<pre style="max-height:200px;overflow:au
 		";
 		$res = $this->_db->query($sql);
 		while ($r = $this->_db->fetch($res)) {
-			$ret [$r->ID] = $r;
+			$ret[$r->{$primaryKeyField}] = $r;
 		}
 		return $ret;
 	}
@@ -748,4 +758,8 @@ if(V::get('DBG_DS', 0, $_GET) > 2){echo'<pre style="max-height:200px;overflow:au
 		return $errors;
 	}
 
+	public function getPrimaryKeyField() {
+		return 'ID';// TODO: read from struct - jest funkcja w Mysql.php my Psql.php
+	}
+
 }

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
SE/se-lib/Nodes_path_analys.php


+ 3 - 3
SE/se-lib/ProcesTestyHelper.php

@@ -25,9 +25,9 @@ class ProcesTestyHelper {
 		$db = DB::getDB();
 		$sql = "select `ID`,`ADM_NAME`,`ADM_PHONE`,`ADM_OTHER_INFO`
 			from `ADMIN_USERS`
-			where `ADM_ADMIN_LEVEL`='6'
-				and `A_STATUS`='WAITING'
-				and `ADM_AREA` like 'KANDYDAT'
+		where `ADM_ADMIN_LEVEL`>=3
+			and `A_STATUS`!='OFF_HARD' and  `A_STATUS`!='DELETED'
+			 and `EMPLOYEE_TYPE` like '%Kandydat%'
 			{$sql_order_by}
 			limit 1000
 		";

+ 39 - 0
SE/se-lib/TableAcl.php

@@ -43,6 +43,16 @@ class TableAcl {
 	public function setName($name) {
 		$this->_name = $name;
 	}
+	
+	public function setNameByTableId($tableID) {
+	//used for init without knowing table name	
+		$sql="select `DESC` from CRM_LISTA_ZASOBOW where ID=".$tableID." and `TYPE`='TABELA'";
+		$res=DB::query($sql);
+		$res_=DB::fetch($res);
+		//DEBUG_S(-3,'setNameByTableId',$res_,__FILE__,__FUNCTION__,__LINE__);
+		self::setName($res->DESC);
+		
+	}
 
 	public function getName() {
 		return $this->_name;
@@ -120,6 +130,11 @@ class TableAcl {
 		$this->_fields[$fieldID] = $field;
 	}
 
+
+	public function getTableDbId($tableID) {
+		return $this->_db;
+	}
+
 	public function getField($fieldID) {
 		return $this->_fields[$fieldID];
 	}
@@ -534,6 +549,30 @@ class TableAcl {
 		return $out;
 	}
 
+	/**
+	* List table ids by database
+	* 
+	*
+	*/
+	public static function GetTablesByDbId($db) {
+	   		DEBUG_S(3,'TableAcl_cache',$_SESSION['TableAcl_cache'],__FILE__,__FUNCTION__,__LINE__);
+	    	static $_cache;
+	   	 	$return=array();
+	    	if (!$_cache) $_cache = array();
+	    	if (!empty($_SESSION['TableAcl_cache'])) {
+	    		foreach($_SESSION['TableAcl_cache'] as $tableID=>$obj) {
+		    		//if($obj->db==$db)
+		    		 $return[$obj['name']]=$tableID;
+		    		
+	    		}
+	    		return $return;
+	    	}
+	    	return null;
+	}
+
+	
+
+
 	/**
 	 * Get column object. Not initialize
 	 * @returns object - column instance if exists else null

+ 15 - 0
SE/se-lib/UserAcl.php

@@ -702,6 +702,21 @@ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:
 		return $urls;
 	}
 
+	public function getObjectAcl($sourceName, $objName) {
+		if ('default_db' == $sourceName) {
+			$zasobTblInfo = ProcesHelper::getZasobTableInfoByUri("{$sourceName}/{$objName}");
+			if ($zasobTblInfo) {
+				if ($this->hasTableAcl($zasobTblInfo->ID)) {
+					return $this->getTableAcl($zasobTblInfo->ID);
+				}
+			}
+		}
+		else {
+			throw new HttpException("Not Implemented", 501);
+		}
+		return false;
+	}
+
 	public function getTablesAcl() {
 		$tbls = array();
 		$tblIds = $this->_cache_read('foundTables');

+ 3312 - 0
SE/stuff/phpqrcode.php

@@ -0,0 +1,3312 @@
+<?php
+
+/*
+ * PHP QR Code encoder
+ *
+ * This file contains MERGED version of PHP QR Code library.
+ * It was auto-generated from full version for your convenience.
+ *
+ * This merged version was configured to not requre any external files,
+ * with disabled cache, error loging and weker but faster mask matching.
+ * If you need tune it up please use non-merged version.
+ *
+ * For full version, documentation, examples of use please visit:
+ *
+ *    http://phpqrcode.sourceforge.net/
+ *    https://sourceforge.net/projects/phpqrcode/
+ *
+ * PHP QR Code is distributed under LGPL 3
+ * Copyright (C) 2010 Dominik Dzienia <deltalab at poczta dot fm>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+ 
+ 
+
+/*
+ * Version: 1.1.4
+ * Build: 2010100721
+ */
+
+
+
+//---- qrconst.php -----------------------------
+
+
+
+
+
+/*
+ * PHP QR Code encoder
+ *
+ * Common constants
+ *
+ * Based on libqrencode C library distributed under LGPL 2.1
+ * Copyright (C) 2006, 2007, 2008, 2009 Kentaro Fukuchi <fukuchi@megaui.net>
+ *
+ * PHP QR Code is distributed under LGPL 3
+ * Copyright (C) 2010 Dominik Dzienia <deltalab at poczta dot fm>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+ 
+	// Encoding modes
+	 
+	define('QR_MODE_NUL', -1);
+	define('QR_MODE_NUM', 0);
+	define('QR_MODE_AN', 1);
+	define('QR_MODE_8', 2);
+	define('QR_MODE_KANJI', 3);
+	define('QR_MODE_STRUCTURE', 4);
+
+	// Levels of error correction.
+
+	define('QR_ECLEVEL_L', 0);
+	define('QR_ECLEVEL_M', 1);
+	define('QR_ECLEVEL_Q', 2);
+	define('QR_ECLEVEL_H', 3);
+	
+	// Supported output formats
+	
+	define('QR_FORMAT_TEXT', 0);
+	define('QR_FORMAT_PNG',  1);
+	
+	class qrstr {
+		public static function set(&$srctab, $x, $y, $repl, $replLen = false) {
+			$srctab[$y] = substr_replace($srctab[$y], ($replLen !== false)?substr($repl,0,$replLen):$repl, $x, ($replLen !== false)?$replLen:strlen($repl));
+		}
+	}	
+
+
+
+//---- merged_config.php -----------------------------
+
+
+
+
+/*
+ * PHP QR Code encoder
+ *
+ * Config file, tuned-up for merged verion
+ */
+     
+    define('QR_CACHEABLE', false);       // use cache - more disk reads but less CPU power, masks and format templates are stored there
+    define('QR_CACHE_DIR', false);       // used when QR_CACHEABLE === true
+    define('QR_LOG_DIR', false);         // default error logs dir   
+    
+    define('QR_FIND_BEST_MASK', true);                                                          // if true, estimates best mask (spec. default, but extremally slow; set to false to significant performance boost but (propably) worst quality code
+    define('QR_FIND_FROM_RANDOM', 2);                                                       // if false, checks all masks available, otherwise value tells count of masks need to be checked, mask id are got randomly
+    define('QR_DEFAULT_MASK', 2);                                                               // when QR_FIND_BEST_MASK === false
+                                                  
+    define('QR_PNG_MAXIMUM_SIZE',  1024);                                                       // maximum allowed png image width (in pixels), tune to make sure GD and PHP can handle such big images
+                                                  
+
+
+
+//---- qrtools.php -----------------------------
+
+
+
+
+/*
+ * PHP QR Code encoder
+ *
+ * Toolset, handy and debug utilites.
+ *
+ * PHP QR Code is distributed under LGPL 3
+ * Copyright (C) 2010 Dominik Dzienia <deltalab at poczta dot fm>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+    class QRtools {
+    
+        //----------------------------------------------------------------------
+        public static function binarize($frame)
+        {
+            $len = count($frame);
+            foreach ($frame as &$frameLine) {
+                
+                for($i=0; $i<$len; $i++) {
+                    $frameLine[$i] = (ord($frameLine[$i])&1)?'1':'0';
+                }
+            }
+            
+            return $frame;
+        }
+        
+        //----------------------------------------------------------------------
+        public static function tcpdfBarcodeArray($code, $mode = 'QR,L', $tcPdfVersion = '4.5.037')
+        {
+            $barcode_array = array();
+            
+            if (!is_array($mode))
+                $mode = explode(',', $mode);
+                
+            $eccLevel = 'L';
+                
+            if (count($mode) > 1) {
+                $eccLevel = $mode[1];
+            }
+                
+            $qrTab = QRcode::text($code, false, $eccLevel);
+            $size = count($qrTab);
+                
+            $barcode_array['num_rows'] = $size;
+            $barcode_array['num_cols'] = $size;
+            $barcode_array['bcode'] = array();
+                
+            foreach ($qrTab as $line) {
+                $arrAdd = array();
+                foreach(str_split($line) as $char)
+                    $arrAdd[] = ($char=='1')?1:0;
+                $barcode_array['bcode'][] = $arrAdd;
+            }
+                    
+            return $barcode_array;
+        }
+        
+        //----------------------------------------------------------------------
+        public static function clearCache()
+        {
+            self::$frames = array();
+        }
+        
+        //----------------------------------------------------------------------
+        public static function buildCache()
+        {
+			QRtools::markTime('before_build_cache');
+			
+			$mask = new QRmask();
+            for ($a=1; $a <= QRSPEC_VERSION_MAX; $a++) {
+                $frame = QRspec::newFrame($a);
+                if (QR_IMAGE) {
+                    $fileName = QR_CACHE_DIR.'frame_'.$a.'.png';
+                    QRimage::png(self::binarize($frame), $fileName, 1, 0);
+                }
+				
+				$width = count($frame);
+				$bitMask = array_fill(0, $width, array_fill(0, $width, 0));
+				for ($maskNo=0; $maskNo<8; $maskNo++)
+					$mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);
+            }
+			
+			QRtools::markTime('after_build_cache');
+        }
+
+        //----------------------------------------------------------------------
+        public static function log($outfile, $err)
+        {
+            if (QR_LOG_DIR !== false) {
+                if ($err != '') {
+                    if ($outfile !== false) {
+                        file_put_contents(QR_LOG_DIR.basename($outfile).'-errors.txt', date('Y-m-d H:i:s').': '.$err, FILE_APPEND);
+                    } else {
+                        file_put_contents(QR_LOG_DIR.'errors.txt', date('Y-m-d H:i:s').': '.$err, FILE_APPEND);
+                    }
+                }    
+            }
+        }
+        
+        //----------------------------------------------------------------------
+        public static function dumpMask($frame) 
+        {
+            $width = count($frame);
+            for($y=0;$y<$width;$y++) {
+                for($x=0;$x<$width;$x++) {
+                    echo ord($frame[$y][$x]).',';
+                }
+            }
+        }
+        
+        //----------------------------------------------------------------------
+        public static function markTime($markerId)
+        {
+            list($usec, $sec) = explode(" ", microtime());
+            $time = ((float)$usec + (float)$sec);
+            
+            if (!isset($GLOBALS['qr_time_bench']))
+                $GLOBALS['qr_time_bench'] = array();
+            
+            $GLOBALS['qr_time_bench'][$markerId] = $time;
+        }
+        
+        //----------------------------------------------------------------------
+        public static function timeBenchmark()
+        {
+            self::markTime('finish');
+        
+            $lastTime = 0;
+            $startTime = 0;
+            $p = 0;
+
+            echo '<table cellpadding="3" cellspacing="1">
+                    <thead><tr style="border-bottom:1px solid silver"><td colspan="2" style="text-align:center">BENCHMARK</td></tr></thead>
+                    <tbody>';
+
+            foreach($GLOBALS['qr_time_bench'] as $markerId=>$thisTime) {
+                if ($p > 0) {
+                    echo '<tr><th style="text-align:right">till '.$markerId.': </th><td>'.number_format($thisTime-$lastTime, 6).'s</td></tr>';
+                } else {
+                    $startTime = $thisTime;
+                }
+                
+                $p++;
+                $lastTime = $thisTime;
+            }
+            
+            echo '</tbody><tfoot>
+                <tr style="border-top:2px solid black"><th style="text-align:right">TOTAL: </th><td>'.number_format($lastTime-$startTime, 6).'s</td></tr>
+            </tfoot>
+            </table>';
+        }
+        
+    }
+    
+    //##########################################################################
+    
+    QRtools::markTime('start');
+    
+
+
+
+//---- qrspec.php -----------------------------
+
+
+
+
+/*
+ * PHP QR Code encoder
+ *
+ * QR Code specifications
+ *
+ * Based on libqrencode C library distributed under LGPL 2.1
+ * Copyright (C) 2006, 2007, 2008, 2009 Kentaro Fukuchi <fukuchi@megaui.net>
+ *
+ * PHP QR Code is distributed under LGPL 3
+ * Copyright (C) 2010 Dominik Dzienia <deltalab at poczta dot fm>
+ *
+ * The following data / specifications are taken from
+ * "Two dimensional symbol -- QR-code -- Basic Specification" (JIS X0510:2004)
+ *  or
+ * "Automatic identification and data capture techniques -- 
+ *  QR Code 2005 bar code symbology specification" (ISO/IEC 18004:2006)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+ 
+    define('QRSPEC_VERSION_MAX', 40);
+    define('QRSPEC_WIDTH_MAX',   177);
+
+    define('QRCAP_WIDTH',        0);
+    define('QRCAP_WORDS',        1);
+    define('QRCAP_REMINDER',     2);
+    define('QRCAP_EC',           3);
+
+    class QRspec {
+    
+        public static $capacity = array(
+            array(  0,    0, 0, array(   0,    0,    0,    0)),
+            array( 21,   26, 0, array(   7,   10,   13,   17)), // 1
+            array( 25,   44, 7, array(  10,   16,   22,   28)),
+            array( 29,   70, 7, array(  15,   26,   36,   44)),
+            array( 33,  100, 7, array(  20,   36,   52,   64)),
+            array( 37,  134, 7, array(  26,   48,   72,   88)), // 5
+            array( 41,  172, 7, array(  36,   64,   96,  112)),
+            array( 45,  196, 0, array(  40,   72,  108,  130)),
+            array( 49,  242, 0, array(  48,   88,  132,  156)),
+            array( 53,  292, 0, array(  60,  110,  160,  192)),
+            array( 57,  346, 0, array(  72,  130,  192,  224)), //10
+            array( 61,  404, 0, array(  80,  150,  224,  264)),
+            array( 65,  466, 0, array(  96,  176,  260,  308)),
+            array( 69,  532, 0, array( 104,  198,  288,  352)),
+            array( 73,  581, 3, array( 120,  216,  320,  384)),
+            array( 77,  655, 3, array( 132,  240,  360,  432)), //15
+            array( 81,  733, 3, array( 144,  280,  408,  480)),
+            array( 85,  815, 3, array( 168,  308,  448,  532)),
+            array( 89,  901, 3, array( 180,  338,  504,  588)),
+            array( 93,  991, 3, array( 196,  364,  546,  650)),
+            array( 97, 1085, 3, array( 224,  416,  600,  700)), //20
+            array(101, 1156, 4, array( 224,  442,  644,  750)),
+            array(105, 1258, 4, array( 252,  476,  690,  816)),
+            array(109, 1364, 4, array( 270,  504,  750,  900)),
+            array(113, 1474, 4, array( 300,  560,  810,  960)),
+            array(117, 1588, 4, array( 312,  588,  870, 1050)), //25
+            array(121, 1706, 4, array( 336,  644,  952, 1110)),
+            array(125, 1828, 4, array( 360,  700, 1020, 1200)),
+            array(129, 1921, 3, array( 390,  728, 1050, 1260)),
+            array(133, 2051, 3, array( 420,  784, 1140, 1350)),
+            array(137, 2185, 3, array( 450,  812, 1200, 1440)), //30
+            array(141, 2323, 3, array( 480,  868, 1290, 1530)),
+            array(145, 2465, 3, array( 510,  924, 1350, 1620)),
+            array(149, 2611, 3, array( 540,  980, 1440, 1710)),
+            array(153, 2761, 3, array( 570, 1036, 1530, 1800)),
+            array(157, 2876, 0, array( 570, 1064, 1590, 1890)), //35
+            array(161, 3034, 0, array( 600, 1120, 1680, 1980)),
+            array(165, 3196, 0, array( 630, 1204, 1770, 2100)),
+            array(169, 3362, 0, array( 660, 1260, 1860, 2220)),
+            array(173, 3532, 0, array( 720, 1316, 1950, 2310)),
+            array(177, 3706, 0, array( 750, 1372, 2040, 2430)) //40
+        );
+        
+        //----------------------------------------------------------------------
+        public static function getDataLength($version, $level)
+        {
+            return self::$capacity[$version][QRCAP_WORDS] - self::$capacity[$version][QRCAP_EC][$level];
+        }
+        
+        //----------------------------------------------------------------------
+        public static function getECCLength($version, $level)
+        {
+            return self::$capacity[$version][QRCAP_EC][$level];
+        }
+        
+        //----------------------------------------------------------------------
+        public static function getWidth($version)
+        {
+            return self::$capacity[$version][QRCAP_WIDTH];
+        }
+        
+        //----------------------------------------------------------------------
+        public static function getRemainder($version)
+        {
+            return self::$capacity[$version][QRCAP_REMINDER];
+        }
+        
+        //----------------------------------------------------------------------
+        public static function getMinimumVersion($size, $level)
+        {
+
+            for($i=1; $i<= QRSPEC_VERSION_MAX; $i++) {
+                $words  = self::$capacity[$i][QRCAP_WORDS] - self::$capacity[$i][QRCAP_EC][$level];
+                if($words >= $size) 
+                    return $i;
+            }
+
+            return -1;
+        }
+    
+        //######################################################################
+        
+        public static $lengthTableBits = array(
+            array(10, 12, 14),
+            array( 9, 11, 13),
+            array( 8, 16, 16),
+            array( 8, 10, 12)
+        );
+        
+        //----------------------------------------------------------------------
+        public static function lengthIndicator($mode, $version)
+        {
+            if ($mode == QR_MODE_STRUCTURE)
+                return 0;
+                
+            if ($version <= 9) {
+                $l = 0;
+            } else if ($version <= 26) {
+                $l = 1;
+            } else {
+                $l = 2;
+            }
+
+            return self::$lengthTableBits[$mode][$l];
+        }
+        
+        //----------------------------------------------------------------------
+        public static function maximumWords($mode, $version)
+        {
+            if($mode == QR_MODE_STRUCTURE) 
+                return 3;
+                
+            if($version <= 9) {
+                $l = 0;
+            } else if($version <= 26) {
+                $l = 1;
+            } else {
+                $l = 2;
+            }
+
+            $bits = self::$lengthTableBits[$mode][$l];
+            $words = (1 << $bits) - 1;
+            
+            if($mode == QR_MODE_KANJI) {
+                $words *= 2; // the number of bytes is required
+            }
+
+            return $words;
+        }
+
+        // Error correction code -----------------------------------------------
+        // Table of the error correction code (Reed-Solomon block)
+        // See Table 12-16 (pp.30-36), JIS X0510:2004.
+
+        public static $eccTable = array(
+            array(array( 0,  0), array( 0,  0), array( 0,  0), array( 0,  0)),
+            array(array( 1,  0), array( 1,  0), array( 1,  0), array( 1,  0)), // 1
+            array(array( 1,  0), array( 1,  0), array( 1,  0), array( 1,  0)),
+            array(array( 1,  0), array( 1,  0), array( 2,  0), array( 2,  0)),
+            array(array( 1,  0), array( 2,  0), array( 2,  0), array( 4,  0)),
+            array(array( 1,  0), array( 2,  0), array( 2,  2), array( 2,  2)), // 5
+            array(array( 2,  0), array( 4,  0), array( 4,  0), array( 4,  0)),
+            array(array( 2,  0), array( 4,  0), array( 2,  4), array( 4,  1)),
+            array(array( 2,  0), array( 2,  2), array( 4,  2), array( 4,  2)),
+            array(array( 2,  0), array( 3,  2), array( 4,  4), array( 4,  4)),
+            array(array( 2,  2), array( 4,  1), array( 6,  2), array( 6,  2)), //10
+            array(array( 4,  0), array( 1,  4), array( 4,  4), array( 3,  8)),
+            array(array( 2,  2), array( 6,  2), array( 4,  6), array( 7,  4)),
+            array(array( 4,  0), array( 8,  1), array( 8,  4), array(12,  4)),
+            array(array( 3,  1), array( 4,  5), array(11,  5), array(11,  5)),
+            array(array( 5,  1), array( 5,  5), array( 5,  7), array(11,  7)), //15
+            array(array( 5,  1), array( 7,  3), array(15,  2), array( 3, 13)),
+            array(array( 1,  5), array(10,  1), array( 1, 15), array( 2, 17)),
+            array(array( 5,  1), array( 9,  4), array(17,  1), array( 2, 19)),
+            array(array( 3,  4), array( 3, 11), array(17,  4), array( 9, 16)),
+            array(array( 3,  5), array( 3, 13), array(15,  5), array(15, 10)), //20
+            array(array( 4,  4), array(17,  0), array(17,  6), array(19,  6)),
+            array(array( 2,  7), array(17,  0), array( 7, 16), array(34,  0)),
+            array(array( 4,  5), array( 4, 14), array(11, 14), array(16, 14)),
+            array(array( 6,  4), array( 6, 14), array(11, 16), array(30,  2)),
+            array(array( 8,  4), array( 8, 13), array( 7, 22), array(22, 13)), //25
+            array(array(10,  2), array(19,  4), array(28,  6), array(33,  4)),
+            array(array( 8,  4), array(22,  3), array( 8, 26), array(12, 28)),
+            array(array( 3, 10), array( 3, 23), array( 4, 31), array(11, 31)),
+            array(array( 7,  7), array(21,  7), array( 1, 37), array(19, 26)),
+            array(array( 5, 10), array(19, 10), array(15, 25), array(23, 25)), //30
+            array(array(13,  3), array( 2, 29), array(42,  1), array(23, 28)),
+            array(array(17,  0), array(10, 23), array(10, 35), array(19, 35)),
+            array(array(17,  1), array(14, 21), array(29, 19), array(11, 46)),
+            array(array(13,  6), array(14, 23), array(44,  7), array(59,  1)),
+            array(array(12,  7), array(12, 26), array(39, 14), array(22, 41)), //35
+            array(array( 6, 14), array( 6, 34), array(46, 10), array( 2, 64)),
+            array(array(17,  4), array(29, 14), array(49, 10), array(24, 46)),
+            array(array( 4, 18), array(13, 32), array(48, 14), array(42, 32)),
+            array(array(20,  4), array(40,  7), array(43, 22), array(10, 67)),
+            array(array(19,  6), array(18, 31), array(34, 34), array(20, 61)),//40
+        );                                                                       
+
+        //----------------------------------------------------------------------
+        // CACHEABLE!!!
+        
+        public static function getEccSpec($version, $level, array &$spec)
+        {
+            if (count($spec) < 5) {
+                $spec = array(0,0,0,0,0);
+            }
+
+            $b1   = self::$eccTable[$version][$level][0];
+            $b2   = self::$eccTable[$version][$level][1];
+            $data = self::getDataLength($version, $level);
+            $ecc  = self::getECCLength($version, $level);
+
+            if($b2 == 0) {
+                $spec[0] = $b1;
+                $spec[1] = (int)($data / $b1);
+                $spec[2] = (int)($ecc / $b1);
+                $spec[3] = 0; 
+                $spec[4] = 0;
+            } else {
+                $spec[0] = $b1;
+                $spec[1] = (int)($data / ($b1 + $b2));
+                $spec[2] = (int)($ecc  / ($b1 + $b2));
+                $spec[3] = $b2;
+                $spec[4] = $spec[1] + 1;
+            }
+        }
+
+        // Alignment pattern ---------------------------------------------------
+
+        // Positions of alignment patterns.
+        // This array includes only the second and the third position of the 
+        // alignment patterns. Rest of them can be calculated from the distance 
+        // between them.
+         
+        // See Table 1 in Appendix E (pp.71) of JIS X0510:2004.
+         
+        public static $alignmentPattern = array(      
+            array( 0,  0),
+            array( 0,  0), array(18,  0), array(22,  0), array(26,  0), array(30,  0), // 1- 5
+            array(34,  0), array(22, 38), array(24, 42), array(26, 46), array(28, 50), // 6-10
+            array(30, 54), array(32, 58), array(34, 62), array(26, 46), array(26, 48), //11-15
+            array(26, 50), array(30, 54), array(30, 56), array(30, 58), array(34, 62), //16-20
+            array(28, 50), array(26, 50), array(30, 54), array(28, 54), array(32, 58), //21-25
+            array(30, 58), array(34, 62), array(26, 50), array(30, 54), array(26, 52), //26-30
+            array(30, 56), array(34, 60), array(30, 58), array(34, 62), array(30, 54), //31-35
+            array(24, 50), array(28, 54), array(32, 58), array(26, 54), array(30, 58), //35-40
+        );                                                                                  
+
+        
+        /** --------------------------------------------------------------------
+         * Put an alignment marker.
+         * @param frame
+         * @param width
+         * @param ox,oy center coordinate of the pattern
+         */
+        public static function putAlignmentMarker(array &$frame, $ox, $oy)
+        {
+            $finder = array(
+                "\xa1\xa1\xa1\xa1\xa1",
+                "\xa1\xa0\xa0\xa0\xa1",
+                "\xa1\xa0\xa1\xa0\xa1",
+                "\xa1\xa0\xa0\xa0\xa1",
+                "\xa1\xa1\xa1\xa1\xa1"
+            );                        
+            
+            $yStart = $oy-2;         
+            $xStart = $ox-2;
+            
+            for($y=0; $y<5; $y++) {
+                QRstr::set($frame, $xStart, $yStart+$y, $finder[$y]);
+            }
+        }
+
+        //----------------------------------------------------------------------
+        public static function putAlignmentPattern($version, &$frame, $width)
+        {
+            if($version < 2)
+                return;
+
+            $d = self::$alignmentPattern[$version][1] - self::$alignmentPattern[$version][0];
+            if($d < 0) {
+                $w = 2;
+            } else {
+                $w = (int)(($width - self::$alignmentPattern[$version][0]) / $d + 2);
+            }
+
+            if($w * $w - 3 == 1) {
+                $x = self::$alignmentPattern[$version][0];
+                $y = self::$alignmentPattern[$version][0];
+                self::putAlignmentMarker($frame, $x, $y);
+                return;
+            }
+
+            $cx = self::$alignmentPattern[$version][0];
+            for($x=1; $x<$w - 1; $x++) {
+                self::putAlignmentMarker($frame, 6, $cx);
+                self::putAlignmentMarker($frame, $cx,  6);
+                $cx += $d;
+            }
+
+            $cy = self::$alignmentPattern[$version][0];
+            for($y=0; $y<$w-1; $y++) {
+                $cx = self::$alignmentPattern[$version][0];
+                for($x=0; $x<$w-1; $x++) {
+                    self::putAlignmentMarker($frame, $cx, $cy);
+                    $cx += $d;
+                }
+                $cy += $d;
+            }
+        }
+
+        // Version information pattern -----------------------------------------
+
+		// Version information pattern (BCH coded).
+        // See Table 1 in Appendix D (pp.68) of JIS X0510:2004.
+        
+		// size: [QRSPEC_VERSION_MAX - 6]
+		
+        public static $versionPattern = array(
+            0x07c94, 0x085bc, 0x09a99, 0x0a4d3, 0x0bbf6, 0x0c762, 0x0d847, 0x0e60d,
+            0x0f928, 0x10b78, 0x1145d, 0x12a17, 0x13532, 0x149a6, 0x15683, 0x168c9,
+            0x177ec, 0x18ec4, 0x191e1, 0x1afab, 0x1b08e, 0x1cc1a, 0x1d33f, 0x1ed75,
+            0x1f250, 0x209d5, 0x216f0, 0x228ba, 0x2379f, 0x24b0b, 0x2542e, 0x26a64,
+            0x27541, 0x28c69
+        );
+
+        //----------------------------------------------------------------------
+        public static function getVersionPattern($version)
+        {
+            if($version < 7 || $version > QRSPEC_VERSION_MAX)
+                return 0;
+
+            return self::$versionPattern[$version -7];
+        }
+
+        // Format information --------------------------------------------------
+        // See calcFormatInfo in tests/test_qrspec.c (orginal qrencode c lib)
+        
+        public static $formatInfo = array(
+            array(0x77c4, 0x72f3, 0x7daa, 0x789d, 0x662f, 0x6318, 0x6c41, 0x6976),
+            array(0x5412, 0x5125, 0x5e7c, 0x5b4b, 0x45f9, 0x40ce, 0x4f97, 0x4aa0),
+            array(0x355f, 0x3068, 0x3f31, 0x3a06, 0x24b4, 0x2183, 0x2eda, 0x2bed),
+            array(0x1689, 0x13be, 0x1ce7, 0x19d0, 0x0762, 0x0255, 0x0d0c, 0x083b)
+        );
+
+        public static function getFormatInfo($mask, $level)
+        {
+            if($mask < 0 || $mask > 7)
+                return 0;
+                
+            if($level < 0 || $level > 3)
+                return 0;                
+
+            return self::$formatInfo[$level][$mask];
+        }
+
+        // Frame ---------------------------------------------------------------
+        // Cache of initial frames.
+         
+        public static $frames = array();
+
+        /** --------------------------------------------------------------------
+         * Put a finder pattern.
+         * @param frame
+         * @param width
+         * @param ox,oy upper-left coordinate of the pattern
+         */
+        public static function putFinderPattern(&$frame, $ox, $oy)
+        {
+            $finder = array(
+                "\xc1\xc1\xc1\xc1\xc1\xc1\xc1",
+                "\xc1\xc0\xc0\xc0\xc0\xc0\xc1",
+                "\xc1\xc0\xc1\xc1\xc1\xc0\xc1",
+                "\xc1\xc0\xc1\xc1\xc1\xc0\xc1",
+                "\xc1\xc0\xc1\xc1\xc1\xc0\xc1",
+                "\xc1\xc0\xc0\xc0\xc0\xc0\xc1",
+                "\xc1\xc1\xc1\xc1\xc1\xc1\xc1"
+            );                            
+            
+            for($y=0; $y<7; $y++) {
+                QRstr::set($frame, $ox, $oy+$y, $finder[$y]);
+            }
+        }
+
+        //----------------------------------------------------------------------
+        public static function createFrame($version)
+        {
+            $width = self::$capacity[$version][QRCAP_WIDTH];
+            $frameLine = str_repeat ("\0", $width);
+            $frame = array_fill(0, $width, $frameLine);
+
+            // Finder pattern
+            self::putFinderPattern($frame, 0, 0);
+            self::putFinderPattern($frame, $width - 7, 0);
+            self::putFinderPattern($frame, 0, $width - 7);
+            
+            // Separator
+            $yOffset = $width - 7;
+            
+            for($y=0; $y<7; $y++) {
+                $frame[$y][7] = "\xc0";
+                $frame[$y][$width - 8] = "\xc0";
+                $frame[$yOffset][7] = "\xc0";
+                $yOffset++;
+            }
+            
+            $setPattern = str_repeat("\xc0", 8);
+            
+            QRstr::set($frame, 0, 7, $setPattern);
+            QRstr::set($frame, $width-8, 7, $setPattern);
+            QRstr::set($frame, 0, $width - 8, $setPattern);
+        
+            // Format info
+            $setPattern = str_repeat("\x84", 9);
+            QRstr::set($frame, 0, 8, $setPattern);
+            QRstr::set($frame, $width - 8, 8, $setPattern, 8);
+            
+            $yOffset = $width - 8;
+
+            for($y=0; $y<8; $y++,$yOffset++) {
+                $frame[$y][8] = "\x84";
+                $frame[$yOffset][8] = "\x84";
+            }
+
+            // Timing pattern  
+            
+            for($i=1; $i<$width-15; $i++) {
+                $frame[6][7+$i] = chr(0x90 | ($i & 1));
+                $frame[7+$i][6] = chr(0x90 | ($i & 1));
+            }
+            
+            // Alignment pattern  
+            self::putAlignmentPattern($version, $frame, $width);
+            
+            // Version information 
+            if($version >= 7) {
+                $vinf = self::getVersionPattern($version);
+
+                $v = $vinf;
+                
+                for($x=0; $x<6; $x++) {
+                    for($y=0; $y<3; $y++) {
+                        $frame[($width - 11)+$y][$x] = chr(0x88 | ($v & 1));
+                        $v = $v >> 1;
+                    }
+                }
+
+                $v = $vinf;
+                for($y=0; $y<6; $y++) {
+                    for($x=0; $x<3; $x++) {
+                        $frame[$y][$x+($width - 11)] = chr(0x88 | ($v & 1));
+                        $v = $v >> 1;
+                    }
+                }
+            }
+    
+            // and a little bit...  
+            $frame[$width - 8][8] = "\x81";
+            
+            return $frame;
+        }
+
+        //----------------------------------------------------------------------
+        public static function debug($frame, $binary_mode = false)
+        {
+            if ($binary_mode) {
+            
+                    foreach ($frame as &$frameLine) {
+                        $frameLine = join('<span class="m">&nbsp;&nbsp;</span>', explode('0', $frameLine));
+                        $frameLine = join('&#9608;&#9608;', explode('1', $frameLine));
+                    }
+                    
+                    ?>
+                <style>
+                    .m { background-color: white; }
+                </style>
+                <?php
+                    echo '<pre><tt><br/ ><br/ ><br/ >&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+                    echo join("<br/ >&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;", $frame);
+                    echo '</tt></pre><br/ ><br/ ><br/ ><br/ ><br/ ><br/ >';
+            
+            } else {
+            
+                foreach ($frame as &$frameLine) {
+                    $frameLine = join('<span class="m">&nbsp;</span>',  explode("\xc0", $frameLine));
+                    $frameLine = join('<span class="m">&#9618;</span>', explode("\xc1", $frameLine));
+                    $frameLine = join('<span class="p">&nbsp;</span>',  explode("\xa0", $frameLine));
+                    $frameLine = join('<span class="p">&#9618;</span>', explode("\xa1", $frameLine));
+                    $frameLine = join('<span class="s">&#9671;</span>', explode("\x84", $frameLine)); //format 0
+                    $frameLine = join('<span class="s">&#9670;</span>', explode("\x85", $frameLine)); //format 1
+                    $frameLine = join('<span class="x">&#9762;</span>', explode("\x81", $frameLine)); //special bit
+                    $frameLine = join('<span class="c">&nbsp;</span>',  explode("\x90", $frameLine)); //clock 0
+                    $frameLine = join('<span class="c">&#9719;</span>', explode("\x91", $frameLine)); //clock 1
+                    $frameLine = join('<span class="f">&nbsp;</span>',  explode("\x88", $frameLine)); //version
+                    $frameLine = join('<span class="f">&#9618;</span>', explode("\x89", $frameLine)); //version
+                    $frameLine = join('&#9830;', explode("\x01", $frameLine));
+                    $frameLine = join('&#8901;', explode("\0", $frameLine));
+                }
+                
+                ?>
+                <style>
+                    .p { background-color: yellow; }
+                    .m { background-color: #00FF00; }
+                    .s { background-color: #FF0000; }
+                    .c { background-color: aqua; }
+                    .x { background-color: pink; }
+                    .f { background-color: gold; }
+                </style>
+                <?php
+                echo "<pre><tt>";
+                echo join("<br/ >", $frame);
+                echo "</tt></pre>";
+            
+            }
+        }
+
+        //----------------------------------------------------------------------
+        public static function serial($frame)
+        {
+            return gzcompress(join("\n", $frame), 9);
+        }
+        
+        //----------------------------------------------------------------------
+        public static function unserial($code)
+        {
+            return explode("\n", gzuncompress($code));
+        }
+        
+        //----------------------------------------------------------------------
+        public static function newFrame($version)
+        {
+            if($version < 1 || $version > QRSPEC_VERSION_MAX) 
+                return null;
+
+            if(!isset(self::$frames[$version])) {
+                
+                $fileName = QR_CACHE_DIR.'frame_'.$version.'.dat';
+                
+                if (QR_CACHEABLE) {
+                    if (file_exists($fileName)) {
+                        self::$frames[$version] = self::unserial(file_get_contents($fileName));
+                    } else {
+                        self::$frames[$version] = self::createFrame($version);
+                        file_put_contents($fileName, self::serial(self::$frames[$version]));
+                    }
+                } else {
+                    self::$frames[$version] = self::createFrame($version);
+                }
+            }
+            
+            if(is_null(self::$frames[$version]))
+                return null;
+
+            return self::$frames[$version];
+        }
+
+        //----------------------------------------------------------------------
+        public static function rsBlockNum($spec)     { return $spec[0] + $spec[3]; }
+        public static function rsBlockNum1($spec)    { return $spec[0]; }
+        public static function rsDataCodes1($spec)   { return $spec[1]; }
+        public static function rsEccCodes1($spec)    { return $spec[2]; }
+        public static function rsBlockNum2($spec)    { return $spec[3]; }
+        public static function rsDataCodes2($spec)   { return $spec[4]; }
+        public static function rsEccCodes2($spec)    { return $spec[2]; }
+        public static function rsDataLength($spec)   { return ($spec[0] * $spec[1]) + ($spec[3] * $spec[4]);    }
+        public static function rsEccLength($spec)    { return ($spec[0] + $spec[3]) * $spec[2]; }
+        
+    }
+
+
+
+//---- qrimage.php -----------------------------
+
+
+
+
+/*
+ * PHP QR Code encoder
+ *
+ * Image output of code using GD2
+ *
+ * PHP QR Code is distributed under LGPL 3
+ * Copyright (C) 2010 Dominik Dzienia <deltalab at poczta dot fm>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+ 
+    define('QR_IMAGE', true);
+
+    class QRimage {
+    
+        //----------------------------------------------------------------------
+        public static function png($frame, $filename = false, $pixelPerPoint = 4, $outerFrame = 4,$saveandprint=FALSE) 
+        {
+            $image = self::image($frame, $pixelPerPoint, $outerFrame);
+            
+            if ($filename === false) {
+                Header("Content-type: image/png");
+                ImagePng($image);
+            } else {
+                if($saveandprint===TRUE){
+                    ImagePng($image, $filename);
+                    header("Content-type: image/png");
+                    ImagePng($image);
+                }else{
+                    ImagePng($image, $filename);
+                }
+            }
+            
+            ImageDestroy($image);
+        }
+    
+        //----------------------------------------------------------------------
+        public static function jpg($frame, $filename = false, $pixelPerPoint = 8, $outerFrame = 4, $q = 85) 
+        {
+            $image = self::image($frame, $pixelPerPoint, $outerFrame);
+            
+            if ($filename === false) {
+                Header("Content-type: image/jpeg");
+                ImageJpeg($image, null, $q);
+            } else {
+                ImageJpeg($image, $filename, $q);            
+            }
+            
+            ImageDestroy($image);
+        }
+    
+        //----------------------------------------------------------------------
+        private static function image($frame, $pixelPerPoint = 4, $outerFrame = 4) 
+        {
+            $h = count($frame);
+            $w = strlen($frame[0]);
+            
+            $imgW = $w + 2*$outerFrame;
+            $imgH = $h + 2*$outerFrame;
+            
+            $base_image =ImageCreate($imgW, $imgH);
+            
+            $col[0] = ImageColorAllocate($base_image,255,255,255);
+            $col[1] = ImageColorAllocate($base_image,0,0,0);
+
+            imagefill($base_image, 0, 0, $col[0]);
+
+            for($y=0; $y<$h; $y++) {
+                for($x=0; $x<$w; $x++) {
+                    if ($frame[$y][$x] == '1') {
+                        ImageSetPixel($base_image,$x+$outerFrame,$y+$outerFrame,$col[1]); 
+                    }
+                }
+            }
+            
+            $target_image =ImageCreate($imgW * $pixelPerPoint, $imgH * $pixelPerPoint);
+            ImageCopyResized($target_image, $base_image, 0, 0, 0, 0, $imgW * $pixelPerPoint, $imgH * $pixelPerPoint, $imgW, $imgH);
+            ImageDestroy($base_image);
+            
+            return $target_image;
+        }
+    }
+
+
+
+//---- qrinput.php -----------------------------
+
+
+
+
+/*
+ * PHP QR Code encoder
+ *
+ * Input encoding class
+ *
+ * Based on libqrencode C library distributed under LGPL 2.1
+ * Copyright (C) 2006, 2007, 2008, 2009 Kentaro Fukuchi <fukuchi@megaui.net>
+ *
+ * PHP QR Code is distributed under LGPL 3
+ * Copyright (C) 2010 Dominik Dzienia <deltalab at poczta dot fm>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+ 
+    define('STRUCTURE_HEADER_BITS',  20);
+    define('MAX_STRUCTURED_SYMBOLS', 16);
+
+    class QRinputItem {
+    
+        public $mode;
+        public $size;
+        public $data;
+        public $bstream;
+
+        public function __construct($mode, $size, $data, $bstream = null) 
+        {
+            $setData = array_slice($data, 0, $size);
+            
+            if (count($setData) < $size) {
+                $setData = array_merge($setData, array_fill(0,$size-count($setData),0));
+            }
+        
+            if(!QRinput::check($mode, $size, $setData)) {
+                throw new Exception('Error m:'.$mode.',s:'.$size.',d:'.join(',',$setData));
+                return null;
+            }
+            
+            $this->mode = $mode;
+            $this->size = $size;
+            $this->data = $setData;
+            $this->bstream = $bstream;
+        }
+        
+        //----------------------------------------------------------------------
+        public function encodeModeNum($version)
+        {
+            try {
+            
+                $words = (int)($this->size / 3);
+                $bs = new QRbitstream();
+                
+                $val = 0x1;
+                $bs->appendNum(4, $val);
+                $bs->appendNum(QRspec::lengthIndicator(QR_MODE_NUM, $version), $this->size);
+
+                for($i=0; $i<$words; $i++) {
+                    $val  = (ord($this->data[$i*3  ]) - ord('0')) * 100;
+                    $val += (ord($this->data[$i*3+1]) - ord('0')) * 10;
+                    $val += (ord($this->data[$i*3+2]) - ord('0'));
+                    $bs->appendNum(10, $val);
+                }
+
+                if($this->size - $words * 3 == 1) {
+                    $val = ord($this->data[$words*3]) - ord('0');
+                    $bs->appendNum(4, $val);
+                } else if($this->size - $words * 3 == 2) {
+                    $val  = (ord($this->data[$words*3  ]) - ord('0')) * 10;
+                    $val += (ord($this->data[$words*3+1]) - ord('0'));
+                    $bs->appendNum(7, $val);
+                }
+
+                $this->bstream = $bs;
+                return 0;
+                
+            } catch (Exception $e) {
+                return -1;
+            }
+        }
+        
+        //----------------------------------------------------------------------
+        public function encodeModeAn($version)
+        {
+            try {
+                $words = (int)($this->size / 2);
+                $bs = new QRbitstream();
+                
+                $bs->appendNum(4, 0x02);
+                $bs->appendNum(QRspec::lengthIndicator(QR_MODE_AN, $version), $this->size);
+
+                for($i=0; $i<$words; $i++) {
+                    $val  = (int)QRinput::lookAnTable(ord($this->data[$i*2  ])) * 45;
+                    $val += (int)QRinput::lookAnTable(ord($this->data[$i*2+1]));
+
+                    $bs->appendNum(11, $val);
+                }
+
+                if($this->size & 1) {
+                    $val = QRinput::lookAnTable(ord($this->data[$words * 2]));
+                    $bs->appendNum(6, $val);
+                }
+        
+                $this->bstream = $bs;
+                return 0;
+            
+            } catch (Exception $e) {
+                return -1;
+            }
+        }
+        
+        //----------------------------------------------------------------------
+        public function encodeMode8($version)
+        {
+            try {
+                $bs = new QRbitstream();
+
+                $bs->appendNum(4, 0x4);
+                $bs->appendNum(QRspec::lengthIndicator(QR_MODE_8, $version), $this->size);
+
+                for($i=0; $i<$this->size; $i++) {
+                    $bs->appendNum(8, ord($this->data[$i]));
+                }
+
+                $this->bstream = $bs;
+                return 0;
+            
+            } catch (Exception $e) {
+                return -1;
+            }
+        }
+        
+        //----------------------------------------------------------------------
+        public function encodeModeKanji($version)
+        {
+            try {
+
+                $bs = new QRbitrtream();
+                
+                $bs->appendNum(4, 0x8);
+                $bs->appendNum(QRspec::lengthIndicator(QR_MODE_KANJI, $version), (int)($this->size / 2));
+
+                for($i=0; $i<$this->size; $i+=2) {
+                    $val = (ord($this->data[$i]) << 8) | ord($this->data[$i+1]);
+                    if($val <= 0x9ffc) {
+                        $val -= 0x8140;
+                    } else {
+                        $val -= 0xc140;
+                    }
+                    
+                    $h = ($val >> 8) * 0xc0;
+                    $val = ($val & 0xff) + $h;
+
+                    $bs->appendNum(13, $val);
+                }
+
+                $this->bstream = $bs;
+                return 0;
+            
+            } catch (Exception $e) {
+                return -1;
+            }
+        }
+
+        //----------------------------------------------------------------------
+        public function encodeModeStructure()
+        {
+            try {
+                $bs =  new QRbitstream();
+                
+                $bs->appendNum(4, 0x03);
+                $bs->appendNum(4, ord($this->data[1]) - 1);
+                $bs->appendNum(4, ord($this->data[0]) - 1);
+                $bs->appendNum(8, ord($this->data[2]));
+
+                $this->bstream = $bs;
+                return 0;
+            
+            } catch (Exception $e) {
+                return -1;
+            }
+        }
+        
+        //----------------------------------------------------------------------
+        public function estimateBitStreamSizeOfEntry($version)
+        {
+            $bits = 0;
+
+            if($version == 0) 
+                $version = 1;
+
+            switch($this->mode) {
+                case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size);    break;
+                case QR_MODE_AN:        $bits = QRinput::estimateBitsModeAn($this->size);    break;
+                case QR_MODE_8:            $bits = QRinput::estimateBitsMode8($this->size);    break;
+                case QR_MODE_KANJI:        $bits = QRinput::estimateBitsModeKanji($this->size);break;
+                case QR_MODE_STRUCTURE:    return STRUCTURE_HEADER_BITS;            
+                default:
+                    return 0;
+            }
+
+            $l = QRspec::lengthIndicator($this->mode, $version);
+            $m = 1 << $l;
+            $num = (int)(($this->size + $m - 1) / $m);
+
+            $bits += $num * (4 + $l);
+
+            return $bits;
+        }
+        
+        //----------------------------------------------------------------------
+        public function encodeBitStream($version)
+        {
+            try {
+            
+                unset($this->bstream);
+                $words = QRspec::maximumWords($this->mode, $version);
+                
+                if($this->size > $words) {
+                
+                    $st1 = new QRinputItem($this->mode, $words, $this->data);
+                    $st2 = new QRinputItem($this->mode, $this->size - $words, array_slice($this->data, $words));
+
+                    $st1->encodeBitStream($version);
+                    $st2->encodeBitStream($version);
+                    
+                    $this->bstream = new QRbitstream();
+                    $this->bstream->append($st1->bstream);
+                    $this->bstream->append($st2->bstream);
+                    
+                    unset($st1);
+                    unset($st2);
+                    
+                } else {
+                    
+                    $ret = 0;
+                    
+                    switch($this->mode) {
+                        case QR_MODE_NUM:        $ret = $this->encodeModeNum($version);    break;
+                        case QR_MODE_AN:        $ret = $this->encodeModeAn($version);    break;
+                        case QR_MODE_8:            $ret = $this->encodeMode8($version);    break;
+                        case QR_MODE_KANJI:        $ret = $this->encodeModeKanji($version);break;
+                        case QR_MODE_STRUCTURE:    $ret = $this->encodeModeStructure();    break;
+                        
+                        default:
+                            break;
+                    }
+                    
+                    if($ret < 0)
+                        return -1;
+                }
+
+                return $this->bstream->size();
+            
+            } catch (Exception $e) {
+                return -1;
+            }
+        }
+    };
+    
+    //##########################################################################
+
+    class QRinput {
+
+        public $items;
+        
+        private $version;
+        private $level;
+        
+        //----------------------------------------------------------------------
+        public function __construct($version = 0, $level = QR_ECLEVEL_L)
+        {
+            if ($version < 0 || $version > QRSPEC_VERSION_MAX || $level > QR_ECLEVEL_H) {
+                throw new Exception('Invalid version no');
+                return NULL;
+            }
+            
+            $this->version = $version;
+            $this->level = $level;
+        }
+        
+        //----------------------------------------------------------------------
+        public function getVersion()
+        {
+            return $this->version;
+        }
+        
+        //----------------------------------------------------------------------
+        public function setVersion($version)
+        {
+            if($version < 0 || $version > QRSPEC_VERSION_MAX) {
+                throw new Exception('Invalid version no');
+                return -1;
+            }
+
+            $this->version = $version;
+
+            return 0;
+        }
+        
+        //----------------------------------------------------------------------
+        public function getErrorCorrectionLevel()
+        {
+            return $this->level;
+        }
+
+        //----------------------------------------------------------------------
+        public function setErrorCorrectionLevel($level)
+        {
+            if($level > QR_ECLEVEL_H) {
+                throw new Exception('Invalid ECLEVEL');
+                return -1;
+            }
+
+            $this->level = $level;
+
+            return 0;
+        }
+        
+        //----------------------------------------------------------------------
+        public function appendEntry(QRinputItem $entry)
+        {
+            $this->items[] = $entry;
+        }
+        
+        //----------------------------------------------------------------------
+        public function append($mode, $size, $data)
+        {
+            try {
+                $entry = new QRinputItem($mode, $size, $data);
+                $this->items[] = $entry;
+                return 0;
+            } catch (Exception $e) {
+                return -1;
+            }
+        }
+        
+        //----------------------------------------------------------------------
+        
+        public function insertStructuredAppendHeader($size, $index, $parity)
+        {
+            if( $size > MAX_STRUCTURED_SYMBOLS ) {
+                throw new Exception('insertStructuredAppendHeader wrong size');
+            }
+            
+            if( $index <= 0 || $index > MAX_STRUCTURED_SYMBOLS ) {
+                throw new Exception('insertStructuredAppendHeader wrong index');
+            }
+
+            $buf = array($size, $index, $parity);
+            
+            try {
+                $entry = new QRinputItem(QR_MODE_STRUCTURE, 3, buf);
+                array_unshift($this->items, $entry);
+                return 0;
+            } catch (Exception $e) {
+                return -1;
+            }
+        }
+
+        //----------------------------------------------------------------------
+        public function calcParity()
+        {
+            $parity = 0;
+            
+            foreach($this->items as $item) {
+                if($item->mode != QR_MODE_STRUCTURE) {
+                    for($i=$item->size-1; $i>=0; $i--) {
+                        $parity ^= $item->data[$i];
+                    }
+                }
+            }
+
+            return $parity;
+        }
+        
+        //----------------------------------------------------------------------
+        public static function checkModeNum($size, $data)
+        {
+            for($i=0; $i<$size; $i++) {
+                if((ord($data[$i]) < ord('0')) || (ord($data[$i]) > ord('9'))){
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        //----------------------------------------------------------------------
+        public static function estimateBitsModeNum($size)
+        {
+            $w = (int)$size / 3;
+            $bits = $w * 10;
+            
+            switch($size - $w * 3) {
+                case 1:
+                    $bits += 4;
+                    break;
+                case 2:
+                    $bits += 7;
+                    break;
+                default:
+                    break;
+            }
+
+            return $bits;
+        }
+        
+        //----------------------------------------------------------------------
+        public static $anTable = array(
+            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+            36, -1, -1, -1, 37, 38, -1, -1, -1, -1, 39, 40, -1, 41, 42, 43,
+             0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 44, -1, -1, -1, -1, -1,
+            -1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+            25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1,
+            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
+        );
+        
+        //----------------------------------------------------------------------
+        public static function lookAnTable($c)
+        {
+            return (($c > 127)?-1:self::$anTable[$c]);
+        }
+        
+        //----------------------------------------------------------------------
+        public static function checkModeAn($size, $data)
+        {
+            for($i=0; $i<$size; $i++) {
+                if (self::lookAnTable(ord($data[$i])) == -1) {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+        
+        //----------------------------------------------------------------------
+        public static function estimateBitsModeAn($size)
+        {
+            $w = (int)($size / 2);
+            $bits = $w * 11;
+            
+            if($size & 1) {
+                $bits += 6;
+            }
+
+            return $bits;
+        }
+    
+        //----------------------------------------------------------------------
+        public static function estimateBitsMode8($size)
+        {
+            return $size * 8;
+        }
+        
+        //----------------------------------------------------------------------
+        public function estimateBitsModeKanji($size)
+        {
+            return (int)(($size / 2) * 13);
+        }
+        
+        //----------------------------------------------------------------------
+        public static function checkModeKanji($size, $data)
+        {
+            if($size & 1)
+                return false;
+
+            for($i=0; $i<$size; $i+=2) {
+                $val = (ord($data[$i]) << 8) | ord($data[$i+1]);
+                if( $val < 0x8140 
+                || ($val > 0x9ffc && $val < 0xe040) 
+                || $val > 0xebbf) {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        /***********************************************************************
+         * Validation
+         **********************************************************************/
+
+        public static function check($mode, $size, $data)
+        {
+            if($size <= 0) 
+                return false;
+
+            switch($mode) {
+                case QR_MODE_NUM:       return self::checkModeNum($size, $data);   break;
+                case QR_MODE_AN:        return self::checkModeAn($size, $data);    break;
+                case QR_MODE_KANJI:     return self::checkModeKanji($size, $data); break;
+                case QR_MODE_8:         return true; break;
+                case QR_MODE_STRUCTURE: return true; break;
+                
+                default:
+                    break;
+            }
+
+            return false;
+        }
+        
+        
+        //----------------------------------------------------------------------
+        public function estimateBitStreamSize($version)
+        {
+            $bits = 0;
+
+            foreach($this->items as $item) {
+                $bits += $item->estimateBitStreamSizeOfEntry($version);
+            }
+
+            return $bits;
+        }
+        
+        //----------------------------------------------------------------------
+        public function estimateVersion()
+        {
+            $version = 0;
+            $prev = 0;
+            do {
+                $prev = $version;
+                $bits = $this->estimateBitStreamSize($prev);
+                $version = QRspec::getMinimumVersion((int)(($bits + 7) / 8), $this->level);
+                if ($version < 0) {
+                    return -1;
+                }
+            } while ($version > $prev);
+
+            return $version;
+        }
+        
+        //----------------------------------------------------------------------
+        public static function lengthOfCode($mode, $version, $bits)
+        {
+            $payload = $bits - 4 - QRspec::lengthIndicator($mode, $version);
+            switch($mode) {
+                case QR_MODE_NUM:
+                    $chunks = (int)($payload / 10);
+                    $remain = $payload - $chunks * 10;
+                    $size = $chunks * 3;
+                    if($remain >= 7) {
+                        $size += 2;
+                    } else if($remain >= 4) {
+                        $size += 1;
+                    }
+                    break;
+                case QR_MODE_AN:
+                    $chunks = (int)($payload / 11);
+                    $remain = $payload - $chunks * 11;
+                    $size = $chunks * 2;
+                    if($remain >= 6) 
+                        $size++;
+                    break;
+                case QR_MODE_8:
+                    $size = (int)($payload / 8);
+                    break;
+                case QR_MODE_KANJI:
+                    $size = (int)(($payload / 13) * 2);
+                    break;
+                case QR_MODE_STRUCTURE:
+                    $size = (int)($payload / 8);
+                    break;
+                default:
+                    $size = 0;
+                    break;
+            }
+            
+            $maxsize = QRspec::maximumWords($mode, $version);
+            if($size < 0) $size = 0;
+            if($size > $maxsize) $size = $maxsize;
+
+            return $size;
+        }
+        
+        //----------------------------------------------------------------------
+        public function createBitStream()
+        {
+            $total = 0;
+
+            foreach($this->items as $item) {
+                $bits = $item->encodeBitStream($this->version);
+                
+                if($bits < 0) 
+                    return -1;
+                    
+                $total += $bits;
+            }
+
+            return $total;
+        }
+        
+        //----------------------------------------------------------------------
+        public function convertData()
+        {
+            $ver = $this->estimateVersion();
+            if($ver > $this->getVersion()) {
+                $this->setVersion($ver);
+            }
+
+            for(;;) {
+                $bits = $this->createBitStream();
+                
+                if($bits < 0) 
+                    return -1;
+                    
+                $ver = QRspec::getMinimumVersion((int)(($bits + 7) / 8), $this->level);
+                if($ver < 0) {
+                    throw new Exception('WRONG VERSION');
+                    return -1;
+                } else if($ver > $this->getVersion()) {
+                    $this->setVersion($ver);
+                } else {
+                    break;
+                }
+            }
+
+            return 0;
+        }
+        
+        //----------------------------------------------------------------------
+        public function appendPaddingBit(&$bstream)
+        {
+            $bits = $bstream->size();
+            $maxwords = QRspec::getDataLength($this->version, $this->level);
+            $maxbits = $maxwords * 8;
+
+            if ($maxbits == $bits) {
+                return 0;
+            }
+
+            if ($maxbits - $bits < 5) {
+                return $bstream->appendNum($maxbits - $bits, 0);
+            }
+
+            $bits += 4;
+            $words = (int)(($bits + 7) / 8);
+
+            $padding = new QRbitstream();
+            $ret = $padding->appendNum($words * 8 - $bits + 4, 0);
+            
+            if($ret < 0) 
+                return $ret;
+
+            $padlen = $maxwords - $words;
+            
+            if($padlen > 0) {
+                
+                $padbuf = array();
+                for($i=0; $i<$padlen; $i++) {
+                    $padbuf[$i] = ($i&1)?0x11:0xec;
+                }
+                
+                $ret = $padding->appendBytes($padlen, $padbuf);
+                
+                if($ret < 0)
+                    return $ret;
+                
+            }
+
+            $ret = $bstream->append($padding);
+            
+            return $ret;
+        }
+
+        //----------------------------------------------------------------------
+        public function mergeBitStream()
+        {
+            if($this->convertData() < 0) {
+                return null;
+            }
+
+            $bstream = new QRbitstream();
+            
+            foreach($this->items as $item) {
+                $ret = $bstream->append($item->bstream);
+                if($ret < 0) {
+                    return null;
+                }
+            }
+
+            return $bstream;
+        }
+
+        //----------------------------------------------------------------------
+        public function getBitStream()
+        {
+
+            $bstream = $this->mergeBitStream();
+            
+            if($bstream == null) {
+                return null;
+            }
+            
+            $ret = $this->appendPaddingBit($bstream);
+            if($ret < 0) {
+                return null;
+            }
+
+            return $bstream;
+        }
+        
+        //----------------------------------------------------------------------
+        public function getByteStream()
+        {
+            $bstream = $this->getBitStream();
+            if($bstream == null) {
+                return null;
+            }
+            
+            return $bstream->toByte();
+        }
+    }
+        
+        
+    
+
+
+
+//---- qrbitstream.php -----------------------------
+
+
+
+
+/*
+ * PHP QR Code encoder
+ *
+ * Bitstream class
+ *
+ * Based on libqrencode C library distributed under LGPL 2.1
+ * Copyright (C) 2006, 2007, 2008, 2009 Kentaro Fukuchi <fukuchi@megaui.net>
+ *
+ * PHP QR Code is distributed under LGPL 3
+ * Copyright (C) 2010 Dominik Dzienia <deltalab at poczta dot fm>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+     
+    class QRbitstream {
+    
+        public $data = array();
+        
+        //----------------------------------------------------------------------
+        public function size()
+        {
+            return count($this->data);
+        }
+        
+        //----------------------------------------------------------------------
+        public function allocate($setLength)
+        {
+            $this->data = array_fill(0, $setLength, 0);
+            return 0;
+        }
+    
+        //----------------------------------------------------------------------
+        public static function newFromNum($bits, $num)
+        {
+            $bstream = new QRbitstream();
+            $bstream->allocate($bits);
+            
+            $mask = 1 << ($bits - 1);
+            for($i=0; $i<$bits; $i++) {
+                if($num & $mask) {
+                    $bstream->data[$i] = 1;
+                } else {
+                    $bstream->data[$i] = 0;
+                }
+                $mask = $mask >> 1;
+            }
+
+            return $bstream;
+        }
+        
+        //----------------------------------------------------------------------
+        public static function newFromBytes($size, $data)
+        {
+            $bstream = new QRbitstream();
+            $bstream->allocate($size * 8);
+            $p=0;
+
+            for($i=0; $i<$size; $i++) {
+                $mask = 0x80;
+                for($j=0; $j<8; $j++) {
+                    if($data[$i] & $mask) {
+                        $bstream->data[$p] = 1;
+                    } else {
+                        $bstream->data[$p] = 0;
+                    }
+                    $p++;
+                    $mask = $mask >> 1;
+                }
+            }
+
+            return $bstream;
+        }
+        
+        //----------------------------------------------------------------------
+        public function append(QRbitstream $arg)
+        {
+            if (is_null($arg)) {
+                return -1;
+            }
+            
+            if($arg->size() == 0) {
+                return 0;
+            }
+            
+            if($this->size() == 0) {
+                $this->data = $arg->data;
+                return 0;
+            }
+            
+            $this->data = array_values(array_merge($this->data, $arg->data));
+
+            return 0;
+        }
+        
+        //----------------------------------------------------------------------
+        public function appendNum($bits, $num)
+        {
+            if ($bits == 0) 
+                return 0;
+
+            $b = QRbitstream::newFromNum($bits, $num);
+            
+            if(is_null($b))
+                return -1;
+
+            $ret = $this->append($b);
+            unset($b);
+
+            return $ret;
+        }
+
+        //----------------------------------------------------------------------
+        public function appendBytes($size, $data)
+        {
+            if ($size == 0) 
+                return 0;
+
+            $b = QRbitstream::newFromBytes($size, $data);
+            
+            if(is_null($b))
+                return -1;
+
+            $ret = $this->append($b);
+            unset($b);
+
+            return $ret;
+        }
+        
+        //----------------------------------------------------------------------
+        public function toByte()
+        {
+        
+            $size = $this->size();
+
+            if($size == 0) {
+                return array();
+            }
+            
+            $data = array_fill(0, (int)(($size + 7) / 8), 0);
+            $bytes = (int)($size / 8);
+
+            $p = 0;
+            
+            for($i=0; $i<$bytes; $i++) {
+                $v = 0;
+                for($j=0; $j<8; $j++) {
+                    $v = $v << 1;
+                    $v |= $this->data[$p];
+                    $p++;
+                }
+                $data[$i] = $v;
+            }
+            
+            if($size & 7) {
+                $v = 0;
+                for($j=0; $j<($size & 7); $j++) {
+                    $v = $v << 1;
+                    $v |= $this->data[$p];
+                    $p++;
+                }
+                $data[$bytes] = $v;
+            }
+
+            return $data;
+        }
+
+    }
+
+
+
+
+//---- qrsplit.php -----------------------------
+
+
+
+
+/*
+ * PHP QR Code encoder
+ *
+ * Input splitting classes
+ *
+ * Based on libqrencode C library distributed under LGPL 2.1
+ * Copyright (C) 2006, 2007, 2008, 2009 Kentaro Fukuchi <fukuchi@megaui.net>
+ *
+ * PHP QR Code is distributed under LGPL 3
+ * Copyright (C) 2010 Dominik Dzienia <deltalab at poczta dot fm>
+ *
+ * The following data / specifications are taken from
+ * "Two dimensional symbol -- QR-code -- Basic Specification" (JIS X0510:2004)
+ *  or
+ * "Automatic identification and data capture techniques -- 
+ *  QR Code 2005 bar code symbology specification" (ISO/IEC 18004:2006)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+    class QRsplit {
+
+        public $dataStr = '';
+        public $input;
+        public $modeHint;
+
+        //----------------------------------------------------------------------
+        public function __construct($dataStr, $input, $modeHint) 
+        {
+            $this->dataStr  = $dataStr;
+            $this->input    = $input;
+            $this->modeHint = $modeHint;
+        }
+        
+        //----------------------------------------------------------------------
+        public static function isdigitat($str, $pos)
+        {    
+            if ($pos >= strlen($str))
+                return false;
+            
+            return ((ord($str[$pos]) >= ord('0'))&&(ord($str[$pos]) <= ord('9')));
+        }
+        
+        //----------------------------------------------------------------------
+        public static function isalnumat($str, $pos)
+        {
+            if ($pos >= strlen($str))
+                return false;
+                
+            return (QRinput::lookAnTable(ord($str[$pos])) >= 0);
+        }
+
+        //----------------------------------------------------------------------
+        public function identifyMode($pos)
+        {
+            if ($pos >= strlen($this->dataStr)) 
+                return QR_MODE_NUL;
+                
+            $c = $this->dataStr[$pos];
+            
+            if(self::isdigitat($this->dataStr, $pos)) {
+                return QR_MODE_NUM;
+            } else if(self::isalnumat($this->dataStr, $pos)) {
+                return QR_MODE_AN;
+            } else if($this->modeHint == QR_MODE_KANJI) {
+            
+                if ($pos+1 < strlen($this->dataStr)) 
+                {
+                    $d = $this->dataStr[$pos+1];
+                    $word = (ord($c) << 8) | ord($d);
+                    if(($word >= 0x8140 && $word <= 0x9ffc) || ($word >= 0xe040 && $word <= 0xebbf)) {
+                        return QR_MODE_KANJI;
+                    }
+                }
+            }
+
+            return QR_MODE_8;
+        } 
+        
+        //----------------------------------------------------------------------
+        public function eatNum()
+        {
+            $ln = QRspec::lengthIndicator(QR_MODE_NUM, $this->input->getVersion());
+
+            $p = 0;
+            while(self::isdigitat($this->dataStr, $p)) {
+                $p++;
+            }
+            
+            $run = $p;
+            $mode = $this->identifyMode($p);
+            
+            if($mode == QR_MODE_8) {
+                $dif = QRinput::estimateBitsModeNum($run) + 4 + $ln
+                     + QRinput::estimateBitsMode8(1)         // + 4 + l8
+                     - QRinput::estimateBitsMode8($run + 1); // - 4 - l8
+                if($dif > 0) {
+                    return $this->eat8();
+                }
+            }
+            if($mode == QR_MODE_AN) {
+                $dif = QRinput::estimateBitsModeNum($run) + 4 + $ln
+                     + QRinput::estimateBitsModeAn(1)        // + 4 + la
+                     - QRinput::estimateBitsModeAn($run + 1);// - 4 - la
+                if($dif > 0) {
+                    return $this->eatAn();
+                }
+            }
+            
+            $ret = $this->input->append(QR_MODE_NUM, $run, str_split($this->dataStr));
+            if($ret < 0)
+                return -1;
+
+            return $run;
+        }
+        
+        //----------------------------------------------------------------------
+        public function eatAn()
+        {
+            $la = QRspec::lengthIndicator(QR_MODE_AN,  $this->input->getVersion());
+            $ln = QRspec::lengthIndicator(QR_MODE_NUM, $this->input->getVersion());
+
+            $p = 0;
+            
+            while(self::isalnumat($this->dataStr, $p)) {
+                if(self::isdigitat($this->dataStr, $p)) {
+                    $q = $p;
+                    while(self::isdigitat($this->dataStr, $q)) {
+                        $q++;
+                    }
+                    
+                    $dif = QRinput::estimateBitsModeAn($p) // + 4 + la
+                         + QRinput::estimateBitsModeNum($q - $p) + 4 + $ln
+                         - QRinput::estimateBitsModeAn($q); // - 4 - la
+                         
+                    if($dif < 0) {
+                        break;
+                    } else {
+                        $p = $q;
+                    }
+                } else {
+                    $p++;
+                }
+            }
+
+            $run = $p;
+
+            if(!self::isalnumat($this->dataStr, $p)) {
+                $dif = QRinput::estimateBitsModeAn($run) + 4 + $la
+                     + QRinput::estimateBitsMode8(1) // + 4 + l8
+                      - QRinput::estimateBitsMode8($run + 1); // - 4 - l8
+                if($dif > 0) {
+                    return $this->eat8();
+                }
+            }
+
+            $ret = $this->input->append(QR_MODE_AN, $run, str_split($this->dataStr));
+            if($ret < 0)
+                return -1;
+
+            return $run;
+        }
+        
+        //----------------------------------------------------------------------
+        public function eatKanji()
+        {
+            $p = 0;
+            
+            while($this->identifyMode($p) == QR_MODE_KANJI) {
+                $p += 2;
+            }
+            
+            $ret = $this->input->append(QR_MODE_KANJI, $p, str_split($this->dataStr));
+            if($ret < 0)
+                return -1;
+
+            return $run;
+        }
+
+        //----------------------------------------------------------------------
+        public function eat8()
+        {
+            $la = QRspec::lengthIndicator(QR_MODE_AN, $this->input->getVersion());
+            $ln = QRspec::lengthIndicator(QR_MODE_NUM, $this->input->getVersion());
+
+            $p = 1;
+            $dataStrLen = strlen($this->dataStr);
+            
+            while($p < $dataStrLen) {
+                
+                $mode = $this->identifyMode($p);
+                if($mode == QR_MODE_KANJI) {
+                    break;
+                }
+                if($mode == QR_MODE_NUM) {
+                    $q = $p;
+                    while(self::isdigitat($this->dataStr, $q)) {
+                        $q++;
+                    }
+                    $dif = QRinput::estimateBitsMode8($p) // + 4 + l8
+                         + QRinput::estimateBitsModeNum($q - $p) + 4 + $ln
+                         - QRinput::estimateBitsMode8($q); // - 4 - l8
+                    if($dif < 0) {
+                        break;
+                    } else {
+                        $p = $q;
+                    }
+                } else if($mode == QR_MODE_AN) {
+                    $q = $p;
+                    while(self::isalnumat($this->dataStr, $q)) {
+                        $q++;
+                    }
+                    $dif = QRinput::estimateBitsMode8($p)  // + 4 + l8
+                         + QRinput::estimateBitsModeAn($q - $p) + 4 + $la
+                         - QRinput::estimateBitsMode8($q); // - 4 - l8
+                    if($dif < 0) {
+                        break;
+                    } else {
+                        $p = $q;
+                    }
+                } else {
+                    $p++;
+                }
+            }
+
+            $run = $p;
+            $ret = $this->input->append(QR_MODE_8, $run, str_split($this->dataStr));
+            
+            if($ret < 0)
+                return -1;
+
+            return $run;
+        }
+
+        //----------------------------------------------------------------------
+        public function splitString()
+        {
+            while (strlen($this->dataStr) > 0)
+            {
+                if($this->dataStr == '')
+                    return 0;
+
+                $mode = $this->identifyMode(0);
+                
+                switch ($mode) {
+                    case QR_MODE_NUM: $length = $this->eatNum(); break;
+                    case QR_MODE_AN:  $length = $this->eatAn(); break;
+                    case QR_MODE_KANJI:
+                        if ($hint == QR_MODE_KANJI)
+                                $length = $this->eatKanji();
+                        else    $length = $this->eat8();
+                        break;
+                    default: $length = $this->eat8(); break;
+                
+                }
+
+                if($length == 0) return 0;
+                if($length < 0)  return -1;
+                
+                $this->dataStr = substr($this->dataStr, $length);
+            }
+        }
+
+        //----------------------------------------------------------------------
+        public function toUpper()
+        {
+            $stringLen = strlen($this->dataStr);
+            $p = 0;
+            
+            while ($p<$stringLen) {
+                $mode = self::identifyMode(substr($this->dataStr, $p), $this->modeHint);
+                if($mode == QR_MODE_KANJI) {
+                    $p += 2;
+                } else {
+                    if (ord($this->dataStr[$p]) >= ord('a') && ord($this->dataStr[$p]) <= ord('z')) {
+                        $this->dataStr[$p] = chr(ord($this->dataStr[$p]) - 32);
+                    }
+                    $p++;
+                }
+            }
+
+            return $this->dataStr;
+        }
+
+        //----------------------------------------------------------------------
+        public static function splitStringToQRinput($string, QRinput $input, $modeHint, $casesensitive = true)
+        {
+            if(is_null($string) || $string == '\0' || $string == '') {
+                throw new Exception('empty string!!!');
+            }
+
+            $split = new QRsplit($string, $input, $modeHint);
+            
+            if(!$casesensitive)
+                $split->toUpper();
+                
+            return $split->splitString();
+        }
+    }
+
+
+
+//---- qrrscode.php -----------------------------
+
+
+
+
+/*
+ * PHP QR Code encoder
+ *
+ * Reed-Solomon error correction support
+ * 
+ * Copyright (C) 2002, 2003, 2004, 2006 Phil Karn, KA9Q
+ * (libfec is released under the GNU Lesser General Public License.)
+ *
+ * Based on libqrencode C library distributed under LGPL 2.1
+ * Copyright (C) 2006, 2007, 2008, 2009 Kentaro Fukuchi <fukuchi@megaui.net>
+ *
+ * PHP QR Code is distributed under LGPL 3
+ * Copyright (C) 2010 Dominik Dzienia <deltalab at poczta dot fm>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+ 
+    class QRrsItem {
+    
+        public $mm;                  // Bits per symbol 
+        public $nn;                  // Symbols per block (= (1<<mm)-1) 
+        public $alpha_to = array();  // log lookup table 
+        public $index_of = array();  // Antilog lookup table 
+        public $genpoly = array();   // Generator polynomial 
+        public $nroots;              // Number of generator roots = number of parity symbols 
+        public $fcr;                 // First consecutive root, index form 
+        public $prim;                // Primitive element, index form 
+        public $iprim;               // prim-th root of 1, index form 
+        public $pad;                 // Padding bytes in shortened block 
+        public $gfpoly;
+    
+        //----------------------------------------------------------------------
+        public function modnn($x)
+        {
+            while ($x >= $this->nn) {
+                $x -= $this->nn;
+                $x = ($x >> $this->mm) + ($x & $this->nn);
+            }
+            
+            return $x;
+        }
+        
+        //----------------------------------------------------------------------
+        public static function init_rs_char($symsize, $gfpoly, $fcr, $prim, $nroots, $pad)
+        {
+            // Common code for intializing a Reed-Solomon control block (char or int symbols)
+            // Copyright 2004 Phil Karn, KA9Q
+            // May be used under the terms of the GNU Lesser General Public License (LGPL)
+
+            $rs = null;
+            
+            // Check parameter ranges
+            if($symsize < 0 || $symsize > 8)                     return $rs;
+            if($fcr < 0 || $fcr >= (1<<$symsize))                return $rs;
+            if($prim <= 0 || $prim >= (1<<$symsize))             return $rs;
+            if($nroots < 0 || $nroots >= (1<<$symsize))          return $rs; // Can't have more roots than symbol values!
+            if($pad < 0 || $pad >= ((1<<$symsize) -1 - $nroots)) return $rs; // Too much padding
+
+            $rs = new QRrsItem();
+            $rs->mm = $symsize;
+            $rs->nn = (1<<$symsize)-1;
+            $rs->pad = $pad;
+
+            $rs->alpha_to = array_fill(0, $rs->nn+1, 0);
+            $rs->index_of = array_fill(0, $rs->nn+1, 0);
+          
+            // PHP style macro replacement ;)
+            $NN =& $rs->nn;
+            $A0 =& $NN;
+            
+            // Generate Galois field lookup tables
+            $rs->index_of[0] = $A0; // log(zero) = -inf
+            $rs->alpha_to[$A0] = 0; // alpha**-inf = 0
+            $sr = 1;
+          
+            for($i=0; $i<$rs->nn; $i++) {
+                $rs->index_of[$sr] = $i;
+                $rs->alpha_to[$i] = $sr;
+                $sr <<= 1;
+                if($sr & (1<<$symsize)) {
+                    $sr ^= $gfpoly;
+                }
+                $sr &= $rs->nn;
+            }
+            
+            if($sr != 1){
+                // field generator polynomial is not primitive!
+                $rs = NULL;
+                return $rs;
+            }
+
+            /* Form RS code generator polynomial from its roots */
+            $rs->genpoly = array_fill(0, $nroots+1, 0);
+        
+            $rs->fcr = $fcr;
+            $rs->prim = $prim;
+            $rs->nroots = $nroots;
+            $rs->gfpoly = $gfpoly;
+
+            /* Find prim-th root of 1, used in decoding */
+            for($iprim=1;($iprim % $prim) != 0;$iprim += $rs->nn)
+            ; // intentional empty-body loop!
+            
+            $rs->iprim = (int)($iprim / $prim);
+            $rs->genpoly[0] = 1;
+            
+            for ($i = 0,$root=$fcr*$prim; $i < $nroots; $i++, $root += $prim) {
+                $rs->genpoly[$i+1] = 1;
+
+                // Multiply rs->genpoly[] by  @**(root + x)
+                for ($j = $i; $j > 0; $j--) {
+                    if ($rs->genpoly[$j] != 0) {
+                        $rs->genpoly[$j] = $rs->genpoly[$j-1] ^ $rs->alpha_to[$rs->modnn($rs->index_of[$rs->genpoly[$j]] + $root)];
+                    } else {
+                        $rs->genpoly[$j] = $rs->genpoly[$j-1];
+                    }
+                }
+                // rs->genpoly[0] can never be zero
+                $rs->genpoly[0] = $rs->alpha_to[$rs->modnn($rs->index_of[$rs->genpoly[0]] + $root)];
+            }
+            
+            // convert rs->genpoly[] to index form for quicker encoding
+            for ($i = 0; $i <= $nroots; $i++)
+                $rs->genpoly[$i] = $rs->index_of[$rs->genpoly[$i]];
+
+            return $rs;
+        }
+        
+        //----------------------------------------------------------------------
+        public function encode_rs_char($data, &$parity)
+        {
+            $MM       =& $this->mm;
+            $NN       =& $this->nn;
+            $ALPHA_TO =& $this->alpha_to;
+            $INDEX_OF =& $this->index_of;
+            $GENPOLY  =& $this->genpoly;
+            $NROOTS   =& $this->nroots;
+            $FCR      =& $this->fcr;
+            $PRIM     =& $this->prim;
+            $IPRIM    =& $this->iprim;
+            $PAD      =& $this->pad;
+            $A0       =& $NN;
+
+            $parity = array_fill(0, $NROOTS, 0);
+
+            for($i=0; $i< ($NN-$NROOTS-$PAD); $i++) {
+                
+                $feedback = $INDEX_OF[$data[$i] ^ $parity[0]];
+                if($feedback != $A0) {      
+                    // feedback term is non-zero
+            
+                    // This line is unnecessary when GENPOLY[NROOTS] is unity, as it must
+                    // always be for the polynomials constructed by init_rs()
+                    $feedback = $this->modnn($NN - $GENPOLY[$NROOTS] + $feedback);
+            
+                    for($j=1;$j<$NROOTS;$j++) {
+                        $parity[$j] ^= $ALPHA_TO[$this->modnn($feedback + $GENPOLY[$NROOTS-$j])];
+                    }
+                }
+                
+                // Shift 
+                array_shift($parity);
+                if($feedback != $A0) {
+                    array_push($parity, $ALPHA_TO[$this->modnn($feedback + $GENPOLY[0])]);
+                } else {
+                    array_push($parity, 0);
+                }
+            }
+        }
+    }
+    
+    //##########################################################################
+    
+    class QRrs {
+    
+        public static $items = array();
+        
+        //----------------------------------------------------------------------
+        public static function init_rs($symsize, $gfpoly, $fcr, $prim, $nroots, $pad)
+        {
+            foreach(self::$items as $rs) {
+                if($rs->pad != $pad)       continue;
+                if($rs->nroots != $nroots) continue;
+                if($rs->mm != $symsize)    continue;
+                if($rs->gfpoly != $gfpoly) continue;
+                if($rs->fcr != $fcr)       continue;
+                if($rs->prim != $prim)     continue;
+
+                return $rs;
+            }
+
+            $rs = QRrsItem::init_rs_char($symsize, $gfpoly, $fcr, $prim, $nroots, $pad);
+            array_unshift(self::$items, $rs);
+
+            return $rs;
+        }
+    }
+
+
+
+//---- qrmask.php -----------------------------
+
+
+
+
+/*
+ * PHP QR Code encoder
+ *
+ * Masking
+ *
+ * Based on libqrencode C library distributed under LGPL 2.1
+ * Copyright (C) 2006, 2007, 2008, 2009 Kentaro Fukuchi <fukuchi@megaui.net>
+ *
+ * PHP QR Code is distributed under LGPL 3
+ * Copyright (C) 2010 Dominik Dzienia <deltalab at poczta dot fm>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+ 
+	define('N1', 3);
+	define('N2', 3);
+	define('N3', 40);
+	define('N4', 10);
+
+	class QRmask {
+	
+		public $runLength = array();
+		
+		//----------------------------------------------------------------------
+		public function __construct() 
+        {
+            $this->runLength = array_fill(0, QRSPEC_WIDTH_MAX + 1, 0);
+        }
+        
+        //----------------------------------------------------------------------
+        public function writeFormatInformation($width, &$frame, $mask, $level)
+        {
+            $blacks = 0;
+            $format =  QRspec::getFormatInfo($mask, $level);
+
+            for($i=0; $i<8; $i++) {
+                if($format & 1) {
+                    $blacks += 2;
+                    $v = 0x85;
+                } else {
+                    $v = 0x84;
+                }
+                
+                $frame[8][$width - 1 - $i] = chr($v);
+                if($i < 6) {
+                    $frame[$i][8] = chr($v);
+                } else {
+                    $frame[$i + 1][8] = chr($v);
+                }
+                $format = $format >> 1;
+            }
+            
+            for($i=0; $i<7; $i++) {
+                if($format & 1) {
+                    $blacks += 2;
+                    $v = 0x85;
+                } else {
+                    $v = 0x84;
+                }
+                
+                $frame[$width - 7 + $i][8] = chr($v);
+                if($i == 0) {
+                    $frame[8][7] = chr($v);
+                } else {
+                    $frame[8][6 - $i] = chr($v);
+                }
+                
+                $format = $format >> 1;
+            }
+
+            return $blacks;
+        }
+        
+        //----------------------------------------------------------------------
+        public function mask0($x, $y) { return ($x+$y)&1;                       }
+        public function mask1($x, $y) { return ($y&1);                          }
+        public function mask2($x, $y) { return ($x%3);                          }
+        public function mask3($x, $y) { return ($x+$y)%3;                       }
+        public function mask4($x, $y) { return (((int)($y/2))+((int)($x/3)))&1; }
+        public function mask5($x, $y) { return (($x*$y)&1)+($x*$y)%3;           }
+        public function mask6($x, $y) { return ((($x*$y)&1)+($x*$y)%3)&1;       }
+        public function mask7($x, $y) { return ((($x*$y)%3)+(($x+$y)&1))&1;     }
+        
+        //----------------------------------------------------------------------
+        private function generateMaskNo($maskNo, $width, $frame)
+        {
+            $bitMask = array_fill(0, $width, array_fill(0, $width, 0));
+            
+            for($y=0; $y<$width; $y++) {
+                for($x=0; $x<$width; $x++) {
+                    if(ord($frame[$y][$x]) & 0x80) {
+                        $bitMask[$y][$x] = 0;
+                    } else {
+                        $maskFunc = call_user_func(array($this, 'mask'.$maskNo), $x, $y);
+                        $bitMask[$y][$x] = ($maskFunc == 0)?1:0;
+                    }
+                    
+                }
+            }
+            
+            return $bitMask;
+        }
+        
+        //----------------------------------------------------------------------
+        public static function serial($bitFrame)
+        {
+            $codeArr = array();
+            
+            foreach ($bitFrame as $line)
+                $codeArr[] = join('', $line);
+                
+            return gzcompress(join("\n", $codeArr), 9);
+        }
+        
+        //----------------------------------------------------------------------
+        public static function unserial($code)
+        {
+            $codeArr = array();
+            
+            $codeLines = explode("\n", gzuncompress($code));
+            foreach ($codeLines as $line)
+                $codeArr[] = str_split($line);
+            
+            return $codeArr;
+        }
+        
+        //----------------------------------------------------------------------
+        public function makeMaskNo($maskNo, $width, $s, &$d, $maskGenOnly = false) 
+        {
+            $b = 0;
+            $bitMask = array();
+            
+            $fileName = QR_CACHE_DIR.'mask_'.$maskNo.DIRECTORY_SEPARATOR.'mask_'.$width.'_'.$maskNo.'.dat';
+
+            if (QR_CACHEABLE) {
+                if (file_exists($fileName)) {
+                    $bitMask = self::unserial(file_get_contents($fileName));
+                } else {
+                    $bitMask = $this->generateMaskNo($maskNo, $width, $s, $d);
+                    if (!file_exists(QR_CACHE_DIR.'mask_'.$maskNo))
+                        mkdir(QR_CACHE_DIR.'mask_'.$maskNo);
+                    file_put_contents($fileName, self::serial($bitMask));
+                }
+            } else {
+                $bitMask = $this->generateMaskNo($maskNo, $width, $s, $d);
+            }
+
+            if ($maskGenOnly)
+                return;
+                
+            $d = $s;
+
+            for($y=0; $y<$width; $y++) {
+                for($x=0; $x<$width; $x++) {
+                    if($bitMask[$y][$x] == 1) {
+                        $d[$y][$x] = chr(ord($s[$y][$x]) ^ (int)$bitMask[$y][$x]);
+                    }
+                    $b += (int)(ord($d[$y][$x]) & 1);
+                }
+            }
+
+            return $b;
+        }
+        
+        //----------------------------------------------------------------------
+        public function makeMask($width, $frame, $maskNo, $level)
+        {
+            $masked = array_fill(0, $width, str_repeat("\0", $width));
+            $this->makeMaskNo($maskNo, $width, $frame, $masked);
+            $this->writeFormatInformation($width, $masked, $maskNo, $level);
+       
+            return $masked;
+        }
+        
+        //----------------------------------------------------------------------
+        public function calcN1N3($length)
+        {
+            $demerit = 0;
+
+            for($i=0; $i<$length; $i++) {
+                
+                if($this->runLength[$i] >= 5) {
+                    $demerit += (N1 + ($this->runLength[$i] - 5));
+                }
+                if($i & 1) {
+                    if(($i >= 3) && ($i < ($length-2)) && ($this->runLength[$i] % 3 == 0)) {
+                        $fact = (int)($this->runLength[$i] / 3);
+                        if(($this->runLength[$i-2] == $fact) &&
+                           ($this->runLength[$i-1] == $fact) &&
+                           ($this->runLength[$i+1] == $fact) &&
+                           ($this->runLength[$i+2] == $fact)) {
+                            if(($this->runLength[$i-3] < 0) || ($this->runLength[$i-3] >= (4 * $fact))) {
+                                $demerit += N3;
+                            } else if((($i+3) >= $length) || ($this->runLength[$i+3] >= (4 * $fact))) {
+                                $demerit += N3;
+                            }
+                        }
+                    }
+                }
+            }
+            return $demerit;
+        }
+        
+        //----------------------------------------------------------------------
+        public function evaluateSymbol($width, $frame)
+        {
+            $head = 0;
+            $demerit = 0;
+
+            for($y=0; $y<$width; $y++) {
+                $head = 0;
+                $this->runLength[0] = 1;
+                
+                $frameY = $frame[$y];
+                
+                if ($y>0)
+                    $frameYM = $frame[$y-1];
+                
+                for($x=0; $x<$width; $x++) {
+                    if(($x > 0) && ($y > 0)) {
+                        $b22 = ord($frameY[$x]) & ord($frameY[$x-1]) & ord($frameYM[$x]) & ord($frameYM[$x-1]);
+                        $w22 = ord($frameY[$x]) | ord($frameY[$x-1]) | ord($frameYM[$x]) | ord($frameYM[$x-1]);
+                        
+                        if(($b22 | ($w22 ^ 1))&1) {                                                                     
+                            $demerit += N2;
+                        }
+                    }
+                    if(($x == 0) && (ord($frameY[$x]) & 1)) {
+                        $this->runLength[0] = -1;
+                        $head = 1;
+                        $this->runLength[$head] = 1;
+                    } else if($x > 0) {
+                        if((ord($frameY[$x]) ^ ord($frameY[$x-1])) & 1) {
+                            $head++;
+                            $this->runLength[$head] = 1;
+                        } else {
+                            $this->runLength[$head]++;
+                        }
+                    }
+                }
+    
+                $demerit += $this->calcN1N3($head+1);
+            }
+
+            for($x=0; $x<$width; $x++) {
+                $head = 0;
+                $this->runLength[0] = 1;
+                
+                for($y=0; $y<$width; $y++) {
+                    if($y == 0 && (ord($frame[$y][$x]) & 1)) {
+                        $this->runLength[0] = -1;
+                        $head = 1;
+                        $this->runLength[$head] = 1;
+                    } else if($y > 0) {
+                        if((ord($frame[$y][$x]) ^ ord($frame[$y-1][$x])) & 1) {
+                            $head++;
+                            $this->runLength[$head] = 1;
+                        } else {
+                            $this->runLength[$head]++;
+                        }
+                    }
+                }
+            
+                $demerit += $this->calcN1N3($head+1);
+            }
+
+            return $demerit;
+        }
+        
+        
+        //----------------------------------------------------------------------
+        public function mask($width, $frame, $level)
+        {
+            $minDemerit = PHP_INT_MAX;
+            $bestMaskNum = 0;
+            $bestMask = array();
+            
+            $checked_masks = array(0,1,2,3,4,5,6,7);
+            
+            if (QR_FIND_FROM_RANDOM !== false) {
+            
+                $howManuOut = 8-(QR_FIND_FROM_RANDOM % 9);
+                for ($i = 0; $i <  $howManuOut; $i++) {
+                    $remPos = rand (0, count($checked_masks)-1);
+                    unset($checked_masks[$remPos]);
+                    $checked_masks = array_values($checked_masks);
+                }
+            
+            }
+            
+            $bestMask = $frame;
+             
+            foreach($checked_masks as $i) {
+                $mask = array_fill(0, $width, str_repeat("\0", $width));
+
+                $demerit = 0;
+                $blacks = 0;
+                $blacks  = $this->makeMaskNo($i, $width, $frame, $mask);
+                $blacks += $this->writeFormatInformation($width, $mask, $i, $level);
+                $blacks  = (int)(100 * $blacks / ($width * $width));
+                $demerit = (int)((int)(abs($blacks - 50) / 5) * N4);
+                $demerit += $this->evaluateSymbol($width, $mask);
+                
+                if($demerit < $minDemerit) {
+                    $minDemerit = $demerit;
+                    $bestMask = $mask;
+                    $bestMaskNum = $i;
+                }
+            }
+            
+            return $bestMask;
+        }
+        
+        //----------------------------------------------------------------------
+    }
+
+
+
+
+//---- qrencode.php -----------------------------
+
+
+
+
+/*
+ * PHP QR Code encoder
+ *
+ * Main encoder classes.
+ *
+ * Based on libqrencode C library distributed under LGPL 2.1
+ * Copyright (C) 2006, 2007, 2008, 2009 Kentaro Fukuchi <fukuchi@megaui.net>
+ *
+ * PHP QR Code is distributed under LGPL 3
+ * Copyright (C) 2010 Dominik Dzienia <deltalab at poczta dot fm>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+ 
+    class QRrsblock {
+        public $dataLength;
+        public $data = array();
+        public $eccLength;
+        public $ecc = array();
+        
+        public function __construct($dl, $data, $el, &$ecc, QRrsItem $rs)
+        {
+            $rs->encode_rs_char($data, $ecc);
+        
+            $this->dataLength = $dl;
+            $this->data = $data;
+            $this->eccLength = $el;
+            $this->ecc = $ecc;
+        }
+    };
+    
+    //##########################################################################
+
+    class QRrawcode {
+        public $version;
+        public $datacode = array();
+        public $ecccode = array();
+        public $blocks;
+        public $rsblocks = array(); //of RSblock
+        public $count;
+        public $dataLength;
+        public $eccLength;
+        public $b1;
+        
+        //----------------------------------------------------------------------
+        public function __construct(QRinput $input)
+        {
+            $spec = array(0,0,0,0,0);
+            
+            $this->datacode = $input->getByteStream();
+            if(is_null($this->datacode)) {
+                throw new Exception('null imput string');
+            }
+
+            QRspec::getEccSpec($input->getVersion(), $input->getErrorCorrectionLevel(), $spec);
+
+            $this->version = $input->getVersion();
+            $this->b1 = QRspec::rsBlockNum1($spec);
+            $this->dataLength = QRspec::rsDataLength($spec);
+            $this->eccLength = QRspec::rsEccLength($spec);
+            $this->ecccode = array_fill(0, $this->eccLength, 0);
+            $this->blocks = QRspec::rsBlockNum($spec);
+            
+            $ret = $this->init($spec);
+            if($ret < 0) {
+                throw new Exception('block alloc error');
+                return null;
+            }
+
+            $this->count = 0;
+        }
+        
+        //----------------------------------------------------------------------
+        public function init(array $spec)
+        {
+            $dl = QRspec::rsDataCodes1($spec);
+            $el = QRspec::rsEccCodes1($spec);
+            $rs = QRrs::init_rs(8, 0x11d, 0, 1, $el, 255 - $dl - $el);
+            
+
+            $blockNo = 0;
+            $dataPos = 0;
+            $eccPos = 0;
+            for($i=0; $i<QRspec::rsBlockNum1($spec); $i++) {
+                $ecc = array_slice($this->ecccode,$eccPos);
+                $this->rsblocks[$blockNo] = new QRrsblock($dl, array_slice($this->datacode, $dataPos), $el,  $ecc, $rs);
+                $this->ecccode = array_merge(array_slice($this->ecccode,0, $eccPos), $ecc);
+                
+                $dataPos += $dl;
+                $eccPos += $el;
+                $blockNo++;
+            }
+
+            if(QRspec::rsBlockNum2($spec) == 0)
+                return 0;
+
+            $dl = QRspec::rsDataCodes2($spec);
+            $el = QRspec::rsEccCodes2($spec);
+            $rs = QRrs::init_rs(8, 0x11d, 0, 1, $el, 255 - $dl - $el);
+            
+            if($rs == NULL) return -1;
+            
+            for($i=0; $i<QRspec::rsBlockNum2($spec); $i++) {
+                $ecc = array_slice($this->ecccode,$eccPos);
+                $this->rsblocks[$blockNo] = new QRrsblock($dl, array_slice($this->datacode, $dataPos), $el, $ecc, $rs);
+                $this->ecccode = array_merge(array_slice($this->ecccode,0, $eccPos), $ecc);
+                
+                $dataPos += $dl;
+                $eccPos += $el;
+                $blockNo++;
+            }
+
+            return 0;
+        }
+        
+        //----------------------------------------------------------------------
+        public function getCode()
+        {
+            $ret;
+
+            if($this->count < $this->dataLength) {
+                $row = $this->count % $this->blocks;
+                $col = $this->count / $this->blocks;
+                if($col >= $this->rsblocks[0]->dataLength) {
+                    $row += $this->b1;
+                }
+                $ret = $this->rsblocks[$row]->data[$col];
+            } else if($this->count < $this->dataLength + $this->eccLength) {
+                $row = ($this->count - $this->dataLength) % $this->blocks;
+                $col = ($this->count - $this->dataLength) / $this->blocks;
+                $ret = $this->rsblocks[$row]->ecc[$col];
+            } else {
+                return 0;
+            }
+            $this->count++;
+            
+            return $ret;
+        }
+    }
+
+    //##########################################################################
+    
+    class QRcode {
+    
+        public $version;
+        public $width;
+        public $data; 
+        
+        //----------------------------------------------------------------------
+        public function encodeMask(QRinput $input, $mask)
+        {
+            if($input->getVersion() < 0 || $input->getVersion() > QRSPEC_VERSION_MAX) {
+                throw new Exception('wrong version');
+            }
+            if($input->getErrorCorrectionLevel() > QR_ECLEVEL_H) {
+                throw new Exception('wrong level');
+            }
+
+            $raw = new QRrawcode($input);
+            
+            QRtools::markTime('after_raw');
+            
+            $version = $raw->version;
+            $width = QRspec::getWidth($version);
+            $frame = QRspec::newFrame($version);
+            
+            $filler = new FrameFiller($width, $frame);
+            if(is_null($filler)) {
+                return NULL;
+            }
+
+            // inteleaved data and ecc codes
+            for($i=0; $i<$raw->dataLength + $raw->eccLength; $i++) {
+                $code = $raw->getCode();
+                $bit = 0x80;
+                for($j=0; $j<8; $j++) {
+                    $addr = $filler->next();
+                    $filler->setFrameAt($addr, 0x02 | (($bit & $code) != 0));
+                    $bit = $bit >> 1;
+                }
+            }
+            
+            QRtools::markTime('after_filler');
+            
+            unset($raw);
+            
+            // remainder bits
+            $j = QRspec::getRemainder($version);
+            for($i=0; $i<$j; $i++) {
+                $addr = $filler->next();
+                $filler->setFrameAt($addr, 0x02);
+            }
+            
+            $frame = $filler->frame;
+            unset($filler);
+            
+            
+            // masking
+            $maskObj = new QRmask();
+            if($mask < 0) {
+            
+                if (QR_FIND_BEST_MASK) {
+                    $masked = $maskObj->mask($width, $frame, $input->getErrorCorrectionLevel());
+                } else {
+                    $masked = $maskObj->makeMask($width, $frame, (intval(QR_DEFAULT_MASK) % 8), $input->getErrorCorrectionLevel());
+                }
+            } else {
+                $masked = $maskObj->makeMask($width, $frame, $mask, $input->getErrorCorrectionLevel());
+            }
+            
+            if($masked == NULL) {
+                return NULL;
+            }
+            
+            QRtools::markTime('after_mask');
+            
+            $this->version = $version;
+            $this->width = $width;
+            $this->data = $masked;
+            
+            return $this;
+        }
+    
+        //----------------------------------------------------------------------
+        public function encodeInput(QRinput $input)
+        {
+            return $this->encodeMask($input, -1);
+        }
+        
+        //----------------------------------------------------------------------
+        public function encodeString8bit($string, $version, $level)
+        {
+            if(string == NULL) {
+                throw new Exception('empty string!');
+                return NULL;
+            }
+
+            $input = new QRinput($version, $level);
+            if($input == NULL) return NULL;
+
+            $ret = $input->append($input, QR_MODE_8, strlen($string), str_split($string));
+            if($ret < 0) {
+                unset($input);
+                return NULL;
+            }
+            return $this->encodeInput($input);
+        }
+
+        //----------------------------------------------------------------------
+        public function encodeString($string, $version, $level, $hint, $casesensitive)
+        {
+
+            if($hint != QR_MODE_8 && $hint != QR_MODE_KANJI) {
+                throw new Exception('bad hint');
+                return NULL;
+            }
+
+            $input = new QRinput($version, $level);
+            if($input == NULL) return NULL;
+
+            $ret = QRsplit::splitStringToQRinput($string, $input, $hint, $casesensitive);
+            if($ret < 0) {
+                return NULL;
+            }
+
+            return $this->encodeInput($input);
+        }
+        
+        //----------------------------------------------------------------------
+        public static function png($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4, $saveandprint=false) 
+        {
+            $enc = QRencode::factory($level, $size, $margin);
+            return $enc->encodePNG($text, $outfile, $saveandprint=false);
+        }
+
+        //----------------------------------------------------------------------
+        public static function text($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4) 
+        {
+            $enc = QRencode::factory($level, $size, $margin);
+            return $enc->encode($text, $outfile);
+        }
+
+        //----------------------------------------------------------------------
+        public static function raw($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4) 
+        {
+            $enc = QRencode::factory($level, $size, $margin);
+            return $enc->encodeRAW($text, $outfile);
+        }
+    }
+    
+    //##########################################################################
+    
+    class FrameFiller {
+    
+        public $width;
+        public $frame;
+        public $x;
+        public $y;
+        public $dir;
+        public $bit;
+        
+        //----------------------------------------------------------------------
+        public function __construct($width, &$frame)
+        {
+            $this->width = $width;
+            $this->frame = $frame;
+            $this->x = $width - 1;
+            $this->y = $width - 1;
+            $this->dir = -1;
+            $this->bit = -1;
+        }
+        
+        //----------------------------------------------------------------------
+        public function setFrameAt($at, $val)
+        {
+            $this->frame[$at['y']][$at['x']] = chr($val);
+        }
+        
+        //----------------------------------------------------------------------
+        public function getFrameAt($at)
+        {
+            return ord($this->frame[$at['y']][$at['x']]);
+        }
+        
+        //----------------------------------------------------------------------
+        public function next()
+        {
+            do {
+            
+                if($this->bit == -1) {
+                    $this->bit = 0;
+                    return array('x'=>$this->x, 'y'=>$this->y);
+                }
+
+                $x = $this->x;
+                $y = $this->y;
+                $w = $this->width;
+
+                if($this->bit == 0) {
+                    $x--;
+                    $this->bit++;
+                } else {
+                    $x++;
+                    $y += $this->dir;
+                    $this->bit--;
+                }
+
+                if($this->dir < 0) {
+                    if($y < 0) {
+                        $y = 0;
+                        $x -= 2;
+                        $this->dir = 1;
+                        if($x == 6) {
+                            $x--;
+                            $y = 9;
+                        }
+                    }
+                } else {
+                    if($y == $w) {
+                        $y = $w - 1;
+                        $x -= 2;
+                        $this->dir = -1;
+                        if($x == 6) {
+                            $x--;
+                            $y -= 8;
+                        }
+                    }
+                }
+                if($x < 0 || $y < 0) return null;
+
+                $this->x = $x;
+                $this->y = $y;
+
+            } while(ord($this->frame[$y][$x]) & 0x80);
+                        
+            return array('x'=>$x, 'y'=>$y);
+        }
+        
+    } ;
+    
+    //##########################################################################    
+    
+    class QRencode {
+    
+        public $casesensitive = true;
+        public $eightbit = false;
+        
+        public $version = 0;
+        public $size = 3;
+        public $margin = 4;
+        
+        public $structured = 0; // not supported yet
+        
+        public $level = QR_ECLEVEL_L;
+        public $hint = QR_MODE_8;
+        
+        //----------------------------------------------------------------------
+        public static function factory($level = QR_ECLEVEL_L, $size = 3, $margin = 4)
+        {
+            $enc = new QRencode();
+            $enc->size = $size;
+            $enc->margin = $margin;
+            
+            switch ($level.'') {
+                case '0':
+                case '1':
+                case '2':
+                case '3':
+                        $enc->level = $level;
+                    break;
+                case 'l':
+                case 'L':
+                        $enc->level = QR_ECLEVEL_L;
+                    break;
+                case 'm':
+                case 'M':
+                        $enc->level = QR_ECLEVEL_M;
+                    break;
+                case 'q':
+                case 'Q':
+                        $enc->level = QR_ECLEVEL_Q;
+                    break;
+                case 'h':
+                case 'H':
+                        $enc->level = QR_ECLEVEL_H;
+                    break;
+            }
+            
+            return $enc;
+        }
+        
+        //----------------------------------------------------------------------
+        public function encodeRAW($intext, $outfile = false) 
+        {
+            $code = new QRcode();
+
+            if($this->eightbit) {
+                $code->encodeString8bit($intext, $this->version, $this->level);
+            } else {
+                $code->encodeString($intext, $this->version, $this->level, $this->hint, $this->casesensitive);
+            }
+            
+            return $code->data;
+        }
+
+        //----------------------------------------------------------------------
+        public function encode($intext, $outfile = false) 
+        {
+            $code = new QRcode();
+
+            if($this->eightbit) {
+                $code->encodeString8bit($intext, $this->version, $this->level);
+            } else {
+                $code->encodeString($intext, $this->version, $this->level, $this->hint, $this->casesensitive);
+            }
+            
+            QRtools::markTime('after_encode');
+            
+            if ($outfile!== false) {
+                file_put_contents($outfile, join("\n", QRtools::binarize($code->data)));
+            } else {
+                return QRtools::binarize($code->data);
+            }
+        }
+        
+        //----------------------------------------------------------------------
+        public function encodePNG($intext, $outfile = false,$saveandprint=false) 
+        {
+            try {
+            
+                ob_start();
+                $tab = $this->encode($intext);
+                $err = ob_get_contents();
+                ob_end_clean();
+                
+                if ($err != '')
+                    QRtools::log($outfile, $err);
+                
+                $maxSize = (int)(QR_PNG_MAXIMUM_SIZE / (count($tab)+2*$this->margin));
+                
+                QRimage::png($tab, $outfile, min(max(1, $this->size), $maxSize), $this->margin,$saveandprint);
+            
+            } catch (Exception $e) {
+            
+                QRtools::log($outfile, $e->getMessage());
+            
+            }
+        }
+    }
+
+

+ 5 - 2
SE/superedit-DB_PROCEDURES_CREATE.php

@@ -772,6 +772,7 @@ select  concat(au.ID,cw.ID,0) as ID,cps.ID as ID_PROCES , left(cps.`DESC`,50) as
 , 'TEORETYCZNY' as TEST_TYPE,cps.SCQuest , max(ct.OCENA) as OCENA , max(ct.TEST_END) as TEST_END
 -- , max(if(ct.TEST_TYPE='TEORETYCZNY',ct.OCENA,NULL)) as OCENA_T
 -- , max(if(ct.TEST_TYPE='PRAKTYCZNY',ct.OCENA,NULL)) as OCENA_P
+, au.EMPLOYEE_TYPE , au.A_RECORD_CREATE_DATE, au.A_RECORD_UPDATE_DATE , au.L_APPOITMENT_DATE, au.L_APPOITMENT_INFO, au.L_APPOITMENT_USER
 from ADMIN_USERS as au 
   left join CRM_AUTH_PROFILE as cap on cap.REMOTE_ID=au.ID and cap.REMOTE_TABLE='ADMIN_USERS' and cap.A_STATUS in ('NORMAL','WAITING')
   left join CRM_WSKAZNIK as cw on cw.ID_ZASOB=cap.ID_ZASOB and cw.A_STATUS in ('NORMAL','WAITING')   
@@ -795,7 +796,7 @@ select  concat(au.ID,cw.ID,1) as ID,cps.ID as ID_PROCES , left(cps.`DESC`,50) as
 , 'TEORETYCZNY' as TEST_TYPE,cps.SCQuest , max(ct.OCENA) as OCENA , max(ct.TEST_END) as TEST_END
 -- , max(if(ct.TEST_TYPE='TEORETYCZNY',ct.OCENA,NULL)) as OCENA_T
 -- , max(if(ct.TEST_TYPE='PRAKTYCZNY',ct.OCENA,NULL)) as OCENA_P
-
+, au.EMPLOYEE_TYPE , au.A_RECORD_CREATE_DATE, au.A_RECORD_UPDATE_DATE , au.L_APPOITMENT_DATE, au.L_APPOITMENT_INFO, au.L_APPOITMENT_USER
 from ADMIN_USERS as au 
   left join CRM_AUTH_PROFILE as cap on cap.REMOTE_ID=au.ID and cap.REMOTE_TABLE='ADMIN_USERS' and cap.A_STATUS in ('NORMAL','WAITING')
   left join CRM_WSKAZNIK as cw on cw.ID_ZASOB=cap.ID_ZASOB and cw.A_STATUS in ('NORMAL','WAITING') 
@@ -815,6 +816,7 @@ select  concat(au.ID,cw.ID,2) as ID, cps.ID as ID_PROCES , left(cps.`DESC`,50) a
 ,au.ADM_ACCOUNT  
 ,cps.path
 , 'PRAKTYCZNY' as TEST_TYPE, cps.SCQuestPract , max(ct.OCENA) as OCENA, max(ct.TEST_END) as TEST_END
+, au.EMPLOYEE_TYPE , au.A_RECORD_CREATE_DATE, au.A_RECORD_UPDATE_DATE , au.L_APPOITMENT_DATE, au.L_APPOITMENT_INFO, au.L_APPOITMENT_USER
 from ADMIN_USERS as au 
   left join CRM_AUTH_PROFILE as cap on cap.REMOTE_ID=au.ID and cap.REMOTE_TABLE='ADMIN_USERS' and cap.A_STATUS in ('NORMAL','WAITING')
   left join CRM_WSKAZNIK as cw on cw.ID_ZASOB=cap.ID_ZASOB  and cw.A_STATUS in ('NORMAL','WAITING')
@@ -833,6 +835,7 @@ select  concat(au.ID,cw.ID,3) as ID, cps.ID as ID_PROCES , left(cps.`DESC`,50) a
 ,au.ADM_ACCOUNT  
 ,cps.path
 , 'PRAKTYCZNY' as TEST_TYPE, cps.SCQuestPract , max(ct.OCENA) as OCENA, max(ct.TEST_END) as TEST_END
+, au.EMPLOYEE_TYPE, au.A_RECORD_CREATE_DATE, au.A_RECORD_UPDATE_DATE , au.L_APPOITMENT_DATE, au.L_APPOITMENT_INFO, au.L_APPOITMENT_USER
 from ADMIN_USERS as au 
   left join CRM_AUTH_PROFILE as cap on cap.REMOTE_ID=au.ID and cap.REMOTE_TABLE='ADMIN_USERS' and cap.A_STATUS in ('NORMAL','WAITING')
   left join CRM_WSKAZNIK as cw on cw.ID_ZASOB=cap.ID_ZASOB  and cw.A_STATUS in ('NORMAL','WAITING')
@@ -849,7 +852,7 @@ and cps.SCQuestPract>0
 ";
 
 $sql['replace__CRM_PROCES_USER_STATS_wiev']="create or replace definer=`root`@`localhost` view _CRM_PROCES_USER_STATS_wiev as
-	select ID,ID_PROCES, `DESC`, ADM_ACCOUNT, path,TEST_TYPE,SCQuest,OCENA,TEST_END
+	select ID,ID_PROCES, `DESC`, ADM_ACCOUNT, EMPLOYEE_TYPE,A_RECORD_CREATE_DATE, A_RECORD_UPDATE_DATE ,L_APPOITMENT_DATE,L_APPOITMENT_INFO, L_APPOITMENT_USER, path,TEST_TYPE,SCQuest,OCENA,TEST_END
 	from _CRM_PROCES_USER_STATS_wiev_to_group
 	group by ADM_ACCOUNT,ID_PROCES,TEST_TYPE ";
 

+ 356 - 563
SE/superedit-GRAPH_VIEW_PROCES.php

@@ -1,274 +1,13 @@
 <?php
 
-class crm_proces_paser {
-
-  // var $this->get_proces_init=array();
-
- // [proces_init]  - A
- //    [step]      - flat 0
- //    [step]      - flat 3 , tree 2 , cut
- //     [step]     - flat 0 , tree 0
- //     [step]     - flat 1 , tree 1
- //       [step]   - flat 1 , tree 1
- //         [step] - flat 0 , tree 0
- //     [step]     - flat 1 , tree 1
- //       [step]   - flat 0 , tree 0
- 
-
-
-   
-   //funckcja do szukania proces_init
-   function get_proces_init($id_proces) {
-	$sql= "select p.`ID`,p.`DESC` from `CRM_PROCES` as p 
-	   LEFT JOIN _CRM_PROCES_INIT_STATS AS cs ON cs.ID = p.ID
-	where  p.`A_STATUS` in('WAITING','NORMAL') and p.`TYPE`='PROCES_INIT' 
-	and (cs.`path` like '%/".$id_proces."/%' or cs.`path` like '%/".$id_proces."'  or cs.`path` like '".$id_proces."/%' ) 
-	";
-//	echo $sql;
-	$res=DB::query($sql);
-		while($h=DB::fetch($res)) {
-			$this->get_proces_init[]=$h->ID;
-		}
-		return $this->get_proces_init;
-	
-   }
-
-   
-
-   function build_proces_init_tree($id_proces) {
-	  // $tree->Childs[$id_proces]=true;
-	   $tree->Childs[$id_proces]->PARENT=0;
-	   $tree->Childs[$id_proces]->SOURCE='build_tree_for_proces';
-
-	   $tree->Parents[0]->CHILD[$id_proces]=$id_proces;
-	   $obj=DB::get_by_id('CRM_PROCES',$id_proces);
-	   $tree->Childs[$id_proces]->TYPE=$obj->TYPE;
-	//   echo "here for ".$id_proces;
-	   self::build_tree_for_proces($tree,$id_proces,$id_proces);
-	   return $tree;
-   }
-   
-      function build_tree_for_proces(&$tree,$cursor,$init_once=null) {
-		  	   if(!empty($init_once)) $sql_or=" or cp.ID={$init_once} "; else $sql_or="";
-	      	   $sql="select cp.`ID`,cp.`IF_TRUE_GOTO`,cp.`IF_TRUE_GOTO_FLAG` , cp.`TYPE` from `CRM_PROCES` as cp 
-	      	   		
-	      	   where ( cp.PARENT_ID={$cursor} {$sql_or} ) and  cp.`A_STATUS` in ('WAITING','NORMAL')";
-		  	  // echo "<br>sql: ".$sql;
-	      	   $res=DB::query($sql);
-	      	   	      	   while ($h=DB::fetch($res)) {
-	      	   	 if(empty($init_once))  $tree->Childs[$h->ID]->PARENT=$cursor; //wyzwolenie tylko pozniejsze
-	      	   	  if(empty($init_once))  $tree->Parents[$cursor]->CHILD[$h->ID]=$h->ID;
-		  	   	   $tree->Childs[$h->ID]->TYPE=$h->TYPE;
-		  	   	   $tree->Childs[$h->ID]->SOURCE='build_tree_for_proces';
-
-
-	      	   	   if($h->IF_TRUE_GOTO>0) { 
-	      	   	      $tree->Childs[$h->ID]->GOTO_FLAG=$h->IF_TRUE_GOTO_FLAG;
-	      	   	      $tree->Childs[$h->ID]->IF_TRUE_GOTO=$h->IF_TRUE_GOTO;
-	      	   	      $tree->Childs[$h->IF_TRUE_GOTO]->IS_EXECUTED_BY[$h->ID]=$h->ID;
-	      	   	   }
-		      	   self::build_tree_for_proces($tree,$h->ID,null);
-	      	   }
-      }
-
-	  function get_resources_by_proceses_id($id_proces_obj,$id_proces,$filter_zasob) {
-		 $filter="";
-		 if( is_array($filter_zasob) ) $filter=" and cz.ID in (".implode(',', $filter_zasob).") " ;
-		 else if(!empty($filter_zasob)) $filter=" and cz.ID=".$filter_zasob ;
-		 
-		  $sql="select cz.ID,cz.PARENT_ID, cz.`DESC`,cz.`TYPE`	,	czp.`DESC` as DESC_czp, czp.`TYPE` as TYPE_czp
-		  	from CRM_WSKAZNIK as cw 
-		  		left join CRM_LISTA_ZASOBOW as cz on cz.ID=cw.ID_ZASOB 
-		  			left join CRM_LISTA_ZASOBOW as czp on czp.ID=cz.PARENT_ID
-		  		where cw.ID_PROCES in (".implode(',', array_keys($id_proces_obj)).") and cw.A_STATUS in ('NORMAL','WAITING')
-		  		and czp.`TYPE` in ('TABELA') ".$filter." ";
-		  $res=DB::query($sql);
-		  		while($h=DB::fetch($res)) {
-			  		$found['ID'][$h->ID]['PARENT_ID']=$h->PARENT_ID;
-			  		$found['ID'][$h->ID]['DESC']=$h->DESC;
-			  		$found['PARENT_ID'][$h->PARENT_ID]=$h->DESC_czp;
-			  		
-		  		}
-		  		
-//		  $this->get_resources_by_proceses_id->$id_proces=$found;
-	//	  DEBUG_S(-3,'Found resources',$found,__FILE__,__FUNCTION__,__LINE__);
-		  return $found;
-
-		  
-	  }
-
-
-      function build_tree_flat_info(&$tree,$flat) {
-		  /* >> zbudowanie ile ma dzieci <<
-			  $tree->Childs[3208] => stdClass Object
-			  (
-            [PARENT] => 3123
-            [CHILD] => Array
-                (
-             >>       [3219] => 1 <<
-             >>       [3237] => 0 <<
-             >>       [3209] => 0 <<
-                 
-			 */
-	      foreach($tree->Childs as $id=>$obj) {
-			  //sprawdzmy czy nasz parent wymaga wyswietlenia osobnego podkroku w widoku szczegolowego procesu
-		      foreach($tree->Parents[$id]->CHILD as $child) {
-			      $tree->Childs[$id]->CHILD[$child]=count($tree->Parents[$child]->CHILD);     
-		      }
-	      }    
-      }
-      
-      
-      function detect_tree_where_to_detail_cut(&$tree,$flag_not_to_cut=null) {
-	       foreach($tree->Childs as $id=>$obj) {
-			  //sprawdzmy czy nasz parent wymaga wyswietlenia osobnego podkroku w widoku szczegolowego procesu
-			  $control=0;
-		      foreach($obj->CHILD as $child) {
-			      if($child>0) $control++;   
-		      }
-		      if(empty($flag_not_to_cut)) {
-		       
-		       if($control>1) $tree->Childs[$id]->TO_DETAIL_CUT_FLAG=true;  //przeciecie jezeli jest wiecej wyjsc niz jedno z zaglebieniami
-		        //przeciecie, jezeli jest wyjscie z kroku procesu do innego 
-		        if(isset($tree->Childs[$id]->GOTO_FLAG)) $tree->Childs[$id]->TO_DETAIL_CUT_FLAG=true;
-		        //trzeba zbadac tez czy nie jest do niego dowiazywany w jakims miejscu proces
-		         if(isset($tree->Childs[$id]->IS_EXECUTED_BY)) { $tree->Childs[$id]->TO_DETAIL_CUT_FLAG=true;
-		         //echo "<br> Is executed by CUT!";
-		         }
-
-		       } else $tree->Childs[$id]->NO_CUT_FLAG=true;
-	      }       
-      }
-      function search_parent_ids_till_cut(&$tree,$init,&$find) {
-      //szukam lancuchow do optymalizacji do miejsca flagi CUT, kojarzac od razu linki
-	     	if(isset($tree->Childs[$init]->TO_DETAIL_CUT_FLAG)) {
-		    	//if(!empty($find))
-		    	//if($init==2444)
-		    	  self::zoom_process_links($tree,$init,$init); 
-			}
-//			$tree->Viev_Zpc_Parent_cut[$init]=$find[0];
-	        if(!isset($tree->Childs[$init]->TO_DETAIL_CUT_FLAG)) {
-				  
-	      		  $find[]=$init;
-		  		  self::zoom_process_links($tree,$init,$find[0]);
-		      foreach($tree->Childs[$init]->CHILD as $id=>$count) {
-			      self::search_parent_ids_till_cut($tree,$id,$find);
-		      }
-	      } //else
-	     // return $find;
-      }
-      
-      function zoom_process_links($tree,$id,$root_id) {
-      	//dobudowuje znaczniki dotyczace LINKOW oraz brakujace ID z tym zwiazane
-	      //echo "<br>testuje zoom dla ".$id." root:".$root_id;
-
-	      if(isset($tree->Childs[$id]->GOTO_FLAG)) {
-					  	if(isset( $tree->Childs[$tree->Childs[$id]->IF_TRUE_GOTO])) {
-						  	//adding internal link to the same process
-						  	//TODO trzeba przemyslec, czy dowiazywac linki do zagregowanych krokow, czy trzeba robic cut w tych miejscach - na ten moment domyslnie CUT
-//						  	if(empty($tree->Childs[$id]->NO_CUT_FLAG)) //tylko linki zewnetrzne jak flaga NOCUT!
-						  	//echo "... dodaje 218:  ".$tree->Childs[$id]->IF_TRUE_GOTO;
-						  	if(isset($tree->Childs[$tree->Childs[$id]->IF_TRUE_GOTO]->SOURCE)) {
-						  		$tree->Viev_Zpc[$root_id]->INTERNAL_LINK[$tree->Childs[$id]->IF_TRUE_GOTO]=$tree->Childs[$id]->IF_TRUE_GOTO;
-						  		//echo "dodalem Linka dla ".$root_id;
-						  	} else { //echo "To jest link external - bo referencyjny ID{$tree->Childs[$id]->IF_TRUE_GOTO}nie byl w procesie";
-
-						  		$tree->Viev_Zpc[$root_id]->EXTERNAL_LINK[$tree->Childs[$id]->IF_TRUE_GOTO]=$tree->Childs[$id]->IF_TRUE_GOTO;
-						  	}
-						  	
-					  	} else { //echo "<br>Links zewnetrzny do ".$id." - ".$tree->Childs[$id]->IF_TRUE_GOTO;
-					  		$tree->Viev_Zpc[$root_id]->EXTERNAL_LINK[$tree->Childs[$id]->IF_TRUE_GOTO]=$tree->Childs[$id]->IF_TRUE_GOTO;
-					  		//$tree->Viev_Zpc_found[$tree->Childs[$id]->IF_TRUE_GOTO]=$tree->Childs[$id]->IF_TRUE_GOTO; //zeby tego rekordu nie przetwarzal ? TODO ?
-					  		$obj=DB::get_by_id('CRM_PROCES',$tree->Childs[$id]->IF_TRUE_GOTO);
-					  		$tree->Viev_Zpc[$tree->Childs[$id]->IF_TRUE_GOTO]->DESC="{".$obj->ID."}".substr($obj->DESC,0,50);
-					  		if($tree->Childs[$id]->GOTO_FLAG=='GOTO_AND_RETURN') {	 //dodanie zwrotnej strzalki TODO dac inny typ strzalki!!
-					  		 $tree->Viev_Zpc[$tree->Childs[$id]->IF_TRUE_GOTO]->EXTERNAL_LINK[$root_id]=$root_id;
-					  		 //echo "<br> GOTO_AND_RETURN!!!".$tree->Childs[$id]->IF_TRUE_GOTO." -- ".$root_id;
-					  		}
-					  		
-					  	}
-				  	} 
-
-	      
-      }
-      
-      function build_path_zoom_proces_cut(&$tree,$init,$path_zpc=array()) {
-	      //funkcja do pokazania procesow wyplaszczonych, z wypunktowanymi rozgalezieniami - buduje drzewo w sposob inteligentny
-		  //szukam rekordow z gory do pierwszego CUT
-		  foreach($tree->Childs as $id=>$obj) {
-		  		if(!isset($tree->Viev_Zpc_found[$id])) {
-			  		//echo "<br>szukam parentow dla ".$id;
-				  	self::search_parent_ids_till_cut($tree,$id,$find);
-			//	  	echo "<br>find:238 for id {$id} ".implode(',', $find)." EOL. ";
-				  	if(empty($find))  { //echo " - Find empty for ".$id."  adding ".$tree->Childs[$id]->PARENT;
-					  	//trzeba przeskanowac w find jest dany parent -> Viev_Zpc_found
-					  	//	if(isset($tree->Childs[$id]->PARENT))
-					  	//		$tree->Viev_Zpc_Parent[$id]=$tree->Childs[$id]->PARENT;
-				  	}
-				  	foreach($find as $find_id) {
-				  		$tree->Viev_Zpc_found[$find_id]=$find[0];
-				  		if($find_id<>$find[0]) $tree->Viev_Zpc_Parent[$find_id]=$find[0]; //todo moze byc to z bledem jak nadrzedny bedzie zbitym ciagiem
-				  		else $tree->Viev_Zpc_Parent[$find_id]=$tree->Childs[$find_id]->PARENT;
-				  	}
-				  	$tree->Viev_Zpc[$id]->PATH=$find;
-				  	//wykrycie parenta polega na znalezieniu jego naturalnego parenta i poszukaniu w ktorej jest grupie
-				  	//$tree->Viev_Zpc[$id]->PARENT=$tree->Viev_Zpc_Parent[$tree->Childs[$id]->PARENT]  ;
-				  	$obj=DB::get_by_id('CRM_PROCES',$id);
-				  	$tree->Viev_Zpc[$id]->DESC="{".$id."}".substr($obj->DESC,0,50)."...";
-				  					  	unset($find);
-			  	}
-			  	
-		  	
-		  }
-		  		//parenty trzeba zrobic za drugim rzutem
-			  	foreach($tree->Viev_Zpc as $id=>$obj) {
-			 // 		echo "<br>256 wykrywam parenta dla {$id}";
-				  				    {
-					  	//skanujemy wszystkie rekordy w Viev_Zpc w celu znalezienia czy danego ID parent nie jest w ktoryms z ID - tego szukamy
-					  if(!isset($obj->PARENT)) //tylko dla tych ktore nie maja parentow
-					  	foreach($tree->Viev_Zpc as $id_=>$obj_) {
-						  	if(isset($tree->Childs[$id_]->SOURCE))
-						  	if(in_array($tree->Childs[$id]->PARENT, $obj_->PATH)) {
-						  	//	echo "<br>206 Skanuje dla brakujacego parenta dla ".$id." i znalazlem".$id_;
-						  		$tree->Viev_Zpc[$id]->PARENT=$id_;
-						  	} //else  echo "<br>&nbsp;&nbsp;   199: nie znalazlem w ".$id_." path:".implode(',', $obj_->PATH);
-					  	}
-					  	
-					  if(!isset($tree->Viev_Zpc[$id]->PARENT)) { //jezeli nie znaleziono ta metoda to znaczy ze parent jest naturalny
-						  $tree->Viev_Zpc[$id]->PARENT=$tree->Childs[$id]->PARENT;
-						//  echo " - 204 ustawilem ostatecznie ".$tree->Childs[$id]->PARENT;
-					  }
-					  	
-				  	}
-				  	
-			  	}
-		  
-		  	      
-      }
-      
-      
-}	 
-
+Lib::loadClass('ProcesHelper');
+Lib::loadClass('UsersHelper');
 
 function GRAPH_VIEW_PROCES() {
-
-
 	$id_proces = V::get('id_proces', '', $_REQUEST, 'int');
 	$id_zasob = V::get('id_zasob', '', $_REQUEST, 'int');
 
-//	$id_proces = $_REQUEST['id_proces'];
-	//TOOD bug funkcji V nie mozna dac INT=0!!!
-//	if (empty($id_proces)) {
-//		echo'<p class="err box box-red">'."Wrong ID".'</p>';
-//		return;
-//	}
-
 	$db = DB::getDB();
-	//$proces = $db->get_by_id('CRM_PROCES', $id_proces);
-	//if (empty($proces)) {
-	//	echo'<p class="err box box-red">'."Process {$id_proces} not exists".'</p>';
-	//	return;
-	//}
 
 	$ajaxTask = V::get('ajaxTask', '', $_REQUEST);
 	if ($ajaxTask == 'getInfo') {
@@ -276,47 +15,48 @@ function GRAPH_VIEW_PROCES() {
 		$id_zasob = V::get('id_zasob', '', $_REQUEST, 'int');
 
 		if ($id > 0) {
-			//TODO najlepiej wyslac to od razu w jsonie i przekazac jakos do uzycia do wykresu!
 			$step = $db->get_by_id('CRM_PROCES', $id);
-						 $cp=new crm_proces_paser;
-						 $tree=$cp->build_proces_init_tree($id);
-						 $cp->build_tree_flat_info($tree,null);
-						 $cp->detect_tree_where_to_detail_cut($tree);
-						 $cp->build_path_zoom_proces_cut($tree,$id);
-
+			$cp = new GraphViewProcessParser();
+			$tree = $cp->build_proces_init_tree($id);
+			$cp->build_tree_flat_info($tree, null);
+			$cp->detect_tree_where_to_detail_cut($tree);
+			$cp->build_path_zoom_proces_cut($tree, $id);
 
-
-			//echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;"> (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($step);echo'</pre>';
 			?>
-			<?php if($step->TYPE=='PROCES_INIT') echo "<a href=?FUNCTION_INIT=GRAPH_VIEW_PROCES&id_proces={$step->PARENT_ID}&PROCES_INIT_SCAN=1>Widok mapy {$step->PARENT_ID}</a>"; ?>
-			<?php if(empty($_REQUEST['RESOURCES'])) echo "<a href=?FUNCTION_INIT=GRAPH_VIEW_PROCES&id_proces={$step->PARENT_ID}&PROCES_INIT_SCAN=1&RESOURCES=1&id_zasob={$id_zasob}> | mapa z zasobami</a>"; ?>
-			<p> <?php echo "<font color=red><a href=?FUNCTION_INIT=GRAPH_VIEW_PROCES&id_proces={$id}>".$step->ID."</a> - ".$step->DESC; ?>  <?php echo $step->DESC; ?></font>
-				<?php echo "| <a href=?FUNCTION_INIT=GRAPH_VIEW_PROCES&id_proces={$id}&RESOURCES=1&id_zasob={$id_zasob}> widok procesu z zasobami </a> ";?>
+			<?php if ($step->TYPE == 'PROCES_INIT') : ?>
+				<a href="?FUNCTION_INIT=GRAPH_VIEW_PROCES&id_proces=<?php echo $step->PARENT_ID; ?>&PROCES_INIT_SCAN=1">Widok mapy <?php echo $step->PARENT_ID; ?></a>
+			<?php endif; ?>
+			<?php if (empty($_REQUEST['RESOURCES'])) : ?>
+				<a href="?FUNCTION_INIT=GRAPH_VIEW_PROCES&id_proces=<?php echo $step->PARENT_ID; ?>&PROCES_INIT_SCAN=1&RESOURCES=1&id_zasob=<?php echo $id_zasob; ?>"> | mapa z zasobami</a>
+			<?php endif; ?>
+			<p>
+				<span style="color:red">
+					<a href="?FUNCTION_INIT=GRAPH_VIEW_PROCES&id_proces=<?php echo $id; ?>"><?php echo $step->ID; ?></a>
+					- <?php echo $step->DESC; ?> <?php echo $step->DESC; ?>
+				</span>
+				| <a href="?FUNCTION_INIT=GRAPH_VIEW_PROCES&id_proces=<?php echo $id; ?>&RESOURCES=1&id_zasob=<?php echo $id_zasob; ?>"> widok procesu z zasobami </a>
 			</p>
 			<p><?php echo $step->OPIS; ?></p>
-			 	<?php foreach ($tree->Viev_Zpc[$id]->PATH as $ind=>$id_include) {
-			 					if($ind==0) continue; //pierwszy wiersz wyswietlony wyzej
-				 				$step = $db->get_by_id('CRM_PROCES', $id_include);
-				 			    echo "<p><b>".$step->ID."</a> - ".$step->DESC."</b> <font size=-3>".$step->OPIS."</font></p>";
-				 			 } ?>
+				<?php foreach ($tree->Viev_Zpc[$id]->PATH as $ind=>$id_include) : ?>
+					<?php if ($ind == 0) continue; //pierwszy wiersz wyswietlony wyzej ?>
+					<?php $step = $db->get_by_id('CRM_PROCES', $id_include); ?>
+					<p><b><?php echo $step->ID; ?></a> - <?php echo $step->DESC; ?></b> <font size="-3"><?php echo $step->OPIS; ?></font></p>
+				<?php endforeach; ?>
 			<?php
-		} else { //zasob
+		}
+		else {//zasob
 			$id = V::get('id', 0, $_REQUEST);
-				if($id[0]=='Z') {
-					Lib::loadClass('ProcesHelper');
-					$zasob=ProcesHelper::getZasobInfo(4975);
-					
-					echo "Zasob: [".$zasob->ID."], Typ: ".$zasob->TYPE.", Nazwa: ".$zasob->DESC." (".$zasob->DESC_PL.")<br>".$zasob->OPIS;
-					echo "<hr> Nadrzędny: Zasob: [".$zasob->P__ID."] , Typ: ".$zasob->P__TYPE.", Nazwa: ".$zasob->P__DESC." (".$zasob->P__DESC_PL.")<br>".$zasob->P__OPIS;
-				}
-
-			
+			if ($id[0] == 'Z') {
+				$zasob = ProcesHelper::getZasobInfo(4975);
+				echo "Zasob: [".$zasob->ID."], Typ: ".$zasob->TYPE.", Nazwa: ".$zasob->DESC." (".$zasob->DESC_PL.")<br>".$zasob->OPIS;
+				echo "<hr> Nadrzędny: Zasob: [".$zasob->P__ID."] , Typ: ".$zasob->P__TYPE.", Nazwa: ".$zasob->P__DESC." (".$zasob->P__DESC_PL.")<br>".$zasob->P__OPIS;
+			}
 		}
 		exit;
 	}
 
 	$graph = new stdClass();
-	$graph->htmlID = 'graph_proces_id_' . $id_proces;
+	$graph->htmlID = "graph_proces_id_{$id_proces}";
 	$graph->procesTreeFlat = array();
 	$graph->procesTreeGoto = array();
 	$graph->treeItems = array();
@@ -324,292 +64,134 @@ function GRAPH_VIEW_PROCES() {
 	$graph->elements = new stdClass();
 	$graph->elements->nodes = array();
 	$graph->elements->edges = array();
-	/*	elements: {
-				nodes: [
-					{ data: { id: 'j', name: 'Jerry' } },
-					{ data: { id: 'e', name: 'Elaine' } },
-					{ data: { id: 'k', name: 'Kramer' } },
-					{ data: { id: 'g', name: 'George' } }
-				],
-				edges: [
-					{ data: { source: 'j', target: 'e' } },
-					{ data: { source: 'j', target: 'k' } },
-					{ data: { source: 'j', target: 'g' } },
-					{ data: { source: 'e', target: 'j' } },
-					{ data: { source: 'e', target: 'k' } },
-					{ data: { source: 'k', target: 'j' } },
-					{ data: { source: 'k', target: 'e' } },
-					{ data: { source: 'k', target: 'g' } },
-					{ data: { source: 'g', target: 'j' } }
-				]
-			},
-	 */
-
-			function graph__addNodeID($id, &$graph,$name=null,$path,$parent=null,$type,$once=null) {
-				if (!array_key_exists($id, $graph->treeItems)) {
-					$graph->treeItems[$id]= true;
-					if(empty($name)) $name=$id;
-					if(!empty($path))  { $name=$name." ".implode(',', $path);// $path=array(); 
-					}
-					//DEBUG_S(-3,'added id,name,path,parent',array($id,$name,$path,$parent),__FILE__,__FUNCTION__,__LINE__);
-		
-					if($type=='PROCES_INIT') $type_init='procesInit'; 
-					else if($type=='RESOURCE') $type_init=$type;
-					else $type_init=null;
-				//	echo "<br>".$type_init." ".$id." ".$name;
-					
-					
-				//	$name=str_replace(array('ś','ż',"ś"), array('s','z',"xxx"), $name);
-
-					
-					$graph->elements->nodes[] = array('data'=>array('id'=>"".$id."", 'name'=>$name , 'type'=>$type_init));
-					
-	
-					//echo "<br> w AddNode:ID".$id." parent".$parent;
-				}
-				   if(!empty($parent)) {
-					   if(isset($once)) {
-						   if(!isset($graph->used_elements[$parent][$id]) && !isset($graph->used_elements[$id][$parent])) {
-						   		$graph->elements->edges[] = array('data'=>array('source'=>$parent, 'target'=>$id  ));
-						   	}
-					   } else {
-						   		$graph->elements->edges[] = array('data'=>array('source'=>$parent, 'target'=>$id  ));
-					   }
-					   
-						$graph->used_elements[$parent][$id]=1;
-						$graph->used_elements[$id][$parent]=1;
-						
-
-				   }
-		
-			}
-		 
-	 
-	 
-	 
-	 
-	$id_zasob = V::get('id_zasob', '', $_REQUEST, 'int');	
-
-	 $PROCES_INIT_SCAN = V::get('PROCES_INIT_SCAN', '', $_REQUEST, 'int');
-	if(!empty($PROCES_INIT_SCAN))	 {
-	     //mapa procesow
-	
-		$cp=new crm_proces_paser;
-
-	$PROCES_INIT_SCAN_STANOWISKO = V::get('PROCES_INIT_SCAN_STANOWISKO', '', $_REQUEST, 'int');		
-	$PROCES_INIT_SCAN_USER = V::get('PROCES_INIT_SCAN_USER', '', $_REQUEST, 'int');		
-	
-	if(!empty($PROCES_INIT_SCAN_STANOWISKO))  {
-		Lib::loadClass('ProcesHelper');
-		$proces_list_obj = ProcesHelper::get_procesy_by_stanowiska( array($PROCES_INIT_SCAN_STANOWISKO) );
-		foreach($proces_list_obj as $obj) {
-			$init[$obj->ID]=$obj->ID;
-		}
-    } else if(!empty($PROCES_INIT_SCAN_USER))  {
-		Lib::loadClass('UsersHelper');
-		$proces_list_obj = UsersHelper::get_group_by_user($PROCES_INIT_SCAN_USER,array('SHOW_IN_PERIOD_MARK'=>'YES'));
-		
-		foreach($proces_list_obj as $obj) {
-			$init[$obj->ID]=$obj->ID;
-		}
-    } else if(!empty($id_zasob)) {
-		Lib::LoadClass('ProcesHelper');
-	    $init=ProcesHelper::get_proces_init_by_zasob_id($id_zasob);
-    } else  {
-	    $init=$cp->get_proces_init($id_proces);
-	}
 
+	function graph__addNodeID($id, &$graph, $name = null, $path, $parent = null, $type, $once = null) {
+		if (!array_key_exists($id, $graph->treeItems)) {
+			$graph->treeItems[$id] = true;
+			if (empty($name)) $name = $id;
+			if (!empty($path)) {
+				$name = $name . " " . implode(',', $path);
+			}
+			$type_init = null;
+			if ($type == 'PROCES_INIT') $type_init = 'procesInit';
+			else if($type == 'RESOURCE') $type_init = 'RESOURCE';
 
-	DEBUG_S(3,'lista procesow init',$init,__FILE__,__FUNCTION__,__LINE__);
-		foreach($init as $id_proces) {
-
-			 $tree=$cp->build_proces_init_tree($id_proces);
-
-			 $cp->build_tree_flat_info($tree,null);
-		     $cp->detect_tree_where_to_detail_cut($tree,'nocut');
-			 $cp->build_path_zoom_proces_cut($tree,$id_proces);
-			
-			
-			 DEBUG_S(3,'get_proces_init',$init);
-			 DEBUG_S(3,'tree->childs',$tree->Childs);
-			 DEBUG_S(3,'tree->Parents',$tree->Parents);
-			 DEBUG_S(3,'tree->Viev_Zpc',$tree->Viev_Zpc);
-			 DEBUG_S(3,'tree->Viev_Zpc_Parent',$tree->Viev_Zpc_Parent);
-			 DEBUG_S(3,'tree->get_resources_by_proceses_id',$tree->get_resources_by_proceses_id);
-
-		
-			 	  graph__addNodeID(0, $graph,$name=null,$path,null);
-			 foreach($tree->Viev_Zpc as $id=>$obj) {
-				  graph__addNodeID($id, $graph,$obj->DESC,null,((isset($obj->PARENT)) ? $obj->PARENT : null),$tree->Childs[$id]->TYPE);
-				//  foreach($obj->INTERNAL_LINK as $link) graph__addNodeID($id, &$graph,$tree->Viev_Zpc[$link]->DESC,null,$link,null);
-				  foreach($obj->EXTERNAL_LINK as $link) graph__addNodeID($link, $graph,$tree->Viev_Zpc[$link]->DESC,null,$id,'PROCES_INIT');
-			 }
-		
-		
-			 if(!empty($_REQUEST['RESOURCES'])) {
-			 
-			 $resources=$cp->get_resources_by_proceses_id($tree->Childs,$id_proces,$id_zasob);
-				 foreach($resources['PARENT_ID'] as $ID=>$DESC) {
-					  graph__addNodeID("Z_".$ID, $graph,$DESC,null,null,'RESOURCE');
-				  }
-				  foreach($resources['ID'] as $ID=>$DESC) {
-					  graph__addNodeID("Z_".$ID, $graph,$DESC['DESC'],null,$id_proces,'RESOURCE');
-					  graph__addNodeID("Z_".$ID, $graph,$DESC['DESC'],null,"Z_".$DESC['PARENT_ID'],'RESOURCE','once');
-				  }
-			 }
-
-
-			 
-			 unset($tree);
+			$graph->elements->nodes[] = array('data' => array('id' => "{$id}", 'name' => $name, 'type' => $type_init));
+		}
+		if (!empty($parent)) {
+			if (isset($once)) {
+				if (!isset($graph->used_elements[$parent][$id]) && !isset($graph->used_elements[$id][$parent])) {
+					$graph->elements->edges[] = array('data' => array('source' => $parent, 'target' => $id));
+				}
+			} else {
+				$graph->elements->edges[] = array('data' => array('source' => $parent, 'target' => $id));
+			}
+			$graph->used_elements[$parent][$id] = 1;
+			$graph->used_elements[$id][$parent] = 1;
 		}
-		
-		
-	}else {
-
-		 //dokladnie 1 proces
-		 $cp=new crm_proces_paser;
-
-		 $tree=$cp->build_proces_init_tree($id_proces);
-		 $cp->build_tree_flat_info($tree,null);
-	     $cp->detect_tree_where_to_detail_cut($tree);
-		 $cp->build_path_zoom_proces_cut($tree,$id_proces);
-		 DEBUG_S(3,'get_proces_init',$init);
-		 DEBUG_S(3,'tree->childs',$tree->Childs);
-		 DEBUG_S(3,'tree->Parents',$tree->Parents);
-		 DEBUG_S(-3,'tree->Viev_Zpc',$tree->Viev_Zpc);
-		 DEBUG_S(3,'tree->Viev_Zpc_Parent',$tree->Viev_Zpc_Parent);
-		 DEBUG_S(3,'tree->Viev_Zpc_Parent_cut',$tree->Viev_Zpc_Parent_cut);
-		 DEBUG_S(3,'tree->Viev_Zpc_found',$tree->Viev_Zpc_found);	
-		 	  graph__addNodeID(0, $graph,$name=null,$path,null);
-		 foreach($tree->Viev_Zpc as $id=>$obj) {
-		 			    //echo "<br> tst edg:".$id." / ".$tree->Childs[$id]->PARENT;
-		 			   // : $tree->Viev_Zpc[$tree->Childs[$id]->PARENT])
-			  graph__addNodeID($id, $graph,$obj->DESC,null,((isset($obj->PARENT)) ? $obj->PARENT : null),$tree->Childs[$id]->TYPE);
-			  foreach($obj->INTERNAL_LINK as $link) graph__addNodeID($id, $graph,$tree->Viev_Zpc[$link]->DESC,null,$link,null);
-			  foreach($obj->EXTERNAL_LINK as $link) graph__addNodeID($link, $graph,$tree->Viev_Zpc[$link]->DESC,null,$id,'PROCES_INIT');
-	
-		 }
-		  if(!empty($_REQUEST['RESOURCES'])) {
-			 $resources=$cp->get_resources_by_proceses_id($tree->Childs,$id_proces,$id_zasob);
-				 foreach($resources['PARENT_ID'] as $ID=>$DESC) {
-					  graph__addNodeID("Z_".$ID, $graph,$DESC,null,null,'RESOURCE');
-				  }
-				  foreach($resources['ID'] as $ID=>$DESC) {
-					  graph__addNodeID("Z_".$ID, $graph,$DESC['DESC'],null,$id_proces,'RESOURCE');
-					  graph__addNodeID("Z_".$ID, $graph,$DESC['DESC'],null,"Z_".$DESC['PARENT_ID'],'RESOURCE');
-				  }
-			 }
-
-		 
-		 
-		 
-		 
-	 }
-	 
-	 
- 
-	 
-/*
-	$db = DB::getDB();
-	
-	$sql= "select p.`ID`,`DESC` from `CRM_PROCES` as p where  p.`A_STATUS` in('WAITING','NORMAL') and p.`TYPE`='PROCES_INIT' and ID=994 limit 1";
-	$res=DB::query($sql);
-	while($h=DB::fetch($res)) {
-		SearchParentsWithExits($h->ID,$h->ID,$graph,'Proces '.$h->ID,0);
-		//graph__addNodeID($h->ID, $graph);
-		graph__addNodeID('1', $graph,'1');
-
-	//	graph__addNodeID($h->ID, $graph,$h->ID);
-//		graph__addNodeID('100', $graph,'100');
-		//$graph->treeItems[$h->ID] = true;
-		//$graph->treeItems[101] = true;
-
-//		$graph->elements->nodes[] = array('data'=>array('id'=>$h->ID, 'name'=>$h->ID , 'type'=>'procesInit'));
-//		$graph->elements->nodes[] = array('data'=>array('id'=>101, 'name'=>101 , 'type'=>'procesInit'));
-//		$graph->elements->edges[] = array('data'=>array('source'=>994, 'target'=>101));
-
-
-	}
-*/
-	foreach($graph->elements->nodes as $var) {
-	//	echo "<br>\n NODE".$var[data][id];
-		$nodes[$var[data][id]]=$var[data][id];
-	}
-	foreach($graph->elements->edges as $var) {
-		//echo "<br>\n".$var[data][source]." ".$var[data][target]." ";
-		if(!isset($nodes[$var[data][source]]))  echo "<br>FAIL1 ".$var[data][source];
-		if(!isset($nodes[$var[data][target]]))  echo "<br>FAIL2 ".$var[data][target];
 	}
 
-	DEBUG_S(3,'nodes',$graph->elements->nodes);
-	DEBUG_S(3,'edges',$graph->elements->edges);
-/*		
-	$sql = "select p.`ID`, p.`PARENT_ID`
-			from `CRM_PROCES` as p
-			where p.`A_STATUS` in('WAITING','NORMAL')
-	";
-	$res = $db->query($sql);
-	while ($r = $db->fetch($res)) {
-		$graph->procesTreeFlat[$r->PARENT_ID] []= $r->ID;
-	}
+	$id_zasob = V::get('id_zasob', '', $_REQUEST, 'int');
 
-	$sql = "select p.`IF_TRUE_GOTO` as ID, p.`ID` as PARENT_ID
-			from `CRM_PROCES` as p
-			where p.`A_STATUS` in('WAITING','NORMAL')
-				and p.IF_TRUE_GOTO>0
-		--		and p.IF_TRUE_GOTO_FLAG='GOTO_AND_RETURN'
-	";
-	
-	$res = $db->query($sql);
-	while ($r = $db->fetch($res)) {
-		$graph->procesTreeGoto[$r->PARENT_ID] []= $r->ID;
-	}
+	$PROCES_INIT_SCAN = V::get('PROCES_INIT_SCAN', '', $_REQUEST, 'int');
+	if (!empty($PROCES_INIT_SCAN)) {
+		$cp = new GraphViewProcessParser();
 
+		$PROCES_INIT_SCAN_STANOWISKO = V::get('PROCES_INIT_SCAN_STANOWISKO', '', $_REQUEST, 'int');
+		$PROCES_INIT_SCAN_USER = V::get('PROCES_INIT_SCAN_USER', '', $_REQUEST, 'int');
 
-	function createGraphRec($id, $tree, &$graph, $lvl = 0) {
-		$graph->treeItems[$id] = true;
-		settype($id, 'string');
-		if ($id == 3122) {
-			$graph->elements->nodes[] = array('data'=>array('id'=>$id, 'name'=>$id, 'type'=>'procesInit', 'lvl'=>$lvl));
+		if (!empty($PROCES_INIT_SCAN_STANOWISKO)) {
+			$PROCES_INIT_SCAN_STANOWISKA = array($PROCES_INIT_SCAN_STANOWISKO);
+			$proces_list_obj = ProcesHelper::get_procesy_by_stanowiska($PROCES_INIT_SCAN_STANOWISKA);
+			foreach ($proces_list_obj as $obj) {
+				$init[$obj->ID] = $obj->ID;
+			}
+		} else if(!empty($PROCES_INIT_SCAN_USER))  {
+			$proces_list_obj = UsersHelper::get_group_by_user($PROCES_INIT_SCAN_USER, array('SHOW_IN_PERIOD_MARK' => 'YES'));
+			foreach ($proces_list_obj as $obj) {
+				$init[$obj->ID] = $obj->ID;
+			}
+		} else if(!empty($id_zasob)) {
+			$init = ProcesHelper::get_proces_init_by_zasob_id($id_zasob);
 		} else {
-			$graph->elements->nodes[] = array('data'=>array('id'=>$id, 'name'=>$id, 'lvl'=>$lvl));
+			$init = $cp->get_proces_init($id_proces);
 		}
-
-		if ($lvl > 1) {
-		//	return;
-		}
-
-		if (!empty($tree[$id])) {
-			foreach ($tree[$id] as $vChildID) {
-				$graph->elements->edges[] = array('data'=>array('source'=>$id, 'target'=>$vChildID));
-				createGraphRec($vChildID, $tree, $graph, $lvl + 1);
+		DEBUG_S(3,'lista procesow init',$init,__FILE__,__FUNCTION__,__LINE__);
+		foreach ($init as $id_proces) {
+			$tree = $cp->build_proces_init_tree($id_proces);
+			$cp->build_tree_flat_info($tree, null);
+			$cp->detect_tree_where_to_detail_cut($tree, 'nocut');
+			$cp->build_path_zoom_proces_cut($tree, $id_proces);
+			DEBUG_S(3,'get_proces_init',$init);
+			DEBUG_S(3,'tree->childs',$tree->Childs);
+			DEBUG_S(3,'tree->Parents',$tree->Parents);
+			DEBUG_S(3,'tree->Viev_Zpc',$tree->Viev_Zpc);
+			DEBUG_S(3,'tree->Viev_Zpc_Parent',$tree->Viev_Zpc_Parent);
+			DEBUG_S(3,'tree->get_resources_by_proceses_id',$tree->get_resources_by_proceses_id);
+			graph__addNodeID(0, $graph, $name = null, $path, null);
+			foreach ($tree->Viev_Zpc as $id => $obj) {
+				graph__addNodeID($id, $graph, $obj->DESC, null, ((isset($obj->PARENT))? $obj->PARENT : null), $tree->Childs[$id]->TYPE);
+				foreach ($obj->EXTERNAL_LINK as $link) {
+					graph__addNodeID($link, $graph, $tree->Viev_Zpc[$link]->DESC, null, $id, 'PROCES_INIT');
+				}
 			}
+			if (!empty($_REQUEST['RESOURCES'])) {
+				$resources = $cp->get_resources_by_proceses_id($tree->Childs, $id_proces, $id_zasob);
+				foreach ($resources['PARENT_ID'] as $ID => $DESC) {
+					graph__addNodeID("Z_{$ID}", $graph, $DESC, null, null, 'RESOURCE');
+				}
+				foreach ($resources['ID'] as $ID => $DESC) {
+					graph__addNodeID("Z_{$ID}", $graph, $DESC['DESC'], null, $id_proces, 'RESOURCE');
+					graph__addNodeID("Z_{$ID}", $graph, $DESC['DESC'], null, "Z_{$DESC['PARENT_ID']}", 'RESOURCE', 'once');
+				}
+			}
+			unset($tree);
 		}
 	}
-
-	createGraphRec($id_proces, $graph->procesTreeFlat, $graph);
-
-*/
-/*
-	// addGraphGoto
-	foreach ($graph->procesTreeGoto as $kID => $vGotoIds) {
-		//$graph->treeItems[$id] = true;
-		if (array_key_exists($kID, $graph->treeItems)) {
-			foreach ($vGotoIds as $vGotoID) {
-				graph__addNodeID($vGotoID, $graph);
-				$graph->elements->edges[] = array('data'=>array('source'=>$kID, 'target'=>$vGotoID, 'type'=>'GOTO'));
+	else {
+		$cp = new GraphViewProcessParser();
+		$tree = $cp->build_proces_init_tree($id_proces);
+		$cp->build_tree_flat_info($tree, null);
+		$cp->detect_tree_where_to_detail_cut($tree);
+		$cp->build_path_zoom_proces_cut($tree, $id_proces);
+		DEBUG_S(3,'get_proces_init',$init);
+		DEBUG_S(3,'tree->childs',$tree->Childs);
+		DEBUG_S(3,'tree->Parents',$tree->Parents);
+		DEBUG_S(-3,'tree->Viev_Zpc',$tree->Viev_Zpc);
+		DEBUG_S(3,'tree->Viev_Zpc_Parent',$tree->Viev_Zpc_Parent);
+		DEBUG_S(3,'tree->Viev_Zpc_Parent_cut',$tree->Viev_Zpc_Parent_cut);
+		DEBUG_S(3,'tree->Viev_Zpc_found',$tree->Viev_Zpc_found);
+		graph__addNodeID(0, $graph, $name = null, $path, null);
+		foreach ($tree->Viev_Zpc as $id => $obj) {
+			graph__addNodeID($id, $graph, $obj->DESC, null, ((isset($obj->PARENT))? $obj->PARENT : null), $tree->Childs[$id]->TYPE);
+			foreach ($obj->INTERNAL_LINK as $link) {
+				graph__addNodeID($id, $graph, $tree->Viev_Zpc[$link]->DESC, null, $link, null);
 			}
-		} else {
-			foreach ($vGotoIds as $vGotoID) {
-				if (array_key_exists($vGotoID, $graph->treeItems)) {
-//echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;"> (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r("TODO: add node ($kID); add edge from $kID to $vGotoID");echo'</pre>';
-					graph__addNodeID($kID, $graph);
-					//$graph->elements->edges[] = array('data'=>array('source'=>$kID, 'target'=>$vGotoID, 'type'=>'GOTO'));
-				}
+			foreach ($obj->EXTERNAL_LINK as $link) {
+				graph__addNodeID($link, $graph, $tree->Viev_Zpc[$link]->DESC, null, $id, 'PROCES_INIT');
+			}
+		}
+		if (!empty($_REQUEST['RESOURCES'])) {
+			$resources = $cp->get_resources_by_proceses_id($tree->Childs, $id_proces, $id_zasob);
+			foreach ($resources['PARENT_ID'] as $ID => $DESC) {
+				graph__addNodeID("Z_{$ID}", $graph, $DESC, null, null, 'RESOURCE');
+			}
+			foreach ($resources['ID'] as $ID => $DESC) {
+				graph__addNodeID("Z_{$ID}", $graph, $DESC['DESC'], null, $id_proces, 'RESOURCE');
+				graph__addNodeID("Z_{$ID}", $graph, $DESC['DESC'], null, "Z_{$DESC['PARENT_ID']}", 'RESOURCE');
 			}
 		}
 	}
-*/
+
+	foreach($graph->elements->nodes as $var) {
+		$nodes[$var['data']['id']] = $var['data']['id'];
+	}
+	foreach($graph->elements->edges as $var) {
+		if (!isset($nodes[$var['data']['source']])) echo "<br>FAIL1 ".$var['data']['source'];
+		if (!isset($nodes[$var['data']['target']])) echo "<br>FAIL2 ".$var['data']['target'];
+	}
+	DEBUG_S(3,'nodes',$graph->elements->nodes);
+	DEBUG_S(3,'edges',$graph->elements->edges);
 ?>
 <style type="text/css">
 #<?php echo $graph->htmlID; ?>_wrap {
@@ -627,9 +209,7 @@ function GRAPH_VIEW_PROCES() {
 }
 #<?php echo $graph->htmlID; ?>_wrap .actions { position:absolute; top:20px; left:-40px; margin:0; padding:0; list-style:none; }
 #<?php echo $graph->htmlID; ?>_wrap .actions button { border-radius:0; background:#fff; border:1px solid #ccc; }
-
 </style>
-
 <script src="./stuff/cytoscape.js/arbor.js"></script>
 <script src="./stuff/cytoscape.js/cytoscape.js"></script>
 <script>
@@ -776,3 +356,216 @@ jQuery(document).ready(function(){
 
 <?php
 }
+
+class GraphViewProcessParser {
+
+// var $this->get_proces_init=array();
+// [proces_init]  - A
+//    [step]      - flat 0
+//    [step]      - flat 3 , tree 2 , cut
+//     [step]     - flat 0 , tree 0
+//     [step]     - flat 1 , tree 1
+//       [step]   - flat 1 , tree 1
+//         [step] - flat 0 , tree 0
+//     [step]     - flat 1 , tree 1
+//       [step]   - flat 0 , tree 0
+
+	public function get_proces_init($id_proces) {
+		$db = DB::getDB();
+		$sql = "select
+				p.`ID`
+				, p.`DESC`
+			from `CRM_PROCES` as p
+				left join `_CRM_PROCES_INIT_STATS` as cs on(cs.`ID` = p.`ID`)
+			where
+				p.`A_STATUS` in('WAITING','NORMAL')
+				and p.`TYPE`='PROCES_INIT'
+				and (cs.`path` like '%/{$id_proces}/%' or cs.`path` like '%/{$id_proces}'  or cs.`path` like '{$id_proces}/%')
+		";
+		$res = $db->query($sql);
+		while ($h = $db->fetch($res)) {
+			$this->get_proces_init[] = $h->ID;
+		}
+		return $this->get_proces_init;
+	}
+
+	public function build_proces_init_tree($id_proces) {
+		$db = DB::getDB();
+		$tree->Childs[$id_proces]->PARENT = 0;
+		$tree->Childs[$id_proces]->SOURCE = 'build_tree_for_proces';
+		$tree->Parents[0]->CHILD[$id_proces] = $id_proces;
+		$obj = $db->get_by_id('CRM_PROCES', $id_proces);
+		$tree->Childs[$id_proces]->TYPE = $obj->TYPE;
+		$this->build_tree_for_proces($tree, $id_proces, $id_proces);
+		return $tree;
+	}
+
+	public function build_tree_for_proces(&$tree, $cursor, $init_once = null) {
+		$db = DB::getDB();
+		$sqlOr = (!empty($init_once))? " or cp.ID={$init_once} " : "";
+		$sql = "select
+			cp.`ID`
+			, cp.`IF_TRUE_GOTO`
+			, cp.`IF_TRUE_GOTO_FLAG`
+			, cp.`TYPE`
+		from `CRM_PROCES` as cp
+		where
+			(cp.PARENT_ID={$cursor} {$sqlOr})
+			and  cp.`A_STATUS` in('WAITING','NORMAL')
+		";
+		$res = $db->query($sql);
+		while ($h = $db->fetch($res)) {
+			if (empty($init_once)) $tree->Childs[$h->ID]->PARENT = $cursor;
+			if (empty($init_once)) $tree->Parents[$cursor]->CHILD[$h->ID] = $h->ID;
+			$tree->Childs[$h->ID]->TYPE = $h->TYPE;
+			$tree->Childs[$h->ID]->SOURCE = 'build_tree_for_proces';
+			if ($h->IF_TRUE_GOTO > 0) {
+				$tree->Childs[$h->ID]->GOTO_FLAG = $h->IF_TRUE_GOTO_FLAG;
+				$tree->Childs[$h->ID]->IF_TRUE_GOTO = $h->IF_TRUE_GOTO;
+				$tree->Childs[$h->IF_TRUE_GOTO]->IS_EXECUTED_BY[$h->ID] = $h->ID;
+			}
+			$this->build_tree_for_proces($tree, $h->ID, null);
+		}
+	}
+
+	public function get_resources_by_proceses_id($id_proces_obj, $id_proces, $filter_zasob) {
+		$db = DB::getDB();
+		$filter = "";
+		if (is_array($filter_zasob)) {
+			$filter = " and cz.ID in (".implode(',', $filter_zasob).") ";
+		}
+		else if (!empty($filter_zasob)) {
+			$filter = " and cz.ID={$filter_zasob}";
+		}
+		$sql = "select
+				cz.ID
+				, cz.PARENT_ID
+				, cz.`DESC`
+				, cz.`TYPE`
+				, czp.`DESC` as DESC_czp
+				, czp.`TYPE` as TYPE_czp
+			from CRM_WSKAZNIK as cw
+				left join CRM_LISTA_ZASOBOW as cz on(cz.ID=cw.ID_ZASOB)
+				left join CRM_LISTA_ZASOBOW as czp on(czp.ID=cz.PARENT_ID)
+			where cw.ID_PROCES in(".implode(',', array_keys($id_proces_obj)).")
+				and cw.A_STATUS in ('NORMAL','WAITING')
+				and czp.`TYPE` in ('TABELA')
+				{$filter}
+		";
+		$res = $db->query($sql);
+		while ($h = $db->fetch($res)) {
+			$found['ID'][$h->ID]['PARENT_ID'] = $h->PARENT_ID;
+			$found['ID'][$h->ID]['DESC'] = $h->DESC;
+			$found['PARENT_ID'][$h->PARENT_ID] = $h->DESC_czp;
+		}
+		return $found;
+	}
+
+	public function build_tree_flat_info(&$tree, $flat) {
+		foreach ($tree->Childs as $id => $obj) {
+			//sprawdzmy czy nasz parent wymaga wyswietlenia osobnego podkroku w widoku szczegolowego procesu
+			foreach ($tree->Parents[$id]->CHILD as $child) {
+				$tree->Childs[$id]->CHILD[$child] = count($tree->Parents[$child]->CHILD);
+			}
+		}
+	}
+
+	public function detect_tree_where_to_detail_cut(&$tree, $flag_not_to_cut = null) {
+		foreach ($tree->Childs as $id => $obj) {
+			//sprawdzmy czy nasz parent wymaga wyswietlenia osobnego podkroku w widoku szczegolowego procesu
+			$control = 0;
+			foreach ($obj->CHILD as $child) {
+				if ($child > 0) $control++;
+			}
+			if (empty($flag_not_to_cut)) {
+				if ($control > 1) {
+					//przeciecie jezeli jest wiecej wyjsc niz jedno z zaglebieniami
+					$tree->Childs[$id]->TO_DETAIL_CUT_FLAG = true;
+				}
+				if (isset($tree->Childs[$id]->GOTO_FLAG)) {
+					//przeciecie, jezeli jest wyjscie z kroku procesu do innego 
+					$tree->Childs[$id]->TO_DETAIL_CUT_FLAG = true;
+				}
+				if (isset($tree->Childs[$id]->IS_EXECUTED_BY)) {
+					//trzeba zbadac tez czy nie jest do niego dowiazywany w jakims miejscu proces
+					$tree->Childs[$id]->TO_DETAIL_CUT_FLAG = true;
+				}
+			} else {
+				$tree->Childs[$id]->NO_CUT_FLAG = true;
+			}
+		}
+	}
+
+	public function search_parent_ids_till_cut(&$tree, $init, &$find) {
+		//szukam lancuchow do optymalizacji do miejsca flagi CUT, kojarzac od razu linki
+		if (isset($tree->Childs[$init]->TO_DETAIL_CUT_FLAG)) {
+			$this->zoom_process_links($tree, $init, $init);
+		}
+		if (!isset($tree->Childs[$init]->TO_DETAIL_CUT_FLAG)) {
+			$find[] = $init;
+			$this->zoom_process_links($tree, $init, $find[0]);
+			foreach($tree->Childs[$init]->CHILD as $id => $count) {
+				$this->search_parent_ids_till_cut($tree, $id, $find);
+			}
+		}
+	}
+
+	public function zoom_process_links($tree, $id, $root_id) {
+		$db = DB::getDB();
+		if (isset($tree->Childs[$id]->GOTO_FLAG)) {
+			if (isset($tree->Childs[$tree->Childs[$id]->IF_TRUE_GOTO])) {
+				if (isset($tree->Childs[$tree->Childs[$id]->IF_TRUE_GOTO]->SOURCE)) {
+					$tree->Viev_Zpc[$root_id]->INTERNAL_LINK[$tree->Childs[$id]->IF_TRUE_GOTO] = $tree->Childs[$id]->IF_TRUE_GOTO;
+				} else {
+					$tree->Viev_Zpc[$root_id]->EXTERNAL_LINK[$tree->Childs[$id]->IF_TRUE_GOTO] = $tree->Childs[$id]->IF_TRUE_GOTO;
+				}
+			} else {
+				$tree->Viev_Zpc[$root_id]->EXTERNAL_LINK[$tree->Childs[$id]->IF_TRUE_GOTO] = $tree->Childs[$id]->IF_TRUE_GOTO;
+				$obj = $db->get_by_id('CRM_PROCES',$tree->Childs[$id]->IF_TRUE_GOTO);
+				$tree->Viev_Zpc[$tree->Childs[$id]->IF_TRUE_GOTO]->DESC = "{" . $obj->ID . "}" . V::strShortUtf8($obj->DESC, 50);
+				if ($tree->Childs[$id]->GOTO_FLAG == 'GOTO_AND_RETURN') {
+					$tree->Viev_Zpc[$tree->Childs[$id]->IF_TRUE_GOTO]->EXTERNAL_LINK[$root_id] = $root_id;
+				}
+			}
+		}
+	}
+
+	public function build_path_zoom_proces_cut(&$tree, $init, $path_zpc = array()) {
+		$db = DB::getDB();
+		foreach ($tree->Childs as $id => $obj) {
+			if (!isset($tree->Viev_Zpc_found[$id])) {
+				$find = array();
+				$this->search_parent_ids_till_cut($tree, $id, $find);
+				foreach ($find as $find_id) {
+					$tree->Viev_Zpc_found[$find_id] = $find[0];
+					if ($find_id != $find[0]) {
+						$tree->Viev_Zpc_Parent[$find_id] = $find[0];// TODO: moze byc to z bledem jak nadrzedny bedzie zbitym ciagiem
+					}
+					else {
+						$tree->Viev_Zpc_Parent[$find_id] = $tree->Childs[$find_id]->PARENT;
+					}
+				}
+				$tree->Viev_Zpc[$id]->PATH = $find;
+				$obj = $db->get_by_id('CRM_PROCES', $id);
+				$tree->Viev_Zpc[$id]->DESC = "{" . $id . "}" . V::strShortUtf8($obj->DESC, 50, '...');
+			}
+		}
+
+		foreach($tree->Viev_Zpc as $id => $obj) {
+			if (!isset($obj->PARENT)) {
+				foreach($tree->Viev_Zpc as $id_=>$obj_) {
+					if (isset($tree->Childs[$id_]->SOURCE)) {
+						if (in_array($tree->Childs[$id]->PARENT, $obj_->PATH)) {
+							$tree->Viev_Zpc[$id]->PARENT = $id_;
+						}
+					}
+				}
+			}
+
+			if (!isset($tree->Viev_Zpc[$id]->PARENT)) {
+				$tree->Viev_Zpc[$id]->PARENT = $tree->Childs[$id]->PARENT;
+			}
+		}
+	}
+
+}

+ 5 - 5
SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -1412,9 +1412,9 @@ database=\"SES_USERS2\"
                           left join CRM_WSKAZNIK cw on cw.ID_ZASOB=czp.ID
                           left join _CRM_PROCES_STATS_proc_wiev as cpi on cpi.ID=cw.ID_PROCES 
                           left join CRM_WSKAZNIK as cw1 on cw1.ID_PROCES=cpi.ID_PROCES_INIT
-                          left join CRM_LISTA_ZASOBOW as czp1 on czp1.ID=cw1.ID_ZASOB and czp1.`TYPE`=\'STANOWISKO\'
+                          left join CRM_LISTA_ZASOBOW as czp1 on czp1.ID=cw1.ID_ZASOB and czp1.\\`TYPE\\`=\'STANOWISKO\'
                           left join ADMIN_USERS au on au.ADM_ACCOUNT=\''.$ADMIN_USERNAME_DIRECTORY.'\'
-                          where cz.`DESC` like \'KONTAKTY_view\' and cz.`TYPE`=\'TABELA\' limit 1 " |mysql -uroot -p'.$ADMIN_USERNAME_PASSWD.' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
+                          where cz.\\`DESC\\` like \'KONTAKTY_view\' and cz.\\`TYPE\\`=\'TABELA\' limit 1 " |mysql -uroot -p'.$ADMIN_USERNAME_PASSWD.' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
  
  $cmd[]['rsh']=' echo " insert into CRM_AUTH_PROFILE (ID_ZASOB, REMOTE_TABLE,REMOTE_ID) select czp1.ID , \'ADMIN_USERS\', au.ID
                           from CRM_LISTA_ZASOBOW cz 
@@ -1422,11 +1422,11 @@ database=\"SES_USERS2\"
                           left join CRM_WSKAZNIK cw on cw.ID_ZASOB=czp.ID
                           left join _CRM_PROCES_STATS_proc_wiev as cpi on cpi.ID=cw.ID_PROCES 
                           left join CRM_WSKAZNIK as cw1 on cw1.ID_PROCES=cpi.ID_PROCES_INIT
-                          left join CRM_LISTA_ZASOBOW as czp1 on czp1.ID=cw1.ID_ZASOB and czp1.`TYPE`=\'STANOWISKO\'
+                          left join CRM_LISTA_ZASOBOW as czp1 on czp1.ID=cw1.ID_ZASOB and czp1.\\`TYPE\\`=\'STANOWISKO\'
                           left join ADMIN_USERS au on au.ADM_ACCOUNT=\''.$ADMIN_USERNAME_L1.'\'
-                          where cz.`DESC` like \'KONTAKTY_view\' and cz.`TYPE`=\'TABELA\' limit 1 " |mysql -uroot -p'.$ADMIN_USERNAME_PASSWD.' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
-
+                          where cz.\\`DESC\\` like \'KONTAKTY_view\' and cz.\\`TYPE\\`=\'TABELA\' limit 1 " |mysql -uroot -p'.$ADMIN_USERNAME_PASSWD.' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
  
+
  /* @2014-03-10 these has been moved to create config_base_structure_dump.sql option - WYKONAJ_REFERENCYJNA_BAZE_DANYCH 
  $cmd[]['rsh']='php -r"include(\'/Library/Server/Web/Data/Sites/Default/SE/superedit-SQIX_STRUCTURE_DB_SYNC.php\') ; SQIX_STRUCTURE_DB_SYNC(\'import_db\',\'default_db\',0,\'WYSLIJ_DO_BAZY\',\'SYNC_ZASOBY_STRUCTURES_FROM_CONFIG\'); " '.$SERVER_ADDRESS.' FILTR'; //todo pare razy trzaba powtarzac bo sa bledy
  $cmd[]['rsh']='php -r"include(\'/Library/Server/Web/Data/Sites/Default/SE/superedit-SQIX_STRUCTURE_DB_SYNC.php\') ; SQIX_STRUCTURE_DB_SYNC(\'import_db\',\'default_db\',0,\'WYSLIJ_DO_BAZY\',\'CREATE_ZASOBY_DATABASE_DESC\'); " '.$SERVER_ADDRESS.' FILTR'; //@2013-10-15 staje recznie ? 

+ 2 - 2
SE/superedit-SYNC_DATABASES.php

@@ -150,7 +150,7 @@ class SYNC_DATABASES {
 				  	} else {
 				  		if(empty($this->ids_loc[$val->$loc_key]))  {
 				  			DEBUG_S(-3,"Brak klucza w loc ".$loc_key." (".$val->$loc_key.") - robie UPDATE w LOC ",$val,__FILE__,__FUNCTION__,__LINE__);
-				  			$res=$this->db->UPDATE_OBJ($table,$this->db->MAKE_DB_OBJ($table,$val)) ;
+				  			$res=$this->db->UPDATE_OBJ($table,$this->db->MAKE_DB_OBJ($table,$val),null,'skip_author') ;
 				  			DEBUG_S(-3,'Res od aktualizacji',$res,__FILE__,__FUNCTION__,__LINE__);
 
 				  		}
@@ -176,7 +176,7 @@ class SYNC_DATABASES {
 				  		if(empty($this->ids_rem[$val->$rem_key]))  {
 				  			DEBUG_S(-3,"Brak klucza w rem ".$rem_key." (".$val->$rem_key.") - robie UPDATE w REM",array($val,$this->gdb->MAKE_DB_OBJ($table,$val)),__FILE__,__FUNCTION__,__LINE__);
 				  			
-				  			$res=$this->gdb->UPDATE_OBJ($table,$this->gdb->MAKE_DB_OBJ($table,$val)) ;
+				  			$res=$this->gdb->UPDATE_OBJ($table,$this->gdb->MAKE_DB_OBJ($table,$val),null,'skip_author') ;
 				  			DEBUG_S(-3,'Res od aktualizacji',$res,__FILE__,__FUNCTION__,__LINE__);
 
 				  		}					  	

+ 239 - 0
SE/superedit-SYNC_GIS_GEOPORTAL_IMPORT_G2_GO_WFS.php

@@ -0,0 +1,239 @@
+<?php
+//
+// synchronizacja do serwera postgres GIS
+//
+
+include_once('se-lib/DB_Dump.php');
+include_once('se-lib/UsersHelper.php');
+set_time_limit(360);
+
+
+
+function get_data($url) {
+	$ch = curl_init();
+	$timeout = 5;
+	
+	$User_Agent = 'Mozilla/5.0 (X11; Linux i686) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.43 Safari/537.31';
+
+	$request_headers = array();
+	$request_headers[] = 'User-Agent: '. $User_Agent;
+	$request_headers[] = 'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8';
+	curl_setopt($ch, CURLOPT_HTTPHEADER, $request_headers);
+	
+	curl_setopt($ch, CURLOPT_URL, $url);
+	curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+	curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout);
+	$data = curl_exec($ch);
+	$error=curl_error ( $ch);
+	
+	echo $error;
+	curl_close($ch);
+	
+	return $data;
+}
+
+
+function SYNC_GIS_GEOPORTAL_IMPORT_G2_GO_WFS() {
+	global $db,$gdb;
+
+	$mysql_zas_id=36;
+	$gis_zas_id=13102;
+	$sql_cr="";
+	
+	$db = DB::getDB();
+	$gdb= DB::getDB($gis_zas_id);
+	
+	$tbl_dest="WFS_DzKat_G2_GO_WFS";
+	
+	
+		DEBUG_S(-3,'db',$db);
+		DEBUG_S(-3,'gis',$gdb);
+		
+	
+	//			 http://sdi.geoportal.gov.pl/wfs_dzkat/wfservice.aspx?service=wfs&request=getfeature&bbox=50.855,20.695,50.911,20.805&version=1.1.0&typename=Dzialki&srsname=EPSG:4326
+	//2014-06-05 http://sdi.geoportal.gov.pl/wfs_dzkat/wfservice.aspx?request=getfeature&version=1.1.0&service=wfs&typename=Dzialki&srsName=EPSG:4326&bbox=21.1,52.6,21.2,52.7
+
+	
+	
+$url="http://sdi.geoportal.gov.pl/wfs_dzkat/wfservice.aspx?request=getFeature&version=1.1.0&service=WFS&typename=gmgml:";
+$url="http://mapy.geoportal.gov.pl/wss/service/pub/guest/G2_GO_WFS/MapServer/WFSServer?service=wfs&request=getFeature&service=service=WFS";
+
+$layers[]='G2_GO_WFS:Dzialki';
+$srsName='EPSG:4326';
+//$bbox_y0=51.00; //dol
+//$bbox_x0=21.00; //lewo
+//$bbox_y1=52.14; //gora
+//$bbox_x1=22.83;//prawo
+//$step_y=0.01;
+//$step_x=0.01;
+
+
+//dla gdanska
+$bbox_x0=54.21; //dol
+$bbox_y0=18.41; //lewo
+$bbox_x1=54.28;//gora
+$bbox_y1=18.55; //prawo
+$step_y=0.01;
+$step_x=0.01;
+
+
+/*
+$srsName='EPSG:2180';
+$bbox_y0=378316; //dol
+$bbox_x0=423036; //lewo
+$bbox_y1=379316; //gora
+$bbox_x1=424036;//prawo
+$step_y=50;
+$step_x=50;
+*/
+
+//lg=174213,770680,,876438,108559
+//<gml:lowerCorner>49.0023866380461 14.1229300045899</gml:lowerCorner>
+//<gml:upperCorner>54.8357888684533 24.1457361773594</gml:upperCorner>
+//EPSG:2180 378316,423036
+//54.13000,18.3156,54.3226,18.5427
+
+
+
+foreach($layers as $layer) {
+
+
+	for($y=$bbox_y0;$y<=$bbox_y1;$y=$y+$step_y) {
+		
+		for($x=$bbox_x0;$x<=$bbox_x1;$x=$x+$step_x) {		
+		
+			$url_get=$url."&typename=".$layer.'&srsName='.$srsName.'&bbox='.$y.','.$x.','.($y+$step_y).','.($x+$step_x);
+			echo "<br>".$url_get;
+			//break 2 ;
+
+
+echo "<br> bede jechac ".$url_get;
+			
+			
+			
+			$xml_=get_data($url_get);
+			//$xmlarray = array(); // this will hold the flattened data 
+			
+			
+			
+			
+			$element = simplexml_load_string($xml_);
+			$element->registerXPathNamespace('G2_GO_WFS', 'http://mapy.geoportal.gov.pl:80/wss/service/pub/guest/G2_GO_WFS/MapServer/WFSServer');
+			$element->registerXPathNamespace('gml', 'http://www.opengis.net/gml');
+			$element->registerXPathNamespace('wfs', 'http://www.opengis.net/wfs');
+
+			//$element->registerXPathNamespace('p', 'http://example.org');
+			
+//			$positions = $element->xpath('/wfs:FeatureCollection[1]/gml:featureMember/gmgml:Dzialki');
+			$positions = $element->xpath('/wfs:FeatureCollection[1]/gml:featureMember');
+			DEBUG_S(-3,'Element positions',$positions,__FILE__,__FUNCTION__,__LINE__);
+			//$count[]=$positions->count();
+			$i=0;
+			foreach ($positions as $pos) {
+			
+
+		     // $pos_id = $element->xpath('/wfs:FeatureCollection/gml:featureMember/G2_GO_WFS:Dzialki[@gml:id="F324__22282165"]/G2_GO_WFS:OBJECTID');
+		     /* $pos_id = $element->xpath('/wfs:FeatureCollection/gml:featureMember/G2_GO_WFS:Dzialki[@gml:id="F324__22458175"]/G2_GO_WFS:IDENTYFIKATOR');
+		      foreach($pos_id as $pos_id_) {
+			      echo "<br>136: ";
+			      print_r($pos_id_->__toString());
+		      }
+				*/	      
+
+			  $pos_ = $pos->xpath('./G2_GO_WFS:Dzialki/@gml:id');
+	//		  DEBUG_S(-3,'pos_',$pos,__FILE__,__FUNCTION__,__LINE__);
+			  foreach ($pos_ as $ind_=>$pos__) {
+			  
+			  	$seq[]=1;
+			  	$exp[$i]['ID']=$pos__->__toString();
+
+			    ///	$result[] = $pos__->__toString();
+			  	$i++;
+			  	
+			  }
+			
+			 
+			}
+			DEBUG_S(-3,'Element exp',$exp,__FILE__,__FUNCTION__,__LINE__);
+
+			$cols=array('IDENTYFIKATOR'=>'G2_GO_WFS:IDENTYFIKATOR','POWIERZCHNIA'=>'G2_GO_WFS:POWIERZCHNIA','posList'=>'G2_GO_WFS:SHAPE/gml:MultiSurface/gml:surfaceMember/gml:Polygon/gml:exterior/gml:LinearRing/gml:posList'); //todo jak zrobic atrubuty ? 'EPSG'=>'gmgml:GEOMETRIA_DEG/gml:Polygon@'
+			
+			foreach($cols as $column=>$xpath) {
+			  foreach($seq as $ind=>$val) {
+			 //  echo "<br>Xpath test ".'/wfs:FeatureCollection/gml:featureMember/G2_GO_WFS:Dzialki[@gml:id="'.$exp[$ind]['ID'].'"]/'.$xpath;
+				$pos1_=$element->xpath('/wfs:FeatureCollection/gml:featureMember/G2_GO_WFS:Dzialki[@gml:id="'.$exp[$ind]['ID'].'"]/'.$xpath);
+					//echo "<br> exp[".$ind. "][".$column."]=";
+					  foreach($pos1_ as $pos1__) {
+				  	     $exp[$ind][$column]=$pos1__->__toString();
+				  	  //  echo "DET: .. a string to ".$pos1__->__toString();
+				  	  }
+			  }
+			}
+			
+			//var_dump($result);
+			
+			DEBUG_S(-3,'x',array($url_get,$xml_,$xml,$element,$result,$ind,$count,$exp),__FILE__,__FUNCTION__,__LINE__);
+			
+			
+			
+			foreach($exp as $exp_) {
+			
+				$WKT_a=explode(" ", $exp_['posList']);
+				$y_=false;
+				$WKT='';
+				$WKT_=array();
+				$i=0;
+				foreach($WKT_a as $ref) {
+				    if(!$y_) $y_=$ref;
+				       else { 
+				       	$WKT_[]=$ref." ".$y_;
+				       	$y_=false;
+				       }
+				$i++;
+				}
+				
+				$WKT=implode(",", $WKT_);
+				//print_r($WKT);
+				
+				//$sql='delete from  "'.$tbl_dest.'" where "REM_SYSTEM"=\''.$url.'\' and "REM_ID"=\''.$exp_['ID'].'\'';
+				//$gdb->query($sql);
+				//nie kasujemy istniejaych obiektow - TODO 
+				$sql='select "REM_ID" from "'.$tbl_dest.'" where "REM_SYSTEM"=\''.$url.'\' and "REM_ID"=\''.$exp_['ID'].'\' ';
+				$res=$gdb->query($sql);
+				if($gdb->count($res)<1) {
+				
+					$sql='insert  into "'.$tbl_dest.'" ( "REM_SYSTEM","REM_ID","IDENTYFIKATOR","POWIERZCHNIA","posList","A_RECORD_CREATE_DATE" ) values 
+					(\''.$url.'\',\''.$exp_['ID'].'\',\''.$exp_['IDENTYFIKATOR'].'\' , \''.$exp_['POWIERZCHNIA'].'\',ST_GeomFromEWKT(\'SRID=4326;POLYGON(('.$WKT.'))\') ,now() ) 
+					';
+					DEBUG_S(-3,"SQL",$sql,__FILE__,__FUNCTION__,__LINE__);	
+					$gdb->query($sql);
+				} else echo " | Obj ".$exp_['ID']." already exists in DB";
+			}
+			
+			unset($exp);
+			unset($seq);
+		//	die();
+
+			//	die('test');
+
+		}
+		
+	}
+	
+flush();
+//break 2;
+}
+
+
+
+			
+
+
+echo "<br> pojechalem";
+
+
+echo "</pre>";
+
+	
+
+}

+ 25 - 0
SE/superedit-bm_make_faktura.php

@@ -0,0 +1,25 @@
+<?php
+
+		Lib::loadClass('TableAcl');
+		Lib::loadClass('UserAcl');
+		Lib::loadClass('Billing_html');
+		$billing=new Billing_html('931');
+
+
+		$billing->set_client_filter=$_REQUEST['ARG1_VAL'];
+		$billing->lista_faktur(); 	
+
+		DEBUG_S(-3,'Billing',$billing,__FILE__,__FUNCTION__,__LINE__);
+	
+
+	
+	
+	
+//	$db=DB::getDb();
+//	DEBUG_S(-3,'db',$_SESSION,__FILE__,__FUNCTION__,__LINE__);
+function bm_make_faktura() {	
+}
+
+
+
+?>

+ 26 - 0
SE/superedit-bm_show_document.php

@@ -0,0 +1,26 @@
+<?php
+
+		Lib::loadClass('TableAcl');
+		Lib::loadClass('UserAcl');
+		Lib::loadClass('Billing_html');
+		$billing=new Billing_html('931');
+
+
+		//$billing->set_client_filter=$_REQUEST['ARG1_VAL'];
+		$billing->bm_show_document($_REQUEST['ARG1_VAL']); 	
+
+		DEBUG_S(3,'Billing',$billing,__FILE__,__FUNCTION__,__LINE__);
+	
+
+	
+	
+	
+//	$db=DB::getDb();
+//	DEBUG_S(-3,'db',$_SESSION,__FILE__,__FUNCTION__,__LINE__);
+function bm_show_document() {	
+	die('--'); //TODO disable dol
+}
+
+
+
+?>

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio