Code style

SE/VERSION

@@ -1 +1 @@
-3.9.9-18
+3.9.9-19

SE/procesy/ajax.php

@@ -1,267 +1,20 @@
 <?php
 
-
 if (!class_exists('Lib')) die('404');
 
-
-function ajax_table() {
-	$ajax_req_id = V::get('_ajax_req_id', '', $_REQUEST);
-	if (!$ajax_req_id) {
-		die('<div>'."Req id error".'</div>');
-	}
-
-	Lib::loadClass( 'AjaxReq' );
-	$conf = AjaxReq::get_conf( $ajax_req_id );
-	if (!$conf) {
-		die('<div>'."Req id error - session".'</div>');
-	}
-
-	$sql_table = V::get('sql_table', '', $conf);
-	if (!$sql_table) {
-		die('<div>'."conf error - table".'</div>');
-	}
-
-	$sql_cols_conf = V::get('sql_cols', '', $conf);
-	if (!$sql_cols_conf) {
-		die('<div>'."conf error - cols".'</div>');
-	}
-
-	$subtask = V::get('subtask', '', $_REQUEST);
-	if ($subtask) {
-		// get data by configuration
-		header('Content-Type: text/javascript; charset=utf8');
-		//echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">';print_r($_REQUEST);echo'</pre>';
-		/* Array (
-			[_ajax_request] => ajax_table
-			[_ajax_req_id] => _tbl_4e9ebfeead7e2
-			[subtask] => get_data
-			[request_mode] => json
-			[page] => 1
-			[rp] => 20
-			[sortname] => id
-			[sortorder] => asc
-			[query] => 
-			[qtype] => 
-		 */
-
-		$data = new stdClass();
-		$data->page = 1;
-		$data->total = 0;
-		$data->rows = array();
-
-		// get cols from session config
-		$sql_cols = array();
-		foreach ($sql_cols_conf as $key => $val) {
-			$sql_cols []= $key;
-		}//end foreach
-
-		$data->page = V::get('page', '1', $_REQUEST, 'int');
-		$limit = V::get('rp', '20', $_REQUEST, 'int');
-		$sql_limit = 'limit '.$limit.' ';
-		if ($data->page > 0) {
-			$sql_limit = 'limit '.$limit.' OFFSET '.(($data->page - 1) * $limit);
-		}
-
-		$sql_order_by = strtoupper( V::get('sortname', 'ID', $_REQUEST) );
-		$sql_order_sort = strtolower( V::get('sortorder', 'asc', $_REQUEST) );
-		if (!in_array($sql_order_by, $sql_cols) || !in_array($sql_order_sort, array('asc', 'desc'))) {
-			$sql_order_by = 'ID';
-			$sql_order_sort = 'asc';
-		}
-		$sql_order = 'order by p.`'.$sql_order_by.'` '.$sql_order_sort;
-
-		$sql_where = 'where 1';
-		$sql_where_and = array();
-		$query = V::get('query', '', $_REQUEST);
-		//trigger_error($query, E_USER_NOTICE);
-		if ($query) {
-			$query = explode('&', $query);
-			foreach ($query as $v) {
-				$tmp = explode('=', $v);
-				if (count($tmp) != 2) continue;
-				if (!in_array(strtoupper($tmp[0]), $sql_cols)) continue;
-				$sql_where_and []= " p.`" . $tmp[0] . "` like '" . $tmp[1] . "'";
-			}//end foreach
-		}
-
-		if (!empty($sql_where_and)) {
-			$sql_where = 'where '.implode(' and ', $sql_where_and);
-		}
-
-		$db = DB::getDB();
-		$sql = "select count(1) as cnt from `".$sql_table."` as p $sql_where ";
-//trigger_error($sql, E_USER_NOTICE);
-		$res = $db->query( $sql );
-		if ($r = $db->fetch( $res )) {
-			$data->total = $r->cnt;
-		}
-
-		$sql_cols_p = array();
-		foreach ($sql_cols as $v) {
-			$sql_cols_p []= "p.`".$v."`";
-		}//end foreach
-		$sql_cols_p = implode(",", $sql_cols_p);
-		$sql = "select ".$sql_cols_p." from `".$sql_table."` as p $sql_where $sql_order $sql_limit ";
-//trigger_error($sql, E_USER_NOTICE);
-		$res = $db->query( $sql );
-		while ($r = $db->fetch( $res )) {
-			$cell = array('id'=>$r->ID, 'cell'=>array());
-			foreach ($sql_cols as $v_col_name) {
-				$cell['cell'] []= str_replace('"', '&quot;', $r->$v_col_name);
-			}//end foreach
-			$data->rows []= (object)$cell;
-		}
-
-		//echo json_encode($data);
-		//echo"\n\n\n";
-		echo V::json_encode_latin2( $data );
-		die('');
-	}
-
-	$tbl = new stdClass();
-	$tbl->title = $conf['title'];// TODO: read from session
-	$tbl->width = '1000';
-	$tbl->height = '250';
-	$tbl->id = 'table_view_'.$ajax_req_id;
-	$tbl_ajax_request = array();
-	$tbl_ajax_request []= "_ajax_request="."ajax_table";
-	$tbl_ajax_request []= "_ajax_req_id=".$ajax_req_id;
-	$tbl_ajax_request []= "subtask=get_data";
-	$tbl_ajax_request []= "request_mode=json";
-	$tbl->ajax_request = $_SERVER['PHP_SELF'] . "?" . implode('&', $tbl_ajax_request);
-
-	// scripts with table config: fields,filters,functions, etc
-	$tbl->searchitems = array();
-	/*
-		[
-			{label: 'ID', name : 'id', def:'%'},
-			{label: 'P_ID', name : 'parent_id', def:'%'},
-			{label: 'Name', name : 'desc', def:'%'},
-			{label: 'Opis', name : 'opis', def:'%'}
-		]
-	 */
-	$tbl->fields = array();
-	/*
-		[
-			{display: 'ID', name : 'id', width : 40, sortable : true, align: 'center'},
-			{display: 'P_ID', name : 'parent_id', width : 40, sortable : true, align: 'center'},
-			{display: 'TYPE', name : 'type', width : 70, sortable : true, align: 'center'},
-			{display: 'Desc', name : 'desc', width : 300, sortable : true, align: 'left'},
-			{display: 'Opis', name : 'opis', width : 350, sortable : true, align: 'left'}
-		]
-	 */
-	// determine columns width
-	$used_width = 0;
-	$used_cols = 0;
-	$col_width = array();
-	foreach ($sql_cols_conf as $k => $v_conf) {
-		$v_type = $v_conf['Type'];
-		if (substr($v_type, 0, 3) == 'int') {
-			$col_width[$k] = 60;
-			$used_width += $col_width[$k] + 7;
-			$used_cols += 1;
-		} else {
-			//$col_width [$k]= 0;
-		}
-	}
-	$width = round( ($tbl->width - $used_width) / (count($sql_cols_conf) - $used_cols)) - 7;
-
-	$perm_create = false;
-	$perm_update = false;
-	foreach ($sql_cols_conf as $k => $v_conf) {
-		$v_name = $v_conf['Label'];
-		$v_width = (isset($col_width[$k]))? $col_width[$k] : $width;
-		$tbl->fields []= (object)array('display'=>$v_name, 'name'=>$k, 'width'=>$v_width, 'sortable'=>'true', 'align'=>'center');
-
-		$tbl->searchitems []= (object)array('label'=>$v_name, 'name'=>$k, 'def'=>'%');
-
-		if (strpos($v_conf['Perm'],'C') !== false) $perm_create = true;
-		if (strpos($v_conf['Perm'],'W') !== false) $perm_update = true;
-	}
-	$tbl->js_buttons_callback = 'js_'.$ajax_req_id.'_cmd';
-
-	$tbl->buttons = array();
-	if ($perm_create) {// if has perm C
-		$tbl->buttons []= (object)array('name'=>'add', 'label'=>'Dodaj', 'bclass'=>'add', 'onpress'=>$tbl->js_buttons_callback);
-		$tbl->buttons []= (object)array('separator'=>'true');
-	}
-	if ($perm_update) {// if has perm W
-		$tbl->buttons []= (object)array('name'=>'edit', 'label'=>'Edytuj', 'bclass'=>'edit', 'onpress'=>$tbl->js_buttons_callback);
-		$tbl->buttons []= (object)array('separator'=>'true');
-	}
-//	$tbl->buttons []= (object)array('name'=>'delete', 'label'=>'Delete', 'bclass'=>'delete', 'onpress'=>$tbl->js_buttons_callback);
-//	$tbl->buttons []= (object)array('separator'=>'true');
-	$tbl->buttons []= (object)array('name'=>'text', 'label'=>'Pełny tekst', 'bclass'=>'edit', 'onpress'=>$tbl->js_buttons_callback);
-	$tbl->buttons []= (object)array('separator'=>'true');
-
-	echo"\n".'<link rel="stylesheet" type="text/css" href="./stuff/flexigrid/css/flexigrid.css" />';
-
-	//echo'<script type="text/javascript" src="./stuff/jquery.js"></script>';
-	echo"\n".'<script type="text/javascript" src="./stuff/flexigrid/js/flexigrid.js"></script>';
-	echo"\n".'<script type="text/javascript" src="./stuff/jquery.cookie.js"></script>';
-	echo"\n".'<script type="text/javascript">'."
-function ".$tbl->js_buttons_callback."(btn, grid){
-	//console.log('function callback ".$tbl->js_buttons_callback."');
-	var com = btn.title;
-	if (com == 'delete') {
-		confirm('Delete ' + jQuery('.trSelected', grid).length + ' items?')
-	} else if (com == 'edit') {
-		confirm('Edit ' + jQuery('.trSelected', grid).length + ' items?')
-	} else if (com == 'add') {
-		//console.log('Add New Item');
-	} else if (com == 'text') {
-		var hasCls = jQuery(grid).toggleClass('long-desc').hasClass('long-desc');
-		if(hasCls) btn.innerHTML='Skrócony tekst';
-		else btn.innerHTML='Pełny tekst';
-	}
-}
-
-jQuery(document).ready(function(){
-jQuery('#".$tbl->id."').flexigrid({
-	id: '".$tbl->id."'
-	, url: '".$tbl->ajax_request."'
-	, dataType: 'json'
-	, colModel : " . V::json_encode_latin2( $tbl->fields ) . "
-	, buttons : " . V::json_encode_latin2( $tbl->buttons ) . "
-	, searchitems : " . V::json_encode_latin2( $tbl->searchitems ) . "
-	, sortname: 'id'
-	, sortorder: 'asc'
-	, usepager: true
-	, title: '".$tbl->title."'
-	, useRp: true
-	, rp: 10
-	, rpOptions: [10, 20, 50]
-	, showTableToggleBtn: true
-	, width: ".$tbl->width."
-	, height: ".$tbl->height."
-});
-});
-	".'</script>';
-
-	echo"\n".'<div id="'.$ajax_req_id.'">';
-		//echo'['.$ajax_req_id.']<br />';
-		//echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">sql_cols_conf = ';print_r($sql_cols_conf);echo'</pre>';
-		//echo'<br />';
-		echo'<table id="'.$tbl->id.'" style="display:none"></table>';
-	echo'</div>'."\n";
-}
-
-
 function ajax_get_subtree() {
 	header('Content-Type: text/html; charset=utf8');//utf8
 
 	$id = V::get('id', '', $_GET);
 	$tbl = V::get('tbl', '', $_GET);
 
-	//sleep(1);// TODO: DBG
-
-	$tree_filter = get_filter_for_table( $tbl );
+	$tree_filter = get_filter_for_table($tbl);
 
 	$clbk = 'tree_callback__show_item_from_'.$tbl;
 	if (!function_exists($clbk)) {
 		$clbk = null;
 	}
-	$tree = new Tree( $tbl );
+	$tree = new Tree($tbl);
 	if ($clbk) $tree->set_param('show_item_callback', $clbk);
 // TODO: get all filters:
 	$tree->set_param('rozwin', ($tree_filter->get_arg('filtr_drzewo') == 'ROZWIN'));
@@ -282,15 +35,14 @@ function ajax_get_subtree() {
 
 	$open_rec = V::get('open_rec', '', $_REQUEST);
 	if ($open_rec == '1') {
-		$tree->show_rec_all( $id );
+		$tree->show_rec_all($id);
 	} else {
-		$tree->show_rec( $id );
+		$tree->show_rec($id);
 	}
 
 	exit;
 }
 
-
 function ajax_add_image() {
 	//sleep(1);// TODO: TEST
 	$tbl = V::get('tbl', '', $_REQUEST);
@@ -322,7 +74,7 @@ function ajax_add_image() {
 	// check remote table
 	$remote_tables = DB_Image::conf_get('remote_tables');
 	if (!in_array($remote_table, $remote_tables)) {
-		$errors []= "Error table not allowed to add image";
+		$errors[] = "Error table not allowed to add image";
 	}
 
 	// task
@@ -334,23 +86,23 @@ function ajax_add_image() {
 		$req['REMOTE_TABLE'] = V::get('REMOTE_TABLE', '', $_REQUEST);
 		// validate
 		if ($req['ID'] <= 0) {
-			$errors []= 'error ID';
+			$errors[] = 'error ID';
 		}
 
 		if ($req['REMOTE_ID'] <= 0) {
-			$errors []= 'error REMOTE_ID';
+			$errors[] = 'error REMOTE_ID';
 		}
 
 		if ($req['REMOTE_TABLE'] != $remote_table) {
-			$errors []= 'error REMOTE_TABLE';
+			$errors[] = 'error REMOTE_TABLE';
 		}
 
 		if (empty($errors)) {
 			$affected = DB_Image::delete_image($req['ID'], $req['REMOTE_TABLE'], $req['REMOTE_ID']);
 			if ($affected == 1) {
-				$msgs []= '<p>'."Usunieto zdjecie ID=".$req['ID'].'</p>';
+				$msgs[] = '<p>'."Usunieto zdjecie ID=".$req['ID'].'</p>';
 			} else {
-				$erros []= '<p>'."Wystapil blad podczas usuwania zdjecia ID=".$req['ID'].'</p>';
+				$erros[] = '<p>'."Wystapil blad podczas usuwania zdjecia ID=".$req['ID'].'</p>';
 			}
 		}
 	}
@@ -363,9 +115,9 @@ function ajax_add_image() {
 		$errors = DB_Image::upload_image($remote_table, $remote_id, $_FILES['userfile']);
 		// give praise and thanks to the php gods
 		if (empty($errors)) {
-			$msgs []= '<p>Thank you for submitting</p>';
+			$msgs[] = '<p>Thank you for submitting</p>';
 		} else {
-			$msgs []= '<p style="border:1px solid red;">' . "Sorry, could not upload file:" . '<br />' . implode('<br />', $errors) .'</p>';
+			$msgs[] = '<p style="border:1px solid red;">' . "Sorry, could not upload file:" . '<br />' . implode('<br />', $errors) .'</p>';
 		}
 	}
 
@@ -400,7 +152,7 @@ function ajax_add_image() {
 		echo"Rodzaj obrazka: ";
 		echo'<input type="text" name="'."DEST".'" value="'."".'" />';
 		$select_arr = array();
-		$select_arr = DB_Image::conf_get_options( $thiss->DETECT_TABLE_NAME );
+		$select_arr = DB_Image::conf_get_options($thiss->DETECT_TABLE_NAME);
 
 		if (!empty($select_arr)) {
 			echo' ';
@@ -409,7 +161,7 @@ function ajax_add_image() {
 				echo'<option value="">'."Wybierz".'</option>';
 			foreach ($select_arr as $key => $val) {
 				echo'<option value="'.$key.'">'.$val.'</option>';
-			}//end foreach
+			}
 			echo'</select>';
 		}
 		echo'<br />';
@@ -432,9 +184,9 @@ function ajax_add_image() {
 			$st = array();
 			if ($r->WIDTH > 100 || $r->HEIGHT > 100) {
 				if ($r->WIDTH > $r->HEIGHT) {
-					$st []= 'width:100px';
+					$st[] = 'width:100px';
 				} else {
-					$st []= 'height:100px';
+					$st[] = 'height:100px';
 				}
 			}
 			$st = (empty($st))? '' : ' style="'.implode(';', $st).'"';
@@ -471,13 +223,12 @@ function ajax_add_image() {
 				echo'</td>';
 			echo'</tr>';
 			echo'</table>';
-		}//end foreach
+		}
 	}
 // } function show images
 
 }
 
-
 function ajax_zasob_search_external_ids() {
 	header('Content-Type: text/html; charset=utf8');
 
@@ -486,9 +237,9 @@ function ajax_zasob_search_external_ids() {
 		echo'Error: Bad request';// TODO: header
 		return;
 	}
-	$DBG = (123 == V::get('DBG', '', $_REQUEST, 'int'));
+	$DBG = ('123' == V::get('DBG', '', $_REQUEST));
 
-	$zasob = DB::get_by_id( 'CRM_LISTA_ZASOBOW', $zasob_id );
+	$zasob = DB::get_by_id('CRM_LISTA_ZASOBOW', $zasob_id);
 	if (!$zasob) {
 		echo'Error: 404 not found';// TODO: header
 		return;
@@ -511,25 +262,26 @@ if($DBG){ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;t
 			$sql_id_col = $cur_cnf->id_col;
 			$sql_where = "";
 			if ($cur_cnf->search_col_regex) {
-				$sql_where = "`".$cur_cnf->search_col."` like '".str_replace('$ID', $zasob->ID, $cur_cnf->search_col_regex)."'";
+				$sql_where = "`{$cur_cnf->search_col}` like '".str_replace('$ID', $zasob->ID, $cur_cnf->search_col_regex)."'";
 			} else {
-				$sql_where = "`".$cur_cnf->search_col."`='".$zasob->ID."'";
+				$sql_where = "`{$cur_cnf->search_col}`='{$zasob->ID}'";
 			}
 
 			$sql = "select t.`ID`, {$sql_id_col} as id_col
-				from `" . $k_table_name . "` as t
-				where " . $sql_where . "
+				from `{$k_table_name}` as t
+				where {$sql_where}
 			";
 if($DBG){ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">sql (F.' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($sql);echo'</pre>'; }
-			$res = DB::query( $sql );
-			while ($r = DB::fetch( $res )) {
+			$db = DB::getDB();
+			$res = $db->query($sql);
+			while ($r = $db->fetch($res)) {
 				if ('ID' != $sql_id_col) {
-					$external_ids []= $r->ID . "(" . $r->id_col . ")";
+					$external_ids[] = "{$r->ID}({$r->id_col})";
 				} else {
-					$external_ids []= "" . $r->id_col;
+					$external_ids[] = "{$r->id_col}";
 				}
 			}
-		}//end foreach
+		}
 	}
 
 	$out_link = '';
@@ -548,7 +300,6 @@ if($DBG){ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;t
 	// TODO: add link to CRM_EXT_IDS - rysuj strukture
 }
 
-
 function ajax_zasob_stanowisko_search_kontakty() {
 	header('Content-Type: text/html; charset=utf8');
 
@@ -557,9 +308,9 @@ function ajax_zasob_stanowisko_search_kontakty() {
 		echo'Error: Bad request';// TODO: header
 		return;
 	}
-	$DBG = (123 == V::get('DBG', '', $_REQUEST, 'int'));
+	$DBG = ('123' == V::get('DBG', '', $_REQUEST));
 
-	$zasob = DB::get_by_id( 'CRM_LISTA_ZASOBOW', $zasob_id );
+	$zasob = DB::get_by_id('CRM_LISTA_ZASOBOW', $zasob_id);
 	if (!$zasob) {
 		echo'Error: 404 not found';// TODO: header
 		return;
@@ -567,26 +318,27 @@ function ajax_zasob_stanowisko_search_kontakty() {
 
 	$external_ids = array();
 	$mailto_links = array();
+	$db = DB::getDB();
 	$sql = "select u.`ID`, u.`ADM_ACCOUNT`, u.`ADM_NAME`, u.`EMAIL`
 		from `CRM_AUTH_PROFILE` as up
 			left join `ADMIN_USERS` as u on (u.`ID`=up.`REMOTE_ID`)
 		where
-			up.`ID_ZASOB`='" . $zasob->ID . "'
+			up.`ID_ZASOB`='{$zasob->ID}'
 			and up.`REMOTE_TABLE`='ADMIN_USERS'
 			and up.`A_STATUS` in('WAITING', 'NORMAL')
 			and u.`A_STATUS` in('WAITING', 'NORMAL')
 		group by u.`ID`
 	";
-if($DBG){ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">sql (F.' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($sql);echo'</pre>'; }
-	$res = DB::query( $sql );
-	while ($r = DB::fetch( $res )) {
-		$external_ids []= $r->ADM_ACCOUNT . "(" . $r->ADM_NAME . ")";
+	if($DBG){ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">sql (F.' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($sql);echo'</pre>'; }
+	$res = $db->query($sql);
+	while ($r = $db->fetch($res)) {
+		$external_ids[] = "{$r->ADM_ACCOUNT}({$r->ADM_NAME})";
 		if (!empty($r->EMAIL)) {
 			$mailto_links[$r->EMAIL] = true;
 		}
 	}
 
-if($DBG){ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">external_ids (F.' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($external_ids);echo'</pre>'; }
+	if($DBG){ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">external_ids (F.' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($external_ids);echo'</pre>'; }
 
 	$out_link = '';
 	if (empty($external_ids)) {
@@ -611,17 +363,14 @@ if($DBG){ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;t
 	// TODO: add link to CRM_EXT_IDS - rysuj strukture
 }
 
-
 function ajax_zasob_get_obowiazki() {
-
-	//sleep(1);
 	$zasob_id = V::get('zasob_id', '', $_REQUEST, 'int');
 	if ($zasob_id <= 0) {
 		echo'Error: Bad request';// TODO: header
 		return;
 	}
 
-	$zasob = DB::get_by_id( 'CRM_LISTA_ZASOBOW', $zasob_id );
+	$zasob = DB::get_by_id('CRM_LISTA_ZASOBOW', $zasob_id);
 	if (!$zasob) {
 		echo'Error: 404 not found';// TODO: header
 		return;
@@ -640,7 +389,7 @@ function ajax_zasob_get_obowiazki() {
 	";
 	$res = $db->query($sql);
 	while ($r = $db->fetch($res)) {
-		$external_ids []= $r->ext_id;
+		$external_ids[] = $r->ext_id;
 	}
 
 	$out_link_ids_limit = 5;
@@ -653,15 +402,15 @@ function ajax_zasob_get_obowiazki() {
 		if ($cnt > $out_link_ids_limit) {
 			$external_ids_tmp = array();
 			for ($i = 0; $i < $out_link_ids_limit; $i++) {
-				$external_ids_tmp []= $external_ids[$i];
-			}//end foreach
+				$external_ids_tmp[] = $external_ids[$i];
+			}
 			$out_link_add .= implode(' ', $external_ids_tmp);
 			$out_link_add .= ' ... ';
-			$out_link_add .= App::link("($cnt)", "?task=CRM_WYSWIETL_OBOWIAZKI&CLZ_ID=".$zasob->ID, array('target'=>'_blank', 'title'=>'Procesy powiazane z tym zasobem'));
+			$out_link_add .= App::link("({$cnt})", "?task=CRM_WYSWIETL_OBOWIAZKI&CLZ_ID={$zasob->ID}", array('target'=>'_blank', 'title'=>'Procesy powiazane z tym zasobem'));
 		} else {
 			$out_link_add .= implode(' ', $external_ids);
 			$out_link_add .= ' ';
-			$out_link_add .= App::link("(OB)", "?task=CRM_WYSWIETL_OBOWIAZKI&CLZ_ID=".$zasob->ID, array('target'=>'_blank', 'title'=>'Procesy powiazane z tym zasobem'));
+			$out_link_add .= App::link("(OB)", "?task=CRM_WYSWIETL_OBOWIAZKI&CLZ_ID={$zasob->ID}", array('target'=>'_blank', 'title'=>'Procesy powiazane z tym zasobem'));
 		}
 	}
 
@@ -675,7 +424,6 @@ function ajax_zasob_get_obowiazki() {
 
 }
 
-
 function ajax_show_images() {
 	$remote_table = V::get('tbl', '', $_REQUEST);
 	$remote_id = V::get('id', '', $_REQUEST, 'int');
@@ -704,8 +452,8 @@ function ajax_show_images() {
 	$sql = "select `ID`, `TYPE`, `SIZE`, `DEST`
 		from `".DB_Image::conf_get_table_name()."`
 		where
-			`REMOTE_ID`='".$remote_id."'
-			and `REMOTE_TABLE`='".$remote_table."'
+			`REMOTE_ID`='{$remote_id}'
+			and `REMOTE_TABLE`='{$remote_table}'
 	";
 
 	$res = $db->query($sql);
@@ -715,27 +463,24 @@ function ajax_show_images() {
 		exit;
 	}
 
-	echo'<p>'."Zdjecia dla rekordu <b>".$remote_id."</b> z tabeli ".$remote_table.'</p>';
+	echo'<p>'."Zdjecia dla rekordu <b>{$remote_id}</b> z tabeli {$remote_table}".'</p>';
 
-	while ($r = $db->fetch( $res )) {
-		$src = "?function_init=fun_SHOW_IMAGE&image_id=".$r->ID;
+	while ($r = $db->fetch($res)) {
+		$src = "?function_init=fun_SHOW_IMAGE&image_id={$r->ID}";
 		echo'<img src="'.$src.'" alt="'.$r->TYPE.'" />';
 	}
 
 	exit;
 }
 
-
 function ajax_zasob_check_table() {
-
-	//sleep(1);
 	$zasob_id = V::get('zasob_id', '', $_REQUEST, 'int');
 	if ($zasob_id <= 0) {
 		echo'Error: Bad request';// TODO: header
 		return;
 	}
 
-	$zasob = DB::get_by_id( 'CRM_LISTA_ZASOBOW', $zasob_id );
+	$zasob = DB::get_by_id('CRM_LISTA_ZASOBOW', $zasob_id);
 	if (!$zasob) {
 		echo'Error: 404 not found';// TODO: header
 		return;
@@ -744,14 +489,14 @@ function ajax_zasob_check_table() {
 	// TODO: get config from parent DATABASE%
 	$cnf_id = $zasob->PARENT_ID;
 	//$ext_db = DB::getDB( $r->PARENT_ID );
-	$cnf = Config::getZasobConf( $cnf_id );
+	$cnf = Config::getZasobConf($cnf_id);
 	if (!$cnf) {
-		echo'<span class="err">'."Brak konfiguracji dla zasobu <b>$cnf_id</b>".'</span>';
+		echo'<span class="err">'."Brak konfiguracji dla zasobu <b>{$cnf_id}</b>".'</span>';
 		return;
 	} else {
-		$db = DB::getDB( $cnf_id );
+		$db = DB::getDB($cnf_id);
 		if ($db->get_errors()) {
-			echo'<span class="err">'."Wystapily bledy podczas polaczenia z baza danych (zasob $cnf_id):";
+			echo'<span class="err">'."Wystapily bledy podczas polaczenia z baza danych (zasob {$cnf_id}):";
 				echo '<br />'.implode('<br />', $db->get_errors());
 			echo'</span>';
 			return;
@@ -763,23 +508,23 @@ function ajax_zasob_check_table() {
 	}
 
 	// conn ok, check if table exists
-	$sql = "show tables like '".$zasob->DESC."' ; ";
-	$res = $db->query( $sql );
-	if ($db->num_rows( $res ) == 1) {
+	$sql = "show tables like '{$zasob->DESC}' ; ";
+	$res = $db->query($sql);
+	if ($db->num_rows($res) == 1) {
 		echo'TABLE NAME OK;';// TODO: msg OK
 	} else {
-		echo'<span class="err">'."Niepoprawna nazwa tabeli <b>".$zasob->DESC."</b>".'</span>';
+		echo'<span class="err">'."Niepoprawna nazwa tabeli <b>{$zasob->DESC}</b>".'</span>';
 		return;
 	}
 
 	// conn ok, table exists, check table fields
 	$fields = array();
-	$sql = "describe `".$zasob->DESC."` ; ";
-	$res = $db->query( $sql );
+	$sql = "describe `{$zasob->DESC}` ; ";
+	$res = $db->query($sql);
 	// Field, Type, Null, Key, Default, Extra
 	// ID, int(10), NO, PRI, NULL, auto_increment
 	// A_RECORD_CREATE_DATE, varchar(30), NO
-	while ($r = $db->fetch( $res )) {
+	while ($r = $db->fetch($res)) {
 		$params = new stdClass();
 		// TODO: analyze field parameters: Type,Length,Default,Null?
 		$params->Type = $r->Type;
@@ -802,54 +547,54 @@ function ajax_zasob_check_table() {
 		// TODO: ...
 		if ($r->Default) $params->Default = $r->Default;
 		else if ($r->Null == 'YES') $params->Default = 'Null';
-		$fields[ $r->Field ] = $params;
+		$fields[$r->Field] = $params;
 	}
 
-echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">fields=';
-foreach ($fields as $f_name => $f_params) {
-	echo"\n".'['.$f_name.']='.json_encode($f_params);
-}//end foreach
-echo'</pre>';
+	echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">fields=';
+	foreach ($fields as $f_name => $f_params) {
+		echo"\n".'['.$f_name.']='.json_encode($f_params);
+	}
+	echo'</pre>';
 
 	$komorki = array();
+	$db = DB::getDB();
 	$sql = "select
 			`ID`, `TYPE`, `DESC`
 			-- TODO: , `PARAMS`
 		from `CRM_LISTA_ZASOBOW`
-		where `PARENT_ID`='".$zasob->ID."'
+		where `PARENT_ID`='{$zasob->ID}'
 	";
-	$res = DB::query( $sql );
+	$res = $db->query($sql);
 	// Field, Type, Null, Key, Default, Extra
 	// ID, int(10), NO, PRI, NULL, auto_increment
 	// A_RECORD_CREATE_DATE, varchar(30), NO
-	while ($r = DB::fetch( $res )) {
-		$komorki [$r->DESC] = $r;
+	while ($r = $db->fetch($res)) {
+		$komorki[$r->DESC] = $r;
 	}
 
 	$errors = array();
 	foreach ($komorki as $z_name => $z) {
 		if ($z->TYPE != 'KOMORKA') {
-			$errors [$z->ID] = 'Wrong type ('.$z->TYPE.','.$z->DESC.')';
+			$errors[$z->ID] = "Wrong type ({$z->TYPE},{$z->DESC})";
 		} else if (!array_key_exists($z->DESC, $fields)) {
-			$errors [$z->ID] = 'Not exists ('.$z->DESC.')';
+			$errors[$z->ID] = "Not exists ({$z->DESC})";
 		} else {
 		}
-	}//end foreach
+	}
 
-echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">1 ';print_r($errors);echo'</pre>';
+	echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">1 ';print_r($errors);echo'</pre>';
 
 	$errors = array();
 	foreach ($fields as $f_name => $f_params) {
 		if (!array_key_exists($f_name, $komorki)) {
-			$errors [$f_name] = 'Not exists ('.json_encode($f_params).')';
+			$errors[$f_name] = 'Not exists ('.json_encode($f_params).')';
 		} else {
 		}
-	}//end foreach
-echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">2 ';print_r($errors);echo'</pre>';
+	}
+	echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">2 ';print_r($errors);echo'</pre>';
 
 }
 
-
 function ajax_get_proces() {
 	echo'<p>TODO: test ajax function L' . __LINE__ . '</p>';
 }

SE/procesy/ext_ids.php

@@ -12,7 +12,7 @@ function task_CRM_EXT_IDS_TREE() {
 	";
 	$res = DB::query( $sql );
 	while ($r = DB::fetch( $res )) {
-		$tree []= $r;
+		$tree[] = $r;
 	}
 
 	echo '<div id="tree-ext-ids">';
@@ -20,7 +20,7 @@ function task_CRM_EXT_IDS_TREE() {
 		echo '<div class="node">';
 			echo $r->ID . ' ' . $r->DESC;
 		echo '</div>';
-	}//end foreach
+	}
 	echo '</div>';
 	
 	
@@ -113,7 +113,7 @@ function task_CRM_EXT_IDS() {
 					list($k_col, $v_col) = explode(':', $v_col, 2);
 				}
 				$cur_cnf->cols [$k_col]= $v_col;
-			}//end foreach
+			}
 		}
 
 		$sql_where = "";
@@ -125,15 +125,15 @@ function task_CRM_EXT_IDS() {
 
 		$sql_cols = array();
 		foreach ($cur_cnf->cols as $k_col => $v_col) {
-			$sql_cols []= "t.`".$k_col."` as ".$v_col."";
-		}//end foreach
+			$sql_cols[] = "t.`".$k_col."` as ".$v_col."";
+		}
 		$cur_cnf->sql = "select ".implode(",", $sql_cols)."
 			from `".$cur_cnf->table_name."` as t
 			where ".$sql_where."
 		";
 
-		$external_tbls []= $cur_cnf;
-	}//end foreach
+		$external_tbls[] = $cur_cnf;
+	}
 
 	foreach ($external_tbls as $cur_cnf) {
 		echo'<p>'.$cur_cnf->table_name.'</p>';
@@ -143,7 +143,7 @@ function task_CRM_EXT_IDS() {
 		echo'<tr>';
 		foreach ($cur_cnf->cols as $k_col => $v_col) {
 			echo'<th title="'.$k_col.'">'.$v_col.'</th>';
-		}//end foreach
+		}
 		echo'</tr>';
 		echo'</thead>';
 		echo'<tbody>';
@@ -157,14 +157,14 @@ function task_CRM_EXT_IDS() {
 						echo $v;
 					}
 				echo'</td>';
-			}//end foreach
+			}
 			echo'</tr>';
 		}
 		echo'</tbody>';
 		echo'</table>';
 
 		echo'<hr />';
-	}//end foreach
+	}
 
 	echo'<p>'."EOF F." . __FUNCTION__ . "..." . '</p>';
 

SE/procesy/legacy.php

@@ -118,9 +118,9 @@ function tree_znajdz_zasoby2( $PARENT, $POZIOM, $LAST ) {
 			case "R": if ($res2['CP_PYTANIE']) $pyt = $res2['CP_PYTANIE']; break;
 		}
 		if ($_SESSION['ROZWIN_OPIS']) {
-			$slowa[$pyt] []= "(".$res2['OPIS_ZASOB'].")"."[".$res2['ID']."]".$res2['DESC'];
+			$slowa[$pyt][] = "(".$res2['OPIS_ZASOB'].")"."[".$res2['ID']."]".$res2['DESC'];
 		} else {
-			$slowa[$pyt] []= $res2['DESC'];
+			$slowa[$pyt][] = $res2['DESC'];
 		}
 
 		if ($_SESSION['ROZWIN']) {
@@ -275,13 +275,13 @@ function tree_listuj_zasoby($PARENT, $POZIOM, $LAST) {
 
 	$sql = new stdClass();
 	$sql->filter = array();
-	$sql->filter []= "(z.`PARENT_ID`='".$PARENT."')";
+	$sql->filter[] = "(z.`PARENT_ID`='".$PARENT."')";
 	if ($_SESSION['TREE_SHOW_P_ID2'] || $_SESSION['TREE_SHOW_P_ID3']) {
 		if ($_SESSION['TREE_SHOW_P_ID2']) {
-			$sql->filter []= "(FIND_IN_SET('".$PARENT."', z.`PARENT_ID_ACCESS`) > 0)";
+			$sql->filter[] = "(FIND_IN_SET('".$PARENT."', z.`PARENT_ID_ACCESS`) > 0)";
 		}
 		if ($_SESSION['TREE_SHOW_P_ID3']) {
-			$sql->filter []= "(FIND_IN_SET('".$PARENT."', z.`PARENT_ID_MAP`) > 0)";
+			$sql->filter[] = "(FIND_IN_SET('".$PARENT."', z.`PARENT_ID_MAP`) > 0)";
 		}
 	}
 	$sql->where = implode(" or ", $sql->filter);
@@ -311,17 +311,17 @@ function tree_listuj_zasoby($PARENT, $POZIOM, $LAST) {
 	} else {
 		$sql->cols = array();
 		$sql->add_left_join = array();
-		$sql->cols []= "z.*";
-		$sql->cols []= $sql->select_parent;
+		$sql->cols[] = "z.*";
+		$sql->cols[] = $sql->select_parent;
 
 		$cnf = Config::getConfFile('external_ids');
 		if ($cnf) {
 			if (!empty($cnf)) {
-				//$sql->cols []= "group_concat(D.T_DEVICE_SERIAL) as DEVICES_IDS";
-				//$sql->cols []= "group_concat(T.T_TELBOX_NAME) as TELBOXES_IDS";
+				//$sql->cols[] = "group_concat(D.T_DEVICE_SERIAL) as DEVICES_IDS";
+				//$sql->cols[] = "group_concat(T.T_TELBOX_NAME) as TELBOXES_IDS";
 
-				//$sql->add_left_join []= "left join DEVICES as D on D.CRM_LISTA_ZASOBOW_ID=z.ID";
-				//$sql->add_left_join []= "left join TELBOXES as T on T.CRM_LISTA_ZASOBOW_ID=z.ID";
+				//$sql->add_left_join[] = "left join DEVICES as D on D.CRM_LISTA_ZASOBOW_ID=z.ID";
+				//$sql->add_left_join[] = "left join TELBOXES as T on T.CRM_LISTA_ZASOBOW_ID=z.ID";
 
 				$external_tbls = array();
 				foreach ($cnf as $k_table_name => $v_cnf) {
@@ -335,8 +335,8 @@ function tree_listuj_zasoby($PARENT, $POZIOM, $LAST) {
 					$cur_cnf->sql = "";
 
 					$result_ext_ids_name = $cur_cnf->table_name."_EXT_IDS";
-					$result_ext_ids_names []= $result_ext_ids_name;
-					$sql->cols []= "group_concat(`".$cur_cnf->table_name."`.`".$cur_cnf->id_col."`) as ".$result_ext_ids_name;
+					$result_ext_ids_names[] = $result_ext_ids_name;
+					$sql->cols[] = "group_concat(`".$cur_cnf->table_name."`.`".$cur_cnf->id_col."`) as ".$result_ext_ids_name;
 
 					$sql_left_join = "left join `".$cur_cnf->table_name."` on `".$cur_cnf->table_name."`.`".$cur_cnf->search_col."`";
 					if ($cur_cnf->search_col_regex) {
@@ -344,7 +344,7 @@ function tree_listuj_zasoby($PARENT, $POZIOM, $LAST) {
 					} else {
 						$sql_left_join .= "=z.ID";
 					}
-					$sql->add_left_join []= $sql_left_join;
+					$sql->add_left_join[] = $sql_left_join;
 				}
 			}
 		}
@@ -373,10 +373,10 @@ function tree_listuj_zasoby($PARENT, $POZIOM, $LAST) {
 				if (!empty($r->$v_ext_ids_name)) {
 					$external_IDS = explode(',', $r->$v_ext_ids_name);
 					foreach ($external_IDS as $v_ext_id) {
-						if ($v_ext_id) $r->external_IDS []= $v_ext_id;
-					}//end foreach
+						if ($v_ext_id) $r->external_IDS[] = $v_ext_id;
+					}
 				}
-			}//end foreach
+			}
 			$r->external_IDS = implode(',', $r->external_IDS);
 		}
 		$lp++;

SE/procesy/proces.php

@@ -67,25 +67,25 @@ function task_CRM_PROCES() {
 		// read args from session, or get dafault values
 		foreach ($tbl_search_params as $k => $req_field_name) {
 			$tbl_filter->filters[$req_field_name] = V::get($req_field_name, '%', $_SESSION[$tbl_filter->key]);
-		}//end foreach
+		}
 
 		// read args from $_GET if isset
 		foreach ($tbl_search_params as $k => $req_field_name) {
 			if (isset($_GET[$req_field_name])) {
 				$tbl_filter->filters[$req_field_name] = $_GET[$req_field_name];
 			}
-		}//end foreach
+		}
 
 		// save args in session and $_GET
 		foreach ($tbl_filter->filters as $req_field_name => $v) {
 			$_SESSION[$tbl_filter->key][$req_field_name] = $v;
 			$_GET[$req_field_name] = $v;
-		}//end foreach
+		}
 
 		echo'<div style="border:1px solid red; display:none;">';
 		foreach ($tbl_filter->filters as $req_field_name => $v) {
 			echo'<br />arg['.$req_field_name.'] = '.$v;
-		}//end foreach
+		}
 		echo'</div>';
 	}// TABLE - Filter
 
@@ -125,7 +125,7 @@ jQuery(document).ready(function(){
 		echo'<div style="border:1px solid red; display:none;">';
 		foreach ($tree_procesy_filter->filters as $arg => $v) {
 			echo'<br />arg['.$arg.'] = '.$tree_procesy_filter->get_arg($arg);
-		}//end foreach
+		}
 		echo'</div>';
 	}// TREE - Filter
 
@@ -348,7 +348,7 @@ function fun_CRM_PROCES_ADD() {
 				$sql_obj->$field_name = $_POST[$post_arg_name];
 			}
 		}
-	}//end foreach
+	}
 
 	// nowy na koniec listy
 	$sql = "select max(t.`SORT_PRIO`) as MAX_SORT_PRIO
@@ -402,7 +402,7 @@ function fun_CRM_PROCES_EDIT() {
 				$sql_obj->$field_name = $_POST[$post_arg_name];
 			}
 		}
-	}//end foreach
+	}
 
 	$redirect .= "&EDIT=".$sql_obj->ID;
 

SE/procesy/proces_log.php

@@ -372,10 +372,10 @@ function task_PROCES_LOG() {
 		if ($modelLog->is_step_finished()) {
 			$next_processes = $modelLog->get_next_step();
 			if (empty($next_processes)) {
-				$next_steps []= App::link("zakończ", array('function_init'=>"fun_PROCES_LOG_QUIT", '_log_id'=>$log_id));
+				$next_steps[] = App::link("zakończ", array('function_init'=>"fun_PROCES_LOG_QUIT", '_log_id'=>$log_id));
 			} else {
 				foreach ($next_processes as $k_proces_id => $v_desc) {
-					$next_steps []= App::link(htmlspecialchars($v_desc), array('function_init'=>"fun_PROCES_LOG_STEP_NEXT", '_log_id'=>$log_id, '_next_step_id'=>$k_proces_id));
+					$next_steps[] = App::link(htmlspecialchars($v_desc), array('function_init'=>"fun_PROCES_LOG_STEP_NEXT", '_log_id'=>$log_id, '_next_step_id'=>$k_proces_id));
 				}
 			}
 		}
@@ -383,7 +383,7 @@ function task_PROCES_LOG() {
 			$next_step_wsk = $modelLog->get_next_step_wskaznik();
 			DEBUG_S(1, "next_step_wsk:", $next_step_wsk, __FILE__, __FUNCTION__, __LINE__);
 			if ($next_step_wsk) {
-				$next_steps []= App::link($next_step_wsk->get_log_wsk_id(), array('function_init'=>"fun_PROCES_LOG_STEP_WSK_NEXT", '_log_id'=>$log_id, '_next_step_wsk_id'=>$next_step_wsk->get_log_wsk_id())) . ": " . $next_step_wsk->get_step_wsk_desc();
+				$next_steps[] = App::link($next_step_wsk->get_log_wsk_id(), array('function_init'=>"fun_PROCES_LOG_STEP_WSK_NEXT", '_log_id'=>$log_id, '_next_step_wsk_id'=>$next_step_wsk->get_log_wsk_id())) . ": " . $next_step_wsk->get_step_wsk_desc();
 			} else {
 				// TODO: BUG
 			}
@@ -559,13 +559,13 @@ die('.EOF L.' . __LINE__ );// TODO: dev
 			$w->_parents = TreeHelper::get_all_parents( 'CRM_LISTA_ZASOBOW', $w->PARENT_ID );
 			$w_parents_out = array();
 			foreach ($w->_parents as $w_p_id => $w_p) {
-				$w_parents_out []= '[<b>'.$w_p->ID.'</b> '.$w_p->TYPE.' '.$w_p->DESC.']';
-			}//end foreach
+				$w_parents_out[] = '[<b>'.$w_p->ID.'</b> '.$w_p->TYPE.' '.$w_p->DESC.']';
+			}
 			echo'<br /><span style="color:#555;font-size:11px;">'.implode(' / ', $w_parents_out).'</span>';
 
 			echo'</p>';
 			echo'</li>';
-		}//end foreach
+		}
 		echo'</ul>';
 
 		// search for KOMORKA -> TABELA -> DATABASE_MYSQL/MSSQL BAZA_DANYH
@@ -587,8 +587,8 @@ die('.EOF L.' . __LINE__ );// TODO: dev
 					$need_db_cnf [$pw->ID] = array();
 					$need_db_tbl [$pw->ID] [$tbl_id] [$w->ID] = $w->DESC;
 				}
-			}//end foreach
-		}//end foreach
+			}
+		}
 		DEBUG_S(4, 'need_db_cnf', $need_db_cnf, __FILE__, __FUNCTION__, __LINE__);
 		$db_cnf = array();
 		foreach ($need_db_cnf as $cnf_id => $cnf) {
@@ -605,7 +605,7 @@ die('.EOF L.' . __LINE__ );// TODO: dev
 					$db_cnf[$cnf_id] = $db;
 				}
 			}
-		}//end foreach
+		}
 		DEBUG_S(4, 'db_cnf', $db_cnf, __FILE__, __FUNCTION__, __LINE__);
 
 		DEBUG_S(4, 'need_db_tbl', $need_db_tbl, __FILE__, __FUNCTION__, __LINE__);
@@ -613,8 +613,8 @@ die('.EOF L.' . __LINE__ );// TODO: dev
 			foreach ($v_tables as $k_tbl_id => $v_fields) {
 				$sql_fields = array();
 				foreach ($v_fields as $k_field_id => $v_field_name) {
-					$sql_fields []= $v_field_name;
-				}//end foreach
+					$sql_fields[] = $v_field_name;
+				}
 				$r_table = DB::get_by_id( 'CRM_LISTA_ZASOBOW', $k_tbl_id );
 				$sql_table = $r_table->DESC;
 				$db = $db_cnf[ $k_db_id ];
@@ -626,12 +626,12 @@ die('.EOF L.' . __LINE__ );// TODO: dev
 					$res = $db->query( $sql );
 					$rows = array();
 					while ($r = $db->fetch( $res )) {
-						$rows []= $r;
+						$rows[] = $r;
 					}
 					DEBUG_S(4, 'rows ('.count($rows).')', $rows);
 				}
-			}//end foreach
-		}//end foreach
+			}
+		}
 		
 
 		DEBUG_S(4, 'wskazniki', $wsk, __FILE__, __FUNCTION__, __LINE__);
@@ -656,7 +656,7 @@ die('.EOF L.' . __LINE__ );// TODO: dev
 			echo ' <span class="cmnt">'.$r->OPIS.'</span>';
 			echo'</li>';
 			//TODO: a href next
-		}//end foreach
+		}
 		echo'</ul>';
 	}
 	echo'</div>';
@@ -728,7 +728,7 @@ function task_CRM_MENU() {
 		$z->DESC = $r->z__DESC;
 		$z->OPIS = $r->z__OPIS;
 		$stanowiska[ $r->z__ID ] = $z;
-		$stanowisko_proces_map[$z->ID] []= $r->ID;
+		$stanowisko_proces_map[$z->ID][] = $r->ID;
 		$menu[$r->ID]->KTO [ $r->z__ID ]= $z;
 	}
 
@@ -745,11 +745,11 @@ function task_CRM_MENU() {
 		} else {
 			foreach ($v_proces->KTO as $k_zasob_id => $v_zasob) {
 				echo '<li>'.'<span class="btn-box btn-box-green">'.$v_zasob->ID.'</span><b class="green">'.$v_zasob->DESC.'</b>'.'</li>';
-			}//end foreach
+			}
 		}
 		echo'</ul>';
 		echo'</li>';
-	}//end foreach
+	}
 	echo'</ul>';
 	echo'</div>';// .box-green
 	}// test
@@ -765,7 +765,7 @@ function task_CRM_MENU() {
 		foreach ($stanowiska as $k_zasob_id => $v_zasob) {
 			$sel = (in_array($k_zasob_id, $selected_stanowiska))? ' selected="selected"' : '';
 			echo'<option value="'.$v_zasob->ID.'"'.$sel.'>'.$v_zasob->ID.': '.$v_zasob->DESC.'</option>';
-		}//end foreach
+		}
 		echo'</select>';
 		if (!empty($selected_stanowiska)) {
 			echo ' ';
@@ -781,8 +781,8 @@ function task_CRM_MENU() {
 		foreach ($selected_stanowiska as $v_zasob_id) {
 			foreach ($stanowisko_proces_map[$v_zasob_id] as $v_proces_id) {
 				$show_procesy_id[$v_proces_id] = true;
-			}//end foreach
-		}//end foreach
+			}
+		}
 		foreach ($show_procesy_id as $p_id => $v_bool) {
 			if (array_key_exists($p_id, $menu)) {
 				$user_menu_tree_flat [$menu[$p_id]->ID] = null;
@@ -836,7 +836,7 @@ function task_CRM_MENU() {
 		";
 		$res = $db->query($sql);
 		while ($r = $db->fetch($res)) {
-			$user_menu[$r->w_ID_PROCES]->KTO []= $r;
+			$user_menu[$r->w_ID_PROCES]->KTO[] = $r;
 		}
 	}
 
@@ -906,7 +906,7 @@ function task_CRM_MENU() {
 						echo '<span class="btn-box btn-box-green">'.$v_kto->ID.'</span>';
 						echo ' <span class="green">'.'<b>'."$v_kto->DESC".'</b>'." $v_kto->OPIS".'</span>';
 						echo'</li>';
-					}//end foreach
+					}
 					echo'</ul>';
 					echo '</dd>';
 				}
@@ -922,7 +922,7 @@ function task_CRM_MENU() {
 				this_print_user_menu_tree( $v_arr, $user_menu, $k_id, $params );
 			}
 			echo'</li>';
-		}//end foreach
+		}
 		echo'</ul>';
 	}
 
@@ -999,7 +999,7 @@ function task_CRM_MENU_NEW() {
 		$z->DESC = $r->z__DESC;
 		$z->OPIS = $r->z__OPIS;
 		$stanowiska[ $r->z__ID ] = $z;
-		$stanowisko_proces_map[$z->ID] []= $r->ID;
+		$stanowisko_proces_map[$z->ID][] = $r->ID;
 		$user_menu[$r->ID]->KTO [ $r->z__ID ]= $z;
 	}
 
@@ -1008,12 +1008,12 @@ function task_CRM_MENU_NEW() {
 		$show_procesy_id = array();
 		foreach ($user_menu as $k_id => $v) {
 			$show_procesy_id [$k_id] = false;
-		}//end foreach
+		}
 		foreach ($selected_stanowiska as $v_zasob_id) {
 			foreach ($stanowisko_proces_map[$v_zasob_id] as $v_proces_id) {
 				$show_procesy_id[$v_proces_id] = true;
-			}//end foreach
-		}//end foreach
+			}
+		}
 
 		foreach ($show_procesy_id as $p_id => $v_bool) {
 			if (array_key_exists($p_id, $user_menu)) {
@@ -1049,7 +1049,7 @@ function task_CRM_MENU_NEW() {
 						echo '<span class="btn-box btn-box-green">'.$v_kto->ID.'</span>';
 						echo ' <span class="green">'.'<b>'."$v_kto->DESC".'</b>'." $v_kto->OPIS".'</span>';
 						echo'</li>';
-					}//end foreach
+					}
 					echo'</ul>';
 					echo'</dd>';
 				}
@@ -1079,7 +1079,7 @@ function task_CRM_MENU_NEW() {
 		foreach ($stanowiska as $k_zasob_id => $v_zasob) {
 			$sel = (in_array($k_zasob_id, $selected_stanowiska))? ' selected="selected"' : '';
 			echo'<option value="'.$v_zasob->ID.'"'.$sel.'>'.$v_zasob->ID.': '.$v_zasob->DESC.'</option>';
-		}//end foreach
+		}
 		echo'</select>';
 		echo'<input type="submit" value="'."Pokaz menu".'" />';
 	echo'</form>';

SE/procesy/testy.php

@@ -200,8 +200,8 @@ function fun_CRM_TEST_EDIT() {
 		foreach ($odpowiedzi as $k_id_proces => $v_odp) {
 			foreach ($v_odp as $k_id_pyt => $v_pyt) {
 				$pytania_id[$k_id_pyt] = $v_pyt;
-			}//end foreach
-		}//end foreach
+			}
+		}
 
 		$user_odpowiedzi = array();
 		if (!empty($_POST)) {
@@ -217,7 +217,7 @@ function fun_CRM_TEST_EDIT() {
 						$user_odpowiedzi[ $k_id_pyt ] = $v;
 					}
 				}
-			}//end foreach
+			}
 		}
 
 		foreach ($user_odpowiedzi as $k_id_pyt => $v_odp) {
@@ -293,7 +293,7 @@ function fun_CRM_TEST_EDIT() {
 					}
 				}
 			}
-		}//end foreach
+		}
 
 		// zakoncz test
 		if (!empty($_POST['save_and_end']) && $test_obj->A_STATUS == 'MONITOR') {
@@ -391,13 +391,13 @@ function fun_CRM_TEST_EDIT() {
 						$p_avg_sum = 0;
 						foreach ($v_odp as $k_id_pyt => $v_ocena) {
 							$p_avg_sum += $v_ocena;
-						}//end foreach
+						}
 						$p_avg_max = count($v_odp);// max 3 za pytanie
 						$p_avg = floatval($p_avg_sum) / $p_avg_max;// srednia procesu $k_id_proces
 						$avg_odpowiedzi[$k_id_proces] = $p_avg;
 						$avg_sum += $p_avg;
 					}
-				}//end foreach
+				}
 
 				if (!empty($avg_odpowiedzi)) {
 					$avg_max = count($avg_odpowiedzi);
@@ -687,15 +687,15 @@ function task_CRM_TEST() {
 					$tree_params[ 'ODP_'.$k_id_pyt.'_ODP_'.$i ] = $v_pyt->$v_pyt_field;
 				}
 				$tree_params[ 'ocena_'.$k_id_pyt ] = $v_pyt->OCENA;
-			}//end foreach
-		}//end foreach
+			}
+		}
 
 		if (!empty($_POST)) {
 			foreach ($_POST as $k => $v) {
 				if (substr($k, 0, 4) == 'ODP_') {
 					$tree_params[ $k ] = $v;// overwrite in tree params
 				}
-			}//end foreach
+			}
 		}
 
 		if ($test_obj->TEST_START != '0000-00-00 00:00:00') {
@@ -888,7 +888,7 @@ function task_CRM_TESTY__ADD_KANDYDAT() {
 				echo '<option value="">' . " [ Wybierz ] " . '</option>';
 			foreach ($kandydaci as $r) {
 				echo '<option value="' . $r->ID . '">' . "" . $r->ADM_NAME . " [" . $r->ID . "] (" . $r->ADM_PHONE . ", " . $r->ADM_OTHER_INFO . ")" . '</option>';
-			}//end foreach
+			}
 			echo '</select>';
 			echo '<br />';
 			echo '<input type="submit" value="' . "Zaloguj kandydata do testow" . '" />';
@@ -995,7 +995,7 @@ function task_CRM_TESTY__ADD_TEST() {
 			if ($rec_limit-- <= 0) return;// recursion limit
 
 			foreach ($procesy_id as $id) {
-				$pomin_id []= $id;
+				$pomin_id[] = $id;
 			}
 
 			$find_procesy_id = array();
@@ -1219,11 +1219,11 @@ function task_CRM_TESTY() {
 	}
 
 	$tasks = array();
-	$tasks []= App::link("Twoje testy", array('task'=>"CRM_TESTY__LIST"), array('class'=>'btn-p5'));
+	$tasks[] = App::link("Twoje testy", array('task'=>"CRM_TESTY__LIST"), array('class'=>'btn-p5'));
 	if (User::hasAccess('procesy')) {
-		$tasks []= App::link("Dodaj Kandydata i zaloguj się do testów", array('task'=>"CRM_TESTY__ADD_KANDYDAT"), array('class'=>'btn-p5'));
+		$tasks[] = App::link("Dodaj Kandydata i zaloguj się do testów", array('task'=>"CRM_TESTY__ADD_KANDYDAT"), array('class'=>'btn-p5'));
 	}
-	$tasks []= App::link("Uruchom nowy test", array('task'=>"CRM_TESTY__ADD_TEST"), array('class'=>'btn-p5'));
+	$tasks[] = App::link("Uruchom nowy test", array('task'=>"CRM_TESTY__ADD_TEST"), array('class'=>'btn-p5'));
 
 	echo '<ol>';
 	foreach ($tasks as $v_task_link) {
@@ -1288,7 +1288,7 @@ function task_CRM_TESTY_WYNIKI() {
 			foreach ($kandydaci as $r) {
 				$sel = ($kandydat_id == $r->ID)? 'selected="selected"' : '';
 				echo'<option value="'.$r->ID.'"'.$sel.'>'."".$r->ADM_NAME." [".$r->ID."] (".$r->ADM_PHONE.", ".$r->ADM_OTHER_INFO.")".'</option>';
-			}//end foreach
+			}
 			echo'</select>';
 			echo '<br />';
 			echo' <input type="submit" value="'."Wybierz".'" />';
@@ -1310,7 +1310,7 @@ function task_CRM_TESTY_WYNIKI() {
 			foreach ($pracownicy as $r) {
 				$sel = ($kandydat_id == $r->ID)? 'selected="selected"' : '';
 				echo'<option value="'.$r->ID.'"'.$sel.'>'."".$r->ADM_NAME." [".$r->ID."] (".$r->ADM_PHONE.", ".$r->ADM_OTHER_INFO.")".'</option>';
-			}//end foreach
+			}
 			echo'</select>';
 			echo '<br />';
 			echo' <input type="submit" value="'."Wybierz".'" />';
@@ -1413,7 +1413,7 @@ function compareCheckbox(n,id){
 			echo'<tr>';
 			foreach ($cols as $k => $v) {
 				echo'<th>'.$v.'</th>';
-			}//end foreach
+			}
 			echo'<th>'."&nbsp;".'</th>';
 			echo'</tr>';
 		echo'</thead>';
@@ -1457,7 +1457,7 @@ function compareCheckbox(n,id){
 							if ($cls) $cls = ' class="' . $cls . '"';
 							echo '<td' . $cls . '>' . $r->$k . '</td>';
 						}
-					}//end foreach
+					}
 					echo'<td>';
 					if (User::get('ADM_ADMIN_LEVEL') == 0 && $r->A_STATUS == 'OFF_HARD') {// tylko level 0 i ocenione testy
 						// edit link
@@ -1481,7 +1481,7 @@ function compareCheckbox(n,id){
 //echo'<input type="checkbox" value="'.$r->ID.'" onclick="'.$js.'" />';
 					echo'</td>';
 				echo'</tr>';
-			}//end foreach
+			}
 			echo'</tbody>';
 			echo'</table>';
 		}
@@ -1708,7 +1708,7 @@ function task_CRM_TESTY_ADD_PYTANIA() {
 
 			echo'</p>';
 			echo'</li>';
-		}//end foreach
+		}
 		echo'</ul>';
 	}
 	echo'</dl>';
@@ -1789,7 +1789,7 @@ a.btn-test-praktyczny {background-color:#B3EBFB;}
 				$sql_obj->TEST_TYPE = $_type;
 				foreach (get_object_vars($r) as $key => $val) {
 					$sql_obj->$key = $val;
-				}//end foreach
+				}
 				if ($prefix == 'add_') {
 					//$sql_ret = DB::ADD_NEW_OBJ( 'CRM_TESTY_PYTANIA', $sql_obj );
 					//if ($sql_ret > 0) {
@@ -1854,7 +1854,7 @@ a.btn-test-praktyczny {background-color:#B3EBFB;}
 					foreach ($options as $k) {
 						$sel = ($r->$field == $k)? ' selected="selected"' : '';
 						$out .= '<option value="'.$k.'"'.$sel.'>'.$k.'</option>';
-					}//end foreach
+					}
 					$out .= '</select>';
 				$out .= '</p>';
 			}
@@ -1909,7 +1909,7 @@ a.btn-test-praktyczny {background-color:#B3EBFB;}
 					foreach ($options as $k) {
 						$sel = ($r->$field == $k)? ' selected="selected"' : '';
 						$out .= '<option value="'.$k.'"'.$sel.'>'.$k.'</option>';
-					}//end foreach
+					}
 					$out .= '</select>';
 				$out .= '</p>';
 			}
@@ -1929,21 +1929,21 @@ a.btn-test-praktyczny {background-color:#B3EBFB;}
 	$pytania_out = array();
 	if (!empty($pytania)) {
 		foreach ($pytania as $k_id => $r) {
-			$pytania_out []= this_print_form_pytanie( $r, 'edit_'.$k_id.'_', $id_pytanie, $_type );
-		}//end foreach
+			$pytania_out[] = this_print_form_pytanie( $r, 'edit_'.$k_id.'_', $id_pytanie, $_type );
+		}
 	}
 	// TODO: link dodaj pytanie i 5 odpowiedzi TAK/NIE
 	$new = new stdClass();
 	foreach (get_object_vars($r) as $key => $val) {
 		$new->$key = '';
-	}//end foreach
+	}
 	$new->ID_PROCES = $proces->ID;
 	$new->ID_WSKAZNIK = $id_wskaznik;
 	$pytanie_out = this_print_form_pytanie( $new, 'add_', $id_pytanie, $_type );
 	if ($pytanie_out === true) {
 		$form_sent = true;
 	}
-	$pytania_out []= $pytanie_out;
+	$pytania_out[] = $pytanie_out;
 
 	if ($form_sent) {
 		echo App::link( "odswiez strone", array('task'=>App::get_task(), 'id_proces'=>81) );
@@ -1957,7 +1957,7 @@ a.btn-test-praktyczny {background-color:#B3EBFB;}
 	}
 	foreach ($pytania_out as $out) {
 		echo $out;
-	}//end foreach
+	}
 }
 
 
@@ -2008,7 +2008,7 @@ function tree_callback__show_test_item_from_CRM_PROCES( &$r, &$tree ) {
 						foreach ($options as $k) {
 							$sel = ($tree->get_param($field_odpowiedz) == $k)? ' selected="selected"' : '';
 							echo'<option value="'.$k.'"'.$sel.'>'.$k.'</option>';
-						}//end foreach
+						}
 						echo'</select>';
 					}
 				}
@@ -2017,7 +2017,7 @@ function tree_callback__show_test_item_from_CRM_PROCES( &$r, &$tree ) {
 					echo'<br />';
 					echo'<textarea name="'.$field.'" rows="3" cols="60">'.$tree->get_param($field).'</textarea>';
 				}
-			}//end foreach
+			}
 			echo'<br />';
 			echo'<input type="submit" name="save" value="'."Zapisz".'" />';
 		}
@@ -2098,10 +2098,10 @@ function tree_callback__show_wynik_item_from_CRM_PROCES( &$r, &$tree ) {
 					foreach ($oceny as $k_ocena => $v_ocena) {
 						$sel = ($k_ocena == $tree->get_param("ocena_".$p->ID))? ' selected="selected"' : '';
 						echo'<option value="'.$k_ocena.'"'.$sel.'>'.$v_ocena.'</option>';
-					}//end foreach
+					}
 					echo'</select>';
 				}
-			}//end foreach
+			}
 		}
 	}
 	echo'</dt>'."\n";
@@ -2143,16 +2143,16 @@ function task_CRM_TESTY_WYNIKI_CERTYFIKAT() {
 	$testy_zakonczone = array();
 	foreach ($testy_arr as $test) {
 		if ($test->A_STATUS == 'OFF_HARD' && $test->TEST_END > '0000-00-00') {// $test->OCENA > 0
-			$testy_zakonczone []= $test;
+			$testy_zakonczone[] = $test;
 		}
-	}//end foreach
+	}
 
 	$kand = reset($testy_zakonczone);
 	$kandydat_name = $kand->Kandydat_Name;
 	$kandydat_stanowiska = array();
 	foreach ($testy_zakonczone as $kand) {
 		$kandydat_stanowiska [$kand->Stanowisko] = true;
-	}//end foreach
+	}
 	$kandydat_stanowiska = implode(', ', array_keys($kandydat_stanowiska));
 
 	echo'<p style="text-align:center">' . "Załącznik nr 1 do umowy na sfinansowanie szkoleń pracownika" . '</p>';
@@ -2207,7 +2207,7 @@ function task_CRM_TESTY_WYNIKI_CERTYFIKAT() {
 			echo'<td>' . number_format($test->DISCOUNT, 2, ',', ' ') . " zł" . '</td>';
 			echo'<td>' . $test->UWAGI . '</td>';
 		echo'</tr>';
-	}//end foreach
+	}
 	echo '</tbody>';
 	echo '</table>';
 	//echo '<p style="text-align:right;margin:100px 0 0 0;">' . ".............................................................." . '<br />' . "(piecz???? firmowa i podpis prezesa)" . '</p>';
@@ -2342,7 +2342,7 @@ function task_CRM_TESTY_WYNIKI_HIST() {
 	$sql = "select * from `CRM_TESTY_HIST` where `ID_USERS2`='" . $test_id . "' order by ID DESC ";
 	$res = DB::query( $sql );
 	while ($r = DB::fetch( $res )) {
-		$hist []= $r;
+		$hist[] = $r;
 	}
 
 	if (empty($hist)) {
@@ -2352,8 +2352,8 @@ function task_CRM_TESTY_WYNIKI_HIST() {
 
 	$cols = array();
 	foreach (get_object_vars(reset($hist)) as $field_name => $v) {
-		$cols []= $field_name;
-	}//end foreach
+		$cols[] = $field_name;
+	}
 	echo '<table class="tbl-view" cellspacing="0" cellpadding="0" border="1">';
 	echo '<thead>';
 		echo '<tr>';

SE/procesy/user.php

@@ -114,20 +114,20 @@ function task_USERS_show_items( $params, &$page_nav, &$items ) {
 	$base_params = array('task'=>"USERS");
 	if (!empty($params['group'])) $base_params['_group'] = $params['group'];
 
-	$page_nav->links []= App::link("|<<", $base_params, array('title'=>"Pierwsza strona"));
+	$page_nav->links[] = App::link("|<<", $base_params, array('title'=>"Pierwsza strona"));
 	if ($page_nav->page_nr > 0) {
-		$page_nav->links []= App::link("<<", V::extend($base_params, array('_p'=>($page_nav->page_nr - 1))), array('title'=>"Poprzednia strona (-" . $page_nav->page_limit . ")"));
+		$page_nav->links[] = App::link("<<", V::extend($base_params, array('_p'=>($page_nav->page_nr - 1))), array('title'=>"Poprzednia strona (-" . $page_nav->page_limit . ")"));
 	} else {
-		$page_nav->links []= " << ";
+		$page_nav->links[] = " << ";
 	}
-	$page_nav->links []= '<span>'.($page_nav->page_nr * $page_nav->page_limit).'</span>';
-	$page_nav->links []= '<span title="'."Znaleziono ".$page_nav->total." rekordów".'">'."(".$page_nav->total.") ".'</span>';
+	$page_nav->links[] = '<span>'.($page_nav->page_nr * $page_nav->page_limit).'</span>';
+	$page_nav->links[] = '<span title="'."Znaleziono ".$page_nav->total." rekordów".'">'."(".$page_nav->total.") ".'</span>';
 	if ($page_nav->last_page_nr > $page_nav->page_nr) {
-		$page_nav->links []= App::link("&gt;&gt;", V::extend($base_params, array('_p'=>($page_nav->page_nr + 1))), array('title'=>"Nastepna strona (+" . $page_nav->page_limit . ")"));
+		$page_nav->links[] = App::link("&gt;&gt;", V::extend($base_params, array('_p'=>($page_nav->page_nr + 1))), array('title'=>"Nastepna strona (+" . $page_nav->page_limit . ")"));
 	} else {
-		$page_nav->links []= " &gt;&gt; ";
+		$page_nav->links[] = " &gt;&gt; ";
 	}
-	$page_nav->links []= App::link("&gt;&gt;|", V::extend($base_params, array('_p'=>$page_nav->last_page_nr)), array('title'=>"Ostatnia strona"));
+	$page_nav->links[] = App::link("&gt;&gt;|", V::extend($base_params, array('_p'=>$page_nav->last_page_nr)), array('title'=>"Ostatnia strona"));
 
 	echo'<div class="tbl-page-nav">';
 	echo implode(" ", $page_nav->links);
@@ -170,13 +170,13 @@ function task_USERS_show_items( $params, &$page_nav, &$items ) {
 				$groups = UsersHelper::get_group_list();
 				foreach ($groups as $k_group_id => $v_group) {
 					$sel_group_options [$v_group->ID] = $v_group->DESC;
-				}//end foreach
+				}
 				echo'<select name="'."_group".'" onchange="this.form.submit();">';
 					echo'<option value="">' . "&nbsp;" . '</option>';
 					foreach ($sel_group_options as $k_value => $v_label) {
 						$sel = ($k_value == $params['group'])? ' selected="selected"' : '';
 						echo'<option value="' . $k_value . '"'.$sel.'>' . $v_label . " (" . $k_value . ")" . '</option>';
-					}//end foreach
+					}
 				echo'</select>';
 			echo '</td>';
 			echo'<td>'."".'</td>';
@@ -228,10 +228,10 @@ function task_USERS_show_items( $params, &$page_nav, &$items ) {
 						foreach ($emails_tmp as $v) {
 							$v = trim($v);
 							if (!empty($v)) {
-								//$emails_arr []= '<a href="' . "mailto:" . $v . '">' . $v . '</a>';
-								$emails_arr []= $v;
+								//$emails_arr[] = '<a href="' . "mailto:" . $v . '">' . $v . '</a>';
+								$emails_arr[] = $v;
 							}
-						}//end foreach
+						}
 						if (!empty($emails_arr)) {
 							echo '<span title="' . implode(', '."\n", $emails_arr). '">';
 								echo reset($emails_arr);
@@ -244,7 +244,7 @@ function task_USERS_show_items( $params, &$page_nav, &$items ) {
 					if (!empty($r->groups)) {
 						foreach ($r->groups as $k_zasob_id => $v_zasob_desc) {
 							echo ' <b style="color:green" title="' . htmlspecialchars($v_zasob_desc) . '">' . $k_zasob_id . '</b>';
-						}//end foreach
+						}
 					} else {
 						echo '<b style="color:red" title="' . "Brak przypisanego stanowiska!" . '">' . "Brak!" . '</b>';
 					}
@@ -258,7 +258,7 @@ function task_USERS_show_items( $params, &$page_nav, &$items ) {
 				echo'</td>';
 			echo'</tr>';
 		    }
-		}//end foreach
+		}
 	}
 	echo'</tbody>';
 	echo'</table>';
@@ -314,7 +314,7 @@ function task_USER_EDIT() {
 	$values = array();
 	foreach (get_object_vars($user_data) as $k_field => $v_value) {
 		$values[$k_field] = V::get($k_field, $v_value, $_POST);
-	}//end foreach
+	}
 
 	if (1 == V::get('save', 0, $_POST, 'int')) {
 		// TODO: use DB::UPDATE_OBJ
@@ -324,10 +324,10 @@ function task_USER_EDIT() {
 			if ($values[$k_field] != $v_value) {
 				$sql_field = $k_field;
 //				if ($k_field == 'EMAIL') $sql_field = "EMAIL";
-				$sql_arr []= "`".$sql_field."`='".$values[$k_field]."'";
+				$sql_arr[] = "`".$sql_field."`='".$values[$k_field]."'";
 				$sql_arr_hist["`".$sql_field."`"] = "'".$values[$k_field]."'";
 			}
-		}//end foreach
+		}
 		if (!empty($sql_arr)) {
 			$sql = "update `ADMIN_USERS` set ".implode(",", $sql_arr)." where `ID`='".$user_data->ID."' limit 1 ";
 			DB::query( $sql );
@@ -392,7 +392,7 @@ function task_USER_EDIT() {
 			echo App::field($k_field, $user_types[$k_field], $values[$k_field]);
 		}
 		echo'<br />';
-	}//end foreach
+	}
 
 		echo'<div style="padding:0 0 0 30px;">';
 		echo '<input type="hidden" name="' . "del_group" . '" value="" />';
@@ -405,24 +405,24 @@ function task_USER_EDIT() {
 				$js = "if(confirm('Czy jestes pewien ze chcesz usunac stanowisko: ".$v_group->DESC."?')){ this.form.del_group.value='".$v_group->ID."'; this.form.submit(); } return false;";
 				echo ' <input type="image" src="' . "stuff/i/del.png". '" alt="' . "Usuń stanowisko" . '" title="' . "Usuń stanowisko" . '" onclick="'.$js.'" />';
 				echo'<br />';
-			}//end foreach
+			}
 		}
 		$add_group_options = array();
 		foreach ($groups as $k_group_id => $v_group) {
 			$add_group_options [$v_group->ID] = $v_group->DESC;
-		}//end foreach
+		}
 
 		$add_get_localisation_list = array();
 		foreach ($get_localisation_list as $k_group_id => $v_group) {
 			$add_get_localisation_list [$v_group->ID] = $v_group->DESC." ".$v_group->T_TELBOX_NAME;
-		}//end foreach
+		}
 		echo'<img src="icon/add.gif" title="Dodaj">';
 		echo " Dodaj nowe stanowisko: ";
 		echo'<select name="'."add_group".'">';
 			echo'<option value="">' . "&nbsp;" . '</option>';
 			foreach ($add_group_options as $k_value => $v_label) {
 				echo'<option value="' . $k_value . '">' . $v_label . " (" . $k_value . ")" . '</option>';
-			}//end foreach
+			}
 		echo'</select>';
 
 		echo " Ustal lokalizacje:  ";
@@ -430,7 +430,7 @@ function task_USER_EDIT() {
 			echo'<option value="">' . "&nbsp;" . '</option>';
 			foreach ($add_get_localisation_list as $k_value => $v_label) {
 				echo'<option value="' . $k_value . '">' . $v_label . " (" . $k_value . ")" . '</option>';
-			}//end foreach
+			}
 		echo'</select>';
 
 		echo'</div>';

SE/procesy/zasob.php

@@ -68,25 +68,25 @@ function task_CRM_LISTA_ZASOBOW() {
 		// read args from session, or get dafault values
 		foreach ($tbl_search_params as $k => $req_field_name) {
 			$tbl_filter->filters[$req_field_name] = V::get($req_field_name, '%', $_SESSION[$tbl_filter->key]);
-		}//end foreach
+		}
 
 		// read args from $_GET if isset
 		foreach ($tbl_search_params as $k => $req_field_name) {
 			if (isset($_GET[$req_field_name])) {
 				$tbl_filter->filters[$req_field_name] = $_GET[$req_field_name];
 			}
-		}//end foreach
+		}
 
 		// save args in session and $_GET
 		foreach ($tbl_filter->filters as $req_field_name => $v) {
 			$_SESSION[$tbl_filter->key][$req_field_name] = $v;
 			$_GET[$req_field_name] = $v;
-		}//end foreach
+		}
 
 		echo'<div style="border:1px solid red; display:none;">';
 		foreach ($tbl_filter->filters as $req_field_name => $v) {
 			echo'<br />arg['.$req_field_name.'] = '.$v;
-		}//end foreach
+		}
 		echo'</div>';
 	}// TABLE - Filter
 
@@ -126,7 +126,7 @@ jQuery(document).ready(function(){
 		echo'<div style="border:1px solid red; display:none;">';
 		foreach ($tree_zasoby_filter->filters as $arg => $v) {
 			echo'<br />arg['.$arg.'] = '.$tree_zasoby_filter->get_arg($arg);
-		}//end foreach
+		}
 		echo'</div>';
 	}// TREE - Filter
 
@@ -259,7 +259,7 @@ jQuery(document).ready(function(){
 						echo App::link("X", array('function_init'=>"fun_USERS_COLUMN", 'arg'=>"hide", 'col_id'=>$field_id), array('title'=>"Ukryj kolumne", 'ico'=>'shutdown.gif', 'ico_height'=>11));
 					}
 				echo'</td>'."\n";
-			}//end foreach
+			}
 		echo'</tr>'."\n";
 		echo'<tr class="find">'."\n";
 			echo'<form action="" method="GET">';
@@ -273,12 +273,12 @@ jQuery(document).ready(function(){
 				$v_label = V::get($field_name, '', $table_view['labels']);
 				if ($v_label && isset($tbl_filter->filters[$v_label])) {
 					if ($tbl_filter->filters[$v_label] != '%') {
-						$cls []= 'selected';
+						$cls[] = 'selected';
 					}
 				}
 				$cls = (!empty($cls))? ' class="'.implode(' ', $cls).'"' : '';
 				echo'<td'.$cls.'>'.$v.'</td>'."\n";
-			}//end foreach
+			}
 			echo'</form>';
 		echo'</tr>'."\n";
 		echo'</thead>';
@@ -291,11 +291,11 @@ jQuery(document).ready(function(){
 		
 			$sql_where = array();
 			if ($_GET['EDIT']) {
-				$sql_where []= "CP.`ID`='".$_GET['EDIT']."'";
+				$sql_where[] = "CP.`ID`='".$_GET['EDIT']."'";
 			} else {
 				foreach ($tbl_search_params as $k => $req_field_name) {
 					// TODO: FILTER_SEARCH <, >, <=, >=, !
-					$sql_where []= "CP.`".$k."` like '".$_GET[$req_field_name]."'";
+					$sql_where[] = "CP.`".$k."` like '".$_GET[$req_field_name]."'";
 				}
 			}
 			$sql_where = implode(" and ", $sql_where);
@@ -373,8 +373,8 @@ jQuery(document).ready(function(){
 							$p_id2_links = array();
 							$p_id2 = explode(',', $r->PARENT_ID_ACCESS);
 							foreach ($p_id2 as $p_id) {
-								$p_id2_links []= App::link($p_id, "?EDIT=".$p_id."#".$p_id);
-							}//end foreach
+								$p_id2_links[] = App::link($p_id, "?EDIT=".$p_id."#".$p_id);
+							}
 							if (!empty($p_id2_links)) echo implode(', ', $p_id2_links);
 						echo'</td>';
 					} else if ($field_name == 'PARENT_ID_MAP') {
@@ -382,8 +382,8 @@ jQuery(document).ready(function(){
 							$p_id3_links = array();
 							$p_id3 = explode(',', $r->PARENT_ID_MAP);
 							foreach ($p_id3 as $p_id) {
-								$p_id3_links []= App::link($p_id, "?EDIT=".$p_id."#".$p_id);
-							}//end foreach
+								$p_id3_links[] = App::link($p_id, "?EDIT=".$p_id."#".$p_id);
+							}
 							if (!empty($p_id3_links)) echo implode(', ', $p_id3_links);
 						echo'</td>';
 					} else {
@@ -408,7 +408,7 @@ jQuery(document).ready(function(){
 		
 					$v = V::get($field_name, ' ', $table_view['foot']);
 					echo'<td>'.$v.'</td>';
-				}//end foreach
+				}
 			echo'</tr>';
 			echo'</form>';
 			echo'</tfoot>';
@@ -416,20 +416,6 @@ jQuery(document).ready(function(){
 		echo'</table>';
 }
 
-echo'<br />';
-
-// test ajax load table content
-//TEST://	Lib::loadClass( 'AjaxReq' );
-// load content from ajax function on load
-//TEST://	$generate_uniq_ajax_req_id = AjaxReq::generate_id( 'CRM_LISTA_ZASOBOW', 'CRM_LISTA_ZASOBOW' );
-//TEST: lub //	echo App::link_ajax_load_on_ready('flexigrid table zasoby', 'ajax_table', array('_ajax_req_id'=>$generate_uniq_ajax_req_id));
-
-
-//if (V::get('EDIT', '', $_GET) > 0) {
-//	echo'edycja - hide tree...';
-//	return;
-//}
-
 echo'<br />';
 
 	echo'<div id="tree"></div>';
@@ -465,7 +451,7 @@ echo'<br />';
 			echo'<select name="filter_hist_id">';
 				foreach ($filter_hist as $k => $v) {
 					echo'<option value="'.$k.'">'.$v.'</option>';
-				}//end foreach
+				}
 			echo'</select>';
 			echo'</form>';
 		}
@@ -563,7 +549,7 @@ echo'<pre>';
 		foreach ($types as $v) {
 			$sel = ($selected_type == $v)? ' selected=selected"' : '';
 			echo'<option value="'.$v.'"'.$sel.'>'.$v.'</option>';
-		}//end foreach
+		}
 		echo'</select>';
 		echo'</form>';
 		echo " / ";
@@ -625,7 +611,7 @@ function fun_CRM_LISTA_ZASOBOW_ADD() {
 				$sql_obj->$field_name = $_POST[$post_arg_name];
 			}
 		}
-	}//end foreach
+	}
 
 	// nowy na koniec listy
 	$sql = "select max(t.`SORT_PRIO`) as MAX_SORT_PRIO
@@ -681,7 +667,7 @@ function fun_CRM_LISTA_ZASOBOW_EDIT() {
 				$sql_obj->$field_name = $_POST[$post_arg_name];
 			}
 		}
-	}//end foreach
+	}
 
 	$redirect .= "&EDIT=".$sql_obj->ID;
 

SE/procesy5.php

@@ -359,7 +359,7 @@ function SORT_PRIO( $table, $parent_id_field ) {
 		foreach ($wsk_order as $k_osrt_prio => $v_wsk_id) {
 			$sql = "update `".$table."` set `SORT_PRIO`='".$k_osrt_prio."' where `ID`='".$v_wsk_id."'; ";
 			DB::query( $sql );
-		}//end foreach
+		}
 	}
 }
 
@@ -487,7 +487,7 @@ function task_CRM_ADD_CRM_WSKAZNIK() {
 
 			echo'</p>';
 			echo'</li>';
-		}//end foreach
+		}
 		echo'</ul>';
 	}
 	echo'</dl>';
@@ -864,8 +864,8 @@ function fun_USERS_COLUMN() {
 		//if($_SESSION[$thiss->DETECT_TABLE_COLUMN]['DESC_TO_LANG'][$_SESSION[$thiss->DETECT_TABLE_COLUMN]['DESC']["$value"]]) {
 		// echo $_SESSION[$thiss->DETECT_TABLE_COLUMN]['DESC_TO_LANG'][$_SESSION[$thiss->DETECT_TABLE_COLUMN]['DESC']["$value"]] . "<br>";
 		//}
-		$out_tbl []= $out_tr;
-	}//end foreach
+		$out_tbl[] = $out_tr;
+	}
 
 	echo'<table border="1" cellspacing="0" cellpadding="0" class="tbl-view" style="margin:30px;">';
 	foreach ($out_tbl as $out_tr) {
@@ -884,7 +884,7 @@ function fun_USERS_COLUMN() {
 				echo'<code>'.$out_tr['field_name'].'</code>';
 			echo'</td>';
 		echo'</tr>';
-	}//end foreach
+	}
 	echo'</table>';
 
 	echo "Wroc do ".App::link(" ".App::get_task(), array('task'=>App::get_task()));
@@ -901,7 +901,7 @@ function action_VIEW_SUBTREE( $tbl, $proces_id, $tree_callback, $tree_params ) {
 	$tree->set_param('show_item_callback', $tree_callback);
 	foreach ($tree_params as $key => $val) {
 		$tree->set_param($key, $val);
-	}//end foreach
+	}
 	$tree->showSubTree( $proces_id );
 }
 
@@ -931,7 +931,7 @@ function task_VIEW_PROCES_MAP() {
 		if ($r->TYPE == 'PROCES_INIT') {
 			$procesMap->procesInitAll[$r->ID] = $r;
 		}
-		$procesMap->treeFlat[$r->PARENT_ID] []= $r->ID;
+		$procesMap->treeFlat[$r->PARENT_ID][] = $r->ID;
 	}
 
 	// validate goto - goto only to PROCES_INIT
@@ -1376,7 +1376,7 @@ function task_CRM_WYSWIETL_OBOWIAZKI() {
 	";
 	$res = $db->query($sql);
 	while ($r = $db->fetch($res)) {
-		$arr [$r->w__ID_PROCES] []= $r;
+		$arr [$r->w__ID_PROCES][] = $r;
 	}
 	echo'<table border="1" cellspacing="0" cellpadding="0" class="tbl-view">';
 	echo'<thead>';
@@ -1403,7 +1403,7 @@ function task_CRM_WYSWIETL_OBOWIAZKI() {
 			}
 			echo'</td>';
 		echo'</tr>';
-	}//end foreach
+	}
 	echo'</tbody>';
 	echo'</table>';
 }
@@ -1480,7 +1480,7 @@ function task_ADD_PROCES_ID() {
 
 			echo'</p>';
 			echo'</li>';
-		}//end foreach
+		}
 		echo'</ul>';
 	}
 	echo'</dl>';
@@ -1673,7 +1673,7 @@ function fun_IMAGE_ADD() {
 	// check remote table
 	$remote_tables = DB_Image::conf_get('remote_tables');
 	if (!in_array($remote_table, $remote_tables)) {
-		$errors []= "Error table not allowed to add image";
+		$errors[] = "Error table not allowed to add image";
 	}
 
 	if (0) {
@@ -1696,23 +1696,23 @@ function fun_IMAGE_ADD() {
 		$req['REMOTE_TABLE'] = V::get('REMOTE_TABLE', '', $_REQUEST);
 		// validate
 		if ($req['ID'] <= 0) {
-			$errors []= 'error ID';
+			$errors[] = 'error ID';
 		}
 
 		if ($req['REMOTE_ID'] <= 0) {
-			$errors []= 'error REMOTE_ID';
+			$errors[] = 'error REMOTE_ID';
 		}
 
 		if ($req['REMOTE_TABLE'] != $remote_table) {
-			$errors []= 'error REMOTE_TABLE';
+			$errors[] = 'error REMOTE_TABLE';
 		}
 
 		if (empty($errors)) {
 			$affected = DB_Image::delete_image($req['ID'], $req['REMOTE_TABLE'], $req['REMOTE_ID']);
 			if ($affected == 1) {
-				$msgs []= '<p>'."Usunieto zdjecie ID=".$req['ID'].'</p>';
+				$msgs[] = '<p>'."Usunieto zdjecie ID=".$req['ID'].'</p>';
 			} else {
-				$erros []= '<p>'."Wystapil blad podczas usuwania zdjecia ID=".$req['ID'].'</p>';
+				$erros[] = '<p>'."Wystapil blad podczas usuwania zdjecia ID=".$req['ID'].'</p>';
 			}
 		}
 	}
@@ -1725,9 +1725,9 @@ function fun_IMAGE_ADD() {
 		$errors = DB_Image::upload_image($remote_table, $remote_id, $_FILES['userfile']);
 		// give praise and thanks to the php gods
 		if (empty($errors)) {
-			$msgs []= '<p>Thank you for submitting</p>';
+			$msgs[] = '<p>Thank you for submitting</p>';
 		} else {
-			$msgs []= '<p style="border:1px solid red;">' . "Sorry, could not upload file:" . '<br />' . implode('<br />', $errors) .'</p>';
+			$msgs[] = '<p style="border:1px solid red;">' . "Sorry, could not upload file:" . '<br />' . implode('<br />', $errors) .'</p>';
 		}
 	}
 
@@ -1772,7 +1772,7 @@ function fun_IMAGE_ADD() {
 				echo'<option value="">'."Wybierz".'</option>';
 			foreach ($select_arr as $key => $val) {
 				echo'<option value="'.$key.'">'.$val.'</option>';
-			}//end foreach
+			}
 			echo'</select>';
 		}
 		echo'<br />';
@@ -1796,9 +1796,9 @@ function fun_IMAGE_ADD() {
 			$st = array();
 			if ($r->WIDTH > 100 || $r->HEIGHT > 100) {
 				if ($r->WIDTH > $r->HEIGHT) {
-					$st []= 'width:100px';
+					$st[] = 'width:100px';
 				} else {
-					$st []= 'height:100px';
+					$st[] = 'height:100px';
 				}
 			}
 			$st = (empty($st))? '' : ' style="'.implode(';', $st).'"';
@@ -1837,7 +1837,7 @@ if (0) {// TODO: edytuj
 				echo'</td>';
 			echo'</tr>';
 			echo'</table>';
-		}//end foreach
+		}
 	}
 	echo'</div>';// .box-blue
 // } function show images
@@ -1946,7 +1946,7 @@ if (User::get('ADM_ADMIN_LEVEL') == 6) {
 foreach ($menu as $k_task => $v_menu) {
 	if ($k_task == App::get_task()) $v_menu[2] ['class'] = 'current';
 	echo App::link($v_menu[0], $v_menu[1], $v_menu[2]);
-}//end foreach
+}
 
 		echo'</td>'."\n";
 		echo'<td class="user" style="text-align:right">'."\n";
@@ -2144,7 +2144,7 @@ function tree_callback__show_item_from_CRM_PROCES( &$r, &$tree ) {
 	$show_form = ($tree->get_param('show_form_at_item') > 0);// TODO: RMME
 	$cls = array();
 	if (($search_id = $tree->get_param('search_id')) > 0 && $search_id == $r->ID) {
-		$cls []= 'search_id';
+		$cls[] = 'search_id';
 	}
 	$cls = (!empty($cls))? ' class="'.implode(' ', $cls).'"' : '';
 	echo '<dl'.$cls.'>';
@@ -2163,9 +2163,9 @@ function tree_callback__show_item_from_CRM_PROCES( &$r, &$tree ) {
 	}
 
 	$cls = array();
-	$cls []= 'item_id';
-	$cls []= 'btn-box';
-	if ($proces_type_css_class) $cls []= 'btn-box-'.$proces_type_css_class;
+	$cls[] = 'item_id';
+	$cls[] = 'btn-box';
+	if ($proces_type_css_class) $cls[] = 'btn-box-'.$proces_type_css_class;
 	echo App::link($out_id, array('task'=>"CRM_PROCES", 'filtr_id'=>$r->ID, '#'=>'TREE'.$r->ID), array('class'=>implode(' ', $cls)));
 
 	//if($r->TYPE == 'PROCES_INIT')  {
@@ -2343,10 +2343,10 @@ function tree_callback__show_item_from_CRM_PROCES( &$r, &$tree ) {
 		if ($r->A_HAS_IMAGE || $tree->get_param('editable')) {
 			echo' <span class="external-ids">{';
 			for ($i = 0; $i < $r->A_HAS_IMAGE; $i++) {
-				echo App::link("I", array('function_init'=>'fun_SHOW_EXTERNAL_IMAGE', 'tbl'=>$tbl,'id'=>$r->ID, 'number'=>$i), array('target'=>'_blank', 'title'=>"Zdjecie ".($i+1), 'ico'=>'img', 'class'=>'lightbox'));
+				echo App::link("I", array('function_init'=>'fun_SHOW_EXTERNAL_IMAGE', 'tbl'=>$tbl,'id'=>$r->ID, 'number'=>$i), array('target'=>'_blank', 'title'=>"Zdjecie ".($i+1), 'iconBootstrap'=>'icon-camera', 'class'=>'lightbox'));
 				//echo'<img src="'."?function_init=fun_SHOW_EXTERNAL_IMAGE&tbl=".$tbl."&id=".$r->ID."&number=".$i."&resize=200x200".'" />';
 			}
-			if ($tree->get_param('editable')) echo App::link("+", "?function_init=fun_IMAGE_ADD&tbl=".$tbl."&id=".$r->ID, array('target'=>'_blank', 'title'=>"Dodaj zdjecia", 'ico'=>'add'));
+			if ($tree->get_param('editable')) echo App::link("+", "?function_init=fun_IMAGE_ADD&tbl=".$tbl."&id=".$r->ID, array('target'=>'_blank', 'title'=>"Dodaj zdjecia", 'iconBootstrap'=>'icon-plus'));
 			echo'}</span>';
 		}
 	}
@@ -2405,9 +2405,9 @@ function tree_callback__show_item_from_CRM_PROCES( &$r, &$tree ) {
 				$tree->log('show item -> fetch-get_all_parents', array('fetch-get_all_parents'));
 				$w_parents_out = array();
 				foreach ($w->_parents as $w_p_id => $w_p) {
-					$w_parents_out []= '[<b>'.$w_p->ID.'</b> '.$w_p->TYPE.' '.$w_p->DESC.']';
-					$w_title_parents_out []= ''.$w_p->ID.' '.$w_p->TYPE.' '.$w_p->DESC.'';
-				}//end foreach
+					$w_parents_out[] = '[<b>'.$w_p->ID.'</b> '.$w_p->TYPE.' '.$w_p->DESC.']';
+					$w_title_parents_out[] = ''.$w_p->ID.' '.$w_p->TYPE.' '.$w_p->DESC.'';
+				}
 				$w_parents_out = ' <span class="wsk_parents">'.implode(' / ', $w_parents_out).'</span>';
 				$w_title_parents_out = (!empty($w_title_parents_out))? ' title="'.implode(' / ', $w_title_parents_out).'"' : '';
 			}
@@ -2473,23 +2473,25 @@ function tree_callback__show_item_from_CRM_PROCES( &$r, &$tree ) {
 				$tbl = 'CRM_WSKAZNIK';
 				if ($w->CW_A_HAS_IMAGE > 0 || $tree->get_param('editable')) {
 					for ($i = 0; $i < $w->CW_A_HAS_IMAGE; $i++) {
-						echo App::link("I", array('function_init'=>'fun_SHOW_EXTERNAL_IMAGE', 'tbl'=>$tbl,'id'=>$w->CW_ID, 'number'=>$i), array('target'=>'_blank', 'title'=>"Zdjecie ".($i+1), 'ico'=>'img', 'class'=>'lightbox'));
+						echo App::link("I", array('function_init'=>'fun_SHOW_EXTERNAL_IMAGE', 'tbl'=>$tbl,'id'=>$w->CW_ID, 'number'=>$i), array('target'=>'_blank', 'title'=>"Zdjecie ".($i+1), 'iconBootstrap'=>'icon-camera', 'class'=>'lightbox'));
 					}
-					if ($tree->get_param('editable')) echo App::link("+", "?function_init=fun_IMAGE_ADD&tbl=".$tbl."&id=".$w->CW_ID, array('target'=>'_blank', 'title'=>"Dodaj zdjecia", 'ico'=>'add'));
+					if ($tree->get_param('editable')) echo App::link("+", "?function_init=fun_IMAGE_ADD&tbl=".$tbl."&id=".$w->CW_ID, array('target'=>'_blank', 'title'=>"Dodaj zdjecia", 'iconBootstrap'=>'icon-plus'));
 				}
 
 				// zasob images
 				$tbl = 'CRM_LISTA_ZASOBOW';
 				if ($w->A_HAS_IMAGE) {
 					for ($i = 0; $i < $w->A_HAS_IMAGE; $i++) {
-						echo App::link("I", array('function_init'=>'fun_SHOW_EXTERNAL_IMAGE', 'tbl'=>$tbl,'id'=>$w->ID, 'number'=>$i), array('target'=>'_blank', 'title'=>"Zdjecie ".($i+1), 'ico'=>'img', 'class'=>'lightbox'));
+						echo App::link("I", array('function_init'=>'fun_SHOW_EXTERNAL_IMAGE', 'tbl'=>$tbl,'id'=>$w->ID, 'number'=>$i), array('target'=>'_blank', 'title'=>"Zdjecie ".($i+1), 'iconBootstrap'=>'icon-camera', 'class'=>'lightbox'));
 					}
 				}
 
 				// show video link if file is movie type
 				if ($w->TYPE == 'PLIK') {
-					$movie_ext = array('avi', 'mov', 'm4v');
-					if (in_array(end(explode('.', $w->DESC)), $movie_ext)) {
+					$movieExtAllowed = array('avi', 'mov', 'm4v');
+					$movieExt = explode('.', $w->DESC);
+					$movieExt = end($movieExt);
+					if (in_array($movie_ext, $movieExtAllowed)) {
 						//echo App::link("V", array('function_init'=>'fun_SHOW_VIDEO','id'=>$w->ID), array('target'=>'_blank', 'title'=>"Film", 'ico'=>'video', 'class'=>''));//lightbox video
 					}
 				}
@@ -2564,10 +2566,10 @@ echo'<pre style="max-height:100px;overflow:auto;border:1px solid red;">wsk = ';p
 			$max_deep = 0;// max parents deep
 			foreach ($wsk as $k_wsk_id => $w) {
 				$wsk_parents_cur = array_reverse(array_keys($w->_parents));
-				$wsk_parents_cur []= $w->ID;
+				$wsk_parents_cur[] = $w->ID;
 				if (count($wsk_parents_cur) > $max_deep) $max_deep = count($wsk_parents_cur);
 				$wsk_parents_cur ['wsk_id'] = $k_wsk_id;
-				$wsk_parents []= $wsk_parents_cur;
+				$wsk_parents[] = $wsk_parents_cur;
 				echo'parents ['.implode(',', $wsk_parents_cur).']<br />';
 			}
 			$wsk_parents_cnt = count($wsk_parents);
@@ -2578,7 +2580,7 @@ echo'<pre style="max-height:100px;overflow:auto;border:1px solid red;">parents('
 				$zasoby_id [$w->ID] =& $wsk[$k_wsk_id];
 				foreach ($w->_parents as $k_z_id => $z) {
 					$zasoby_id [$k_z_id] =& $wsk[$k_wsk_id]->_parents[$k_z_id];
-				}//end foreach
+				}
 			}
 
 			$wsk_parents_map = array();// table td: rowspan, colspan, wsk_id
@@ -2656,8 +2658,8 @@ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">wsk_paren
 						$wsk_parents_map[$k_i][$last_map_ind]['rowspan'] += 1;
 					}
 					$last_p_id = $parent_id;
-				}//end foreach
-			}//end foreach
+				}
+			}
 echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">wsk_parents_map = ';print_r($wsk_parents_map);echo'</pre>';
 */
 
@@ -2714,8 +2716,8 @@ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">zasoby_id
 							$out_zasob .= 'error brak zasobu {'.$v_map['z_id'].'}';
 						} else {
 							$out_zasob_title = array();
-							$out_zasob_title []= V::get('DESC', '', $curr_z);
-							$out_zasob_title []= V::get('OPIS', '', $curr_z);
+							$out_zasob_title[] = V::get('DESC', '', $curr_z);
+							$out_zasob_title[] = V::get('OPIS', '', $curr_z);
 							$out_zasob_title = ''.implode(' ', $out_zasob_title).'';
 							$out_zasob .= '<b class="btn-box btn-box-green" title="'.$out_zasob_title.'">'.$v_map['z_id'].'</b>';
 						}
@@ -2736,7 +2738,7 @@ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">zasoby_id
 					}
 
 					$out_row .= '<td'.$cls.''.$out_rowspan.''.$out_colspan.'>'.$out_zasob.'</td>';
-				}//end foreach
+				}
 				if ($out_row) {
 					echo'<tr>';
 						echo $out_row;
@@ -2753,8 +2755,8 @@ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">zasoby_id
 			if (!empty($zasoby_id['KOMORKA'])) {
 				$komorki = array();
 				foreach ($zasoby_id['KOMORKA'] as $z_id => $w_id) {
-					$komorki []= $wsk[ $w_id ];
-				}//end foreach
+					$komorki[] = $wsk[ $w_id ];
+				}
 
 				DEBUG_S(4,'komorki',$komorki, __FILE__, __FUNCTION__, __LINE__);
 				// zasoby pobierz info o komorkach: tabela, baza danych; host,login,passwd z configa
@@ -2782,8 +2784,8 @@ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">zasoby_id
 				DEBUG_S(5,'sql', $sql, __FILE__, __FUNCTION__, __LINE__);
 				$res = DB::query( $sql );
 				while ($z = DB::fetch( $res )) {
-					$zasoby_db_conf [$z->DB_ID] []= array($z->KOMORKA_ID, $z->DB_ID, $z->DB_DESC, $z->DB_OPIS);
-					$zasoby_tabele [$z->TABELA_ID] []= array($z->KOMORKA_ID, $z->TABELA_ID, $z->TABELA_DESC, $z->TABELA_OPIS);
+					$zasoby_db_conf [$z->DB_ID][] = array($z->KOMORKA_ID, $z->DB_ID, $z->DB_DESC, $z->DB_OPIS);
+					$zasoby_tabele [$z->TABELA_ID][] = array($z->KOMORKA_ID, $z->TABELA_ID, $z->TABELA_DESC, $z->TABELA_OPIS);
 				}
 				DEBUG_S(4,'zasoby_db_conf ['.implode(',',array_keys($zasoby_db_conf)).']', $zasoby_db_conf, __FILE__, __FUNCTION__, __LINE__);
 				DEBUG_S(4,'zasoby_tabele ['.implode(',',array_keys($zasoby_tabele)).']', $zasoby_tabele, __FILE__, __FUNCTION__, __LINE__);
@@ -2804,10 +2806,10 @@ function tree_callback__show_item_from_CRM_LISTA_ZASOBOW( &$r, &$tree ) {
 	// TODO: btn-box zasob type from PARENT_ID
 	$cls = array();
 	if (($search_id = $tree->get_param('search_id')) > 0 && $search_id == $r->ID) {
-		$cls []= 'search_id';
+		$cls[] = 'search_id';
 	}
 	if ($tree->_table == 'CRM_LISTA_ZASOBOW') {
-		$cls []= 'type-'.(($r->ALIAS_ID > 0)? 'ALIAS_ID' : $r->PARENT_TYPE);// TODO: Undefined property: stdClass::$PARENT_TYPE przy Filtr ID
+		$cls[] = 'type-'.(($r->ALIAS_ID > 0)? 'ALIAS_ID' : $r->PARENT_TYPE);// TODO: Undefined property: stdClass::$PARENT_TYPE przy Filtr ID
 	}
 	$cls = (!empty($cls))? ' class="'.implode(' ', $cls).'"' : '';
 	echo'<dl'.$cls.'>';
@@ -2890,9 +2892,9 @@ function tree_callback__show_item_from_CRM_LISTA_ZASOBOW( &$r, &$tree ) {
 			//echo App::link_ajax("IMG", 'ajax_show_images', array('tbl'=>'CRM_LISTA_ZASOBOW','id'=>$r->ID), array('js_result_type'=>'override', 'js_result'=>'', 'title'=>"Zdjecia (".$r->A_HAS_IMAGE.")"));
 			// TODO: A_HAS_IMAGE - count images, show img icons to show image in new window
 			for ($i = 0; $i < $r->A_HAS_IMAGE; $i++) {
-				echo App::link("I", array('function_init'=>'fun_SHOW_EXTERNAL_IMAGE', 'tbl'=>$tbl,'id'=>$r->ID, 'number'=>$i), array('target'=>'_blank', 'title'=>"Zdjecie ".($i+1), 'ico'=>'img', 'class'=>'lightbox'));
+				echo App::link("I", array('function_init'=>'fun_SHOW_EXTERNAL_IMAGE', 'tbl'=>$tbl,'id'=>$r->ID, 'number'=>$i), array('target'=>'_blank', 'title'=>"Zdjecie ".($i+1), 'iconBootstrap'=>'icon-camera', 'class'=>'lightbox'));
 			}
-			if ($tree->get_param('editable')) echo App::link("+", "?function_init=fun_IMAGE_ADD&tbl=".$tbl."&id=".$r->ID, array('target'=>'_blank', 'title'=>"Dodaj zdjecia", 'ico'=>'add'));
+			if ($tree->get_param('editable')) echo App::link("+", "?function_init=fun_IMAGE_ADD&tbl=".$tbl."&id=".$r->ID, array('target'=>'_blank', 'title'=>"Dodaj zdjecia", 'iconBootstrap'=>'icon-plus'));
 			echo'}</span>';
 		}
 	}
@@ -2900,9 +2902,9 @@ function tree_callback__show_item_from_CRM_LISTA_ZASOBOW( &$r, &$tree ) {
 	if ($tree->get_param('editable')) {
 		// TODO:  check table
 		$allowed_check_database = array();
-		$allowed_check_database []= 'BAZA_DANYCH';
-		$allowed_check_database []= 'DATABASE_MYSQL';
-		$allowed_check_database []= 'DATABASE_MSSQL';
+		$allowed_check_database[] = 'BAZA_DANYCH';
+		$allowed_check_database[] = 'DATABASE_MYSQL';
+		$allowed_check_database[] = 'DATABASE_MSSQL';
 
 		if ($r->TYPE == 'TABELA') {
 			//echo'{';
@@ -2931,23 +2933,23 @@ function tree_callback__show_item_from_CRM_LISTA_ZASOBOW( &$r, &$tree ) {
 			echo "}" . '</span>';
 		} else {
 			$external_ids_allowed_type = array();
-			$external_ids_allowed_type []= 'NARZEDZIE';
-			$external_ids_allowed_type []= 'TELBOX';
-			$external_ids_allowed_type []= 'URZADZENIE';
-			$external_ids_allowed_type []= 'SERWER';
-			$external_ids_allowed_type []= 'SEGREGATOR';
-			$external_ids_allowed_type []= 'MAGAZYN';
-			$external_ids_allowed_type []= 'POMIESZCZENIE';
-			$external_ids_allowed_type []= 'ALARM-SATEL';
-			$external_ids_allowed_type []= 'DOSTEP-ZAMEK';
-			$external_ids_allowed_type []= 'DOSTEP-KLUCZ';
-			$external_ids_allowed_type []= 'SZAFA';
-			$external_ids_allowed_type []= 'PIECZATKA';
-			$external_ids_allowed_type []= 'MATERIAL_REKLAMOWY';
-			$external_ids_allowed_type []= 'INNE';
-			$external_ids_allowed_type []= 'DANE';
-			$external_ids_allowed_type []= 'SIP_ACCOUNT';
-			$external_ids_allowed_type []= 'PODMIOT';
+			$external_ids_allowed_type[] = 'NARZEDZIE';
+			$external_ids_allowed_type[] = 'TELBOX';
+			$external_ids_allowed_type[] = 'URZADZENIE';
+			$external_ids_allowed_type[] = 'SERWER';
+			$external_ids_allowed_type[] = 'SEGREGATOR';
+			$external_ids_allowed_type[] = 'MAGAZYN';
+			$external_ids_allowed_type[] = 'POMIESZCZENIE';
+			$external_ids_allowed_type[] = 'ALARM-SATEL';
+			$external_ids_allowed_type[] = 'DOSTEP-ZAMEK';
+			$external_ids_allowed_type[] = 'DOSTEP-KLUCZ';
+			$external_ids_allowed_type[] = 'SZAFA';
+			$external_ids_allowed_type[] = 'PIECZATKA';
+			$external_ids_allowed_type[] = 'MATERIAL_REKLAMOWY';
+			$external_ids_allowed_type[] = 'INNE';
+			$external_ids_allowed_type[] = 'DANE';
+			$external_ids_allowed_type[] = 'SIP_ACCOUNT';
+			$external_ids_allowed_type[] = 'PODMIOT';
 			if (in_array($r->TYPE, $external_ids_allowed_type)) {
 				echo '<span class="external-ids">' . "{";
 				echo App::link_ajax("get IDS", "ajax_zasob_search_external_ids", array('zasob_id'=>$r->ID), array('js_result_type'=>'override', 'js_result'=>''));
@@ -2980,7 +2982,7 @@ function tree_callback__show_item_from_CRM_LISTA_ZASOBOW( &$r, &$tree ) {
 //	}
 
 
-function typespecial_L_APPOITMENT_USER( $field_name, $cmd, $user_value, $attrs = array() ) {
+function typespecial_L_APPOITMENT_USER($field_name, $cmd, $user_value, $attrs = array()) {
 	static $_users_list;
 	if (!$_users_list) {
 		$_users_list = array();
@@ -3006,7 +3008,7 @@ function typespecial_L_APPOITMENT_USER( $field_name, $cmd, $user_value, $attrs =
 					foreach ($_users_list as $key => $val) {
 						$sel = ($user_value == $key)? ' selected="selected"' : '';
 						$out .= '<option value="' . $key . '"' . $sel . '>' . $val . '</option>';
-					}//end foreach
+					}
 				$out .= '</select>';
 			}
 			break;
@@ -3016,7 +3018,7 @@ function typespecial_L_APPOITMENT_USER( $field_name, $cmd, $user_value, $attrs =
 					foreach ($_users_list as $key => $val) {
 						$sel = ($user_value == $key)? ' selected="selected"' : '';
 						$out .= '<option value="' . $key . '"' . $sel . '>' . $val . '</option>';
-					}//end foreach
+					}
 				$out .= '</select>';
 			}
 			break;
@@ -3053,7 +3055,7 @@ function typespecial_CRM_TESTY__ID_ORGANIZER( $field_name, $cmd, $user_value, $a
 					foreach ($_users_list as $key => $val) {
 						$sel = ($user_value == $key)? ' selected="selected"' : '';
 						$out .= '<option value="' . $key . '"' . $sel . '>' . $val . '</option>';
-					}//end foreach
+					}
 				$out .= '</select>';
 			}
 			break;
@@ -3063,7 +3065,7 @@ function typespecial_CRM_TESTY__ID_ORGANIZER( $field_name, $cmd, $user_value, $a
 					foreach ($_users_list as $key => $val) {
 						$sel = ($user_value == $key)? ' selected="selected"' : '';
 						$out .= '<option value="' . $key . '"' . $sel . '>' . $val . '</option>';
-					}//end foreach
+					}
 				$out .= '</select>';
 			}
 			break;

SE/se-lib/AjaxReq.php

@@ -11,7 +11,7 @@ class AjaxReq {
  * Wygenerowanie id requestu dla ajaxowych requestow.
  * TODO: params ID_PROCES, ID_ZASOB_TABLE
  */
-function generate_id( $proces_id, $tbl_zasob_id ) {
+function generate_id($proces_id, $tbl_zasob_id) {
 	$generate_uniq_ajax_req_id = '_tbl_'.uniqid();// uniq string eg. 4e9eaf7b82516
 
 	self::_gc();
@@ -39,7 +39,7 @@ function generate_id( $proces_id, $tbl_zasob_id ) {
 		$sql_cols = array();
 		foreach ($allowed_cols as $k_field => $v_label) {
 			$sql_cols[$k_field] = '';
-		}//end foreach
+		}
 
 		$db = DB::getDB( $conf['sql_db'] );
 		$sql = "show fields from `".$conf['sql_table']."`; ";
@@ -56,7 +56,7 @@ function generate_id( $proces_id, $tbl_zasob_id ) {
 			if (array_key_exists($r->Field, $sql_cols)) {
 				$r->Perm = 'RWC';// TODO: raed from wskaznik.pytanie
 				$r->Label = $allowed_cols[$r->Field];
-				$sql_cols[ $r->Field ] = (array)$r;//json_encode( $r );
+				$sql_cols[$r->Field] = (array)$r;//json_encode( $r );
 			}
 		}
 		$conf['sql_cols'] = $sql_cols;// ['sql_col_name'] = 'sql_name;perm;type;default';
@@ -71,11 +71,11 @@ function generate_id( $proces_id, $tbl_zasob_id ) {
 }
 
 
-function &get_conf( $ajax_req_id ) {
+function &get_conf($ajax_req_id) {
 	$ret = null;
 	if (array_key_exists($ajax_req_id, $_SESSION['_ajax_req_id'])) {
-		$_SESSION['_ajax_req_id'][ $ajax_req_id ]['_last_access_time'] = time();
-		return $_SESSION['_ajax_req_id'][ $ajax_req_id ];
+		$_SESSION['_ajax_req_id'][$ajax_req_id]['_last_access_time'] = time();
+		return $_SESSION['_ajax_req_id'][$ajax_req_id];
 	}
 	return $ret;
 }
@@ -89,12 +89,12 @@ function _gc() {
 	$time_limit = 5 * 60;
 	foreach ($_SESSION['_ajax_req_id'] as $ajax_req_id => $conf) {
 		if (!isset($conf['_last_access_time'])) {// bad data
-			unset($_SESSION['_ajax_req_id'][ $ajax_req_id ]);
+			unset($_SESSION['_ajax_req_id'][$ajax_req_id]);
 		} else if (time() - $conf['_last_access_time'] > $time_limit) {// too old request
-			unset($_SESSION['_ajax_req_id'][ $ajax_req_id ]);
+			unset($_SESSION['_ajax_req_id'][$ajax_req_id]);
 		}
-	}//end foreach
+	}
 }
 
 
-}// class
+}

SE/se-lib/BaseDao.php

@@ -22,8 +22,8 @@ class BaseDao {
 		$id = (int)$id;
 		if ($id <= 0) return $null;
 		$sql = "select t.*
-			from `" . $this->_table . "` as t
-			where t.`ID`='" . $id . "'
+			from `{$this->_table}` as t
+			where t.`ID`='{$id}'
 		";
 		$res = DB::query($sql);
 		if ($h = DB::fetch_assoc($res)) {
@@ -54,9 +54,9 @@ class BaseDao {
 				$data['A_RECORD_UPDATE_DATE'] = date('Y-m-d-H:i');
 				$data['A_RECORD_UPDATE_AUTHOR'] =  User::getName();
 				foreach ($data as $k_field => $v_value) {
-					$sql_data []= "`" . $k_field . "`='" . $v_value . "'";
+					$sql_data[] = "`{$k_field}`='{$v_value}'";
 				}
-				$sql = "update `" . $this->_table . "` set " . implode(", ", $sql_data) . " where `ID`='" . $model->get('ID') . "'; ";
+				$sql = "update `{$this->_table}` set " . implode(", ", $sql_data) . " where `ID`='" . $model->get('ID') . "'; ";
 				$this->_db->query($sql);
 				if ($this->_db->affected_rows() > 0) {
 					$ret = true;
@@ -72,10 +72,10 @@ class BaseDao {
 			$data['A_RECORD_CREATE_AUTHOR'] =  User::getName();
 			foreach ($data as $k_field => $v_value) {
 				if (!empty($v_value)) {
-					$sql_data["`" . $k_field . "`"] = "'" . $v_value . "'";
+					$sql_data["`{$k_field}`"] = "'{$v_value}'";
 				}
 			}
-			$sql = "insert into `" . $this->_table . "` (" . implode(", ", array_keys($sql_data)) . ") values (" . implode(", ", array_values($sql_data)) . "); ";
+			$sql = "insert into `{$this->_table}` (" . implode(", ", array_keys($sql_data)) . ") values (" . implode(", ", array_values($sql_data)) . "); ";
 			$this->_db->query($sql);
 			$this->_save_id = $this->_db->insert_id();
 			if ($this->_save_id > 0) {
@@ -87,10 +87,10 @@ class BaseDao {
 			if ($this->_save_id > 0 && !empty($data)) {
 				$sql_data = array();
 				foreach ($data as $key => $val) {
-					$sql_data["`" . $key . "`"] = "'" . $val . "'";
+					$sql_data["`{$key}`"] = "'{$val}'";
 				}
-				$sql_data["`ID_USERS2`"] = "'" . $this->_save_id . "'";
-				$sql_hist = "insert into `" . $this->_table . "_HIST` (" . implode(", ", array_keys($sql_data)) . ") values (" . implode(", ", array_values($sql_data)) . "); ";
+				$sql_data["`ID_USERS2`"] = "'{$this->_save_id}'";
+				$sql_hist = "insert into `{$this->_table}_HIST` (" . implode(", ", array_keys($sql_data)) . ") values (" . implode(", ", array_values($sql_data)) . "); ";
 				$this->_db->query($sql_hist);
 				$this->_save_hist_id = $this->_db->insert_id();
 			}

SE/se-lib/Column.php

@@ -1,8 +1,8 @@
 <?php
 /**
- * TODO: columns in $_SESSION['columns'][ Table ][ Field ] = array(Type, Type_value, Default, Null)
- *     legacy: $_SESSION[ Table . '_COLUMN'][ TYPE ], ...
- *   $_SESSION['columns'][ Table ]
+ * TODO: columns in $_SESSION['columns'][Table][Field] = array(Type, Type_value, Default, Null)
+ *     legacy: $_SESSION[Table . '_COLUMN'][TYPE], ...
+ *   $_SESSION['columns'][Table]
  * 
  * add column config to config/.cnf--column_init_{TBL_NAME}.ini.php
  * @see method is_allowed
@@ -17,7 +17,7 @@ var $_data;
 var $_initialized;
 
 
-function __construct( $table, &$col_data ) {
+function __construct($table, &$col_data) {
 	$this->_table = $table;
 	$this->_data = $col_data;
 	$this->_initialized = (V::get('_checked', '', $col_data))? true : false;
@@ -74,7 +74,7 @@ function toArray() {
  * 
  * static
  */
-public static function init( $table, $force = false ) {
+public static function init($table, $force = false) {
 
 	$col = Column::getInstance($table);
 	if ($col && $col->initialized() && $force == false) {
@@ -108,11 +108,11 @@ public static function init( $table, $force = false ) {
 		return;
 	}
 
-	if (!self::is_allowed( $table )) {
+	if (!self::is_allowed($table)) {
 		return;
 	}
 
-	$col_data = self::get_table_struct( $table, $tbl_config );
+	$col_data = self::get_table_struct($table, $tbl_config);
 
 	// DESC_TO_LANG
 	$col_data['DESC_TO_LANG'] = V::get('DESC_TO_LANG', array(), $tbl_config);
@@ -131,7 +131,7 @@ function init_old(){
 	// wymagane struktura tabeli `CRM_LISTA_ZASOBOW` w tej wersji aplikacji:
 	$column_struct = array();
 	//ZAP_SQL("show fields from $COLUMN");// Field, Type, Null, Key, Default, Extra
-	//$column_struct[ Field ] = array( Type, Type_value, Default, Null, Extra );
+	//$column_struct[Field] = array( Type, Type_value, Default, Null, Extra );
 	function column_struct_create_type_obj($type, $type_value=null, $default=null, $null=null, $extra=null) {
 		return (object)array('Type'=>$type, 'Type_value'=>$type_value, 'Default'=>$default, 'Null'=>$null, 'Extra'=>$extra);
 	}
@@ -212,7 +212,7 @@ echo'</pre>';
 }
 
 
-public static function get_table_struct( $tbl_name, $tbl_conf ) {
+public static function get_table_struct($tbl_name, $tbl_conf) {
 	$col = array();
 
 	//$COLUMN = $INIT_TABLE;
@@ -232,7 +232,7 @@ public static function get_table_struct( $tbl_name, $tbl_conf ) {
 
 	$database = V::get('database', null, $tbl_config['CONFIG']);
 	$db = DB::getDB($database);
-	$res = $db->query("show fields from `$tbl_name` ");
+	$res = $db->query("show fields from `{$tbl_name}` ");
 
 	$KEY = 0;
 
@@ -251,11 +251,11 @@ public static function get_table_struct( $tbl_name, $tbl_conf ) {
 		}
 
 		$col['DESC']["$KEY"] = $field_name;
-		$col['TYPE'][ $col['DESC']["$KEY"] ] = $field_type;
+		$col['TYPE'][$col['DESC']["$KEY"]] = $field_type;
 		//if (!isset($tbl_conf['PERMEDIT'][$field_name])) {
-		$col['PERMEDIT'][ $field_name ] = $tbl_conf['PERMEDIT'][$field_name];
+		$col['PERMEDIT'][$field_name] = $tbl_conf['PERMEDIT'][$field_name];
 		//}
-		$col['DESC_TO_KEY'][ $field_name ] = $KEY;
+		$col['DESC_TO_KEY'][$field_name] = $KEY;
 		$col['ID']["$KEY"] = $KEY;
 		//if ($_SESSION['USER_PROFILE'][$COLUMN."_COLUMN"]["$KEY"] == "HIDE") {
 		//	$col['HIDE']["$KEY"] = 'HIDE';
@@ -284,19 +284,19 @@ if(0){
 }
 
 
-function get_table_hist_struct( $tbl_name ) {
+function get_table_hist_struct($tbl_name) {
 	$col = array();
-	$tbl_hist_name = $tbl_name . "_HIST";
-	$res = DB::query("show fields from `$tbl_hist_name` ");
+	$tbl_hist_name = "{$tbl_name}_HIST";
+	$res = DB::query("show fields from `{$tbl_hist_name}` ");
 	$KEY = 0;
 	while ($h = mysql_fetch_row($res)) {
-		$col['DESC']["$KEY"] = $h[0];
-		$col['TYPE'][ $col['DESC']["$KEY"] ] = $h[1];
-		if (!isset($col['PERMEDIT'][ $h[0] ])) {
-			$col['PERMEDIT'][ $h[0] ] = "RW";
+		$col['DESC']["{$KEY}"] = $h[0];
+		$col['TYPE'][$col['DESC']["{$KEY}"]] = $h[1];
+		if (!isset($col['PERMEDIT'][$h[0]])) {
+			$col['PERMEDIT'][$h[0]] = "RW";
 		}
-		$col['DESC_TO_KEY'][ $h[0] ] = $KEY;
-		$col['ID']["$KEY"] = $KEY;
+		$col['DESC_TO_KEY'][$h[0]] = $KEY;
+		$col['ID']["{$KEY}"] = $KEY;
 		//if ($_SESSION['USER_PROFILE'][$COLUMN."_COLUMN"]["$KEY"] == "HIDE") {
 		//	$_SESSION[$COLUMN."_COLUMN"]['HIDE']["$KEY"] = 'HIDE';
 		//}
@@ -334,11 +334,11 @@ public static function is_allowed($column_name) {
 function getVisibleFieldList() {
 	$cols = array();
 	foreach ($this->_data['ID'] as $field_id) {
-		$field_name = $this->_data['DESC'][ $field_id ];
+		$field_name = $this->_data['DESC'][$field_id];
 		if (User::getProfileColumn($this->_table, $field_id) == 'HIDE') {
 			continue;
 		}
-		$cols[ $field_id ] = $field_name;
+		$cols[$field_id] = $field_name;
 	}
 	return $cols;
 }
@@ -347,8 +347,8 @@ function getVisibleFieldList() {
 function getFieldList() {
 	$cols = array();
 	foreach ($this->_data['ID'] as $field_id) {
-		$field_name = $this->_data['DESC'][ $field_id ];
-		$cols[ $field_id ] = $field_name;
+		$field_name = $this->_data['DESC'][$field_id];
+		$cols[$field_id] = $field_name;
 	}
 	return $cols;
 }
@@ -394,8 +394,8 @@ public static function saveToAcl($table,$data) {
 		$userAcl = User::getAcl();
 		$tblAcl = $userAcl->getTableAcl(ProcesHelper::getZasobTableID($table));
 	if($tblAcl)
-	foreach($data['PERMEDIT'] as $FIELD=>$PERM) {
-		$tblAcl->setFieldPerms($tblAcl->getFieldIdByName($FIELD),$PERM);
+	foreach($data['PERMEDIT'] as $FIELD => $PERM) {
+		$tblAcl->setFieldPerms($tblAcl->getFieldIdByName($FIELD), $PERM);
 	}
 	
 	

SE/se-lib/ColumnCrm.php

@@ -125,8 +125,8 @@ class ColumnCrm {
 	public function getFieldList() {
 		$cols = array();
 		foreach ($this->_data['ID'] as $field_id) {
-			$field_name = $this->_data['DESC'][ $field_id ];
-			$cols[ $field_id ] = $field_name;
+			$field_name = $this->_data['DESC'][$field_id];
+			$cols[$field_id] = $field_name;
 		}
 		return $cols;
 	}

SE/se-lib/ColumnDealsStatus.php

@@ -150,19 +150,19 @@ class ColumnDealsStatus {
 			$db = DB::getDB();
 
 			$sql = self::get_drop_query();
-			$dbg_msgs []= $sql;
+			$dbg_msgs[] = $sql;
 			$db->query($sql, false);
 
 			$sql = self::get_create_query();
-			$dbg_msgs []= $sql;
+			$dbg_msgs[] = $sql;
 			$db->query($sql, false);
 
 			$sql = self::get_insert_query();
-			$dbg_msgs []= $sql;
+			$dbg_msgs[] = $sql;
 			$db->query($sql, false);
 
 			$sql = self::get_update_query();
-			$dbg_msgs []= $sql;
+			$dbg_msgs[] = $sql;
 			$db->query($sql, false);
 
 			$date = date("Y-m-d");
@@ -179,11 +179,11 @@ class ColumnDealsStatus {
 		$db->query($sql, false);
 
 		$sql = self::get_insert_query($userID);
-		$dbg_msgs []= $sql;
+		$dbg_msgs[] = $sql;
 		$db->query($sql, false);
 
 		$sql = self::get_update_query($userID);
-		$dbg_msgs []= $sql;
+		$dbg_msgs[] = $sql;
 		$db->query($sql, false);
 
 		return true;
@@ -196,7 +196,7 @@ class ColumnDealsStatus {
 		if (!$force) {
 			if (!empty($_SESSION[self::get_table().'_COLUMN']['_stats_by_month_cache'])) {
 				foreach ($_SESSION[self::get_table().'_COLUMN']['_stats_by_month_cache'] as $k => $v) {
-					$deals_stats [ $k ] = $v;
+					$deals_stats[$k] = $v;
 				}
 				return $deals_stats;
 			}
@@ -220,7 +220,7 @@ class ColumnDealsStatus {
 		$res = DB::query( $sql );
 		while ($r = DB::fetch_assoc( $res )) {
 			$r['suma'] = 0;
-			$deals_stats [ $r['deal_term_month'] ]= $r;
+			$deals_stats[$r['deal_term_month']] = $r;
 		}
 
 		// fetch suma, for first 12 months
@@ -255,7 +255,7 @@ class ColumnDealsStatus {
 		// save in cache
 		$_SESSION[self::get_table().'_COLUMN']['_stats_by_month_cache'] = array();
 		foreach ($deals_stats as $k => $v) {
-			$_SESSION[self::get_table().'_COLUMN']['_stats_by_month_cache'][ $k ] = $v;
+			$_SESSION[self::get_table().'_COLUMN']['_stats_by_month_cache'][$k] = $v;
 		}
 
 		return $deals_stats;
@@ -271,11 +271,11 @@ class ColumnDealsStatus {
 		$sql_where_and_arr = array();
 
 		if ($_month == '0000-00') {// filter - P_DEALDATE_TERM
-			$sql_where_and_arr []= "td.`P_DEALDATE_TERM`<'" . date("Y-m") . "-00'";
+			$sql_where_and_arr[] = "td.`P_DEALDATE_TERM`<'" . date("Y-m") . "-00'";
 		} else {
-			$sql_where_and_arr []= "td.`P_DEALDATE_TERM` like '" . $_month . "-%'";
+			$sql_where_and_arr[] = "td.`P_DEALDATE_TERM` like '" . $_month . "-%'";
 		}
-		$sql_where_and_arr []= "td.`DEALS_ACTIVE`=1";// filter - ACTIVE: tylko aktywne umowy
+		$sql_where_and_arr[] = "td.`DEALS_ACTIVE`=1";// filter - ACTIVE: tylko aktywne umowy
 
 
 		$sql_where = (!empty($sql_where_and_arr))? "where" . "\n" . implode(" and ", $sql_where_and_arr) : "";
@@ -304,7 +304,7 @@ class ColumnDealsStatus {
 		if (V::get('DBG_DEALS', '', $_GET)){echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">sql (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($sql);echo'</pre>';}
 		$res = $db->query($sql);
 		while ($r = $db->fetch($res)) {
-			$deals [$r->ID] = $r;
+			$deals[$r->ID] = $r;
 		}
 		if (empty($deals)) {
 			return $deals;
@@ -313,7 +313,7 @@ class ColumnDealsStatus {
 //	function fetch_services(&$deals)
 		$sql_deals_ids = array();
 		foreach ($deals as $k_id => $v_deal) {
-			$sql_deals_ids []= "'" . $k_id . "'";
+			$sql_deals_ids[] = "'" . $k_id . "'";
 			$deals[$k_id]->uslugi = array();
 		}
 		if (empty($sql_deals_ids)) {
@@ -343,7 +343,7 @@ class ColumnDealsStatus {
 		if (V::get('DBG_DEALS', '', $_GET)){echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">sql (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($sql);echo'</pre>';}
 		$res = $db->query($sql);
 		while ($r = $db->fetch($res)) {
-			$deals [$r->ID_DEALS_TABLE]->uslugi[$r->ID] = $r;
+			$deals[$r->ID_DEALS_TABLE]->uslugi[$r->ID] = $r;
 		}
 //	} // fetch_services
 

SE/se-lib/CompanyHelper.php

@@ -386,7 +386,7 @@ class CompanyHelper {
 			foreach ($v_deal_arr as $k_p_service => $v_srv_arr) {
 				if (empty($v_srv_arr)) continue;
 				foreach ($v_srv_arr as $k_srv_id => $v_srv) {
-					$load_ses_x_a_ids [$v_srv->NAME_LIST_SERVICES] []= $v_srv->ID;
+					$load_ses_x_a_ids [$v_srv->NAME_LIST_SERVICES][] = $v_srv->ID;
 				}
 			}
 		}
@@ -417,27 +417,27 @@ class CompanyHelper {
 		$dealsActive = array();
 		$sql_left_join = "";
 		$sql_select_arr = array();
-		$sql_select_arr []= "ds.`ID_DEALS`";
-		$sql_select_arr []= "ds.`ID_BILLING_USERS`";
-		$sql_select_arr []= "ds.`SERVICES_S_ADDRESS_STREET`";
-		$sql_select_arr []= "concat(c.`P_NAME`, ' ', c.`P_NAME_SECOND`) as P_NAME";
+		$sql_select_arr[] = "ds.`ID_DEALS`";
+		$sql_select_arr[] = "ds.`ID_BILLING_USERS`";
+		$sql_select_arr[] = "ds.`SERVICES_S_ADDRESS_STREET`";
+		$sql_select_arr[] = "concat(c.`P_NAME`, ' ', c.`P_NAME_SECOND`) as P_NAME";
 		if ('' != V::get('ID_BILLING_USERS', '', $params)) {
 			$sql_left_join .= "\n left join `DEALS_TABLE` as d on (d.`ID`=ds.`ID_DEALS`)";
-			$sql_select_arr []= "d.`P_DEALNUMBER`";
-			$sql_select_arr []= "d.`P_DEALDATE`";
-			$sql_select_arr []= "d.`P_DEALDATE_TERM`";
-			$sql_select_arr []= "d.`ID_OFFERS_GROUP`";
-			$sql_select_arr []= "d.`ID_OFFERS_ON`";
-			$sql_select_arr []= "d.`ID_OFFERS_OFF`";
-			$sql_select_arr []= "d.`S_ADDRESS_STREET`";
+			$sql_select_arr[] = "d.`P_DEALNUMBER`";
+			$sql_select_arr[] = "d.`P_DEALDATE`";
+			$sql_select_arr[] = "d.`P_DEALDATE_TERM`";
+			$sql_select_arr[] = "d.`ID_OFFERS_GROUP`";
+			$sql_select_arr[] = "d.`ID_OFFERS_ON`";
+			$sql_select_arr[] = "d.`ID_OFFERS_OFF`";
+			$sql_select_arr[] = "d.`S_ADDRESS_STREET`";
 		}
 		$sql_where_arr = array();
-		$sql_where_arr []= "ds.`DEALS_ACTIVE`=1";
+		$sql_where_arr[] = "ds.`DEALS_ACTIVE`=1";
 		if ('' != ($user_id = V::get('ID_BILLING_USERS', '', $params))) {
-			$sql_where_arr []= "ds.`ID_BILLING_USERS`='{$user_id}'";
+			$sql_where_arr[] = "ds.`ID_BILLING_USERS`='{$user_id}'";
 		}
 		if ('' != ($street = V::get('S_ADDRESS_STREET', '', $params))) {
-			$sql_where_arr []= "(ds.`SERVICES_S_ADDRESS_STREET`='{$street}' or concat(',', ds.`SERVICES_S_ADDRESS_STREET`, ',') like '%,{$street},%')";
+			$sql_where_arr[] = "(ds.`SERVICES_S_ADDRESS_STREET`='{$street}' or concat(',', ds.`SERVICES_S_ADDRESS_STREET`, ',') like '%,{$street},%')";
 		}
 		$sql_where_arr = implode("\n and ", $sql_where_arr);
 		$sql = "select " . implode("\n, ", $sql_select_arr) . "
@@ -451,9 +451,9 @@ class CompanyHelper {
 		$res = $this->_db->query($sql);
 		while ($r = $this->_db->fetch($res)) {
 			if ($sqlReturnBy == 'ID') {
-				$dealsActive [$r->ID_DEALS]= $r;
+				$dealsActive[$r->ID_DEALS]= $r;
 			} else {
-				$dealsActive [$r->ID_BILLING_USERS] []= $r;
+				$dealsActive[$r->ID_BILLING_USERS][] = $r;
 			}
 		}
 		return $dealsActive;

SE/se-lib/Config.php

@@ -41,13 +41,9 @@ Array
 )
  */
 
-
-require_once dirname(__FILE__) . '/' . 'Lib.php';
-
-
 class Config {
 
-	public static function get( $key, $section = null ) {
+	public static function get($key, $section = null) {
 		static $_main_config;
 
 		if ($_main_config === null) {
@@ -75,29 +71,29 @@ class Config {
 	 *   .cnf--zasob_{$ID}.ini.php - config file for zasob $ZASOB_ID
 	 *   .cnf--zasob_{$ID}-{$host}.ini.php - config file for zasob $ZASOB_ID on host
 	 */
-	public static function getZasobConf( $zasob_id ) {
-		return self::getConfFile( 'zasob_' . $zasob_id );
+	public static function getZasobConf($zasob_id) {
+		return self::getConfFile("zasob_{$zasob_id}");
 	}
 
 	/**
 	 * Search for zasob config ini file.
 	 */
-	public static function getColumnConf( $col ) {
-		return self::getConfFile( 'column_init_' . $col );
+	public static function getColumnConf($col) {
+		return self::getConfFile("column_init_{$col}");
 	}
 
 	/**
 	 * Search for config ini file.
 	 * TODO: $conf_file == '' - main config file
 	 */
-	public static function getConfFile( $conf_file = '' ) {
+	public static function getConfFile($conf_file = '') {
 		static $_cnf;
 		if (!is_array($_cnf)) $_cnf = array();
 
 		if (array_key_exists($conf_file, $_cnf)) {
-			return $_cnf[ $conf_file ];
+			return $_cnf[$conf_file];
 		}
-		$_cnf[ $conf_file ] = null;
+		$_cnf[$conf_file] = null;
 
 		$cnf = null;
 		$file_prefix = '.cnf';
@@ -105,26 +101,26 @@ class Config {
 		$file_suffix = '.ini.php';
 		$search_for_files = array();// kolejka includowania plikow
 		$host = $_SERVER['SERVER_NAME'];
-		$search_for_files []= APP_PATH_CONFIG . DS . $file_prefix . '-' . $host . $file_suffix;
+		$search_for_files[] = APP_PATH_CONFIG . DS . $file_prefix . '-' . $host . $file_suffix;
 
 		// dziedziczenie - subdomain np. www.biall.com.pl i www2.biall.com.pl -> biall.com.pl
 		$host_subdomain_exp = explode('.', $host);
 		$host_subdomain = reset($host_subdomain_exp);
 		$host_parent = substr($host, strlen($host_subdomain . '.'));
-		$search_for_files []= APP_PATH_CONFIG . DS . $file_prefix . '-' . $host_parent . $file_suffix;
+		$search_for_files[] = APP_PATH_CONFIG . DS . $file_prefix . '-' . $host_parent . $file_suffix;
 
-		$search_for_files []= APP_PATH_CONFIG . DS . $file_prefix . $file_suffix;
+		$search_for_files[] = APP_PATH_CONFIG . DS . $file_prefix . $file_suffix;
 		foreach ($search_for_files as $f) {
 			if (1 == V::get('DBG_CNF', '', $_GET)) { echo "f(" . end(explode('/',$f)) . ")=(" . file_exists($f) . ")"; }
 			if (file_exists($f)) {
-				Lib::loadClass( 'Core_Config_INI' );
-				$cnf = new Core_Config_INI( $f );
-				$_cnf[ $conf_file ] = $cnf->getData();
+				Lib::loadClass('Core_Config_INI');
+				$cnf = new Core_Config_INI($f);
+				$_cnf[$conf_file] = $cnf->getData();
 				break;
 			}
 		}
 
-		return $_cnf[ $conf_file ];
+		return $_cnf[$conf_file];
 	}
 
 }

SE/se-lib/Core/Cache.php

@@ -3,74 +3,59 @@
 
 class Core_Cache {
 
+	var $cache;
 
-var $cache;
-
-
-function __construct() {
-	$this->cache = array();
-}
-
-
-/* static */
-function &getInstance() {
-	static $_instance;
-	if (!is_object($_instance)) {
-		$_instance = new Core_Cache();
+	public function __construct() {
+		$this->cache = array();
 	}
-	return $_instance;
-}
-
-
-/* static */
-function get( $key, $default = null ) {
-	return self::getInstance()->_get( $key, $default );
-}
-
-
-/* static */
-function get_and_clean( $key, $default = null ) {
-	return self::getInstance()->_get_and_clean( $key, $default );
-}
-
 
-/* static */
-function set( $key, $value ) {
-	return self::getInstance()->_set( $key, $value );
-}
+	public static function &getInstance() {
+		static $_instance;
+		if (!is_object($_instance)) {
+			$_instance = new Core_Cache();
+		}
+		return $_instance;
+	}
 
+	public static function get($key, $default = null) {
+		return self::getInstance()->_get($key, $default);
+	}
 
-function &_get( $key, $default = null ) {
-	$null = null;
-	if ($key === null) return $null;
-	if (array_key_exists($key, $this->cache)) {
-		return $this->cache[ $key ];
-	} else {
-		return $default;
+	public static function get_and_clean($key, $default = null) {
+		return self::getInstance()->_get_and_clean($key, $default);
 	}
-}
 
+	public static function set($key, $value) {
+		return self::getInstance()->_set($key, $value);
+	}
 
-function &_get_and_clean( $key, $default = null ) {
-	if (array_key_exists($key, $this->cache)) {
-		$ret = $this->cache[ $key ];
-		unset($this->cache[ $key ]);
-		return $ret;
-	} else {
-		return $default;
+	public function &_get($key, $default = null) {
+		$null = null;
+		if ($key === null) return $null;
+		if (array_key_exists($key, $this->cache)) {
+			return $this->cache[$key];
+		} else {
+			return $default;
+		}
 	}
-}
 
+	public function &_get_and_clean($key, $default = null) {
+		if (array_key_exists($key, $this->cache)) {
+			$ret = $this->cache[$key];
+			unset($this->cache[$key]);
+			return $ret;
+		} else {
+			return $default;
+		}
+	}
 
-function _set( $key, $value ) {
-	$this->cache [ $key ] = $value;
-	return true;
-}
+	public function _set($key, $value) {
+		$this->cache[$key] = $value;
+		return true;
+	}
 
+	public function dbg() {
+		return self::_('dbg','all','values');
+	}
 
-function dbg() {
-	return self::_('dbg','all','values');
 }
-
-
-}// class

SE/se-lib/Core/Config/INI.php

@@ -3,60 +3,55 @@
 
 class Core_Config_INI {
 
+	var $_config_file;
+	var $_data;
 
-var $_config_file;
-var $_data;
-
-
-function __construct( $config_file ) {
-	$this->_config_file = $config_file;
-	$this->_data = null;
-}
-
+	public function __construct($config_file) {
+		$this->_config_file = $config_file;
+		$this->_data = null;
+	}
 
-/**
- * @return an associative array on success, and FALSE on failure.
- */
-function &getData() {
-	if ($this->_data === null) {// @see __construct()
-		if (!file_exists($this->_config_file)) {
-			$this->_data = false;
-			trigger_error('config file not exists', E_USER_WARNING);
-		} else {
-			$this->_data = parse_ini_file( $this->_config_file, true );// @return false if error
+	/**
+	 * @return an associative array on success, and FALSE on failure.
+	 */
+	public function &getData() {
+		if ($this->_data === null) {// @see __construct()
+			if (!file_exists($this->_config_file)) {
+				$this->_data = false;
+				trigger_error('config file not exists', E_USER_WARNING);
+			} else {
+				$this->_data = parse_ini_file($this->_config_file, true);// @return false if error
+			}
 		}
+		return $this->_data;
 	}
-	return $this->_data;
-}
 
+	public function get($key, $section = null) {
+		$_data = $this->getData();
+		if ($_data == false) {
+			return false;
+		}
 
-function get( $key, $section = null ) {
-	$_data = $this->getData();
-	if ($_data == false) {
-		return false;
-	}
-
-	if (null != $section) {
-		if (array_key_exists($section, $_data)) {
-			if (array_key_exists($key, $_data[ $section ])) {
-				return $_data[ $section ][ $key ];
+		if (null != $section) {
+			if (array_key_exists($section, $_data)) {
+				if (array_key_exists($key, $_data[$section])) {
+					return $_data[$section][$key];
+				} else {
+					trigger_error('config error: key('.$key.') not exists in section ('.$section.')', E_USER_NOTICE);
+				}
 			} else {
-				trigger_error('config error: key('.$key.') not exists in section ('.$section.')', E_USER_NOTICE);
+				trigger_error('config error: section not exists: ('.$section.')', E_USER_NOTICE);
 			}
-		} else {
-			trigger_error('config error: section not exists: ('.$section.')', E_USER_NOTICE);
 		}
-	}
-	else {
-		if (array_key_exists($key, $_data)) {
-			return $_data[ $key ];
-		} else {
-			trigger_error('config error: key not exists ('.$key.')', E_USER_NOTICE);
+		else {
+			if (array_key_exists($key, $_data)) {
+				return $_data[$key];
+			} else {
+				trigger_error('config error: key not exists ('.$key.')', E_USER_NOTICE);
+			}
 		}
+
+		return false;
 	}
 
-	return false;
 }
-
-
-}//class

SE/se-lib/Core/Database.php

@@ -19,15 +19,15 @@ class Core_Database {
 	/**
 	 * Wykonuje podane zapytanie i zwraca wynik mysql_query().
 	 */
-	function query( $query, $msg = 'Query ERROR.' ) {
+	function query($query, $msg = 'Query ERROR.') {
 		return null;
 	}
 
-	function fetch( $res ) {
+	function fetch($res) {
 		return null;
 	}
 
-	function _( $str ) {
+	function _($str) {
 		return $str;
 	}
 
@@ -35,8 +35,8 @@ class Core_Database {
 		return "#unknown";
 	}
 
-	function _set_error( $err ) {
-		$this->_errors []= $err;
+	function _set_error($err) {
+		$this->_errors[] = $err;
 	}
 
 	function get_errors() {
@@ -51,7 +51,7 @@ class Core_Database {
 		return end($this->_errors);
 	}
 
-	function get_by_id( $table, $id ) {
+	function get_by_id($table, $id) {
 		return null;
 	}
 

SE/se-lib/DB.php

@@ -88,7 +88,7 @@ public static function transaction_rollback() {
 }
 
 
-public static function query( $sql, $die_on_error = true ) {
+public static function query($sql, $die_on_error = true) {
 	$conn = self::connect();
 	$res = mysql_query($sql, $conn);
 	if (!$res) {
@@ -106,35 +106,35 @@ public static function query( $sql, $die_on_error = true ) {
 }
 
 
-public static function fetch( $res ) {
+public static function fetch($res) {
 	$ret = null;
-	if ($res) $ret = mysql_fetch_object( $res );
+	if ($res) $ret = mysql_fetch_object($res);
 	return $ret; 
 }
 
 
-public static function fetch_row( $res ) {
+public static function fetch_row($res) {
 	$ret = null;
-	if ($res) $ret = mysql_fetch_row( $res );
+	if ($res) $ret = mysql_fetch_row($res);
 	return $ret;
 }
 
 
-public static function fetch_array( $res ) {
+public static function fetch_array($res) {
 	$ret = null;
-	if ($res) $ret = mysql_fetch_array( $res );
+	if ($res) $ret = mysql_fetch_array($res);
 	return $ret;
 }
 
 
-public static function fetch_assoc( $res ) {
+public static function fetch_assoc($res) {
 	$ret = null;
-	if ($res) $ret = mysql_fetch_assoc( $res );
+	if ($res) $ret = mysql_fetch_assoc($res);
 	return $ret;
 }
 
 
-public static function _( $str ) {
+public static function _($str) {
 	//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());
 }
@@ -148,30 +148,30 @@ public static function error() {
 
 // 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() );
+	return mysql_affected_rows(self::connect());
 }
 
 
 // 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() );
+	return mysql_insert_id(self::connect());
 }
 
 
 // Zwraca liczbê wierszy w wyniku. Tê funkcjê stosuje siê tylko do operacji SELECT.
-public static function num_rows( $res ) {
-	return mysql_num_rows( $res );
+public static function num_rows($res) {
+	return mysql_num_rows($res);
 }
 
 
-public static function get_by_id( $table, $id ) {
+public static function get_by_id($table, $id) {
 	$null = null;
 	$sql = "select p.*
-		from `".$table."` as p
-		where p.`ID`='".$id."'
+		from `{$table}` as p
+		where p.`ID`='{$id}'
 	";
-	$res = DB::query( $sql );
-	if ($r = DB::fetch( $res )) {
+	$res = DB::query($sql);
+	if ($r = DB::fetch($res)) {
 		return $r;
 	}
 	return $null;
@@ -188,14 +188,14 @@ public static function get_by_id( $table, $id ) {
  * 
  * TODO: sprawdzac czy w hist mozna odczytac aktualny stan, jesli nie to dodac caly rekord do HIST, jako 'procesy-fix-hist-data'
  */
-public static function UPDATE_OBJ( $table, &$sql_obj ) {
+public static function UPDATE_OBJ($table, &$sql_obj) {
 	if (!isset($sql_obj->ID) || $sql_obj->ID <= 0) {
 		return -1;
 	}
 	$id = $sql_obj->ID;
 
 	// check id record $id exists
-	if (($curr_obj = self::get_by_id( $table, $sql_obj->ID )) == null) {
+	if (($curr_obj = self::get_by_id($table, $sql_obj->ID)) == null) {
 		return -2;
 	}
 
@@ -209,7 +209,7 @@ public static function UPDATE_OBJ( $table, &$sql_obj ) {
 		} else {
 			$changed = true;
 		}
-	}//end foreach
+	}
 	if ($changed == false) {
 		return 0;// record not changed
 	}
@@ -217,14 +217,14 @@ public static function UPDATE_OBJ( $table, &$sql_obj ) {
 	$sql_arr = array();
 	// TODO: add admin columns if exists in table - search in session
 	$admin_col = array();
-	$admin_col []= 'A_RECORD_CREATE_DATE';
-	$admin_col []= 'A_RECORD_CREATE_AUTHOR';
+	$admin_col[] = 'A_RECORD_CREATE_DATE';
+	$admin_col[] = 'A_RECORD_CREATE_AUTHOR';
 	// ...
 	$sql_obj->A_RECORD_UPDATE_DATE = date('Y-m-d-H:i');
 	$sql_obj->A_RECORD_UPDATE_AUTHOR = User::getName();
 	foreach (get_object_vars($sql_obj) as $k => $v) {
 		$sql_arr [] = "`".$k."`=".(($v == 'NOW()')? $v : "'".self::_($v)."'");//"'".self::_($v)."'";
-	}//end foreach
+	}
 	$sql = "update `".$table."` set ".implode(",", $sql_arr)." where `ID`='".$id."' limit 1; ";
 	self::query( $sql );
 	$ret = self::affected_rows();
@@ -240,15 +240,15 @@ public static function UPDATE_OBJ( $table, &$sql_obj ) {
 }
 
 
-public static function ADD_NEW_OBJ( $table, &$sql_obj ) {
+public static function ADD_NEW_OBJ($table, &$sql_obj) {
 	$sql_arr = array();
 	// TODO: add admin columns if exists in table - search in session
 	$admin_col = array();
-	$admin_col []= 'ID';
-	$admin_col []= 'A_RECORD_CREATE_DATE';
-	$admin_col []= 'A_RECORD_CREATE_AUTHOR';
-	$admin_col []= 'A_RECORD_UPDATE_DATE';
-	$admin_col []= 'A_RECORD_UPDATE_AUTHOR';
+	$admin_col[] = 'ID';
+	$admin_col[] = 'A_RECORD_CREATE_DATE';
+	$admin_col[] = 'A_RECORD_CREATE_AUTHOR';
+	$admin_col[] = 'A_RECORD_UPDATE_DATE';
+	$admin_col[] = 'A_RECORD_UPDATE_AUTHOR';
 	// ...
 	$sql_arr["`ID`"] = "NULL";// add default value for ID, NULL in all inserts
 	if (substr($table, 0, -5) == '_HIST') {
@@ -261,9 +261,9 @@ public static function ADD_NEW_OBJ( $table, &$sql_obj ) {
 
 	foreach (get_object_vars($sql_obj) as $k => $v) {
 		$sql_arr ["`".$k."`"] = ($v == 'NOW()')? $v : "'".self::_($v)."'";
-	}//end foreach
+	}
 	$sql = "insert into `".$table."` (".implode(",", array_keys($sql_arr)).") values (".implode(",", array_values($sql_arr))."); ";
-	self::query( $sql );
+	self::query($sql);
 	$ret_id = self::insert_id();
 	if (substr($table, -5) == '_HIST') {
 		return $ret_id;

SE/se-lib/DB_Dump.php

@@ -4,7 +4,7 @@
 class DB_Dump {
 
 
-	function get_db_structure_by_table_prefix( &$db, $table_prefix ) {
+	function get_db_structure_by_table_prefix(&$db, $table_prefix) {
 		$structure = '';
 		$res=$db->show_tables();
 //		$res = $db->query('SHOW TABLES');
@@ -28,7 +28,7 @@ class DB_Dump {
 		return $structure;
 	}
 
-	function get_db_structure( &$db, $tables = array() ) {
+	function get_db_structure(&$db, $tables = array()) {
 		$structure = '';
 		//$res = $db->query('SHOW TABLES');
 		$res=$db->show_tables();
@@ -49,7 +49,7 @@ class DB_Dump {
 		return $structure;
   }
 
-  function get_table_structure( &$db, $table ) {
+  function get_table_structure(&$db, $table) {
 		// Structure Header
 		$structure = "-- \n";
 		$structure .= "-- Table structure for table `{$table}` \n";
@@ -81,7 +81,7 @@ class DB_Dump {
 			if (!empty($record['Extra'])) {
 				$curr_sql_field .= " " . $record['Extra'];
 			}
-			$sql_table_fields []= $curr_sql_field;
+			$sql_table_fields[] = $curr_sql_field;
 		}
 		$structure .= (!empty($sql_table_fields))? implode(",\n", $sql_table_fields) : "";
 		//$structure = @ereg_replace(",\n$", null, $structure);
@@ -112,7 +112,7 @@ class DB_Dump {
 		return $structure;
 	}
 
-	function get_sql_keys_table( &$db, $table ) {
+	function get_sql_keys_table(&$db, $table) {
 		$ret_keys = array();
 		$primary = "";
 		$unique = array();
@@ -125,25 +125,25 @@ class DB_Dump {
 		while ($row = $db->fetch($res)) {
 			if ($row->Key_name == 'PRIMARY') {
 				if ($row->Index_type == 'BTREE') {
-					$ret_keys ["PRIMARY KEY"] []= "`" . $row->Column_name . "`";
+					$ret_keys["PRIMARY KEY"][] = "`" . $row->Column_name . "`";
 				}
 			}
 			else {
 				if ($row->Non_unique == '0' && $row->Index_type == 'BTREE') {
-					$ret_keys ["UNIQUE KEY `" . $row->Key_name . "`"] []= "`" . $row->Column_name . "`";
+					$ret_keys["UNIQUE KEY `" . $row->Key_name . "`"][] = "`" . $row->Column_name . "`";
 				}
 				if ($row->Non_unique == '1' && $row->Index_type == 'BTREE') {
-					$ret_keys ["KEY `" . $row->Key_name . "`"] []= "`" . $row->Column_name . "`";
+					$ret_keys["KEY `" . $row->Key_name . "`"][] = "`" . $row->Column_name . "`";
 				}
 				if ($row->Non_unique == '1' && $row->Index_type == 'FULLTEXT') {
-					$ret_keys ["FULLTEXT `" . $row->Key_name . "`"] []= "`" . $row->Column_name . "`";
+					$ret_keys["FULLTEXT `" . $row->Key_name . "`"][] = "`" . $row->Column_name . "`";
 				}
 			}
 		}
 		$out_keys = array();
 		if (!empty($ret_keys)) {
 			foreach ($ret_keys as $key => $val) {
-				$out_keys []= $key . " (" . implode(", ", $val) . ")";
+				$out_keys[] = $key . " (" . implode(", ", $val) . ")";
 			}
 		}
 		$out_keys = (!empty($out_keys))? implode(",\n", $out_keys) : '';

SE/se-lib/DB_Image.php

@@ -9,14 +9,14 @@ public static function conf_get( $key ) {
 		$conf['table_name'] = 'CRM_IMAGE';
 		$conf['max_size'] = 1024 * 1024 * 16;// MAX for MEDIUMBLOB field
 		$conf['allowed_types'] = array();
-		$conf['allowed_types'] []= 'image/png';
-		$conf['allowed_types'] []= 'image/jpeg';
-		$conf['allowed_types'] []= 'image/gif';
+		$conf['allowed_types'][] = 'image/png';
+		$conf['allowed_types'][] = 'image/jpeg';
+		$conf['allowed_types'][] = 'image/gif';
 
 		$conf['remote_tables'] = array();
-		$conf['remote_tables'] []= 'CRM_LISTA_ZASOBOW';
-		$conf['remote_tables'] []= 'CRM_PROCES';
-		$conf['remote_tables'] []= 'CRM_WSKAZNIK';
+		$conf['remote_tables'][] = 'CRM_LISTA_ZASOBOW';
+		$conf['remote_tables'][] = 'CRM_PROCES';
+		$conf['remote_tables'][] = 'CRM_WSKAZNIK';
 
 		$conf['desc_options'] = array();
 		$conf['desc_options']['CRM_LISTA_ZASOBOW'] = array();
@@ -129,7 +129,7 @@ public static function get_images($remote_table, $remote_id) {
 	";
 	$res = $db->query($sql);
 	while ($r = $db->fetch( $res )) {
-		$images []= $r;
+		$images[] = $r;
 	}
 	return $images;
 }
@@ -170,7 +170,7 @@ public static function upload_image($remote_table, $remote_id, $req_file_data) {
 
 			// check if type is allowed to upload
 			if (!DB_Image::is_allowed_type($obj['TYPE'])) {
-				$errors []= 'File type "'.$obj['TYPE'].'" is not allowed.';
+				$errors[] = 'File type "'.$obj['TYPE'].'" is not allowed.';
 				return $errors;
 			}
 
@@ -211,7 +211,7 @@ public static function upload_image($remote_table, $remote_id, $req_file_data) {
 			$sql_arr = array();
 			foreach ($obj as $key => $val) {
 				$sql_arr["`".$key."`"] = "'".$val."'";
-			}//end foreach
+			}
 			$sql = "insert into `".self::conf_get_table_name()."` (".implode(",", array_keys($sql_arr)).") values (".implode(",", array_values($sql_arr)).") ; ";
 
 			// insert the image
@@ -219,7 +219,7 @@ public static function upload_image($remote_table, $remote_id, $req_file_data) {
 			$db = DB::getDB();
 
 			if (!$db->query($sql)) {
-				$errors []= 'Unable to upload file - sql error';
+				$errors[] = 'Unable to upload file - sql error';
 				//echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">mysql err: '.mysql_errno($conn);var_dump(mysql_error($conn));echo'</pre>';
 				//echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">sql: ';print_r($sql);echo'</pre>';
 			}
@@ -229,7 +229,7 @@ public static function upload_image($remote_table, $remote_id, $req_file_data) {
 	}
 	else {
 		// if the file is not less than the maximum allowed, print an error
-		$errors []= 'File exceeds the Maximum File limit';
+		$errors[] = 'File exceeds the Maximum File limit';
 	}
 	return $errors;
 }

SE/se-lib/DB_Util.php

@@ -12,7 +12,7 @@ class DB_Util {
 	}
 
 	function action_drop_table_to_sql($table_name) {
-		$sql = "DROP `" . $table_name . "` ";
+		$sql = "DROP `{$table_name}` ";
 		return $sql;
 	}
 
@@ -20,7 +20,7 @@ class DB_Util {
 	 * @param $field_params array('type'=>'' [, 'default'=>'', 'not null'=>bool, 'extra'=>''])
 	 */
 	function action_modify_column_to_sql($table_name, $field_name, $field_params) {
-		$sql = "ALTER TABLE `" . $table_name . "` MODIFY `" . $field_name . "` ";
+		$sql = "ALTER TABLE `{$table_name}` MODIFY `{$field_name}` ";
 		$sql .= $field_params['type'];
 		if (!empty($field_params['not null']) && $field_params['not null'] == true) {
 			$sql .= " NOT ";
@@ -39,7 +39,7 @@ class DB_Util {
 	 * @param $field_params array('type'=>'' [, 'default'=>'', 'not null'=>bool, 'extra'=>''])
 	 */
 	function action_add_column_to_sql($table_name, $field_name, $field_params) {
-		$sql = "ALTER TABLE `" . $table_name . "` ADD `" . $field_name . "` ";
+		$sql = "ALTER TABLE `{$table_name}` ADD `{$field_name}` ";
 		$sql .= $field_params['type'];
 		if (!empty($field_params['not null']) && $field_params['not null'] == true) {
 			$sql .= " NOT ";
@@ -55,7 +55,7 @@ class DB_Util {
 	}
 
 	function action_drop_column_to_sql($table_name, $field_name) {
-		$sql = "ALTER TABLE `" . $table_name . "` DROP `" . $field_name . "` ";
+		$sql = "ALTER TABLE `{$table_name}` DROP `{$field_name}` ";
 		return $sql;
 	}
 
@@ -64,19 +64,19 @@ class DB_Util {
 	 * @param $keys array of key params
 	 */
 	function action_create_table_to_sql($table_name, $columns, $keys) {
-		$sql = "DROP `" . $table_name . "` ";
+		$sql = "DROP `{$table_name}` ";
 		return $sql;
 	}
 
 	function action_add_key_to_sql($table_name, $key_name, $key_params) {
-		$sql = "ALTER TABLE `" . $table_name . "` ADD " . $key_params['type'];
-		if ($key_params['type'] != 'PRIMARY KEY')  $sql .= " " . $key_name;
+		$sql = "ALTER TABLE `{$table_name}` ADD {$key_params['type']}";
+		if ($key_params['type'] != 'PRIMARY KEY')  $sql .= " {$key_name}";
 		$sql .= " (" . implode(", ", $key_params['columns']) . ")";
 		return $sql;
 	}
 
 	function action_drop_key_to_sql($table_name, $key_name) {
-		$sql = "ALTER TABLE `" . $table_name . "` DROP INDEX " . $key_name . " ";
+		$sql = "ALTER TABLE `{$table_name}` DROP INDEX {$key_name} ";
 		return $sql;
 	}
 
@@ -250,20 +250,20 @@ class DB_Util {
 		}
 		else {
 			while ($record = $db->fetch_assoc($res)) {
-				$tbl_struct[ $record['Field'] ] = array();
-				$tbl_struct[ $record['Field'] ]['type'] = $record['Type'];
+				$tbl_struct[$record['Field']] = array();
+				$tbl_struct[$record['Field']]['type'] = $record['Type'];
 				if (!empty($record['Default'])) {
 					if (substr($record['Default'], 0, strlen('CURRENT_TIMESTAMP')) == 'CURRENT_TIMESTAMP') {
-						$tbl_struct[ $record['Field'] ]['default'] = $record['Default'];
+						$tbl_struct[$record['Field']]['default'] = $record['Default'];
 					} else {
-						$tbl_struct[ $record['Field'] ]['default'] = "'" . $record['Default'] . "'";
+						$tbl_struct[$record['Field']]['default'] = "'" . $record['Default'] . "'";
 					}
 				}
 				if (@strcmp($record['Null'], 'YES') != 0) {
-					$tbl_struct[ $record['Field'] ]['not null'] = true;
+					$tbl_struct[$record['Field']]['not null'] = true;
 				}
 				if (!empty($record['Extra'])) {
-					$tbl_struct[ $record['Field'] ]['extra'] = $record['Extra'];
+					$tbl_struct[$record['Field']]['extra'] = $record['Extra'];
 				}
 			}
 		}
@@ -291,33 +291,33 @@ class DB_Util {
 			else {
 				if ($row->Non_unique == '0' && $row->Index_type == 'BTREE') {
 					$key_type = "UNIQUE KEY";
-					$key_name = "`" . $key_name . "`";
+					$key_name = "`{$key_name}`";
 				}
 				if ($row->Non_unique == '1' && $row->Index_type == 'BTREE') {
 					$key_type = "KEY";
-					$key_name = "`" . $key_name . "`";
+					$key_name = "`{$key_name}`";
 				}
 				if ($row->Non_unique == '1' && $row->Index_type == 'FULLTEXT') {
 					$key_type = "FULLTEXT";
-					$key_name = "`" . $key_name . "`";
+					$key_name = "`{$key_name}`";
 				}
 			}
 
 			if (!$key_type) {
 				// TODO: error - unknown type
 			} else {
-				if (empty($tbl_keys [$key_name])) {
-					$tbl_keys [$key_name] = array('type'=>$key_type, 'columns'=>array());
+				if (empty($tbl_keys[$key_name])) {
+					$tbl_keys[$key_name] = array('type'=>$key_type, 'columns'=>array());
 				}
-				$tbl_keys [$key_name]['columns'] []= $row->Column_name;
+				$tbl_keys[$key_name]['columns'][] = $row->Column_name;
 			}
 		}
 		return $tbl_keys;
 	}
 
-	function get_table_list(&$db, $table_prefix = '',$table_type=null) {
+	function get_table_list(&$db, $table_prefix = '', $table_type = null) {
 		$tbl_list = array();
-		if($table_type) $sql="SHOW FULL TABLES WHERE TABLE_TYPE LIKE  '".$table_type."'";
+		if($table_type) $sql="SHOW FULL TABLES WHERE TABLE_TYPE LIKE  '{$table_type}'";
 		else $sql="SHOW TABLES";
 		$res = $db->query($sql);
 		if ($db->num_rows($res) == 0) {
@@ -325,13 +325,13 @@ class DB_Util {
 		}
 		while ($record = $db->fetch_row($res)) {
 			if ($table_prefix == '' || $table_prefix == '%' || $table_prefix == substr($record[0], 0, strlen($table_prefix))) {
-				$tbl_list []= $record[0];
+				$tbl_list[] = $record[0];
 			}
 		}
 		return $tbl_list;
 	}
 
-	function get_db_structure_by_table_prefix( &$db, $table_prefix ) {
+	function get_db_structure_by_table_prefix(&$db, $table_prefix) {
 		$structure = '';
 		$res = $db->query('SHOW TABLES');
 		if ($db->num_rows($res) == 0) {
@@ -350,7 +350,7 @@ class DB_Util {
 		return $structure;
 	}
 
-	function get_db_structure( &$db, $tables = array() ) {
+	function get_db_structure(&$db, $tables = array()) {
 		$structure = '';
 		$res = $db->query('SHOW TABLES');
 		if ($db->num_rows($res) == 0) {
@@ -369,7 +369,7 @@ class DB_Util {
 		return $structure;
   }
 
-  function get_table_structure( &$db, $table ) {
+  function get_table_structure(&$db, $table) {
 		// Structure Header
 		$structure = "-- \n";
 		$structure .= "-- Table structure for table `{$table}` \n";
@@ -377,7 +377,7 @@ class DB_Util {
 		// Dump Structure
 		//$structure .= 'DROP TABLE IF EXISTS `'.$table.'`;'."\n";
 		// Create sql
-		$structure .= "CREATE TABLE `".$table."` (\n";
+		$structure .= "CREATE TABLE `{$table}` (\n";
 		$sql_table_fields = array();
 		$records = $db->query('SHOW FIELDS FROM `'.$table.'`');
 		if ($db->num_rows($records) == 0) {
@@ -390,7 +390,7 @@ class DB_Util {
 				if (substr($record['Default'], 0, strlen('CURRENT_TIMESTAMP')) == 'CURRENT_TIMESTAMP') {
 					$curr_sql_field .= " DEFAULT " . $record['Default'];
 				} else {
-					$curr_sql_field .= " DEFAULT '" . $record['Default'] . "'";
+					$curr_sql_field .= " DEFAULT '{$record['Default']}'";
 				}
 			}
 			if (@strcmp($record['Null'], 'YES') != 0) {
@@ -399,7 +399,7 @@ class DB_Util {
 			if (!empty($record['Extra'])) {
 				$curr_sql_field .= " " . $record['Extra'];
 			}
-			$sql_table_fields []= $curr_sql_field;
+			$sql_table_fields[] = $curr_sql_field;
 		}
 		$structure .= (!empty($sql_table_fields))? implode(",\n", $sql_table_fields) : "";
 		//$structure = @ereg_replace(",\n$", null, $structure);
@@ -428,7 +428,7 @@ class DB_Util {
 		return $structure;
 	}
 
-	function get_sql_keys_table( &$db, $table ) {
+	function get_sql_keys_table(&$db, $table) {
 		$ret_keys = array();
 		$primary = "";
 		$unique = array();
@@ -441,25 +441,25 @@ class DB_Util {
 		while ($row = $db->fetch($res)) {
 			if ($row->Key_name == 'PRIMARY') {
 				if ($row->Index_type == 'BTREE') {
-					$ret_keys ["PRIMARY KEY"] []= "`" . $row->Column_name . "`";
+					$ret_keys["PRIMARY KEY"][] = "`" . $row->Column_name . "`";
 				}
 			}
 			else {
 				if ($row->Non_unique == '0' && $row->Index_type == 'BTREE') {
-					$ret_keys ["UNIQUE KEY `" . $row->Key_name . "`"] []= "`" . $row->Column_name . "`";
+					$ret_keys["UNIQUE KEY `" . $row->Key_name . "`"][] = "`" . $row->Column_name . "`";
 				}
 				if ($row->Non_unique == '1' && $row->Index_type == 'BTREE') {
-					$ret_keys ["KEY `" . $row->Key_name . "`"] []= "`" . $row->Column_name . "`";
+					$ret_keys["KEY `" . $row->Key_name . "`"][] = "`" . $row->Column_name . "`";
 				}
 				if ($row->Non_unique == '1' && $row->Index_type == 'FULLTEXT') {
-					$ret_keys ["FULLTEXT `" . $row->Key_name . "`"] []= "`" . $row->Column_name . "`";
+					$ret_keys["FULLTEXT `" . $row->Key_name . "`"][] = "`" . $row->Column_name . "`";
 				}
 			}
 		}
 		$out_keys = array();
 		if (!empty($ret_keys)) {
 			foreach ($ret_keys as $key => $val) {
-				$out_keys []= $key . " (" . implode(", ", $val) . ")";
+				$out_keys[] = $key . " (" . implode(", ", $val) . ")";
 			}
 		}
 		$out_keys = (!empty($out_keys))? implode(",\n", $out_keys) : '';

SE/se-lib/Data_Source.php

@@ -332,7 +332,7 @@ if(V::get('DBG_DS', 0, $_GET) > 0){echo'<pre style="max-height:200px;overflow:au
 		foreach ($params as $k => $v) {
 			if (strlen($k) > 3 && substr($k, 0, 2) == 'f_') {
 				//$v = trim($v, '% ');
-				//$sql_where_and []= "t.`" . substr($k, 2) . "` like '%" . DB::_($v) . "%'";
+				//$sql_where_and[] = "t.`" . substr($k, 2) . "` like '%" . DB::_($v) . "%'";
 				$fldName = substr($k, 2);
 				if ($this->isGeomField($fldName)) {
 					$sqlFilter = $this->_sqlValueForGeomField($fldName, $v, 't');
@@ -347,34 +347,34 @@ if(V::get('DBG_DS', 0, $_GET) > 0){echo'<pre style="max-height:200px;overflow:au
 
 				if (substr($v, 0, 1) == '=') {
 					$v = $this->_db->_(substr($v, 1));
-					if (strlen($v)) $sql_where_and []= "t.`{$fldName}`='{$v}'";
+					if (strlen($v)) $sql_where_and[] = "t.`{$fldName}`='{$v}'";
 				}
 				else if (substr($v, 0, 1) == '!') {
 					$v = $this->_db->_(substr($v, 1));
-					if (strlen($v)) $sql_where_and []= "t.`{$fldName}` not like '{$v}'";
+					if (strlen($v)) $sql_where_and[] = "t.`{$fldName}` not like '{$v}'";
 				}
 				else if (substr($v, 0, 2) == '<=') {
 					$v = $this->_db->_(substr($v, 2));
-					if (strlen($v)) $sql_where_and []= "t.`{$fldName}`<='{$v}'";
+					if (strlen($v)) $sql_where_and[] = "t.`{$fldName}`<='{$v}'";
 				}
 				else if (substr($v, 0, 2) == '>=') {
 					$v = $this->_db->_(substr($v, 2));
-					if (strlen($v)) $sql_where_and []= "t.`{$fldName}`>='{$v}'";
+					if (strlen($v)) $sql_where_and[] = "t.`{$fldName}`>='{$v}'";
 				}
 				else if (substr($v, 0, 1) == '<') {
 					$v = $this->_db->_(substr($v, 1));
-					if (strlen($v)) $sql_where_and []= "t.`{$fldName}`<'{$v}'";
+					if (strlen($v)) $sql_where_and[] = "t.`{$fldName}`<'{$v}'";
 				}
 				else if (substr($v, 0, 1) == '>') {
 					$v = $this->_db->_(substr($v, 1));
-					if (strlen($v)) $sql_where_and []= "t.`{$fldName}`>'{$v}'";
+					if (strlen($v)) $sql_where_and[] = "t.`{$fldName}`>'{$v}'";
 				}
 				else if (false !== strpos($v, '%')) {
-					$sql_where_and []= "t.`{$fldName}` like '{$v}'";
+					$sql_where_and[] = "t.`{$fldName}` like '{$v}'";
 				}
 				else if ($this->isColTypeNumber($fldName)) {
 					$v = $this->_db->_($v);
-					$sql_where_and []= "t.`{$fldName}`='{$v}'";
+					$sql_where_and[] = "t.`{$fldName}`='{$v}'";
 				}
 				else {
 					$searchWords = explode(' ', $v);
@@ -383,19 +383,19 @@ if(V::get('DBG_DS', 0, $_GET) > 0){echo'<pre style="max-height:200px;overflow:au
 						foreach ($searchWords as $word) {
 							if (!empty($word)) {
 								$word = $this->_db->_($word);
-								$sqlWhereWords []= "t.`{$fldName}` like '%{$word}%'";
+								$sqlWhereWords[] = "t.`{$fldName}` like '%{$word}%'";
 							}
 						}
 					}
 					if (!empty($searchWords)) {
-						$sql_where_and []= "(" . implode(" and ", $sqlWhereWords) . ")";
+						$sql_where_and[] = "(" . implode(" and ", $sqlWhereWords) . ")";
 					}
 				}
 			}
 			else if (strlen($k) > 4 && substr($k, 0, 3) == 'sf_') {
 				$sqlFltr = $this->_parseSpecialFilter(substr($k, 3), $v);
 				if (!empty($sqlFltr)) {
-					$sql_where_and []= $sqlFltr;
+					$sql_where_and[] = $sqlFltr;
 				}
 			}
 		}

SE/se-lib/Data_Tree_Source.php

@@ -64,16 +64,16 @@ class Data_Tree_Source extends Data_Source {
 		foreach ($params as $k => $v) {
 			if ($k == '_rawSql') {
 				foreach ($v as $rawSql) {
-					$sql_where_and []= $rawSql;
+					$sql_where_and[] = $rawSql;
 				}
 			}
 			else if (strlen($k) > 3 && substr($k, 0, 2) == 'f_') {
-				$sql_where_and []= "t.`" . substr($k, 2) . "` like '" . DB::_($v) . "'";
+				$sql_where_and[] = "t.`" . substr($k, 2) . "` like '" . DB::_($v) . "'";
 			}
 			else if (strlen($k) > 4 && substr($k, 0, 3) == 'sf_') {
 				$sqlFltr = $this->_parseSpecialFilter(substr($k, 3), $v);
 				if (!empty($sqlFltr)) {
-					$sql_where_and []= $sqlFltr;
+					$sql_where_and[] = $sqlFltr;
 				}
 			}
 		}

SE/se-lib/FileUploader.php

@@ -204,7 +204,7 @@ class FileUploader {
 			if (false !== strpos('<', $look->regex) || false !== strpos('>', $look->regex)) {
 				die('<p>' . "Error: Blad konfiguracji \$FOLDERS[{$this->_column}_DEST_FOLDER]" . '</p>');
 			} else {
-				$dir_tree []= $look->regex;
+				$dir_tree[] = $look->regex;
 			}
 		}
 		return implode('/', $dir_tree);
@@ -618,7 +618,7 @@ class FileUploader {
 					if (empty($params['M_DIST_FILES_DATE'])) {
 						$genLog['DATE'] = $file_part;
 					}
-					$genLog_INDEX['DATE'] []= array('PREFIX'=>"_", 'INDEKS'=>"$ind", 'VALUE'=>$file_part);
+					$genLog_INDEX['DATE'][] = array('PREFIX'=>"_", 'INDEKS'=>"$ind", 'VALUE'=>$file_part);
 				}
 			}
 		}
@@ -634,7 +634,7 @@ class FileUploader {
 							$genLog['DATE'] = $file_part;
 						}
 					}
-					$genLog_INDEX['DATE'] []= array('PREFIX'=>".", 'INDEKS'=>"$ind", 'VALUE'=>$file_part);
+					$genLog_INDEX['DATE'][] = array('PREFIX'=>".", 'INDEKS'=>"$ind", 'VALUE'=>$file_part);
 				}
 			}
 		}

SE/se-lib/Filter.php

@@ -19,7 +19,7 @@ var $_trash_filtr;// Tree trash
  * @param $key - kay to store values in @storage, if not set then args not saved
  * @param $storage - where to store state - cookie or session, default is cookie
  */
-function __construct( $args, $key = null, $storage = 'cookie' ) {
+function __construct($args, $key = null, $storage = 'cookie') {
 	$this->args = $args;
 	$this->args_default = array();
 	$this->filters = array();
@@ -32,12 +32,12 @@ function __construct( $args, $key = null, $storage = 'cookie' ) {
 }
 
 
-function get_arg( $name ) {
+function get_arg($name) {
 	// try load from @storage and save
 	if (array_key_exists($name, $this->args)) {
-		return $this->args[ $name ];
+		return $this->args[$name];
 	} else if (array_key_exists($name, $this->args_default)) {
-		return $this->args_default[ $name ];
+		return $this->args_default[$name];
 	}
 	return null;
 }
@@ -52,11 +52,11 @@ function _init_args() {
 }
 
 
-function add_filter( $name, $values, $default, $label = '', $callback = null ) {
-	$this->filters[ $name ] = $values;
-	$this->labels[ $name ] = ($label)? $label : $name;
-	$this->args_default[ $name ] = $default;
-	if ($callback) $this->callbacks[ $name ] = $callback;
+function add_filter($name, $values, $default, $label = '', $callback = null) {
+	$this->filters[$name] = $values;
+	$this->labels[$name] = ($label)? $label : $name;
+	$this->args_default[$name] = $default;
+	if ($callback) $this->callbacks[$name] = $callback;
 }
 
 
@@ -79,19 +79,19 @@ function _save_args_in_session() {
 		if (count($options) == 1 && reset($options) == 'search') {
 			if ($arg != $this->args_default[$name]) {
 				$option = $arg;
-				$save_args []= ''.urlencode($name).'='.urlencode($option);
+				$save_args[] = ''.urlencode($name).'='.urlencode($option);
 			}
 		} else {
 			foreach($options as $option => $field_name) {
 				if (isset($this->args[$name]) && $this->args[$name] == $option) {
-					$save_args []= ''.urlencode($name).'='.urlencode($option);
+					$save_args[] = ''.urlencode($name).'='.urlencode($option);
 				}
 			}
 		}
 	}
 
 	$save_args = implode(',', $save_args);
-	$_SESSION[ $this->_key ] = $save_args;
+	$_SESSION[$this->_key] = $save_args;
 }
 
 
@@ -104,12 +104,12 @@ function _save_args_in_cookie() {
 		if (count($options) == 1 && reset($options) == 'search') {
 			if ($arg != $this->args_default[$name]) {
 				$option = $arg;
-				$save_args []= ''.urlencode($name).'='.urlencode($option);
+				$save_args[] = ''.urlencode($name).'='.urlencode($option);
 			}
 		} else {
 			foreach($options as $option => $field_name) {
 				if (isset($this->args[$name]) && $this->args[$name] == $option) {
-					$save_args []= ''.urlencode($name).'='.urlencode($option);
+					$save_args[] = ''.urlencode($name).'='.urlencode($option);
 				}
 			}
 		}
@@ -153,10 +153,10 @@ function _read_args_from_session($force = false) {
 		$name = urldecode($c_val[0]);
 		$option = urldecode($c_val[1]);
 		if ($force || !array_key_exists($name, $this->args)) {
-//echo'<p>read from session: '.$name.' / '.$this->args[ $name ].' / set '.$option.'</p>';
-			$this->args[ $name ] = $option;
+//echo'<p>read from session: '.$name.' / '.$this->args[$name].' / set '.$option.'</p>';
+			$this->args[$name] = $option;
 		}
-	}//end foreach
+	}
 }
 
 
@@ -173,9 +173,9 @@ function _read_args_from_cookie($force = false) {
 		$name = urldecode($c_val[0]);
 		$option = urldecode($c_val[1]);
 		if ($force || !array_key_exists($name, $this->args)) {
-			$this->args[ $name ] = $option;
+			$this->args[$name] = $option;
 		}
-	}//end foreach
+	}
 }
 
 
@@ -260,7 +260,7 @@ function show_filters() {
 }
 
 
-function set_trash( $filtr_key = '', $value = 0 ) {
+function set_trash($filtr_key = '', $value = 0) {
 	$this->_trash_filtr = array('filtr_key'=>$filtr_key, 'value'=>$value);
 }
 

SE/se-lib/FilterLast.php

@@ -18,7 +18,7 @@ var $_storage;// enum('session', 'cookie')
  * @param $key - kay to store values in @storage, if not set then args not saved
  * @param $storage - where to store state - cookie or session, default is cookie
  */
-function __construct( $args, $key = null, $storage = 'cookie' ) {
+function __construct($args, $key = null, $storage = 'cookie') {
 	$this->args = $args;
 	$this->values = array();
 	$this->filters = array();
@@ -31,18 +31,18 @@ function __construct( $args, $key = null, $storage = 'cookie' ) {
 }
 
 
-function get_values( $name ) {
+function get_values($name) {
 	if (array_key_exists($name, $this->values)) {
-		return $this->values[ $name ];
+		return $this->values[$name];
 	}
 	return array();
 }
 
 
-function get_arg( $name ) {
+function get_arg($name) {
 	// try load from @storage and save
 	if (array_key_exists($name, $this->args)) {
-		return $this->args[ $name ];
+		return $this->args[$name];
 	}
 	return null;
 }
@@ -53,10 +53,10 @@ function _init_args() {
 }
 
 
-function add_filter( $name, $arg_names, $label = '', $type = 'string' ) {
-	$this->filters[ $name ] = $arg_names;
-	$this->labels[ $name ] = ($label)? $label : $name;
-	$this->types[ $name ] = $type;
+function add_filter($name, $arg_names, $label = '', $type = 'string') {
+	$this->filters[$name] = $arg_names;
+	$this->labels[$name] = ($label)? $label : $name;
+	$this->types[$name] = $type;
 }
 
 
@@ -88,23 +88,23 @@ function _save_args_in_session() {
 				}
 				$cur_values = V::get($name, array(), $this->values, 'array');
 				if (!in_array($arg_val, $cur_values)) {
-					$cur_values []= $arg_val;
+					$cur_values[] = $arg_val;
 					if (count($cur_values) > $this->_values_limit) {
 						array_shift($cur_values);// - Shift an element off the beginning of array
 					}
 					$this->values[$name] = $cur_values;
 				}
 			}
-		}//end foreach
+		}
 	}
 
 	foreach ($this->values as $name => $v_arr) {
 		if (!empty($v_arr)) {
-			$save_args []= ''.urlencode($name).'='.urlencode(implode(';', $v_arr));
+			$save_args[] = ''.urlencode($name).'='.urlencode(implode(';', $v_arr));
 		}
-	}//end foreach
+	}
 	$save_args = implode(',', $save_args);
-	$_SESSION[ $this->_key ] = $save_args;
+	$_SESSION[$this->_key] = $save_args;
 }
 
 
@@ -118,12 +118,12 @@ function _save_args_in_cookie() {
 		if (count($options) == 1 && reset($options) == 'search') {
 			if ($arg != $this->args_default[$name]) {
 				$option = $arg;
-				$save_args []= ''.urlencode($name).'='.urlencode($option);
+				$save_args[] = ''.urlencode($name).'='.urlencode($option);
 			}
 		} else {
 			foreach($options as $option => $field_name) {
 				if (isset($this->args[$name]) && $this->args[$name] == $option) {
-					$save_args []= ''.urlencode($name).'='.urlencode($option);
+					$save_args[] = ''.urlencode($name).'='.urlencode($option);
 				}
 			}
 		}
@@ -166,9 +166,9 @@ function _read_args_from_session($force = false) {
 		$name = urldecode($c_val[0]);
 		$values = urldecode($c_val[1]);
 		if ($force || !array_key_exists($name, $this->values)) {
-			$this->values[ $name ] = explode(';', $values);
+			$this->values[$name] = explode(';', $values);
 		}
-	}//end foreach
+	}
 }
 
 
@@ -186,9 +186,9 @@ function _read_args_from_cookie($force = false) {
 		$name = urldecode($c_val[0]);
 		$option = urldecode($c_val[1]);
 		if ($force || !array_key_exists($name, $this->args)) {
-			$this->args[ $name ] = $option;
+			$this->args[$name] = $option;
 		}
-	}//end foreach
+	}
 }
 
 
@@ -209,8 +209,8 @@ function show_filters() {
 		$out->cnt_arr = array();
 		foreach ($vals as $val) {
 			$js = "return scrollToProces('".$val."');";
-			$out->cnt_arr []= '<a href="'."#TREE".$val.'" onclick="'.$js.'">'.$val.'</a>';// TODO: read from add_arg
-		}//end foreach
+			$out->cnt_arr[] = '<a href="'."#TREE".$val.'" onclick="'.$js.'">'.$val.'</a>';// TODO: read from add_arg
+		}
 		$out->cnt = implode(', ', $out->cnt_arr);
 
 		echo' <nobr'.(($out->cls)? ' class="'.$out->cls.'"' : '').'>';

SE/se-lib/FoldersConfig.php

@@ -2,7 +2,7 @@
 
 class FoldersConfig {
 
-	function getNfsOsPath() {
+	public static function getNfsOsPath() {
 		if (strstr($_SERVER['HTTP_USER_AGENT'], 'Mac')) {
 			return 'afp:';
 		}

SE/se-lib/Html.php

@@ -85,7 +85,7 @@ class Html_tag {
 	 * String or object Html_tag
 	 */
 	function appendChild($tag) {
-		$this->_childrens []= $tag;
+		$this->_childrens[] = $tag;
 	}
 
 
@@ -103,7 +103,7 @@ class Html_tag {
 		if (!empty($this->attr)) {
 			$attr_arr = array();
 			foreach ($this->attr as $k_attr => $v_attr) {
-				$attr_arr []= $k_attr . '="' . $v_attr . '"';
+				$attr_arr[] = $k_attr . '="' . $v_attr . '"';
 			}
 			if (!empty($attr_arr)) {
 				$attr_out = ' ' . implode(' ', $attr_arr);

SE/se-lib/LDAP.php

@@ -64,18 +64,15 @@ class LDAP {
 		echo "Number of entries found: " . $ldap->count_entries($res) . "\n";
 		// iterate over array and print data for each entry
 		for ($i=0; $i < $info['count']; $i++) {
-		//foreach ($info as $k_1 => $v_1) {
 			echo"\n".'-------------------------';
 			echo"\n".'dn: <em>('.$info[$i]['dn'].')</em>';
 			for ($j=0; $j < $info[$i]['count']; $j++) {
-			//foreach ($v_1 as $k_2 => $v_2) {
 				$k2 = $info[$i][$j];
 				echo"\n".'<b>'.$k2.'</b>: ';
 				for ($k=0; $k < $info[$i][$k2]['count']; $k++) {
-				//foreach ($v_2 as $k_3 => $v_3) {
 					echo '"'.$info[$i][$k2][$k].'" ';
-				}//end foreach
-			}//end foreach
+				}
+			}
 		}
 		echo'</pre>';
 	}

SE/se-lib/PageNav.php

@@ -73,7 +73,7 @@ class PageNav {
 
 		$params_out = array();
 		foreach ($params as $k => $v) {
-			$params_out []= $k . "=" . $v;
+			$params_out[] = $k . "=" . $v;
 		}
 		return "?" . implode("&", $params_out);
 	}
@@ -226,14 +226,14 @@ function {$this->_post_uniq_id}_frm(nr){
 		$link_out = $this->get_page_link($nr);
 		$attrs = array();
 		if ('' != ($title = V::get('title', '', $params))) {
-			$attrs []= 'title="' . $title . '"';
+			$attrs[] = 'title="' . $title . '"';
 		}
 		if ('' != ($class = V::get('class', '', $params))) {
-			$attrs []= 'class="' . $class . '"';
+			$attrs[] = 'class="' . $class . '"';
 		}
 		if ($this->req_method == 'POST') {
 			$offset = ($nr - 1) * $this->limit;
-			$attrs []= 'onclick="' . "return {$this->_post_uniq_id}_frm({$offset})" . '"';
+			$attrs[] = 'onclick="' . "return {$this->_post_uniq_id}_frm({$offset})" . '"';
 		}
 		$attrs_out = (!empty($attrs))? ' ' . implode(' ', $attrs) : '';
 		$out = '<a href="' . $link_out . '"' . $attrs_out . '>' . $label . '</a>';

SE/se-lib/PokazOfertyView.php

@@ -255,40 +255,40 @@ body{font-family:arial; font-size:12px;}
 													// show params
 													$srv_params = array();
 													if ($v_srv->NAME_LIST_SERVICES == 'USERS2') {
-														$srv_params []= '<span title="' . "Początkowa prędkość dostępu (dla danej uslugi) - P_SERVICE_QUOTA" . '">' . $ses_x_a->P_SERVICE_QUOTA . "kbit" . '</span>';
+														$srv_params[] = '<span title="' . "Początkowa prędkość dostępu (dla danej uslugi) - P_SERVICE_QUOTA" . '">' . $ses_x_a->P_SERVICE_QUOTA . "kbit" . '</span>';
 														if ($ses_x_a->CONN_DIV == 'YES') {
-															$srv_params []= '<span title="' . "podział łącza" . '">' . "CONN_DIV" . '</span>';
+															$srv_params[] = '<span title="' . "podział łącza" . '">' . "CONN_DIV" . '</span>';
 														}
 														if ($ses_x_a->S_PUBLIC_IP == 'YES') {
-															$srv_params []= '<span title="' . "Zewnętrzne IP" . '">' . "S_PUBLIC_IP" . '</span>';
+															$srv_params[] = '<span title="' . "Zewnętrzne IP" . '">' . "S_PUBLIC_IP" . '</span>';
 														}
 														if ($ses_x_a->S_E_PORT_1293 == 'YES') {
-															$srv_params []= '<span title="' . "Przekierowanie portu TCP/IP" . '">' . "PORT" . '</span>';
+															$srv_params[] = '<span title="' . "Przekierowanie portu TCP/IP" . '">' . "PORT" . '</span>';
 														}
 														if ($ses_x_a->S_SOHO_WIFI_ROUTER_1292 == 'YES') {
-															$srv_params []= '<span title="' . "Dzierżawa urządzenia WIFI z ROUTEREM" . '">' . "WIFI ROUTER" . '</span>';
+															$srv_params[] = '<span title="' . "Dzierżawa urządzenia WIFI z ROUTEREM" . '">' . "WIFI ROUTER" . '</span>';
 														}
 														//echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">TV (F.' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($ses_x_a);echo'</pre>';
 													}
 													else if ($v_srv->NAME_LIST_SERVICES == 'TV') {
-														$srv_params []= '<span title="' . "Typ usługi TV do ustalenia w systemie" . '">' . $ses_x_a->P_SERVICE_CLASS . '</span>';
+														$srv_params[] = '<span title="' . "Typ usługi TV do ustalenia w systemie" . '">' . $ses_x_a->P_SERVICE_CLASS . '</span>';
 														if ($ses_x_a->P_DEVICE != 'BRAK') {
-															$srv_params []= '<span title="' . "Dzierżawa urządzenia do odbioru TV" . '">' . $ses_x_a->P_DEVICE . '</span>';
+															$srv_params[] = '<span title="' . "Dzierżawa urządzenia do odbioru TV" . '">' . $ses_x_a->P_DEVICE . '</span>';
 														}
 														if ($ses_x_a->P_SERVICE_SOCKETS_AMMOUNT_1298 > 0) {
-															$srv_params []= '<span title="' . "Ilość dodatkowych gniazd analogowych do zainstalowania u klienta" . '">' . "Dodatkowe gniazda: " . $ses_x_a->P_SERVICE_SOCKETS_AMMOUNT_1298 . '</span>';
+															$srv_params[] = '<span title="' . "Ilość dodatkowych gniazd analogowych do zainstalowania u klienta" . '">' . "Dodatkowe gniazda: " . $ses_x_a->P_SERVICE_SOCKETS_AMMOUNT_1298 . '</span>';
 														}
 														if ($ses_x_a->ID_DOMAINS_PACKET_ID > 0) {
-															$srv_params []= '<span title="' . "Numer pakietu/cennika z zewnętrznego systemu" . '">' . $ses_x_a->ID_DOMAINS . ": " . $ses_x_a->ID_DOMAINS_PACKET_ID . '</span>';
+															$srv_params[] = '<span title="' . "Numer pakietu/cennika z zewnętrznego systemu" . '">' . $ses_x_a->ID_DOMAINS . ": " . $ses_x_a->ID_DOMAINS_PACKET_ID . '</span>';
 														}
 														//echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">TV (F.' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($ses_x_a);echo'</pre>';
 													}
 													else if ($v_srv->NAME_LIST_SERVICES == 'VOIP') {
 														if (!empty($ses_x_a->S_PHONE_NUMBER)) {
-															$srv_params []= '<span title="' . "Numer tel" . '">' . $ses_x_a->S_PHONE_NUMBER . '</span>';
+															$srv_params[] = '<span title="' . "Numer tel" . '">' . $ses_x_a->S_PHONE_NUMBER . '</span>';
 														}
 														if (!empty($ses_x_a->ID_DOMAINS)) {
-															$srv_params []= '<span title="' . "Numer pakietu/cennika z zewnętrznego systemu" . '">' . $ses_x_a->ID_DOMAINS . ": " . $ses_x_a->ID_DOMAINS_PACKET_ID . '</span>';
+															$srv_params[] = '<span title="' . "Numer pakietu/cennika z zewnętrznego systemu" . '">' . $ses_x_a->ID_DOMAINS . ": " . $ses_x_a->ID_DOMAINS_PACKET_ID . '</span>';
 														}
 													}
 
@@ -500,40 +500,40 @@ jQuery(document).ready(function(){
 													// show params
 													$srv_params = array();
 													if ($v_srv->NAME_LIST_SERVICES == 'USERS2') {
-														$srv_params []= '<span title="' . "Początkowa prędkość dostępu (dla danej uslugi) - P_SERVICE_QUOTA" . '">' . $ses_x_a->P_SERVICE_QUOTA . "kbit" . '</span>';
+														$srv_params[] = '<span title="' . "Początkowa prędkość dostępu (dla danej uslugi) - P_SERVICE_QUOTA" . '">' . $ses_x_a->P_SERVICE_QUOTA . "kbit" . '</span>';
 														if ($ses_x_a->CONN_DIV == 'YES') {
-															$srv_params []= '<span title="' . "podział łącza" . '">' . "CONN_DIV" . '</span>';
+															$srv_params[] = '<span title="' . "podział łącza" . '">' . "CONN_DIV" . '</span>';
 														}
 														if ($ses_x_a->S_PUBLIC_IP == 'YES') {
-															$srv_params []= '<span title="' . "Zewnętrzne IP" . '">' . "S_PUBLIC_IP" . '</span>';
+															$srv_params[] = '<span title="' . "Zewnętrzne IP" . '">' . "S_PUBLIC_IP" . '</span>';
 														}
 														if ($ses_x_a->S_E_PORT_1293 == 'YES') {
-															$srv_params []= '<span title="' . "Przekierowanie portu TCP/IP" . '">' . "PORT" . '</span>';
+															$srv_params[] = '<span title="' . "Przekierowanie portu TCP/IP" . '">' . "PORT" . '</span>';
 														}
 														if ($ses_x_a->S_SOHO_WIFI_ROUTER_1292 == 'YES') {
-															$srv_params []= '<span title="' . "Dzierżawa urządzenia WIFI z ROUTEREM" . '">' . "WIFI ROUTER" . '</span>';
+															$srv_params[] = '<span title="' . "Dzierżawa urządzenia WIFI z ROUTEREM" . '">' . "WIFI ROUTER" . '</span>';
 														}
 														//echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">TV (F.' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($ses_x_a);echo'</pre>';
 													}
 													else if ($v_srv->NAME_LIST_SERVICES == 'TV') {
-														$srv_params []= '<span title="' . "Typ usługi TV do ustalenia w systemie" . '">' . $ses_x_a->P_SERVICE_CLASS . '</span>';
+														$srv_params[] = '<span title="' . "Typ usługi TV do ustalenia w systemie" . '">' . $ses_x_a->P_SERVICE_CLASS . '</span>';
 														if ($ses_x_a->P_DEVICE != 'BRAK') {
-															$srv_params []= '<span title="' . "Dzierżawa urządzenia do odbioru TV" . '">' . $ses_x_a->P_DEVICE . '</span>';
+															$srv_params[] = '<span title="' . "Dzierżawa urządzenia do odbioru TV" . '">' . $ses_x_a->P_DEVICE . '</span>';
 														}
 														if ($ses_x_a->P_SERVICE_SOCKETS_AMMOUNT_1298 > 0) {
-															$srv_params []= '<span title="' . "Ilość dodatkowych gniazd analogowych do zainstalowania u klienta" . '">' . "Dodatkowe gniazda: " . $ses_x_a->P_SERVICE_SOCKETS_AMMOUNT_1298 . '</span>';
+															$srv_params[] = '<span title="' . "Ilość dodatkowych gniazd analogowych do zainstalowania u klienta" . '">' . "Dodatkowe gniazda: " . $ses_x_a->P_SERVICE_SOCKETS_AMMOUNT_1298 . '</span>';
 														}
 														if ($ses_x_a->ID_DOMAINS_PACKET_ID > 0) {
-															$srv_params []= '<span title="' . "Numer pakietu/cennika z zewnętrznego systemu" . '">' . $ses_x_a->ID_DOMAINS . ": " . $ses_x_a->ID_DOMAINS_PACKET_ID . '</span>';
+															$srv_params[] = '<span title="' . "Numer pakietu/cennika z zewnętrznego systemu" . '">' . $ses_x_a->ID_DOMAINS . ": " . $ses_x_a->ID_DOMAINS_PACKET_ID . '</span>';
 														}
 														//echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">TV (F.' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($ses_x_a);echo'</pre>';
 													}
 													else if ($v_srv->NAME_LIST_SERVICES == 'VOIP') {
 														if (!empty($ses_x_a->S_PHONE_NUMBER)) {
-															$srv_params []= '<span title="' . "Numer tel" . '">' . $ses_x_a->S_PHONE_NUMBER . '</span>';
+															$srv_params[] = '<span title="' . "Numer tel" . '">' . $ses_x_a->S_PHONE_NUMBER . '</span>';
 														}
 														if (!empty($ses_x_a->ID_DOMAINS)) {
-															$srv_params []= '<span title="' . "Numer pakietu/cennika z zewnętrznego systemu" . '">' . $ses_x_a->ID_DOMAINS . ": " . $ses_x_a->ID_DOMAINS_PACKET_ID . '</span>';
+															$srv_params[] = '<span title="' . "Numer pakietu/cennika z zewnętrznego systemu" . '">' . $ses_x_a->ID_DOMAINS . ": " . $ses_x_a->ID_DOMAINS_PACKET_ID . '</span>';
 														}
 													}
 

SE/se-lib/ProcesHelper.php

@@ -3,28 +3,28 @@
 
 class ProcesHelper {
 
-
-public static function get_wskazniki( $id ) {
-	$ret = array();
-	$sql = "select
-			clz.*
-			, w.`ID` as CW_ID, w.`TYP` as CW_TYP, w.`OPIS_ZASOB` as OPIS_ZASOB, w.`SORT_PRIO` as CW_SORT_PRIO, w.`ID_PRZYPADEK` as CW_ID_PRZYPADEK
-			, w.`A_HAS_IMAGE` as CW_A_HAS_IMAGE
-			, cp.`PYTANIE` as CP_PYTANIE, cp.`OPIS` as CP_OPIS, cp.`FORM_TREAT` as CP_FORM_TREAT
-		from `CRM_WSKAZNIK` as w
-			left join `CRM_LISTA_ZASOBOW` as clz on (clz.`ID`=w.`ID_ZASOB`)
-			left join `CRM_PRZYPADEK` as cp on (cp.`ID`=w.`ID_PRZYPADEK`)
-		where
-			w.`ID_PROCES`='".$id."'
-			and w.`A_STATUS` in('WAITING','NORMAL','MONITOR')
-		order by w.`SORT_PRIO` asc, w.`ID` asc
-	";
-	$res = DB::query( $sql );
-	while ($r = DB::fetch( $res )) {
-		$ret[$r->CW_ID] = $r;
+	public static function get_wskazniki($id) {
+		$ret = array();
+		$db = DB::getDB();
+		$sql = "select
+				clz.*
+				, w.`ID` as CW_ID, w.`TYP` as CW_TYP, w.`OPIS_ZASOB` as OPIS_ZASOB, w.`SORT_PRIO` as CW_SORT_PRIO, w.`ID_PRZYPADEK` as CW_ID_PRZYPADEK
+				, w.`A_HAS_IMAGE` as CW_A_HAS_IMAGE
+				, cp.`PYTANIE` as CP_PYTANIE, cp.`OPIS` as CP_OPIS, cp.`FORM_TREAT` as CP_FORM_TREAT
+			from `CRM_WSKAZNIK` as w
+				left join `CRM_LISTA_ZASOBOW` as clz on (clz.`ID`=w.`ID_ZASOB`)
+				left join `CRM_PRZYPADEK` as cp on (cp.`ID`=w.`ID_PRZYPADEK`)
+			where
+				w.`ID_PROCES`='".$id."'
+				and w.`A_STATUS` in('WAITING','NORMAL','MONITOR')
+			order by w.`SORT_PRIO` asc, w.`ID` asc
+		";
+		$res = $db->query($sql);
+		while ($r = $db->fetch($res)) {
+			$ret[$r->CW_ID] = $r;
+		}
+		return $ret;
 	}
-	return $ret;
-}
 
 	public static function getWskaznikiByIds($ids, $params = array()) {
 		$wskazniki = array();
@@ -72,135 +72,132 @@ public static function get_wskazniki( $id ) {
 		return $wskazniki;
 	}
 
-public static function get_list_for_user_count( $user_groups, $params = array() ) {
-	$ret = array();
-	$sql = self::_get_list_for_user_sql( $user_groups, $params, true );
-	$res = DB::query( $sql );
-	if ($r = DB::fetch( $res )) {
-		$ret = $r->cnt;
+	public static function get_list_for_user_count($user_groups, $params = array()) {
+		$ret = array();
+		$db = DB::getDB();
+		$sql = self::_get_list_for_user_sql($user_groups, $params, true);
+		$res = $db->query($sql);
+		if ($r = $db->fetch($res)) {
+			$ret = $r->cnt;
+		}
+		return $ret;
 	}
-	return $ret;
-}
-
 
-public static function get_list_for_user( $user_groups, $params = array() ) {
-	$ret = array();
-	$sql = self::_get_list_for_user_sql( $user_groups, $params );
-	$res = DB::query( $sql );
-	while ($r = DB::fetch( $res )) {
-		$ret []= $r;
+	public static function get_list_for_user($user_groups, $params = array()) {
+		$ret = array();
+		$db = DB::getDB();
+		$sql = self::_get_list_for_user_sql($user_groups, $params);
+		$res = $db->query($sql);
+		while ($r = $db->fetch($res)) {
+			$ret[] = $r;
+		}
+		return $ret;
 	}
-	return $ret;
-}
 
+	/**
+	 * TODO: find user proces
+	 */
+	public static function _get_list_for_user_sql($user_groups, $params = array(), $count = false) {
+		$sql_select = array();
+		$sql_limit = "";
+		$sql_where = "";
+
+		if ($count) {
+			$sql_select[] = "count(1) as cnt";
+		} else {
+			$sql_select[] = "t.*";
+			$sql_limit = V::get('limit', '10', $params);
+			$sql_offset = V::get('offset', '0', $params);
+			$sql_limit = "limit {$sql_limit} offset {$sql_offset}";
+		}
 
-/**
- * TODO: find user proces
- */
-public static function _get_list_for_user_sql( $user_groups, $params = array(), $count = false ) {
-	$sql_select = array();
-	$sql_limit = "";
-	$sql_where = "";
-
-	if ($count) {
-		$sql_select []= "count(1) as cnt";
-	} else {
-		$sql_select []= "t.*";
-		$sql_limit = V::get('limit', '10', $params);
-		$sql_offset = V::get('offset', '0', $params);
-		$sql_limit = "limit $sql_limit offset $sql_offset";
+		$sql_select = implode(", ", $sql_select);
+		$sql = "select
+				{$sql_select}
+			from `CRM_PROCES_LOG` as t
+	--			left join `` as p on(p.``=t.``)
+			where
+				{$sql_where}
+			{$sql_limit}
+		";
+		return $sql;
 	}
 
-	$sql_select = implode(", ", $sql_select);
-	$sql = "select
-			$sql_select
-		from `CRM_PROCES_LOG` as t
---			left join `` as p on(p.``=t.``)
-		where
-			$sql_where
-		$sql_limit
-	";
-	return $sql;
-}
-
-
-/**
- * Get allowed Stanowiska ID for given proces.
- * @param $proces_id - proces ID
- * @returns array of Stanowiska ID
- * Search recursively up by p.PARENT_ID, stop when find p.PROCES_INIT or find z.STANOWISKO
- */
-public static function get_allowed_stanowiska_by_proces_id( $proces_id ) {
-	$ret = array();
-	$proces_id = intval($proces_id);
-	if ($proces_id <= 0) return $ret;
-	// TODO: DB::get_by_id('CRM_PROCES', $proces_id);
-	// TODO: check TYPE=PROCES_INIT -> get STANOWISKO and stop
-	// TODO: find wskazniki STANOWISKO
-	// TODO: if !empty return else recursive - TODO: add recursive limit!
-	$sql = "select
-			p.`TYPE` as p__TYPE
-			, z.`ID` as z__ID
-			, z.`TYPE` as z__TYPE
-		from `CRM_PROCES` as p
-			left join `CRM_WSKAZNIK` as w on(w.`ID_PROCES`=p.`ID`)
-			left join `CRM_LISTA_ZASOBOW` as z on (z.`ID`=w.`ID_ZASOB`)
-		where
-			p.`ID`='".$proces_id."'
-			and w.`A_STATUS` in('WAITING','NORMAL','MONITOR')
-			and z.`TYPE`='STANOWISKO'
-	";
-	$res = DB::query( $sql );
-	while ($r = DB::fetch( $res )) {
-		$ret []= $r->z__ID;
+	/**
+	 * Get allowed Stanowiska ID for given proces.
+	 * @param $proces_id - proces ID
+	 * @returns array of Stanowiska ID
+	 * Search recursively up by p.PARENT_ID, stop when find p.PROCES_INIT or find z.STANOWISKO
+	 */
+	public static function get_allowed_stanowiska_by_proces_id($proces_id) {
+		$ret = array();
+		$proces_id = intval($proces_id);
+		if ($proces_id <= 0) return $ret;
+		// TODO: DB::get_by_id('CRM_PROCES', $proces_id);
+		// TODO: check TYPE=PROCES_INIT -> get STANOWISKO and stop
+		// TODO: find wskazniki STANOWISKO
+		// TODO: if !empty return else recursive - TODO: add recursive limit!
+		$db = DB::getDB();
+		$sql = "select
+				p.`TYPE` as p__TYPE
+				, z.`ID` as z__ID
+				, z.`TYPE` as z__TYPE
+			from `CRM_PROCES` as p
+				left join `CRM_WSKAZNIK` as w on(w.`ID_PROCES`=p.`ID`)
+				left join `CRM_LISTA_ZASOBOW` as z on (z.`ID`=w.`ID_ZASOB`)
+			where
+				p.`ID`='{$proces_id}'
+				and w.`A_STATUS` in('WAITING','NORMAL','MONITOR')
+				and z.`TYPE`='STANOWISKO'
+		";
+		$res = $db->query($sql);
+		while ($r = $db->fetch($res)) {
+			$ret[] = $r->z__ID;
+		}
+	//echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">ret: ';print_r($ret);echo'</pre>';
+		return $ret;
 	}
-//echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">ret: ';print_r($ret);echo'</pre>';
-	return $ret;
-}
-
 
-public static function getProcesByUser( $user_name, $groups ) {
-	$ret = array();
-	$sql = "select plog.*
-		from `CRM_PROCES_LOG` as plog
-		where
-			( plog.`A_RECORD_CREATE_AUTHOR`='".$user_name."'
-				or plog.`A_RECORD_UPDATE_AUTHOR`='".$user_name."'
-			)
-		order by plog.ID DESC
-	";
-	$res = DB::query($sql);
-	while ($r = DB::fetch($res)) {
-		$ret[$r->ID] = $r;
+	public static function getProcesByUser($user_name, $groups) {
+		$ret = array();
+		$db = DB::getDB();
+		$sql = "select plog.*
+			from `CRM_PROCES_LOG` as plog
+			where
+				( plog.`A_RECORD_CREATE_AUTHOR`='{$user_name}'
+					or plog.`A_RECORD_UPDATE_AUTHOR`='{$user_name}'
+				)
+			order by plog.ID DESC
+		";
+		$res = $db->query($sql);
+		while ($r = $db->fetch($res)) {
+			$ret[$r->ID] = $r;
+		}
+		return $ret;
 	}
-	return $ret;
-}
-
 
-public static function split_wskazniki_by_table( &$wsk ) {
-	$wsk_split = array();
-echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">wsk: ';print_r($wsk);echo'</pre>';
-	foreach ($wsk as $k_id => $w) {
-		$w->_parents = TreeHelper::get_all_parents( 'CRM_LISTA_ZASOBOW', $w->PARENT_ID );
-	}
-	foreach ($wsk as $k_id => $w) {// $w->CW_ID == $k_id
-		if ($w->TYPE == 'KOMORKA') {
-			$last_wsk = end($wsk_split);
-			if (empty($last_wsk)) {
-				
+	public static function split_wskazniki_by_table(&$wsk) {
+		$wsk_split = array();
+		echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">wsk: ';print_r($wsk);echo'</pre>';
+		foreach ($wsk as $k_id => $w) {
+			$w->_parents = TreeHelper::get_all_parents('CRM_LISTA_ZASOBOW', $w->PARENT_ID);
+		}
+		foreach ($wsk as $k_id => $w) {// $w->CW_ID == $k_id
+			if ($w->TYPE == 'KOMORKA') {
+				$last_wsk = end($wsk_split);
+				if (empty($last_wsk)) {
+					
+				}
+			} else if ($w->TYPE == 'DOKUMENTY') {
+				// file
 			}
-		} else if ($w->TYPE == 'DOKUMENTY') {
-			// file
 		}
-	}//end foreach
-	
-}
-
+	}
 
 	/**
 	 * @param $stanowiska_id - array of integer
 	 */
-	public static function get_procesy_by_stanowiska( $stanowiska_id = array() ) {
+	public static function get_procesy_by_stanowiska($stanowiska_id = array()) {
 		$db = DB::getDB();
 		$ret = array();
 		if (empty($stanowiska_id)) {
@@ -210,7 +207,7 @@ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">wsk: ';pr
 		foreach ($stanowiska_id as $v_id) {
 			$v_id = intval($v_id);
 			if ($v_id > 0) {
-				$sql_stanowiska_id []= "'" . $v_id . "'";
+				$sql_stanowiska_id[] = "'{$v_id}'";
 			}
 		}
 		if (empty($sql_stanowiska_id)) {
@@ -240,7 +237,7 @@ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">wsk: ';pr
 		";
 		$res = $db->query($sql);
 		while ($r = $db->fetch($res)) {
-			$ret []= $r;
+			$ret[] = $r;
 		}
 		return $ret;
 	}
@@ -263,7 +260,7 @@ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">wsk: ';pr
 		";
 		$res = $db->query($sql);
 		while ($r = $db->fetch($res)) {
-			$ret [$r->ID]= $r->TEST_SORT_PRIO;
+			$ret[$r->ID]= $r->TEST_SORT_PRIO;
 		}
 		return $ret;
 	}
@@ -298,7 +295,7 @@ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">wsk: ';pr
 		";
 		$res = $db->query($sql);
 		while ($r = $db->fetch($res)) {
-			$ret []= $r;
+			$ret[] = $r;
 		}
 		return $ret;
 	}
@@ -316,31 +313,31 @@ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">wsk: ';pr
 		$wsk_order = array();
 		$sort_prio = 0;
 		foreach ($proces_list as $r) {
-			$wsk [$r->ID] = $sort_prio;//$r->SORT_PRIO;
-			$wsk_order [$sort_prio]= $r->ID;
+			$wsk[$r->ID] = $sort_prio;//$r->SORT_PRIO;
+			$wsk_order[$sort_prio] = $r->ID;
 			$sort_prio += 1;
 		}
 		if (empty($wsk)) return;
 		$wsk_new = array();
 		if ($sort_prio_dir == 'dw') {// wskaznik $wsk_id 'w gore' (zmniejsz sort_prio)
-			$old_wsk_id = $wsk[ $proces_id ];
+			$old_wsk_id = $wsk[$proces_id];
 			if ($old_wsk_id == 0) return;
-			//echo'zamien "'.$proces_id.'" na "'.$wsk_order[ $wsk[ $proces_id ] - 1 ].'"';
-			$tmp = $wsk_order[ $wsk[ $proces_id ] ];
-			$wsk_order[ $wsk[ $proces_id ] ] = $wsk_order[ $wsk[ $proces_id ] - 1 ];
-			$wsk_order[ $wsk[ $proces_id ] - 1 ] = $tmp;
+			//echo'zamien "'.$proces_id.'" na "'.$wsk_order[$wsk[$proces_id] - 1].'"';
+			$tmp = $wsk_order[$wsk[$proces_id]];
+			$wsk_order[$wsk[$proces_id]] = $wsk_order[$wsk[$proces_id] - 1];
+			$wsk_order[$wsk[$proces_id] - 1] = $tmp;
 		} else {// wskaznik $wsk_id 'w dol' (zwieksz sort_prio)
-			$old_wsk_id = $wsk[ $proces_id ];
+			$old_wsk_id = $wsk[$proces_id];
 			if ($old_wsk_id + 1 == count($wsk)) return;
-			//echo'zamien "'.$proces_id.'" na "'.$wsk_order[ $wsk[ $proces_id ] + 1 ].'"';
-			$tmp = $wsk_order[ $wsk[ $proces_id ] ];
-			$wsk_order[ $wsk[ $proces_id ] ] = $wsk_order[ $wsk[ $proces_id ] + 1 ];
-			$wsk_order[ $wsk[ $proces_id ] + 1 ] = $tmp;
+			//echo'zamien "'.$proces_id.'" na "'.$wsk_order[$wsk[$proces_id] + 1].'"';
+			$tmp = $wsk_order[$wsk[$proces_id]];
+			$wsk_order[$wsk[$proces_id]] = $wsk_order[$wsk[$proces_id] + 1];
+			$wsk_order[$wsk[$proces_id] + 1] = $tmp;
 		}
 		if (empty($wsk_order)) return;
 		foreach ($wsk_order as $k_sort_prio => $v_proces_id) {
 			$sql = "update `CRM_PROCES` set `TEST_SORT_PRIO`='{$k_sort_prio}' where `ID`='{$v_proces_id}'; ";
-			$db->query( $sql );
+			$db->query($sql);
 		}
 		return true;
 	}
@@ -386,7 +383,7 @@ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">wsk: ';pr
 		$res = $db->query($sql);
 		while ($r = $db->fetch($res)) {
 			if ($return_by == 'dest') {
-				$ret[$r->IF_TRUE_GOTO] []= $r;
+				$ret[$r->IF_TRUE_GOTO][] = $r;
 			} else {
 				$ret[$r->ID] = $r;
 			}
@@ -418,8 +415,9 @@ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">wsk: ';pr
 		return $gotoList;
 	}
 
-	public static function get_wskaznik( $wsk_id ) {
+	public static function get_wskaznik($wsk_id) {
 		$ret = array();
+		$db = DB::getDB();
 		$sql = "select
 				clz.*
 				, w.`ID` as CW_ID, w.`TYP` as CW_TYP, w.`OPIS_ZASOB` as OPIS_ZASOB, w.`SORT_PRIO` as CW_SORT_PRIO, w.`ID_PRZYPADEK` as CW_ID_PRZYPADEK
@@ -429,17 +427,17 @@ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">wsk: ';pr
 				left join `CRM_LISTA_ZASOBOW` as clz on (clz.`ID`=w.`ID_ZASOB`)
 				left join `CRM_PRZYPADEK` as cp on (cp.`ID`=w.`ID_PRZYPADEK`)
 			where
-				w.`ID`='" . $wsk_id . "'
+				w.`ID`='{$wsk_id}'
 				and w.`A_STATUS` in('WAITING','NORMAL','MONITOR')
 		";
-		$res = DB::query( $sql );
-		if ($r = DB::fetch( $res )) {
+		$res = $db->query($sql);
+		if ($r = $db->fetch($res)) {
 			$ret[$r->CW_ID] = $r;
 		}
 		return $ret;
 	}
 
-	public static function get_proces( $next_id ) {
+	public static function get_proces($next_id) {
 		return DB::get_by_id('CRM_PROCES', $next_id);
 	}
 

SE/se-lib/ProcesLogDao.php

@@ -120,7 +120,7 @@ class ProcesLogDao extends BaseDao {
 		while ($r = $this->_db->fetch($res)) {
 			$model = new ProcesLogModel($this);
 			$model->setDataFromDB($r);
-			$ret []= $model;
+			$ret[] = $model;
 		}
 		return $ret;
 	}
@@ -131,7 +131,7 @@ class ProcesLogDao extends BaseDao {
 		if (!empty($user_groups)) {
 			$sql_where_groups_and = array();
 			foreach ($user_groups as $v_group_id) {
-				$sql_where_groups_and []= "FIND_IN_SET('$v_group_id', plog.`ID_STANOWISKA`)";
+				$sql_where_groups_and[] = "FIND_IN_SET('$v_group_id', plog.`ID_STANOWISKA`)";
 			}
 			$sql_where_groups_add .= " or (plog.`ID_USER`=0 and (" . implode(" or ", $sql_where_groups_and) . "))";
 		}
@@ -305,7 +305,7 @@ class ProcesLogDao extends BaseDao {
 		$komorka_ids = array();
 		foreach ($wskazniki as $k_id => $v_wsk) {
 			if ($v_wsk->TYPE == 'KOMORKA') {// TODO: 'DANE' under 'KOMORKA'
-				$komorka_ids []= $v_wsk->ID;
+				$komorka_ids[] = $v_wsk->ID;
 			}
 		}
 		if (empty($komorka_ids)) {

SE/se-lib/ProcesLogEdit.php

@@ -166,7 +166,7 @@ class ProcesLogEdit {
 	}
 
 	function add_error($msg) {
-		$this->_errors []= $msg;
+		$this->_errors[] = $msg;
 	}
 
 	function has_errors() {
@@ -685,7 +685,7 @@ class ProcesLogEdit {
 				$sql_field = $this->_komorki[$k_wsk_id]->DESC;
 			}
 			if ($v_val != '%') {
-				$sql_where_and_arr []= "t.`" . $sql_field . "` like '" . $db->_($v_val) . "'";
+				$sql_where_and_arr[] = "t.`" . $sql_field . "` like '" . $db->_($v_val) . "'";
 			}
 		}
 
@@ -730,9 +730,9 @@ class ProcesLogEdit {
 			$sql_order_by = 'order by t.`ID` ' . $this->get_nav_filter('f-_order_desc');
 		}
 
-		$sql_select []= "t.`ID` as f_ID";
+		$sql_select[] = "t.`ID` as f_ID";
 		foreach ($this->get_komorki() as $k_wsk_id => $v_wsk) {
-			$sql_select []= "t.`" . $v_wsk->DESC . "` as f_" . $k_wsk_id;
+			$sql_select[] = "t.`" . $v_wsk->DESC . "` as f_" . $k_wsk_id;
 		}
 
 		$sql = "select " . implode("," , $sql_select) . "
@@ -743,7 +743,7 @@ class ProcesLogEdit {
 		";
 		$res = $db->query($sql);
 		while ($r = $db->fetch($res)) {
-			$rows []= $r;
+			$rows[] = $r;
 		}
 		return $rows;
 	}
@@ -761,9 +761,9 @@ class ProcesLogEdit {
 
 		$sql_where .= (($sql_where)? " and " : " where ") . " t.`ID`='" . $this->_id_key . "' ";
 
-		$sql_select []= "t.`ID` as f_ID";
+		$sql_select[] = "t.`ID` as f_ID";
 		foreach ($this->get_komorki() as $k_wsk_id => $v_wsk) {
-			$sql_select []= "t.`" . $v_wsk->DESC . "` as f_" . $k_wsk_id;
+			$sql_select[] = "t.`" . $v_wsk->DESC . "` as f_" . $k_wsk_id;
 		}
 
 		$sql = "select " . implode("," , $sql_select) . "

SE/se-lib/ProcesLogMenuView.php

@@ -16,7 +16,7 @@ class ProcesLogMenuView extends View {
 		} else {
 			$out_groups_arr = array();
 			foreach ($user_groups as $v_group) {
-				$out_groups_arr []= '<span title="' . htmlspecialchars($v_group->DESC) . '">' . $v_group->ID . '</span>';
+				$out_groups_arr[] = '<span title="' . htmlspecialchars($v_group->DESC) . '">' . $v_group->ID . '</span>';
 			}
 			$user_groups_out = '<b>' . implode(",", $out_groups_arr) . '</b>';
 			unset($out_groups_arr);

SE/se-lib/ProcesLogSelectView.php

@@ -56,7 +56,7 @@ class ProcesLogSelectView extends View {
 										break;
 								}
 								if ($task) {
-									$actions_out []= App::link($v_task_label, array('task'=>$task, '_log_id'=>$modelLog->get('ID')));
+									$actions_out[] = App::link($v_task_label, array('task'=>$task, '_log_id'=>$modelLog->get('ID')));
 								}
 							}
 							$out .= implode(" ", $actions_out);

SE/se-lib/ProcesLogStepView.php

@@ -129,8 +129,8 @@ function resetForm(n){
 			$last_key_id = end(array_keys($wskazniki));
 			foreach ($wskazniki as $k_key_id => $v_wsk) {
 				$cls = array();
-				if ($k_key_id == $last_key_id) $cls []= 'last';
-				if (in_array($k_key_id, $current_edit_wsk_ids)) $cls []= 'selected';
+				if ($k_key_id == $last_key_id) $cls[] = 'last';
+				if (in_array($k_key_id, $current_edit_wsk_ids)) $cls[] = 'selected';
 				$out .= '<li' . ((!empty($cls))? ' class="'.implode(' ', $cls).'"' : '') . '><p>';
 					$out .= '<span class="btn-box btn-box-silver">' . $v_wsk->CW_ID . '</span>';
 					$out .= '<span class="green">' . "[" . $v_wsk->ID . "]" . '</span>';

SE/se-lib/ProcesMenu.php

@@ -132,7 +132,7 @@ class ProcesMenu {
 	}
 
 	function setError($error) {
-		$this->error []= $error;
+		$this->error[] = $error;
 	}
 
 	function ifError() {// TODO: RMME
@@ -894,17 +894,17 @@ class ProcesMenu {
 				else {
 					$CRM_TREE_WSKAZNIK_NARZEDZIE[$r->ID_ZASOB] = $r->FORM_TREAT;
 				}
-				$CRM_WSKAZNIK_PROCES_WSKAZNIK_TREE[$r->ID_PROCES] []= $r->ID_WSKAZNIK;//ustawiam wskaznik od procesu, jak user wybierze proces do roboty, to ja poznam co moze mu sie pojawic
+				$CRM_WSKAZNIK_PROCES_WSKAZNIK_TREE[$r->ID_PROCES][] = $r->ID_WSKAZNIK;//ustawiam wskaznik od procesu, jak user wybierze proces do roboty, to ja poznam co moze mu sie pojawic
 			}
 			else if ($r->TYPE == 'URL') {
-				$CRM_WSKAZNIK_PROCES_WSKAZNIK_TREE[$r->ID_PROCES] []= $r->ID_WSKAZNIK;//ustawiam wskaznik od procesu, jak user wybierze proces do roboty, to ja poznam co moze mu sie pojawic
+				$CRM_WSKAZNIK_PROCES_WSKAZNIK_TREE[$r->ID_PROCES][] = $r->ID_WSKAZNIK;//ustawiam wskaznik od procesu, jak user wybierze proces do roboty, to ja poznam co moze mu sie pojawic
 				$_SESSION['MENU_SELECT_PROCES_DATA']['MENU_COLUMN'][$r->ID_ZASOB]['TYPE'] = $r->TYPE;
 				$_SESSION['MENU_SELECT_PROCES_DATA']['MENU_COLUMN'][$r->ID_ZASOB]['DESC'] = $r->ZASOB_DESC;
 				$_SESSION['MENU_SELECT_PROCES_DATA']['MENU_COLUMN'][$r->ID_ZASOB]['OPIS'] = $r->ZASOB_OPIS;
 			}
 			else {
 				if ($r->PARENT_TYPE == 'TABELA') {
-					$CRM_WSKAZNIK_PROCES_WSKAZNIK_TREE[$r->ID_PROCES] []= $r->ID_WSKAZNIK;//ustawiam wskaznik od procesu, jak user wybierze proces do roboty, to ja poznam co moze mu sie pojawic
+					$CRM_WSKAZNIK_PROCES_WSKAZNIK_TREE[$r->ID_PROCES][] = $r->ID_WSKAZNIK;//ustawiam wskaznik od procesu, jak user wybierze proces do roboty, to ja poznam co moze mu sie pojawic
 					if (isset($r->FORM_TREAT)) {
 						if (isset($TREE_CRM_WSKAZNIK_CONF[$r->PARENT_ZASOB_DESC][$r->ZASOB_DESC])) {
 							$TREE_CRM_WSKAZNIK_CONF[$r->PARENT_ZASOB_DESC][$r->ZASOB_DESC] .= $r->FORM_TREAT;
@@ -973,13 +973,13 @@ class ProcesMenu {
 						//echo "<br><font color=red>Brak spojnosci definicji dla kolumny : ".$ses_column_name."[<b>".$k_name."</b>] </font>";
 					}
 					else {
-						$new_desc[ $desc_to_sort[$k_name] ] = $k_name;
+						$new_desc[$desc_to_sort[$k_name]] = $k_name;
 					}
 				}
 
 				// add columns
 				foreach ($desc_to_sort as $k_name => $v_ind) {
-					$new_desc[ $v_ind ] = $k_name;
+					$new_desc[$v_ind] = $k_name;
 				}
 
 				$_SESSION[$ses_column_name."_COLUMN"]['DESC'] = $new_desc;

SE/se-lib/ProcesTestyHelper.php

@@ -9,322 +9,312 @@
 class ProcesTestyHelper {
 
 
-public static function &get_kandydaci( $params = array() ) {
-	$ret = array();
-	$params['order by'] = V::get('order by', '', $params);
-	$allowed_order_by = array();
-	$allowed_order_by ['ID']= 'DESC';
-	$allowed_order_by ['ADM_NAME']= 'ASC';
-	if (!array_key_exists($params['order by'], $allowed_order_by)) {
-		$params['order by'] = "";
-	}
-	$sql_order_by = "";
-	if ($params['order by']) {
-		$sql_order_by = "order by " . $params['order by'] . " " . $allowed_order_by[ $params['order by'] ];
-	}
-	$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'
-		" . $sql_order_by . "
-		limit 1000
-	";
-	$res = $db->query($sql);
-	while ($r = $db->fetch($res)) {
-		$ret []= $r;
-	}
-	return $ret;
-}
-
-
-public static function &get_testy_by_kandydat( $kandydat_id ) {
-	$params = array();
-	$params['id_tester'] = $kandydat_id;
-	$params['order_by'] = 'ID';
-	$params['order_dir'] = 'desc';
-	return self::get_testy( $params );
-}
-
-
-public static function _get_testy_sql_where($params = array()) {
-	$sql_where = "1=1";
-	if (($id_tester = V::get('id_tester', 0, $params, 'int')) > 0) {
-		$sql_where .= " and t.`ID_TESTER`='{$id_tester}'";
-	}
-	if ('TAK' == V::get('SHOW_IN_CERT', '', $params)) {
-		$sql_where .= " and t.`SHOW_IN_CERT`='TAK'";
+	public static function get_kandydaci($params = array()) {
+		$ret = array();
+		$params['order by'] = V::get('order by', '', $params);
+		$allowed_order_by = array();
+		$allowed_order_by['ID']= 'DESC';
+		$allowed_order_by['ADM_NAME']= 'ASC';
+		if (!array_key_exists($params['order by'], $allowed_order_by)) {
+			$params['order by'] = "";
+		}
+		$sql_order_by = "";
+		if ($params['order by']) {
+			$sql_order_by = "order by " . $params['order by'] . " " . $allowed_order_by[$params['order by']];
+		}
+		$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'
+			{$sql_order_by}
+			limit 1000
+		";
+		$res = $db->query($sql);
+		while ($r = $db->fetch($res)) {
+			$ret[] = $r;
+		}
+		return $ret;
 	}
-	return $sql_where;
-}
 
-public static function &get_testy_total( $params = array() ) {
-	$ret = 0;
-	$sql_where = self::_get_testy_sql_where($params);
-	$db = DB::getDB();
-	$sql = "select
-			count(1) as cnt
-		from `CRM_TESTY` as t
-		where
-			".$sql_where."
-	";
-	$res = $db->query($sql);
-	if ($r = $db->fetch($res)) {
-		$ret = $r->cnt;
+	public static function get_testy_by_kandydat($kandydat_id) {
+		$params = array();
+		$params['id_tester'] = $kandydat_id;
+		$params['order_by'] = 'ID';
+		$params['order_dir'] = 'desc';
+		return self::get_testy($params);
 	}
-	return $ret;
-}
-
 
-public static function &get_testy( $params = array() ) {
-	$ret = array();
-	$sql_select = array();
-	$sql_select []= "t.`ID`";
-	$sql_select []= "t.`A_STATUS`";
-	$sql_select []= "t.`A_RECORD_CREATE_DATE`";
-	$sql_select []= "t.`ID_TESTER`";
-	$sql_select []= "t.`ID_PROCES_INIT`";
-	$sql_select []= "t.`ID_STANOWISKO`";
-	$sql_select []= "t.`TEST_INIT`";
-	$sql_select []= "t.`TEST_START`";
-	$sql_select []= "t.`TEST_END`";
-	$sql_select []= "t.`UWAGI`";
-	$sql_select []= "t.`OCENA`";
-	$sql_select []= "t.`DISCOUNT`";
-	$sql_select []= "t.`ID_ORGANIZER`";
-	$sql_select []= "t.`TEST_PLACE`";
-	//$sql_select []= "t.`TEST_TIME`";
-	$sql_select []= "t.`COST`";
-	$sql_select []= "t.`TEST_TYPE`";
-	$sql_select []= "z.`DESC` as Stanowisko";
-	$sql_select []= "concat(u.`ADM_NAME`, ' (', u.`ADM_PHONE`, ', ', u.`ADM_OTHER_INFO`, ')') as Kandydat";
-	$sql_select []= "IF( u.`ID` is null, t.`ID_TESTER`, u.`ADM_NAME`) as Kandydat_Name";
-	$sql_select []= "t.`SHOW_IN_CERT`";
-	$sql_join = array();
-	$sql_order_by = "";
-	if (($p_order_by = V::get('order_by', '', $params)) != '') {
-		$sql_order_by = "order by ".$p_order_by;
-		if (in_array(strtoupper($p_order_dir = V::get('order_dir', '', $params)), array('ASC','DESC'))) {
-			$sql_order_by .= " ".$p_order_dir;
+	public static function _get_testy_sql_where($params = array()) {
+		$sql_where = "1=1";
+		if (($id_tester = V::get('id_tester', 0, $params, 'int')) > 0) {
+			$sql_where .= " and t.`ID_TESTER`='{$id_tester}'";
 		}
-	}
-	$sql_limit = V::get('limit', 10, $params, 'int');
-	if (($p_offset = V::get('offset', 0, $params, 'int')) > 0) {
-		$sql_limit .= " offset ".$p_offset;
-	}
-
-	$sql_where = self::_get_testy_sql_where($params);
-
-	if ((true == V::get('proces_name', '', $params))) {
-		$sql_join []= "left join `CRM_PROCES` as p on(p.`ID`=t.`ID_PROCES_INIT`)";
-		$sql_select []= "p.`DESC` as Proces_Name";
+		if ('TAK' == V::get('SHOW_IN_CERT', '', $params)) {
+			$sql_where .= " and t.`SHOW_IN_CERT`='TAK'";
+		}
+		return $sql_where;
 	}
 
-	if ((true == V::get('organizer_name', '', $params))) {
-		$sql_join []= "left join `ADMIN_USERS` as u_org on(u_org.`ID`=t.`ID_ORGANIZER`)";
-		$sql_select []= "u_org.`ADM_NAME` as Organizer";
+	public static function get_testy_total($params = array()) {
+		$ret = 0;
+		$sql_where = self::_get_testy_sql_where($params);
+		$db = DB::getDB();
+		$sql = "select
+				count(1) as cnt
+			from `CRM_TESTY` as t
+			where
+				{$sql_where}
+		";
+		$res = $db->query($sql);
+		if ($r = $db->fetch($res)) {
+			$ret = $r->cnt;
+		}
+		return $ret;
 	}
 
-	$sql_join = implode("\n\t", $sql_join);
-	$sql_select = implode(", ", $sql_select);
-	$db = DB::getDB();
-	$sql = "select
-			".$sql_select."
-		from `CRM_TESTY` as t
-			left join `CRM_LISTA_ZASOBOW` as z on(z.`ID`=t.`ID_STANOWISKO`)
-			left join `ADMIN_USERS` as u on(u.`ID`=t.`ID_TESTER`)
-			".$sql_join."
-		where
-			".$sql_where."
-		".$sql_order_by."
-		limit ".$sql_limit."
-	";
-	$res = $db->query($sql);
-	while ($r = $db->fetch($res)) {
-		//$sql_select []= "IF( z.`ID` is null, t.`ID_STANOWISKO`, z.`DESC` ) as Stanowisko";
-		//$sql_select []= "IF( u.`ID` is null, t.`ID_TESTER`, concat(u.`ADM_NAME`, ' (', u.`ADM_PHONE`, ', ', u.`ADM_OTHER_INFO`, ')') ) as Kandydat";
-		//$sql_select []= "IF( u.`ID` is null, t.`ID_TESTER`, u.`ADM_NAME`) as Kandydat_Name";
-		if (!$r->Stanowisko) {
-			$r->Stanowisko = $r->ID_STANOWISKO;
-		}
-		if (!$r->Kandydat) {
-			$r->Kandydat = $r->ID_TESTER;
+	public static function get_testy($params = array()) {
+		$ret = array();
+		$sql_select = array();
+		$sql_select[] = "t.`ID`";
+		$sql_select[] = "t.`A_STATUS`";
+		$sql_select[] = "t.`A_RECORD_CREATE_DATE`";
+		$sql_select[] = "t.`ID_TESTER`";
+		$sql_select[] = "t.`ID_PROCES_INIT`";
+		$sql_select[] = "t.`ID_STANOWISKO`";
+		$sql_select[] = "t.`TEST_INIT`";
+		$sql_select[] = "t.`TEST_START`";
+		$sql_select[] = "t.`TEST_END`";
+		$sql_select[] = "t.`UWAGI`";
+		$sql_select[] = "t.`OCENA`";
+		$sql_select[] = "t.`DISCOUNT`";
+		$sql_select[] = "t.`ID_ORGANIZER`";
+		$sql_select[] = "t.`TEST_PLACE`";
+		//$sql_select[] = "t.`TEST_TIME`";
+		$sql_select[] = "t.`COST`";
+		$sql_select[] = "t.`TEST_TYPE`";
+		$sql_select[] = "z.`DESC` as Stanowisko";
+		$sql_select[] = "concat(u.`ADM_NAME`, ' (', u.`ADM_PHONE`, ', ', u.`ADM_OTHER_INFO`, ')') as Kandydat";
+		$sql_select[] = "IF( u.`ID` is null, t.`ID_TESTER`, u.`ADM_NAME`) as Kandydat_Name";
+		$sql_select[] = "t.`SHOW_IN_CERT`";
+		$sql_join = array();
+		$sql_order_by = "";
+		if (($p_order_by = V::get('order_by', '', $params)) != '') {
+			$sql_order_by = "order by {$p_order_by}";
+			if (in_array(strtoupper($p_order_dir = V::get('order_dir', '', $params)), array('ASC','DESC'))) {
+				$sql_order_by .= " {$p_order_dir}";
+			}
 		}
-		if (!$r->Kandydat_Name) {
-			$r->Kandydat_Name = $r->ID_TESTER;
+		$sql_limit = V::get('limit', 10, $params, 'int');
+		if (($p_offset = V::get('offset', 0, $params, 'int')) > 0) {
+			$sql_limit .= " offset {$p_offset}";
 		}
 
-		$ret []= $r;
-	}
-	return $ret;
-}
+		$sql_where = self::_get_testy_sql_where($params);
 
+		if ((true == V::get('proces_name', '', $params))) {
+			$sql_join[] = "left join `CRM_PROCES` as p on(p.`ID`=t.`ID_PROCES_INIT`)";
+			$sql_select[] = "p.`DESC` as Proces_Name";
+		}
 
-/**
- * @return array( ID_PROCES => array( ID_PYTANIE => {ID,ODPOWIEDZ,ODP_0,ODP_1,ODP_2,ODP_3,ODP_4,OCENA} ) )
- */
-public static function &get_odpowiedzi( $test_id, $type = 'TEORETYCZNY' ) {
-	$ret = array();
-	$sql_type = "";
-	$types_allowed = self::get_allowed_types();
-	if (array_key_exists($type, $types_allowed)) {
-		$sql_type = "and pyt.`TEST_TYPE`='" . $type . "'";
-	}
-	$db = DB::getDB();
-	$sql = "select
-			odp.`ID`
-			, odp.`ID_PYTANIE`
-			, pyt.`ID_PROCES` as ID_PROCES
-			, odp.`ODPOWIEDZ`
-			, odp.`ODP_0`
-			, odp.`ODP_1`
-			, odp.`ODP_2`
-			, odp.`ODP_3`
-			, odp.`ODP_4`
-			, odp.`OCENA`
-		from `CRM_TESTY_ODPOWIEDZI` as odp
-			left join `CRM_TESTY_PYTANIA` as pyt on(pyt.`ID`=odp.`ID_PYTANIE`)
-		where
-			pyt.`ID` is not NULL
-			and odp.`ID_TEST`='".$test_id."'
-			" . $sql_type . "
-	";
-	$res = $db->query($sql);
-	while ($r = $db->fetch($res)) {
-		$ret[$r->ID_PROCES][$r->ID_PYTANIE] = $r;
-	}
-	return $ret;
-}
+		if ((true == V::get('organizer_name', '', $params))) {
+			$sql_join[] = "left join `ADMIN_USERS` as u_org on(u_org.`ID`=t.`ID_ORGANIZER`)";
+			$sql_select[] = "u_org.`ADM_NAME` as Organizer";
+		}
 
+		$sql_join = implode("\n\t", $sql_join);
+		$sql_select = implode(", ", $sql_select);
+		$db = DB::getDB();
+		$sql = "select
+				{$sql_select}
+			from `CRM_TESTY` as t
+				left join `CRM_LISTA_ZASOBOW` as z on(z.`ID`=t.`ID_STANOWISKO`)
+				left join `ADMIN_USERS` as u on(u.`ID`=t.`ID_TESTER`)
+				{$sql_join}
+			where
+				{$sql_where}
+			{$sql_order_by}
+			limit {$sql_limit}
+		";
+		$res = $db->query($sql);
+		while ($r = $db->fetch($res)) {
+			//$sql_select[] = "IF( z.`ID` is null, t.`ID_STANOWISKO`, z.`DESC` ) as Stanowisko";
+			//$sql_select[] = "IF( u.`ID` is null, t.`ID_TESTER`, concat(u.`ADM_NAME`, ' (', u.`ADM_PHONE`, ', ', u.`ADM_OTHER_INFO`, ')') ) as Kandydat";
+			//$sql_select[] = "IF( u.`ID` is null, t.`ID_TESTER`, u.`ADM_NAME`) as Kandydat_Name";
+			if (!$r->Stanowisko) {
+				$r->Stanowisko = $r->ID_STANOWISKO;
+			}
+			if (!$r->Kandydat) {
+				$r->Kandydat = $r->ID_TESTER;
+			}
+			if (!$r->Kandydat_Name) {
+				$r->Kandydat_Name = $r->ID_TESTER;
+			}
 
-public static function &get_pytania_by_proces_id( $proces_id, $type = 'TEORETYCZNY' ) {
-	$ret = array();
-	$sql_type = "";
-	$types_allowed = self::get_allowed_types();
-	if (array_key_exists($type, $types_allowed)) {
-		$sql_type = "and pyt.`TEST_TYPE`='".$type."'";
-	}
-	$db = DB::getDB();
-	$sql = "select pyt.*
-		from `CRM_TESTY_PYTANIA` as pyt
-		where
-			pyt.`ID_PROCES`='".$proces_id."'
-			" . $sql_type . "
-		order by pyt.`ID` ASC
-	";
-	$res = $db->query($sql);
-	while ($r = $db->fetch($res)) {
-		$ret[$r->ID] = $r;
+			$ret[] = $r;
+		}
+		return $ret;
 	}
-	return $ret;
-}
 
+	/**
+	 * @return array( ID_PROCES => array( ID_PYTANIE => {ID,ODPOWIEDZ,ODP_0,ODP_1,ODP_2,ODP_3,ODP_4,OCENA} ) )
+	 */
+	public static function get_odpowiedzi($test_id, $type = 'TEORETYCZNY') {
+		$ret = array();
+		$sql_type = "";
+		$types_allowed = self::get_allowed_types();
+		if (array_key_exists($type, $types_allowed)) {
+			$sql_type = "and pyt.`TEST_TYPE`='{$type}'";
+		}
+		$db = DB::getDB();
+		$sql = "select
+				odp.`ID`
+				, odp.`ID_PYTANIE`
+				, pyt.`ID_PROCES` as ID_PROCES
+				, odp.`ODPOWIEDZ`
+				, odp.`ODP_0`
+				, odp.`ODP_1`
+				, odp.`ODP_2`
+				, odp.`ODP_3`
+				, odp.`ODP_4`
+				, odp.`OCENA`
+			from `CRM_TESTY_ODPOWIEDZI` as odp
+				left join `CRM_TESTY_PYTANIA` as pyt on(pyt.`ID`=odp.`ID_PYTANIE`)
+			where
+				pyt.`ID` is not NULL
+				and odp.`ID_TEST`='{$test_id}'
+				{$sql_type}
+		";
+		$res = $db->query($sql);
+		while ($r = $db->fetch($res)) {
+			$ret[$r->ID_PROCES][$r->ID_PYTANIE] = $r;
+		}
+		return $ret;
+	}
 
-/**
- * @param $pytania_id - array if int
- */
-public static function &get_pytania_by_id( $pytania_id ) {
-	$ret = array();
-	if (empty($pytania_id)) return $ret;
-	// TODO: if int or array
-	if (!is_array($pytania_id)) $pytania_id = array($pytania_id);
-	$db = DB::getDB();
-	$sql = "select
-			pyt.*
-		from `CRM_TESTY_PYTANIA` as pyt
-		where
-			pyt.`ID` in(".implode(",", $pytania_id).")
-	";
-	$res = $db->query($sql);
-	while ($r = $db->fetch($res)) {
-		$ret[$r->ID] = $r;
+	public static function get_pytania_by_proces_id($proces_id, $type = 'TEORETYCZNY') {
+		$ret = array();
+		$sql_type = "";
+		$types_allowed = self::get_allowed_types();
+		if (array_key_exists($type, $types_allowed)) {
+			$sql_type = "and pyt.`TEST_TYPE`='{$type}'";
+		}
+		$db = DB::getDB();
+		$sql = "select pyt.*
+			from `CRM_TESTY_PYTANIA` as pyt
+			where
+				pyt.`ID_PROCES`='{$proces_id}'
+				{$sql_type}
+			order by pyt.`ID` ASC
+		";
+		$res = $db->query($sql);
+		while ($r = $db->fetch($res)) {
+			$ret[$r->ID] = $r;
+		}
+		return $ret;
 	}
-	return $ret;
-}
 
+	/**
+	 * @param $pytania_id - array if int
+	 */
+	public static function get_pytania_by_id($pytania_id) {
+		$ret = array();
+		if (empty($pytania_id)) return $ret;
+		// TODO: if int or array
+		if (!is_array($pytania_id)) $pytania_id = array($pytania_id);
+		$db = DB::getDB();
+		$sql = "select
+				pyt.*
+			from `CRM_TESTY_PYTANIA` as pyt
+			where
+				pyt.`ID` in(".implode(",", $pytania_id).")
+		";
+		$res = $db->query($sql);
+		while ($r = $db->fetch($res)) {
+			$ret[$r->ID] = $r;
+		}
+		return $ret;
+	}
 
-/**
- * Updates field TEST_PYTANIE in remote table.
- */
-public static function update_proces_stat($remote_id) {
-	$db = DB::getDB();
-	$sql = "update `CRM_PROCES`
-			set `TEST_PYTANIE`=(
+	/**
+	 * Updates field TEST_PYTANIE in remote table.
+	 */
+	public static function update_proces_stat($remote_id) {
+		$db = DB::getDB();
+		$sql = "update `CRM_PROCES`
+				set `TEST_PYTANIE`=(
+					select count(1)
+					from `CRM_TESTY_PYTANIA`
+					where
+						`ID_PROCES`='{$remote_id}'
+				)
+			where `ID`='{$remote_id}'
+			limit 1;
+		";
+		// update all records
+		$sql = "update `CRM_PROCES` as p
+			set p.`TEST_PYTANIE`=(
 				select count(1)
-				from `CRM_TESTY_PYTANIA`
+				from `CRM_TESTY_PYTANIA` as pyt
 				where
-					`ID_PROCES`='".$remote_id."'
+					pyt.`ID_PROCES`=p.ID
 			)
-		where `ID`='".$remote_id."'
-		limit 1;
-	";
-	// update all records
-	$sql = "update `CRM_PROCES` as p
-		set p.`TEST_PYTANIE`=(
-			select count(1)
-			from `CRM_TESTY_PYTANIA` as pyt
-			where
-				pyt.`ID_PROCES`=p.ID
-		)
-	";
-	$res = $db->query($sql);
-	$affected = $db->affected_rows();
-	return $affected;
-}
-
-
-public static function delete_pytanie($id, $remote_id) {
-	$db = DB::getDB();
-	$sql = "delete from `CRM_TESTY_PYTANIA`
-		where
-			`ID`='".$id."'
-			and `ID_PROCES`='".$remote_id."'
-		limit 1
-	";
-	//echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">sql delete = ';print_r($sql);echo'</pre>';
-	$db->query($sql);
-	$affected = $db->affected_rows();
+		";
+		$res = $db->query($sql);
+		$affected = $db->affected_rows();
+		return $affected;
+	}
 
-	self::update_proces_stat($remote_id);
+	public static function delete_pytanie($id, $remote_id) {
+		$db = DB::getDB();
+		$sql = "delete from `CRM_TESTY_PYTANIA`
+			where
+				`ID`='{$id}'
+				and `ID_PROCES`='{$remote_id}'
+			limit 1
+		";
+		//echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">sql delete = ';print_r($sql);echo'</pre>';
+		$db->query($sql);
+		$affected = $db->affected_rows();
 
-	return $affected;
-}
+		self::update_proces_stat($remote_id);
 
+		return $affected;
+	}
 
-/**
- * Ocena pytania.
- * @param $p - sql object pytanie
- * @param $selected_values - array of user selected values
- * @returns null if pytanie is openm ale return integer value 0 - 3 (avg)
- */
-public static function ocen_pytanie(&$p, &$selected_values) {
-	$ret = null;
 	/**
-	 * TODO: pokaz tylko odpowiedz udzielona przez kandydata i czy jest prawidlowa
-	 * ODP_{id_pyt}
-	 * ODP_{id_pyt}_{id_odp} (TAK/NIE)
+	 * Ocena pytania.
+	 * @param $p - sql object pytanie
+	 * @param $selected_values - array of user selected values
+	 * @returns null if pytanie is openm ale return integer value 0 - 3 (avg)
 	 */
-	$pytanie_otwarte = true;
-	$avg_odp_cnt = 0;
-	$avg_odp_ok_cnt = 0;
-	for ($i = 0; $i < 5; $i++) {
-		$odp_field = "ODP_".$i;
-		if (!empty($p->$odp_field)) {// jest odpowiedz do pytania
-			$avg_odp_cnt += 1;
-			$p_field_prawidlowa_odp = "ODP_".$i."_ODP";
-			$pytanie_otwarte = false;
-			if (!empty($selected_values[$i]) != '' && $p->$p_field_prawidlowa_odp == $selected_values[$i]) {
-				$avg_odp_ok_cnt += 1;
+	public static function ocen_pytanie(&$p, &$selected_values) {
+		$ret = null;
+		/**
+		 * TODO: pokaz tylko odpowiedz udzielona przez kandydata i czy jest prawidlowa
+		 * ODP_{id_pyt}
+		 * ODP_{id_pyt}_{id_odp} (TAK/NIE)
+		 */
+		$pytanie_otwarte = true;
+		$avg_odp_cnt = 0;
+		$avg_odp_ok_cnt = 0;
+		for ($i = 0; $i < 5; $i++) {
+			$odp_field = "ODP_".$i;
+			if (!empty($p->$odp_field)) {// jest odpowiedz do pytania
+				$avg_odp_cnt += 1;
+				$p_field_prawidlowa_odp = "ODP_".$i."_ODP";
+				$pytanie_otwarte = false;
+				if (!empty($selected_values[$i]) != '' && $p->$p_field_prawidlowa_odp == $selected_values[$i]) {
+					$avg_odp_ok_cnt += 1;
+				}
 			}
 		}
+		if (!$pytanie_otwarte) {
+			$ret = round((3 * floatval($avg_odp_ok_cnt)) / $avg_odp_cnt);
+		}
+		return $ret;
 	}
-	if (!$pytanie_otwarte) {
-		$ret = round((3 * floatval($avg_odp_ok_cnt)) / $avg_odp_cnt);
-	}
-	return $ret;
-}
-
 
 	/**
 	 * CRM_TESTY_PYTANIA.TEST_TYPE
@@ -349,12 +339,12 @@ public static function ocen_pytanie(&$p, &$selected_values) {
 		Lib::loadClass('DB');
 		$db = DB::getDB();
 		$sql_where_arr = array();
-		$sql_where_arr []= "t.`ID_TESTER`='{$user_id}'";
+		$sql_where_arr[] = "t.`ID_TESTER`='{$user_id}'";
 		if (!empty($proces_ids)) {
-			$sql_where_arr []= "t.`ID_PROCES_INIT` in (" . implode(",", $proces_ids) . ")";
+			$sql_where_arr[] = "t.`ID_PROCES_INIT` in (" . implode(",", $proces_ids) . ")";
 		}
 		if ($max_age > 0) {
-			$sql_where_arr []= "UNIX_TIMESTAMP(t.`TEST_END`) > (UNIX_TIMESTAMP(NOW()) - $max_age)";
+			$sql_where_arr[] = "UNIX_TIMESTAMP(t.`TEST_END`) > (UNIX_TIMESTAMP(NOW()) - $max_age)";
 		}
 		$sql = "select tbl.*
 			from ( select t.`ID_PROCES_INIT`, t.`OCENA`, t.`A_STATUS`, t.`TEST_TYPE`, t.`TEST_END`
@@ -366,7 +356,7 @@ public static function ocen_pytanie(&$p, &$selected_values) {
 		";
 		$res = $db->query($sql);
 		while ($r = $db->fetch($res)) {
-			$testy_stats []= $r;
+			$testy_stats[] = $r;
 		}
 		return $testy_stats;
 	}
@@ -395,10 +385,10 @@ public static function ocen_pytanie(&$p, &$selected_values) {
 		$sql = "select t.`TEST_END`
 			from `CRM_TESTY` as t
 			where
-				t.`ID_TESTER`={$id_tester}
-				and t.`ID_PROCES_INIT`={$id_proces_init}
-				and t.`ID_STANOWISKO`={$id_stanowisko}
-				and t.`ID`<{$id_test}
+				t.`ID_TESTER` = {$id_tester}
+				and t.`ID_PROCES_INIT` = {$id_proces_init}
+				and t.`ID_STANOWISKO` = {$id_stanowisko}
+				and t.`ID` < {$id_test}
 			limit 1
 		";
 		$res = $db->query($sql);

SE/se-lib/SimulateDBTask.php

@@ -109,10 +109,10 @@ class SimulateDBTask {
 
 	function set_result($task_id, $res_id) {
 		$sql_data = array();
-		$sql_data []= "`A_RECORD_UPDATE_DATE`='" . date('Y-m-d-H:i:s') ."'";
-		$sql_data []= "`A_RECORD_UPDATE_AUTHOR`='" . User::getName() . "'";
-		$sql_data []= "`RESULT_ID`='{$res_id}'";
-		$sql_data []= "`TASK_DONE`='1'";
+		$sql_data[] = "`A_RECORD_UPDATE_DATE`='" . date('Y-m-d-H:i:s') ."'";
+		$sql_data[] = "`A_RECORD_UPDATE_AUTHOR`='" . User::getName() . "'";
+		$sql_data[] = "`RESULT_ID`='{$res_id}'";
+		$sql_data[] = "`TASK_DONE`='1'";
 		$sql = "update `{$this->_tbl}` set " . implode("\n , ", $sql_data) . " where ID='{$task_id}';";
 		$this->_db->query($sql);
 		$this->_task_list[$task_id]->RESULT_ID = $res_id;
@@ -246,7 +246,7 @@ class SimulateDBTask {
 	function _decode_obj($obj) {
 		$lines = array();
 		foreach ($obj as $k_field => $v_value) {
-			$lines []= "{$k_field}: {$v_value}";
+			$lines[] = "{$k_field}: {$v_value}";
 		}
 		return implode("\n", $lines);
 	}

SE/se-lib/TableAcl.php

@@ -379,15 +379,15 @@ class TableAcl {
 		) {
 			//$h->Type_value = (int)str_replace(array(' ','(',')'), '', substr($h->Type, 4));
 			$html->attrs['type'] = 'number';
-			$html->attrs['class'] []= 'input-small';
+			$html->attrs['class'][] = 'input-small';
 		}
 		else if (substr($colType['type'], 0, 6) == 'double') {
 			$html->attrs['type'] = 'text';
-			$html->attrs['class'] []= 'input-small';
+			$html->attrs['class'][] = 'input-small';
 		}
 		else if (substr($colType['type'], 0, 7) == 'decimal') {
 			$html->attrs['type'] = 'text';
-			$html->attrs['class'] []= 'input-small';
+			$html->attrs['class'][] = 'input-small';
 		}
 		else if (substr($colType['type'], 0, 7) == 'varchar'
 				|| substr($colType['type'], 0, 4) == 'char'
@@ -407,15 +407,15 @@ class TableAcl {
 				}
 			} else {
 				if ($maxLength < 11) {
-					$html->attrs['class'] []= 'span2';
+					$html->attrs['class'][] = 'span2';
 				} else if ($maxLength < 31) {
-					$html->attrs['class'] []= 'span5';
+					$html->attrs['class'][] = 'span5';
 				} else if ($maxLength < 51) {
-					$html->attrs['class'] []= (8 <= $maxGrid)? 'span8' : "span{$maxGrid}";
+					$html->attrs['class'][] = (8 <= $maxGrid)? 'span8' : "span{$maxGrid}";
 				} else if ($maxLength < 101) {
-					$html->attrs['class'] []= (10 <= $maxGrid)? 'span10' : "span{$maxGrid}";
+					$html->attrs['class'][] = (10 <= $maxGrid)? 'span10' : "span{$maxGrid}";
 				} else {
-					$html->attrs['class'] []= (12 <= $maxGrid)? 'span12' : "span{$maxGrid}";
+					$html->attrs['class'][] = (12 <= $maxGrid)? 'span12' : "span{$maxGrid}";
 				}
 			}
 		}

SE/se-lib/TableAjax.php

@@ -4484,7 +4484,7 @@ jQuery(document).ready(function(){
 						</label>
 					</td>
 					<td style="border-right:1px solid #eee;">
-						<input type="text" name="M_DIST_FILES_DESCRIPTION" value="<?php echo $M_DIST_FILES_DESCRIPTION; ?>" maxlength="50">
+						<input type="text" name="M_DIST_FILES_DESCRIPTION" value="" maxlength="50">
 						<br><label>jeśli nie zostanie podany to zostanie automatycznie wygenerowany na podstawie nazwy pliku wysyłanego</label>
 					</td>
 					<td style="border-right:1px solid #eee;">

SE/se-lib/TreeHelper.php

@@ -2,36 +2,36 @@
 
 class TreeHelper {
 
-	public static function get_tree_from_flat( &$cechy_used_tree ) {
+	public static function get_tree_from_flat(&$cechy_used_tree) {
 		$tree_to_rm = array();// to remove from tree
 		$tree_flat = array();// wskazniki na $tree
 		// 1st pass - create parent => childrens struct
 		foreach ($cechy_used_tree as $k_id => $v_parent_id) {
 			if (!array_key_exists($v_parent_id, $tree_flat)) {
-				$tree_flat[ $v_parent_id ] = array();
+				$tree_flat[$v_parent_id] = array();
 			}
-			$tree_flat[ $v_parent_id ] [$k_id] = null;
-		}//end foreach
+			$tree_flat[$v_parent_id][$k_id] = null;
+		}
 
 		foreach ($tree_flat as $k_parent => $v_childrens) {
 			foreach ($v_childrens as $k_child_id => $v_child_arr) {
 				if (array_key_exists($k_child_id, $tree_flat)) {
-					$tree_flat[ $k_parent ][ $k_child_id ] =& $tree_flat[ $k_child_id ];
-					$tree_to_rm []= $k_child_id;
+					$tree_flat[$k_parent][$k_child_id] =& $tree_flat[$k_child_id];
+					$tree_to_rm[] = $k_child_id;
 				}
-			}//end foreach
-		}//end foreach
+			}
+		}
 
 		$tree = array();
 		foreach ($tree_flat as $k_id => $v_tree) {
 			if (!in_array($k_id, $tree_to_rm)) {
-				$tree[ $k_id ] =& $tree_flat[ $k_id ];
+				$tree[$k_id] =& $tree_flat[$k_id];
 			}
-		}//end foreach
+		}
 		return $tree;
 	}
 
-	public static function build_tree_flat( $sql_table, &$cechy_used_tree, $rec_count = 0 ) {
+	public static function build_tree_flat($sql_table, &$cechy_used_tree, $rec_count = 0) {
 		if ($rec_count > 20) {// rec limit
 			echo'Error L' . __LINE__ . ' ('.$rec_count.') limit petli - prawdopodobnie bledna struktura danych ';
 			echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">tree: ';print_r( TreeHelper::get_tree_from_flat($cechy_used_tree) );echo'</pre>';
@@ -41,60 +41,63 @@ class TreeHelper {
 		$get_parents_id = array();
 		foreach ($cechy_used_tree as $k_cecha_id => $v_parent_id) {
 			if (!$v_parent_id) {
-				$get_parents_id []= $k_cecha_id;
+				$get_parents_id[] = $k_cecha_id;
 			}
-		}//end foreach
+		}
 		if (!empty($get_parents_id)) {
 			$do_zmiana = false;
+			$db = DB::getDB();
 			$sql = "select
 					t1.`ID`
 					, t1.`PARENT_ID`
-				from `".$sql_table."` as t1
+				from `{$sql_table}` as t1
 				where
 					t1.`ID` in (".implode(",", $get_parents_id).")
 			";
-			$res = DB::query( $sql );
-			while ($r = DB::fetch( $res )) {
-				$cechy_used_tree[ $r->ID ] = $r->PARENT_ID;
+			$res = $db->query($sql);
+			while ($r = $db->fetch($res)) {
+				$cechy_used_tree[$r->ID] = $r->PARENT_ID;
 				if ($r->PARENT_ID > 0) {
-					$cechy_used_tree[ $r->PARENT_ID ] = null;
+					$cechy_used_tree[$r->PARENT_ID] = null;
 					$do_zmiana = true;
 				}
-			}//while
+			}
 			if (!$do_zmiana) {
 				return true;
 			}
 		} else {
 			return true;
 		}
-		return TreeHelper::build_tree_flat( $sql_table, $cechy_used_tree, $rec_count + 1 );
+		return TreeHelper::build_tree_flat($sql_table, $cechy_used_tree, $rec_count + 1);
 	}
 
-	public static function get_childrens( $sql_table, $id_proces ) {
+	public static function get_childrens($sql_table, $id_proces) {
 		$ret = array();
+		$db = DB::getDB();
 		$sql = "select
 				t1.*
-			from `".$sql_table."` as t1
+			from `{$sql_table}` as t1
 			where
-				t1.`PARENT_ID`='".$id_proces."'
+				t1.`PARENT_ID`='{$id_proces}'
 		";
-		$res = DB::query( $sql );
-		while ($r = DB::fetch( $res )) {
-			$ret[ $r->ID ] = $r;
-		}//while
+		$res = $db->query($sql);
+		while ($r = $db->fetch($res)) {
+			$ret[$r->ID] = $r;
+		}
 		return $ret;
 	}
 
-	public static function get_all_parents( $sql_table, $id, $parent_id_key = 'PARENT_ID' ) {
+	public static function get_all_parents($sql_table, $id, $parent_id_key = 'PARENT_ID') {
 		$parents = array();
 		self::get_all_parents_rec($sql_table, $id, $parents, $parent_id_key);
 		return $parents;
 	}
 
-	public static function get_all_parents_rec( $sql_table, $id, &$parents, $parent_id_key ) {
-		$sql = "select t.* from `".$sql_table."` as t where t.`ID`='".$id."'";
-		$res = DB::query( $sql );
-		if ($r = DB::fetch( $res )) {
+	public static function get_all_parents_rec($sql_table, $id, &$parents, $parent_id_key) {
+		$db = DB::getDB();
+		$sql = "select t.* from `{$sql_table}` as t where t.`ID`='{$id}'";
+		$res = $db->query($sql);
+		if ($r = $db->fetch($res)) {
 			$parents[$r->ID] = $r;
 			self::get_all_parents_rec($sql_table, $r->$parent_id_key, $parents, $parent_id_key);
 		}

SE/se-lib/TreeList.php

@@ -35,7 +35,7 @@ class TreeList {
 		if(V::get('DBG_TF', '', $_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>';}
 		$res = $db->query($sql);
 		while ($r = $db->fetch($res)) {
-			$this->_treeFlat[$r->PARENT_ID] []= $r->ID;
+			$this->_treeFlat[$r->PARENT_ID][] = $r->ID;
 			$this->_treeType[$r->ID]= $r->TYPE;
 		}
 		if(V::get('DBG_TF', '', $_GET) > 0){echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">treeFlatAll (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($this->_treeFlat);echo'</pre>';}

SE/se-lib/TreeListView.php

@@ -35,7 +35,7 @@ class TreeListView {
 		if(V::get('DBG_TF', '', $_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>';}
 		$res = $db->query($sql);
 		while ($r = $db->fetch($res)) {
-			$this->_treeFlat[$r->PARENT_ID] []= $r->ID;
+			$this->_treeFlat[$r->PARENT_ID][] = $r->ID;
 		}
 		if(V::get('DBG_TF', '', $_GET) > 0){echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">treeFlatAll (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($this->_treeFlat);echo'</pre>';}
 	}

SE/se-lib/UserAcl.php

@@ -90,7 +90,7 @@ class UserAcl {
 		//union select '83','2025'	
 		$res = $db->query($sql);
 		while ($r = $db->fetch($res)) {
-			$this->_proces_tree_flat[$r->PARENT_ID] []= $r->ID;
+			$this->_proces_tree_flat[$r->PARENT_ID][] = $r->ID;
 		}
 		return $this->_proces_tree_flat;
 	}
@@ -123,11 +123,11 @@ class UserAcl {
 			$this->find_in_tree_parent_rec($CRM_PROCESS_TREE, $proces_id, $CRM_PROCES_USERA_UZYTY_FIND, $dbg);
 			if ($dbg) echo '</div>';
 			$this->_proces_used_ids[$proces_id] = true;//trzeba dodac sam proces, bo go brakuje w indeksach
-			$this->_proces_used_map[$proces_id] []= $proces_id;//trzeba dodac sam proces, bo go brakowalo w indeksach
+			$this->_proces_used_map[$proces_id][] = $proces_id;//trzeba dodac sam proces, bo go brakowalo w indeksach
 			if (is_array($CRM_PROCES_USERA_UZYTY_FIND)) {
 				foreach ($CRM_PROCES_USERA_UZYTY_FIND as $INDEX => $proces_id_found ) {
 					$this->_proces_used_ids[$proces_id_found] = true;
-					$this->_proces_used_map[$proces_id] []= $proces_id_found;//tworze mape procesow od glownego w dol
+					$this->_proces_used_map[$proces_id][] = $proces_id_found;//tworze mape procesow od glownego w dol
 				}
 			}
 		}
@@ -169,7 +169,7 @@ class UserAcl {
 			$sql = "select `ID` from `CRM_PROCES` where `TYPE`='PROCES_INIT' and `ID` in (" . implode(",", array_keys($map)) . ") ";
 			$res = $db->query($sql);
 			while ($h = $db->fetch($res)) {
-				$this->_proces_init_used_ids []= $h->ID;
+				$this->_proces_init_used_ids[] = $h->ID;
 			}
 		}
 		return $this->_proces_init_used_ids;
@@ -287,7 +287,7 @@ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:
 			$res = $db->query($sql);
 			$CRM_PROCES_USERA_UZYTY_MAP_PROCES_INIT = array();
 			while($r = $db->fetch($res)) {
-				$CRM_PROCES_USERA_UZYTY_MAP_PROCES_INIT []= $r->ID;
+				$CRM_PROCES_USERA_UZYTY_MAP_PROCES_INIT[] = $r->ID;
 			}
 		}
 
@@ -317,7 +317,7 @@ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:
 		//szukam procesów
 		$res = $db->query($zap_sql);
 		while ($r = $db->fetch($res)) {
-			$ID_ZASOBOW_USERA []= $r->ID_ZASOB;
+			$ID_ZASOBOW_USERA[] = $r->ID_ZASOB;
 		}
 		echo '<p>' . "1. ID_ZASOBOW_USERA: [" . implode(', ', $ID_ZASOBOW_USERA) . "]"  .'</p>';
 
@@ -352,7 +352,7 @@ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:
 					//union select '83','2025'	
 		$res = $db->query($zap_sql);
 		while ($r = $db->fetch($res)) {
-			$CRM_PROCESS_TREE[$r->PARENT_ID] []= $r->ID;
+			$CRM_PROCESS_TREE[$r->PARENT_ID][] = $r->ID;
 		}
 echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">3. CRM_PROCESS_TREE (F.' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($CRM_PROCESS_TREE);echo'</pre>';
 
@@ -488,11 +488,11 @@ if(0) {// OFF TEST - nie ustalaj permów SE
 				$new_desc = array();
 				foreach ($TREE_CRM_WSKAZNIK_SORT_PRIO[$ses_column_name] as $k_name => $v_sort_prio) {
 						if(!isset($desc_to_sort[$k_name])) {} //echo "<br><font color=red>Brak spojnosci definicji dla kolumny : ".$ses_column_name."[<b>".$k_name."</b>] </font>";
-					 else $new_desc[ $desc_to_sort[$k_name] ] = $k_name; //@2012-10-15 walka z warningami sqix
+					 else $new_desc[$desc_to_sort[$k_name]] = $k_name; //@2012-10-15 walka z warningami sqix
 				}
 				// add columns
 				foreach ($desc_to_sort as $k_name => $v_ind) {
-					$new_desc[ $v_ind ] = $k_name;
+					$new_desc[$v_ind] = $k_name;
 				}
 
 				$_SESSION[$ses_column_name."_COLUMN"]['DESC'] = $new_desc;
@@ -513,7 +513,7 @@ if(0) {// OFF TEST - nie ustalaj permów SE
 		$res = $db->query($sql);
 		$CRM_PROCES_USERA_UZYTY_MAP_PROCES_INIT = array();
 		while($r = $db->fetch($res)) {
-			$CRM_PROCES_USERA_UZYTY_MAP_PROCES_INIT []= $r->ID;
+			$CRM_PROCES_USERA_UZYTY_MAP_PROCES_INIT[] = $r->ID;
 		}
 		$_SESSION['CRM_PROCES_USERA_UZYTY_MAP_PROCES_INIT']=$CRM_PROCES_USERA_UZYTY_MAP_PROCES_INIT;
 	}
@@ -600,7 +600,7 @@ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:
 					continue;
 				}
 
-				$crm_proces_usera_uzyty []= $CHILD;
+				$crm_proces_usera_uzyty[] = $CHILD;
 				if ($dbg) { echo '<p style="margin:0;">' . "-- find_in_tree_parent_rec_old(tree, $parent_id, $when_finish, ret, $dbg, $rec_limit) crm_proces_usera_uzyty: [" . implode(', ', $crm_proces_usera_uzyty) . "]"  .'</p>'; }
 				// TODO: $ret_array będize mial tylko wartosci z ostatniego wyszukiwania
 				$ret_array = $this->find_in_tree_parent_rec_old($tree, $CHILD, 'recurs', $items_array, $dbg, $rec_limit);
@@ -608,13 +608,13 @@ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:
 		}
 		if (!empty($ret_array)) {
 			foreach ($ret_array as $proces_id) {
-				$ret []= $proces_id;
+				$ret[] = $proces_id;
 			}
 		}
 		if (!empty($crm_proces_usera_uzyty)) {
 			foreach ($crm_proces_usera_uzyty as $index => $proces_id) {
-				$find_in_tree_parent_rec_return []= $proces_id;
-				$ret []= $proces_id;
+				$find_in_tree_parent_rec_return[] = $proces_id;
+				$ret[] = $proces_id;
 			}
 		}
 		//kiedy jest ostatnia petla wyswietlamy wynik drzewa
@@ -637,7 +637,7 @@ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:
 					continue;
 				}
 
-				$ret_array []= $CHILD;
+				$ret_array[] = $CHILD;
 				if ($dbg) { echo '<p style="margin:0;">' . "-- find_in_tree_parent_rec(tree, $parent_id, ret, $dbg, $rec_limit) crm_proces_usera_uzyty: [" . implode(', ', $ret_array) . "]"  .'</p>'; }
 				// TODO: $ret_array będize mial tylko wartosci z ostatniego wyszukiwania
 				$this->find_in_tree_parent_rec($tree, $CHILD, $ret_array, $dbg, $rec_limit);

SE/se-lib/UserStorageDB.php

@@ -345,11 +345,11 @@ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:
 		$groups = array();
 
 		$sql_select = array();
-		$sql_select []= "z.`ID`";
-		$sql_select []= "z.`DESC`";
-		$sql_select []= "z.`TYPE`";
-		//$sql_select []= "z.`OPIS`";
-		$sql_select []= "z.`A_LDAP_GID`";
+		$sql_select[] = "z.`ID`";
+		$sql_select[] = "z.`DESC`";
+		$sql_select[] = "z.`TYPE`";
+		//$sql_select[] = "z.`OPIS`";
+		$sql_select[] = "z.`A_LDAP_GID`";
 
 		$sql_select = implode(', ', $sql_select);
 		$sql = "select {$sql_select}
@@ -503,15 +503,15 @@ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:
 		$profile = null;
 
 		$sql_select = array();
-		$sql_select []= "z.`ID`";
-		$sql_select []= "z.`DESC`";
-		$sql_select []= "z.`TYPE`";
-		//$sql_select []= "z.`OPIS`";
-		$sql_select []= "z.`A_LDAP_GID`";
-		$sql_select []= "up.`ID` as profileId";
-		$sql_select []= "up.`T_TELBOX_NEIGHBOUR_IN_ID` as localisationId";
-		$sql_select []= "a.`ADM_ACCOUNT` as usrLogin";
-		$sql_select []= "a.`ID` as usrId";
+		$sql_select[] = "z.`ID`";
+		$sql_select[] = "z.`DESC`";
+		$sql_select[] = "z.`TYPE`";
+		//$sql_select[] = "z.`OPIS`";
+		$sql_select[] = "z.`A_LDAP_GID`";
+		$sql_select[] = "up.`ID` as profileId";
+		$sql_select[] = "up.`T_TELBOX_NEIGHBOUR_IN_ID` as localisationId";
+		$sql_select[] = "a.`ADM_ACCOUNT` as usrLogin";
+		$sql_select[] = "a.`ID` as usrId";
 
 		$sql_select = implode(', ', $sql_select);
 		$sql = "select {$sql_select}
@@ -551,15 +551,15 @@ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:
 		$profiles = array();
 
 		$sql_select = array();
-		$sql_select []= "z.`ID`";
-		$sql_select []= "z.`DESC`";
-		$sql_select []= "z.`TYPE`";
-		//$sql_select []= "z.`OPIS`";
-		$sql_select []= "z.`A_LDAP_GID`";
-		$sql_select []= "up.`ID` as profileId";
-		$sql_select []= "up.`T_TELBOX_NEIGHBOUR_IN_ID` as localisationId";
-		$sql_select []= "a.`ADM_ACCOUNT` as usrLogin";
-		$sql_select []= "a.`ID` as usrId";
+		$sql_select[] = "z.`ID`";
+		$sql_select[] = "z.`DESC`";
+		$sql_select[] = "z.`TYPE`";
+		//$sql_select[] = "z.`OPIS`";
+		$sql_select[] = "z.`A_LDAP_GID`";
+		$sql_select[] = "up.`ID` as profileId";
+		$sql_select[] = "up.`T_TELBOX_NEIGHBOUR_IN_ID` as localisationId";
+		$sql_select[] = "a.`ADM_ACCOUNT` as usrLogin";
+		$sql_select[] = "a.`ID` as usrId";
 
 		$sql_select = implode(', ', $sql_select);
 		$sql = "select {$sql_select}

SE/se-lib/UsersHelper.php

@@ -4,28 +4,27 @@ Lib::loadClass('UsersLdapHelper');
 
 class UsersHelper {
 
-
-	public static function _parse_query( &$params ) {
+	public static function _parse_query(&$params) {
 		$sql_where = '';
 		//if (!empty($params)) {
 			$sql_where_and_arr = array();
-			$sql_where_and_arr []= "a.`A_STATUS` in('WAITING','NORMAL','MONITOR','WARNING')";
-			$sql_where_and_arr []= "a.`ADM_ADMIN_DESC`!='Kandydat'";
+			$sql_where_and_arr[] = "a.`A_STATUS` in('WAITING','NORMAL','MONITOR','WARNING')";
+			$sql_where_and_arr[] = "a.`ADM_ADMIN_DESC`!='Kandydat'";
 		//} else {
 		//	$sql_where = "1=1";
 		//}
 		if (isset($params['ADM_ADMIN_LEVEL'])) {
 			$adm_lvl = V::get('ADM_ADMIN_LEVEL', 0, $params, 'int');
-			$sql_where_and_arr []= "a.`ADM_ADMIN_LEVEL`='" . $adm_lvl . "'";
+			$sql_where_and_arr[] = "a.`ADM_ADMIN_LEVEL`='{$adm_lvl}'";
 		}
 		if (!empty($params['group'])) {
-			$sql_where_and_arr []= "(select up.`ID` 
+			$sql_where_and_arr[] = "(select up.`ID` 
 					from `CRM_AUTH_PROFILE` as up 
 					where
 						up.`REMOTE_TABLE`='ADMIN_USERS'
 						and up.`A_STATUS` in('WAITING', 'NORMAL')
 						and up.`REMOTE_ID`=a.`ID`
-						and up.`ID_ZASOB`='" . $params['group'] . "'
+						and up.`ID_ZASOB`='{$params['group']}'
 					limit 1 
 				)>0";
 		}
@@ -33,43 +32,43 @@ class UsersHelper {
 		return $sql_where;
 	}
 
-
-	public static function get_users_total( $params = array() ) {
+	public static function get_users_total($params = array()) {
 		$total = 0;
-		$sql_where = UsersHelper::_parse_query( $params );
+		$db = DB::getDB();
+		$sql_where = UsersHelper::_parse_query($params);
 		$sql = "select count(1) as cnt
 			from `ADMIN_USERS` as a
-			where ".$sql_where."
+			where {$sql_where}
 		";
-		$res = DB::query($sql);
-		if ($r = DB::fetch($res)) {
+		$res = $db->query($sql);
+		if ($r = $db->fetch($res)) {
 			$total = $r->cnt;
 		}
 		return $total;
 	}
 
-
-	public static function &get_users_list( $params = array(), $limit = 10, $limit_start = 0, $order_by = '', $order_dir = '' ) {
+	public static function &get_users_list($params = array(), $limit = 10, $limit_start = 0, $order_by = '', $order_dir = '') {
 		$ret = array();
 
-		$sql_where = UsersHelper::_parse_query( $params );
+		$sql_where = UsersHelper::_parse_query($params);
 		$sql_limit = "";
 		if ($limit > 0) {
-			$sql_limit = "limit " . $limit;
-			if ($limit_start > 0) $sql_limit .= " offset $limit_start";
+			$sql_limit = "limit {$limit}";
+			if ($limit_start > 0) $sql_limit .= " offset {$limit_start}";
 		}
 		$allowed_order_by = array();
-		$allowed_order_by []= 'ID';
-		$allowed_order_by []= 'ADM_NAME';
+		$allowed_order_by[] = 'ID';
+		$allowed_order_by[] = 'ADM_NAME';
 		$sql_order_by = "";
 		if (in_array($order_by, $allowed_order_by)) {
-			$sql_order_by .= " order by ".$order_by."";
+			$sql_order_by .= " order by {$order_by}";
 			if (in_array($order_dir, array('DESC','ASC'))) {
-				$sql_order_by .= " ".$order_dir;
+				$sql_order_by .= " {$order_dir}";
 			}
 		}
 
 		// 'WAITING','NORMAL','MONITOR','WARNING','OFF_SOFT','OFF_HARD','DELETED'
+		$db = DB::getDB();
 		$sql = "SELECT a.`ID`
 				, a.`A_STATUS`
 				, a.`ADM_ACCOUNT`
@@ -86,24 +85,24 @@ class UsersHelper {
 			from `ADMIN_USERS` as a
 			   left join CRM_AUTH_PROFILE as cp on (cp.REMOTE_TABLE='ADMIN_USERS' and cp.REMOTE_ID=a.ID)
 			   left join TELBOXES as tx on (tx.ID=cp.T_TELBOX_NEIGHBOUR_IN_ID)
-			where ".$sql_where."
+			where {$sql_where}
 			group by a.ID
-			".$sql_order_by."
-			".$sql_limit."
+			{$sql_order_by}
+			{$sql_limit}
 		";
-		$res = DB::query($sql);
-		while ($r = DB::fetch($res)) {
-			$ret [$r->ID] = $r;
+		$res = $db->query($sql);
+		while ($r = $db->fetch($res)) {
+			$ret[$r->ID] = $r;
 		}
 		return $ret;
 	}
 
-
 	public static function get_user_by_id( $id ) {
 		$ret = null;
 		if ($id <= 0) return $ret;
 
-		$sql_where = "a.`ID`='".$id."'";
+		$sql_where = "a.`ID`='{$id}'";
+		$db = DB::getDB();
 		$sql = "SELECT a.`ID`
 				, a.`A_STATUS`
 				, a.`ADM_ACCOUNT`
@@ -118,10 +117,10 @@ class UsersHelper {
 			from `ADMIN_USERS` as a
 				left join CRM_AUTH_PROFILE as cp on (cp.REMOTE_TABLE='ADMIN_USERS' and cp.REMOTE_ID=a.ID)
 				left join TELBOXES as tx on (tx.ID=cp.T_TELBOX_NEIGHBOUR_IN_ID)
-			where ".$sql_where."
+			where {$sql_where}
 		";
-		$res = DB::query($sql);
-		if ($r = DB::fetch($res)) {
+		$res = $db->query($sql);
+		if ($r = $db->fetch($res)) {
 			$ret = $r;
 		}
 		return $ret;
@@ -256,14 +255,15 @@ class UsersHelper {
 		static $_groups;
 		if (!$_groups) {
 			$_groups = array();
+			$db = DB::getDB();
 			$sql = "select z.`ID`, z.`DESC`, z.`OPIS`
 				from `CRM_LISTA_ZASOBOW` as z
 				where
 					z.`TYPE` in('STANOWISKO','PODMIOT')
 					order by z.`DESC`
 			";
-			$res = DB::query($sql);
-			while ($r = DB::fetch($res)) {
+			$res = $db->query($sql);
+			while ($r = $db->fetch($res)) {
 				$_groups[$r->ID] = $r;
 			}
 		}
@@ -274,29 +274,30 @@ class UsersHelper {
 		static $_groups;
 		if (!$_groups) {
 			$_groups = array();
+			$db = DB::getDB();
 			$sql = "select tx.`ID`, tx.`T_TELBOX_NAME`, tx.`T_TELBOX_TYPE` 
 				from `TELBOXES` as tx
 				where
 					tx.`A_STATUS`!='DELETED'
 				order by tx.`T_TELBOX_NAME`
 			";
-			$res = DB::query($sql);
-			while ($r = DB::fetch($res)) {
+			$res = $db->query($sql);
+			while ($r = $db->fetch($res)) {
 				$_groups[$r->ID] = $r;
 			}
 		}
 		return $_groups;
 	}
 
-
-	public static function add_groups_to_user_list( &$items ) {
+	public static function add_groups_to_user_list(&$items) {
 		if (empty($items)) return;
 		$user_list_id = array();
 		foreach ($items as $k_ind => $v_item) {
 			$items[$k_ind]->groups = array();
-			$user_list_id []= "'" . $v_item->ID . "'";
-		}//end foreach
+			$user_list_id[] = "'{$v_item->ID}'";
+		}
 		if (empty($user_list_id)) return;
+		$db = DB::getDB();
 		$sql = "select z.`ID`, z.`DESC`, z.`OPIS`
 				, up.`REMOTE_ID`
 			from `CRM_AUTH_PROFILE` as up
@@ -308,9 +309,9 @@ class UsersHelper {
 				and z.`ID` is not null
 				and z.`TYPE` in('STANOWISKO','PODMIOT')
 		";
-		$res = DB::query($sql);
-		while ($r = DB::fetch($res)) {
-			$items[$r->REMOTE_ID]->groups [$r->ID] = $r->DESC;//array('DESC'=>$r->DESC , 'OPIS'=>$r->OPIS);
+		$res = $db->query($sql);
+		while ($r = $db->fetch($res)) {
+			$items[$r->REMOTE_ID]->groups[$r->ID] = $r->DESC;//array('DESC'=>$r->DESC , 'OPIS'=>$r->OPIS);
 		}
 	}
 
@@ -344,10 +345,10 @@ class UsersHelper {
 			$sql_select = array();
 			$sql_left_join = "";
 
-			$sql_select []= "z.`ID`";
-			$sql_select []= "z.`DESC`";
-			$sql_select []= "z.`OPIS`";
-			$sql_select []= "z.`A_LDAP_GID`";
+			$sql_select[] = "z.`ID`";
+			$sql_select[] = "z.`DESC`";
+			$sql_select[] = "z.`OPIS`";
+			$sql_select[] = "z.`A_LDAP_GID`";
 
 			$telbox = V::get('T_TELBOX_NAME', 0, $params, 'int');
 			$SHOW_IN_PERIOD_MARK = V::get('SHOW_IN_PERIOD_MARK', 0, $params, 'string');
@@ -356,7 +357,7 @@ class UsersHelper {
 
 			if ($telbox > 0) {
 				$sql_left_join = "left join `TELBOXES` as tx on(tx.`ID`=up.`T_TELBOX_NEIGHBOUR_IN_ID`)";
-				$sql_select []= "tx.`T_TELBOX_NAME`";
+				$sql_select[] = "tx.`T_TELBOX_NAME`";
 			}
 			$sql_select_where_and="";
 			if (!empty($SHOW_IN_PERIOD_MARK)) {
@@ -443,14 +444,14 @@ class UsersHelper {
 		$sql_where = '';
 		//if (!empty($params)) {
 			$sql_where_and_arr = array();
-			$sql_where_and_arr []= "a.`A_STATUS` in('WAITING','NORMAL','MONITOR','WARNING')";
-			$sql_where_and_arr []= "a.`ADM_ADMIN_DESC`!='Kandydat'";
+			$sql_where_and_arr[] = "a.`A_STATUS` in('WAITING','NORMAL','MONITOR','WARNING')";
+			$sql_where_and_arr[] = "a.`ADM_ADMIN_DESC`!='Kandydat'";
 		//} else {
 		//	$sql_where = "1=1";
 		//}
 		if (isset($params['ADM_ADMIN_LEVEL'])) {
 			$adm_lvl = V::get('ADM_ADMIN_LEVEL', 0, $params, 'int');
-			$sql_where_and_arr []= "a.`ADM_ADMIN_LEVEL`='" . $adm_lvl . "'";
+			$sql_where_and_arr[] = "a.`ADM_ADMIN_LEVEL`='{$adm_lvl}'";
 		}
 		$sql_where = implode(" and ", $sql_where_and_arr);
 
@@ -470,14 +471,14 @@ class UsersHelper {
 			from `ADMIN_USERS` as a
 			   left join CRM_AUTH_PROFILE as cp on (cp.REMOTE_TABLE='ADMIN_USERS' and cp.REMOTE_ID=a.ID)
 			   left join TELBOXES as tx on (tx.ID=cp.T_TELBOX_NEIGHBOUR_IN_ID)
-			where ".$sql_where."
+			where {$sql_where}
 			group by a.ID
-			-- ".$sql_order_by."
-			-- ".$sql_limit."
+			-- {$sql_order_by}
+			-- {$sql_limit}
 		";
-		$res = DB::query($sql);
-		while ($r = DB::fetch($res)) {
-			$allGroups [$r->ID] = $r;
+		$res = $db->query($sql);
+		while ($r = $db->fetch($res)) {
+			$allGroups[$r->ID] = $r;
 		}
 		return $allGroups;
 	}

SE/se-lib/V.php

@@ -3,18 +3,18 @@
 /**
  * @see http://pl2.php.net/manual/en/book.var.php
  * 
- * Define Your own convert function: var func_type_convert_{$type}( $var );
+ * Define Your own convert function: var func_type_convert_{$type}($var);
  */
 class V {
 
 	/**
 	 * Get variable from array or object.
 	 */
-	public static function get( $name, $default, &$from, $type = '' ) {
+	public static function get($name, $default, &$from, $type = '') {
 		$ret = null;
 		if (is_array($from)) {
 			if (array_key_exists($name, $from)) {
-				$ret = $from[ $name ];
+				$ret = $from[$name];
 			}
 		}
 		else if (is_object($from)) {
@@ -24,7 +24,7 @@ class V {
 		}
 
 		if (isset($ret) && $type != '') {
-			$ret = V::convert( $ret, $type );
+			$ret = V::convert($ret, $type);
 		}
 
 		return (isset($ret))? $ret : $default;
@@ -33,10 +33,10 @@ class V {
 	/**
 	 * Convert variable type.
 	 */
-	public static function convert( &$from, $type = 'string' ) {
-		$type = strtolower( $type );
+	public static function convert(&$from, $type = 'string') {
+		$type = strtolower($type);
 
-		// is_scalar( $from ) - return TRUE if int,float,string,bool, FALSE if array,object,resource, ...
+		// is_scalar($from) - return TRUE if int,float,string,bool, FALSE if array,object,resource, ...
 
 		$ret = null;
 		switch ($type) {
@@ -84,7 +84,7 @@ class V {
 					settype($arr, $type);
 					foreach ($arr as $v) {
 						$v = V::convert($v,'int');
-						$ret []= $v;
+						$ret[] = $v;
 					}
 				}
 				break;
@@ -96,7 +96,7 @@ class V {
 					foreach ($arr as $v) {
 						$v = V::convert($v,'int');
 						if ($v <= 0) continue;
-						$ret []= $v;
+						$ret[] = $v;
 					}
 				}
 				break;
@@ -106,15 +106,15 @@ class V {
 					$arr = $from;
 					settype($arr, $type);
 					foreach ($arr as $v) {
-						$v = V::convert($v,'float');
-						$ret []= $v;
+						$v = V::convert($v, 'float');
+						$ret[] = $v;
 					}
 				}
 				break;
 			default:
 				$fun = 'func_type_convert_'.$type;
-				if ( function_exists($fun) ) {
-					$ret = $fun( $from );
+				if (function_exists($fun)) {
+					$ret = $fun($from);
 				}
 				break;
 		}
@@ -124,28 +124,28 @@ class V {
 	/**
 	 * Merge the contents of two objects/array.
 	 * 
-	 * array V::extend( mixed $defaults, mixed $params );
+	 * array V::extend(mixed $defaults, mixed $params);
 	 * @see http://api.jquery.com/jQuery.extend/
-	 * is_scalar( $from ) - return TRUE if int,float,string,bool, FALSE if array,object,resource, ...
+	 * is_scalar($from) - return TRUE if int,float,string,bool, FALSE if array,object,resource, ...
 	 */
-	public static function extend( $defaults, $params ) {
+	public static function extend($defaults, $params) {
 		$ret = array();
 		$d = (is_array($defaults))? $defaults : (array)$defaults;
 		$p = (is_array($params))? $params : (array)$params;
 		foreach ($d as $k => $v) {
-			$ret [$k] = $v;
+			$ret[$k] = $v;
 		}
 		foreach ($p as $k => $v) {
 			if (array_key_exists($k, $ret) && (is_array($ret[$k]) || is_object($ret[$k])) && (is_array($v) || is_object($v))) {
-				$ret [$k] = V::extend( $ret[$k], $v );
+				$ret[$k] = V::extend($ret[$k], $v);
 			} else {
-				$ret [$k] = $v;
+				$ret[$k] = $v;
 			}
 		}
 		return $ret;
 	}
 
-	public static function json_encode_latin2( $o, $force_object = false ) {
+	public static function json_encode_latin2($o, $force_object = false) {
 		if ($o === '') {
 			return '""';
 		}
@@ -156,14 +156,14 @@ class V {
 			$arr = '';
 			if ($force_object) {
 				foreach ($o as $k => $v) {
-					$arr []= '"'.$k.'":'.V::json_encode_latin2($v, $force_object);
+					$arr[] = '"'.$k.'":'.V::json_encode_latin2($v, $force_object);
 				}
 				return '{'.implode(',',$arr).'}';
 			}
 			else {
 				foreach ($o as $k => $v) {
-					if (is_string($k)) $arr []= '"'.$k.'":'.V::json_encode_latin2($v, $force_object);
-					else $arr []= V::json_encode_latin2($v);
+					if (is_string($k)) $arr[] = '"'.$k.'":'.V::json_encode_latin2($v, $force_object);
+					else $arr[] = V::json_encode_latin2($v);
 				}
 				return '['.implode(',',$arr).']';
 			}
@@ -171,7 +171,7 @@ class V {
 		else if (is_object($o)) {
 			$arr = '';
 			foreach (get_object_vars($o) as $k => $v) {
-				$arr []= '"'.$k.'":'.V::json_encode_latin2($v, $force_object);
+				$arr[] = '"'.$k.'":'.V::json_encode_latin2($v, $force_object);
 			}
 			return '{'.implode(',',$arr).'}';
 		}
@@ -186,7 +186,7 @@ class V {
 		}
 	}
 
-	public static function copy( $o ) {
+	public static function copy($o) {
 		$null = null;
 		if (!$o) {
 			return $null;
@@ -194,7 +194,7 @@ class V {
 		else if (is_array($o)) {
 			$ret = array();
 			foreach ($o as $k => $v) {
-				$ret [$k] = $v;
+				$ret[$k] = $v;
 			}
 			return $ret;
 		}
@@ -211,7 +211,7 @@ class V {
 		}
 	}
 
-	public static function make_link( $prefix = '', $params = array() ) {
+	public static function make_link($prefix = '', $params = array()) {
 		$ret = '';
 		if ($prefix) {
 			$ret = $prefix;
@@ -219,7 +219,7 @@ class V {
 		if (!empty($params)) {
 			$ret_arr = array();
 			foreach ($params as $k => $v) {
-				$ret_arr []= $k . "=" . $v;
+				$ret_arr[] = $k . "=" . $v;
 			}
 			$ret .= "?" . implode("&", $ret_arr);
 		}

SE/se-lib/WebdavCache.php

@@ -183,7 +183,7 @@ class WebdavCache {
 				list($fileID, $tmp) = explode('.', $fileParts[1], 2);
 			}
 			if ($fileID > 0) {
-				$_SESSION['WebdavCache']['_pisma_all'][$fileID] []= array('name'=>$fileParts[1], 'realpath'=>$file,'K_TYP_KORESP'=>$fileParts[0]);
+				$_SESSION['WebdavCache']['_pisma_all'][$fileID][] = array('name'=>$fileParts[1], 'realpath'=>$file,'K_TYP_KORESP'=>$fileParts[0]);
 			}
 		}
 		myLog(__CLASS__, __FUNCTION__, __LINE__, " glob end count(".count($files).") _pisma_all(".count($_SESSION['WebdavCache']['_pisma_all']).") ");
@@ -191,7 +191,7 @@ class WebdavCache {
 
 	function setPismaByIds($projektID, $pismaIds) {
 		self::_cacheFileInitPisma();
-		//$_SESSION['WebdavCache']['_pisma_all'][$fileID] []= array('realpath'=>$file, 'K_TYP_KORESP'=>$fileParts[0]);
+		//$_SESSION['WebdavCache']['_pisma_all'][$fileID][] = array('realpath'=>$file, 'K_TYP_KORESP'=>$fileParts[0]);
 		if (empty($pismaIds)) {
 			return;
 		}

SE/se-lib/WebdavHelper.php

@@ -212,7 +212,7 @@ class WebdavHelper {
 						// TODO: add $file->virtual_dirs - PROJEKT.{$ID}/ <-- get creator projekt ID from DB
 						$projektyIds = WebdavHelper::getProjektyIdsByDruk($druk_id, $user);
 						foreach ($projektyIds as $projektID) {
-							$file->virtual_dirs []= "PROJEKT.{$projektID}";
+							$file->virtual_dirs[] = "PROJEKT.{$projektID}";
 						}
 					}
 
@@ -236,11 +236,11 @@ class WebdavHelper {
 
 					if ($projekt_id > 0) {
 						$file->perms = 'RWXC';
-						$file->virtual_dirs []= "PISMA";
+						$file->virtual_dirs[] = "PISMA";
 
 						$druki = self::getDrukiIdsByProjekt($pathObj->_projekt_id);
 						foreach ($druki as $druk_id) {
-							$file->virtual_dirs []= "DRUK.{$druk_id}";
+							$file->virtual_dirs[] = "DRUK.{$druk_id}";
 						}
 					}
 
@@ -308,7 +308,7 @@ class WebdavHelper {
 						if (!empty($pismaIds)) {
 							$pismaFiles = self::findRealPaths('PISMA', $pismaIds);
 							foreach ($pismaFiles as $pismoFile) {
-								$file->virtual_files []= end(explode('/', $pismoFile));
+								$file->virtual_files[] = end(explode('/', $pismoFile));
 							}
 							$file->is_dir = true;
 							$file->prevent_scandir = true;
@@ -320,7 +320,7 @@ class WebdavHelper {
 							$pismo_file = self::findRealPath('PISMO', $pathObj->_pismo_id);
 							//myLog(__CLASS__, __FUNCTION__, __LINE__, "PISMO {$pismo_file}...");
 							//$file->realpath = $pismo_file;
-							$file->virtual_files []= end(explode('/', $pismo_file));
+							$file->virtual_files[] = end(explode('/', $pismo_file));
 							$file->prevent_scandir = true;
 						}
 					}
@@ -442,7 +442,7 @@ class WebdavHelper {
 					continue;
 				}
 				$file = reset($files);
-				$foundFiles []= $file;
+				$foundFiles[] = $file;
 			}
 		}
 		return $foundFiles;