Merge branch 'master' of biuro.biall-net.pl:plabudda/se

SE/se-lib/PokazOfertyView.php

@@ -469,6 +469,7 @@ jQuery(document).ready(function(){
 									echo '<th>' . "ID_OFFERS" . '</th>';
 									echo '<th>' . "description" . '</th>';
 									echo '<th>' . "parametry (ses_x_a)" . '</th>';
+									echo '<th>' . "dodatkowe (extra_srv.)" . '</th>';
 									echo '<th>' . "T WHEN CONNECTED" . '</th>';
 									echo '<th>' . "STATUS" . '</th>';
 									echo '<th>' . "HANGUP" . '</th>';
@@ -546,6 +547,18 @@ jQuery(document).ready(function(){
 													}
 												}
 											echo '</td>';
+											echo '<td>';
+												$dodatkowe = V::get($k_srv_id, null, $v_deal->extra_services);
+												if (!empty($dodatkowe)) {
+													$dodatkoweOut = array();
+													foreach ($dodatkowe as $esrvKey => $esrv) {
+														$dodatkoweOut[] = "{$esrv->E_SERVICE},{$esrv->E_S_V}";
+													}
+													if (!empty($dodatkoweOut)) {
+														echo implode('<br>', $dodatkoweOut);
+													}
+												}
+											echo '</td>';
 											echo '<td>';
 												if ($ses_x_a) {
 													echo $ses_x_a->T_WHEN_CONNECTED;

SE/superedit-POKAZ_OFERTY_AKTUALNE_FUNC.php

@@ -1044,6 +1044,28 @@ body {font:11px helvetica, arial;}
 		$active_deals_by_id = PokazOfertyHelper::get_deals_active_by_user($user->ID_BILLING_USERS, false);
 		if(V::get('DBG',0,$_GET)){echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;display:none">active_deals_by_id (F.' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($active_deals_by_id);echo'</pre>';}
 
+		foreach ($active_deals_by_id as $v_deal_ind => $v_deal) {
+			$esrv_rows = array();
+			$db = DB::getDB();
+			$sql_srv_ids = array();
+			if (!empty($v_deal->services_by_id)) {
+				$sql_srv_ids = array_keys($v_deal->services_by_id);
+			}
+			if (!empty($sql_srv_ids)) {
+				$sql_srv_ids = implode(",", $sql_srv_ids);
+				$sql = "select e.`ID`, e.`ID_SERVICES`, e.`E_SERVICE`, e.`E_S_V`
+					from `EXTRA_SERVICES` as e
+					where e.`ID_SERVICES` in({$sql_srv_ids})
+				";
+				$res = $db->query($sql);
+				while ($r = $db->fetch($res)) {
+					$esrv_rows[$r->ID_SERVICES][] = $r;
+				}
+			}
+			$active_deals_by_id[$v_deal_ind]->extra_services = $esrv_rows;
+		}
+		if(V::get('DBG',0,$_GET)){echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left">active_deals_by_id (F.' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($active_deals_by_id);echo'</pre>';}
+
 		$pokaz_oferty_view = new PokazOfertyView();
 		echo $pokaz_oferty_view->print_css();
 		$pokaz_oferty_view->user_with_services($user, $active_deals_by_id);

SE/superedit-ZLECENIE.php

@@ -1,13 +1,10 @@
 <?php
 
-function iso2utf($s) {
-	return iconv("iso-8859-2","utf8",$s);
-}
-
-function KONFIGURACJA($SES_A) {
+function ZLECENIE_KONFIGURACJA($SES_A) {
+	$db = DB::getDB();
 	$query="select c.*,bo.name1 as OPERATOR from COMPANIES c join BILLING_OWNER bo on c.BILLING_OWNER=bo.ID where c.ID='".$SES_A['ID_BILLING_USERS']."'";
-	$result=DB::query($query);
-	$COMPANIES=DB::fetch($result) or die("Error 2");
+	$result=$db->query($query);
+	$COMPANIES=$db->fetch($result) or die("Error 2");
 
 	if ($SES_A['S_IP']=="") $SES_A['S_IP']="<b>Nie przydzielono adresu IP!</b>";
 	else {
@@ -19,8 +16,8 @@ function KONFIGURACJA($SES_A) {
 		$BUDYNEK_MIESZKANIE=substr($SES_A['S_ADDRESS_STREET'],strlen($ULICA[0]));
 		if (preg_match("/^[[:digit:]]*/",$BUDYNEK_MIESZKANIE,$BUDYNEK)) {
 			$query="select * from BUILDINGS where S_ADDRESS_STREET like '".$ULICA[0].$BUDYNEK[0]."%' limit 1";
-			$result=DB::query($query);
-			if ($BUILDINGS=DB::fetch($result)) {
+			$result=$db->query($query);
+			if ($BUILDINGS=$db->fetch($result)) {
 				$ADRES=$BUILDINGS->S_ADDRESS_CITY.", ". preg_replace("/[[:digit:]].*/","",$BUILDINGS->S_ADDRESS_STREET_FULL)." ".$BUDYNEK_MIESZKANIE;
 			}
 		}
@@ -40,40 +37,40 @@ function KONFIGURACJA($SES_A) {
 	$PUBLICZNY_ADRES_IP=$STATUSY[$SES_A['S_PUBLIC_IP']];
 	$PRZEKIEROWANIE_PORTOW=$STATUSY[$SES_A['S_E_PORT_1293']];
 
-	if ($PODZIAL_LACZA=="Nie" && $DZIERZAWA_ROUTERA=="Tak") $PODZIAL_LACZA.=iso2utf(" <b>(Jest dzier¿awa routera, a nie ma podzia³u ³±cza!)</b>");
+	if ($PODZIAL_LACZA=="Nie" && $DZIERZAWA_ROUTERA=="Tak") $PODZIAL_LACZA.= " <b>(Jest dzierżawa routera, a nie ma podziału łącza!)</b>";
 
 	$query="select * from EXTRA_SERVICES where ID_SERVICES='".$SES_A['ID_SERVICES']."' and E_SERVICE='E_NAT_IP' and T_NETWORK_SERVER='".$SES_A['T_NETWORK_SERVER']."'";
-	$result=DB::query($query);
-	if (!DB::num_rows($result)) {
+	$result=$db->query($query);
+	if (!$db->num_rows($result)) {
 		if ($PUBLICZNY_ADRES_IP=="Tak") $PUBLICZNY_ADRES_IP.=" <b>(Nie przydzielono!)</b>";
 		elseif ($PUBLICZNY_ADRES_IP=="Nie wiadomo") $PUBLICZNY_ADRES_IP="Nie";
 	}
-	elseif (DB::num_rows($result)>1) {
+	elseif ($db->num_rows($result)>1) {
 		if ($PUBLICZNY_ADRES_IP=="Nie wiadomo") $PUBLICZNY_ADRES_IP="Tak";
-		$PUBLICZNY_ADRES_IP.=iso2utf(" <b>(Przydzielono wiêcej ni¿ jeden adres IP!)</b>");
+		$PUBLICZNY_ADRES_IP.= " <b>(Przydzielono więcej niż jeden adres IP!)</b>";
 	}
 	else {
-		$EXTRA_SERVICES=DB::fetch($result);
+		$EXTRA_SERVICES=$db->fetch($result);
 		if ($PUBLICZNY_ADRES_IP=="Nie wiadomo") $PUBLICZNY_ADRES_IP="Tak";
 		if ($PUBLICZNY_ADRES_IP=="Tak") $PUBLICZNY_ADRES_IP.=" (".$EXTRA_SERVICES->E_S_V.")";
 		else $PUBLICZNY_ADRES_IP.=" <b>(A jest przydzielony adres IP ".$EXTRA_SERVICES->E_S_V."!)";
 	}
 
 	$query="select * from EXTRA_SERVICES where ID_SERVICES='".$SES_A['ID_SERVICES']."' and E_SERVICE='E_PORT' and T_NETWORK_SERVER='".$SES_A['T_NETWORK_SERVER']."'";
-	$result=DB::query($query);
-	if (!DB::num_rows($result)) {
-		if ($PRZEKIEROWANIE_PORTOW=="Tak") $PRZEKIEROWANIE_PORTOW.=iso2utf(" <b>(Nie przekierowano ¿adnych portów!)</b>");
+	$result=$db->query($query);
+	if (!$db->num_rows($result)) {
+		if ($PRZEKIEROWANIE_PORTOW=="Tak") $PRZEKIEROWANIE_PORTOW.= " <b>(Nie przekierowano żadnych portów!)</b>";
 		elseif ($PRZEKIEROWANIE_PORTOW=="Nie wiadomo") $PRZEKIEROWANIE_PORTOW="Nie";
 	}
 	else {
-		while ($EXTRA_SERVICES=DB::fetch($result)) {
+		while ($EXTRA_SERVICES=$db->fetch($result)) {
 			if ($EXTRA_SERVICES->E_S_V=="TCP_UDP") $PORTY_a[]=$EXTRA_SERVICES->E_S_V2;
 			elseif ($EXTRA_SERVICES->E_S_V=="TCP_UDP_RANGE") $PORTY_a[]=$EXTRA_SERVICES->E_S_V2."-".$EXTRA_SERVICES->E_S_V3;
 		}
 		$PORTY=implode(",",$PORTY_a);
 		if ($PRZEKIEROWANIE_PORTOW=="Nie wiadomo") $PRZEKIEROWANIE_PORTOW="Tak";
 		if ($PRZEKIEROWANIE_PORTOW=="Tak") $PRZEKIEROWANIE_PORTOW.=" (".$PORTY.")";
-		else $PRZEKIEROWANIE_PORTOW.=iso2utf(" <b>(A s± przekierowano porty ".$PORTY."!)</b>");
+		else $PRZEKIEROWANIE_PORTOW.= " <b>(A sÄ… przekierowano porty ".$PORTY."!)</b>";
 	}
 
 	echo "
@@ -86,33 +83,33 @@ function KONFIGURACJA($SES_A) {
 		<tr><td colspan=2><h4>".$COMPANIES->OPERATOR."<h4><hr></td></tr>
 		<tr><td>Abonent:</td><td>".$COMPANIES->P_NAME." ".$COMPANIES->P_NAME_SECOND."</td></tr>
 		<tr><td>Adres instalacji:</td><td>".$ADRES."</td></tr>
-		<tr><td>".iso2utf("ID us³ugi:")."</td><td>".$SES_A['ID_SERVICES']."</td></tr>
-		<tr><td colspan=2><br>".iso2utf("Parametry us³ugi dostêpu do Internetu:")."</td></tr>
-		<tr><td>".iso2utf("Prêdko¶æ pobierania:")."</td><td>".$DOWNLOAD."</td></tr>
-		<tr><td>".iso2utf("Prêdko¶æ wysy³ania:")."</td><td>".$UPLOAD."</td></tr>
-		<tr><td>".iso2utf("Podzia³ ³±cza:")."</td><td>".$PODZIAL_LACZA."</td></tr>
-		<tr><td>".iso2utf("Dzier¿awa routera:")."</td><td>".$DZIERZAWA_ROUTERA."</td></tr>
-		<tr><td>".iso2utf("Publiczny adres IP:")."</td><td>".$PUBLICZNY_ADRES_IP."</td></tr>
-		<tr><td>".iso2utf("Przekierowanie portów:")."</td><td>".$PRZEKIEROWANIE_PORTOW."</td></tr>
-		<tr><td colspan=2><br>Konfiguracja protoko".iso2utf("³")."u TCP/IP:</td></tr>
+		<tr><td>ID usługi:</td><td>".$SES_A['ID_SERVICES']."</td></tr>
+		<tr><td colspan=2><br>Parametry usługi dostępu do Internetu:</td></tr>
+		<tr><td>Prędkość pobierania:</td><td>".$DOWNLOAD."</td></tr>
+		<tr><td>Prędkość wysyłania:</td><td>".$UPLOAD."</td></tr>
+		<tr><td>Podział łącza:</td><td>".$PODZIAL_LACZA."</td></tr>
+		<tr><td>Dzierżawa routera:</td><td>".$DZIERZAWA_ROUTERA."</td></tr>
+		<tr><td>Publiczny adres IP:</td><td>".$PUBLICZNY_ADRES_IP."</td></tr>
+		<tr><td>Przekierowanie portów:</td><td>".$PRZEKIEROWANIE_PORTOW."</td></tr>
+		<tr><td colspan=2><br>Konfiguracja protokołu TCP/IP:</td></tr>
 		<tr><td>Adres IP:</td><td>".$SES_A['S_IP']."</td></tr>
 		<tr><td>Maska podsieci:</td><td>".$SUBNET_MASK."</td></tr>
-		<tr><td>Brama domy".iso2utf("¶")."lna:</td><td>".$GATEWAY."</td></tr>
+		<tr><td>Brama domyślna:</td><td>".$GATEWAY."</td></tr>
 		<tr><td>Preferowany serwer DNS:</td><td>".$GATEWAY."</td></tr>
 		<td><td colspan=2></td></tr>
 		<tr><td>Zarejestrowany adres fizyczny (MAC):</td><td>
 	";
-	if ($_GET['action']=="se-detect") {
-		if ($SES_A['S_HWSTAT']=="FIXED") {
+	if (V::get('action', '', $_GET) == "se-detect") {
+		if ($SES_A['S_HWSTAT'] == "FIXED") {
 			$result=file_get_contents("http://se.dev.webone.pl/odblokuj.php?action=se-detect&komp=".$SES_A['S_IP']."&ADM_ACCOUNT=".$_SESSION['ADM_ACCOUNT']);
 			$result_a=explode("\n",$result);
 			if ($result_a[0]=="OK") $SES_A['S_HWSTAT']="DETECT";
 			else $result_a[0].=" (".$result_a[1].")";
-		} else $result_a[0]=iso2utf("ERROR (adres MAC ju¿ wcze¶niej zosta³ odblokowany!)");
+		} else $result_a[0]= "ERROR (adres MAC już wcześniej został odblokowany!)";
 	}
 	if ($SES_A['S_HWSTAT']=="FIXED") echo $SES_A['S_HW']." <span class=\"noPrint\">(<a href=\"".$_SERVER['REQUEST_URI']."&action=se-detect\">odblokuj</a>)</span>";
 	else echo "odblokowany";
-	if ($_GET['action']=="se-detect") echo "</td><tr><tr class=\"noPrint\"><td>Wynik odblokowania:</td><td>".$result_a[0];
+	if (V::get('action', '', $_GET) == "se-detect") echo "</td><tr><tr class=\"noPrint\"><td>Wynik odblokowania:</td><td>".$result_a[0];
 #echo "<pre>";
 #print_r($_SESSION);
 #echo "</pre>";
@@ -120,20 +117,21 @@ function KONFIGURACJA($SES_A) {
 }
 
 function ZLECENIE() {
-	$TYP_ZLECENIA=$_GET['TYP_ZLECENIA'];
-	$ID_SERVICES=$_GET['ID_SERVICES'];
+	$TYP_ZLECENIA = V::get('TYP_ZLECENIA', '', $_GET);
+	$ID_SERVICES = V::get('ID_SERVICES', '', $_GET);
+	$db = DB::getDB();
 
 	$query="select NAME_LIST_SERVICES from SERVICES where ID='".$ID_SERVICES."';";
-	$result=DB::query($query);
-	$row=DB::fetch($result) or die('Error 0');
+	$result=$db->query($query);
+	$row=$db->fetch($result) or die('Error 0');
 	$NAME_LIST_SERVICES=$row->NAME_LIST_SERVICES;
 
 	$query="select * from SES_".$NAME_LIST_SERVICES."_A where ID_SERVICES='".$ID_SERVICES."';";
-	$result=DB::query($query);
-	$SES_A=DB::fetch_array($result) or die('Error 1');
+	$result=$db->query($query);
+	$SES_A=$db->fetch_array($result) or die('Error 1');
 
 	if ($TYP_ZLECENIA=="KONFIGURACJA" && $NAME_LIST_SERVICES == "USERS2") {
-		KONFIGURACJA($SES_A);
+		ZLECENIE_KONFIGURACJA($SES_A);
 		exit();
 	}
 
@@ -145,12 +143,12 @@ function ZLECENIE() {
 
 	while (($A_DB_TELBOX_TRACE_PATH_GO == 'GO') && ($WHILECNT < 50)) {
 		$query = "select T_TELBOX_NEIGHBOUR_IN from TELBOXES where T_TELBOX_NAME='$UNTIL1' ORDER BY ID limit 0,1 ";
-		$result=DB::query($query) or die("Error 2");
-		while ($h = DB::fetch_row($result)) {
+		$result=$db->query($query) or die("Error 2");
+		while ($h = $db->fetch_row($result)) {
 			$WHILECNT++;
 			$UNTIL1 = $h[0];
 		}
-		if (DB::num_rows($result) == 0) {
+		if ($db->num_rows($result) == 0) {
 			$A_DB_TELBOX_TRACE_PATH_GO = "STOP";
 		} else {
 			$A_DB_TELBOX_TRACE_PATH = $A_DB_TELBOX_TRACE_PATH . " " . $UNTIL1;
@@ -163,74 +161,74 @@ function ZLECENIE() {
 		} else {
 			$query="select '<b>',S_ADDRESS_STREET,'</b> ',A_STATUS,' <b> ',A_PROBLEM,'</b> ',A_PROBLEM_DESC,'<br> ' from SES_".$NAME_LIST_SERVICES."_A where T_TELBOX_ADDRESS='" . $SES_A['T_TELBOX_ADDRESS'] . "' and A_ADM_COMPANY like '" . $_SESSION['ADM_COMPANY'] . "' ORDER BY ID ;";
 		}
-		$result=DB::query($query);
-		while ($h = DB::fetch_row($result)) {
+		$result=$db->query($query);
+		while ($h = $db->fetch_row($result)) {
 			foreach ($h as $value) {
 				$MAKE_ORDERER_TELBOX_USERS_LIST = $MAKE_ORDERER_TELBOX_USERS_LIST . " $value";
 			}
 		}
 
 		$query = "select ID from SES_".$NAME_LIST_SERVICES."_A where T_TELBOX_ADDRESS='".$SES_A['T_TELBOX_ADDRESS']."' and ( A_STATUS='NORMAL' or A_STATUS='WARNING' or  A_STATUS='OFF_SOFT' or A_STATUS='MONITOR' ) and A_ADM_COMPANY like '".$_SESSION['ADM_COMPANY']."' ORDER BY ID ;";
-		$result=DB::query($query);
-		$MAKE_ORDERER_TELBOX_USERS = DB::num_rows($result);
+		$result=$db->query($query);
+		$MAKE_ORDERER_TELBOX_USERS = $db->num_rows($result);
 		$MAKE_ORDERER_TELBOX_USERS="( <b>$MAKE_ORDERER_TELBOX_USERS</b> aktywnych )";
 
 		$query = "select T_TELBOX_NAME,' | ' from TELBOXES where T_TELBOX_NEIGHBOUR_IN='".$SES_A['T_TELBOX_ADDRESS']."' and A_ADM_COMPANY like '".$_SESSION['ADM_COMPANY']."' ORDER BY T_TELBOX_NAME ";
-		$result=DB::query($query);
-		while ($h = DB::fetch_row($result)) {
+		$result=$db->query($query);
+		while ($h = $db->fetch_row($result)) {
 			foreach ($h as $value) {
 				$MAKE_ORDERER_TELBOX_MAGISTRAL = $MAKE_ORDERER_TELBOX_MAGISTRAL . " $value";
 			}
 		}
-		$MAKE_ORDERER_TELBOX_MAGISTRAL_OUT_COUNT = DB::num_rows($result);
+		$MAKE_ORDERER_TELBOX_MAGISTRAL_OUT_COUNT = $db->num_rows($result);
 
 		//PATCH 2003-09-30 for BUILDINGS
 		$query="select '<b>',t1.S_ADDRESS_STREET,'</b> | ',t1.A_STATUS,t1.S_ADMIN_NAME,t1.P_ADMIN_NAME from BUILDINGS as t1, TELBOXES as t2 where t2.T_TELBOX_NAME='".$SES_A['T_TELBOX_ADDRESS']."' and t1.S_ADDRESS_STREET = t2.T_TELBOX_BUILDING_IN and t1.A_ADM_COMPANY like '".$_SESSION['ADM_COMPANY']."' ORDER BY t1.S_ADDRESS_STREET ";
-		$result=DB::query($query);
-		while ($h = DB::fetch_row($result)) {
+		$result=$db->query($query);
+		while ($h = $db->fetch_row($result)) {
 			foreach ($h as $value) {
 				$MAKE_ORDERER_BUILDING_INFO = $MAKE_ORDERER_BUILDING_INFO . " $value";
 			}
 		}
-		$MAKE_ORDERER_BUILDING_INFO_COUNT = DB::num_rows($result);
+		$MAKE_ORDERER_BUILDING_INFO_COUNT = $db->num_rows($result);
 
 		$query = "select t1.B_INVENTORY_DATE from BUILDINGS as t1, TELBOXES as t2 where t2.T_TELBOX_NAME='".$SES_A['T_TELBOX_ADDRESS']."' and t1.S_ADDRESS_STREET = t2.T_TELBOX_BUILDING_IN and t1.A_ADM_COMPANY like '".$_SESSION['ADM_COMPANY']."' ORDER BY t1.S_ADDRESS_STREET ";
-		$result=DB::query($query);
-		while ($h = DB::fetch_row($result)) {
+		$result=$db->query($query);
+		while ($h = $db->fetch_row($result)) {
 			$MAKE_ORDERER_BUILDING_INVENTORY_DATE = $h[0];
 		}
 		//EOF BUILDING PATCH
 
 		$query = "select T_TELBOX_NEIGHBOUR_IN,' | ' from TELBOXES where T_TELBOX_NAME='".$SES_A['T_TELBOX_ADDRESS']."' and A_ADM_COMPANY like '".$_SESSION['ADM_COMPANY']."' ORDER BY T_TELBOX_NAME ";
-		$result=DB::query($query);
-		while ($h = DB::fetch_row($result)) {
+		$result=$db->query($query);
+		while ($h = $db->fetch_row($result)) {
 			foreach ($h as $value) {
 				$MAKE_ORDERER_TELBOX_MAGISTRAL_IN  = $MAKE_ORDERER_TELBOX_MAGISTRAL_IN . " $value";
 			}
 		}
 
 		$query = "select ID from SES_".$NAME_LIST_SERVICES."_A where T_TELBOX_ADDRESS='".$SES_A['T_TELBOX_ADDRESS']."' and ( A_STATUS='NORMAL' or A_STATUS='WARNING' or A_STATUS='OFF_SOFT' or A_STATUS='MONITOR' ) and A_ADM_COMPANY like '".$_SESSION['ADM_COMPANY']."' ORDER BY ID ;";
-		$result=DB::query($query);
-		$MAKE_ORDERER_TELBOX_USERS_COUNT = DB::num_rows($result);
+		$result=$db->query($query);
+		$MAKE_ORDERER_TELBOX_USERS_COUNT = $db->num_rows($result);
 
 		$query="select '<b>',T_DEVICE_TYPE,T_PRODUCER,'</b>(',T_DEVICE_PORTS_OK,')<b>',A_STATUS,A_STATUS_INFO,A_PROBLEM,'</b><font size=-2>',A_PROBLEM_DESC,S_ADDRESS_STREET,T_DEVICE_POWER,T_DEVICE_INFO,'Awar:',T_WORKPOINTS,'gwar.',T_GUARRANTY_EXPIRE,'</font><br>' from DEVICES where T_TELBOX_NEIGHBOUR_IN='".$SES_A['T_TELBOX_ADDRESS']."' and A_ADM_COMPANY like '".$_SESSION['ADM_COMPANY']."' ORDER BY ID ;";
-		$result=DB::query($query);
-		while ($h = DB::fetch_row($result)) {
+		$result=$db->query($query);
+		while ($h = $db->fetch_row($result)) {
 			foreach ($h as $value) {
 				$MAKE_ORDERER_DEVICES_LIST  = $MAKE_ORDERER_DEVICES_LIST . " $value";
 			}
 		}
-		$MAKE_ORDERER_DEVICES_COUNT = DB::num_rows($result);
+		$MAKE_ORDERER_DEVICES_COUNT = $db->num_rows($result);
 
 		$query = "select sum(T_DEVICE_PORTS_OK) from DEVICES where T_TELBOX_NEIGHBOUR_IN='".$SES_A['T_TELBOX_ADDRESS']."' and A_ADM_COMPANY like '".$_SESSION['ADM_COMPANY']."' ORDER BY ID ;";
-		$result=DB::query($query);
-		while ($h = DB::fetch_row($result)) {
+		$result=$db->query($query);
+		while ($h = $db->fetch_row($result)) {
 			$MAKE_ORDERER_DEVICES_PORTS = $h[0];
 		}
 
 		$query = "select '&nbsp; <b>',T_TELBOX_NAME,'</b> &nbsp;&nbsp;','STATUS:<b>', A_STATUS,'</b>(', A_STATUS_INFO, ') <br>Problemy:<b>', A_PROBLEM,'</b>(',A_PROBLEM_DESC,A_PROBLEM_DATE,')Termin_usuniecia:',S_OTHER_INFO, '<BR>Adresy:<b>',S_ADDRESS_CITY,S_ADDRESS_POST_CODE,S_ADDRESS_POST_OFFICE,S_ADDRESS_STREET,S_ADDRESS_HOUSE,'</b><br> Typ:<b>',T_TELBOX_TYPE,'</b><br>Zamkniecie:<b>',T_TELBOX_SAVE,'</b><br>Zasilanie:<b>',T_TELBOX_POWER,'</b><br>Inne inf: ',T_NETWORK_SERVER,'Instalowal:',T_WHO_CONNECTED,T_WHEN_CONNECTED from TELBOXES where T_TELBOX_NAME='".$SES_A['T_TELBOX_ADDRESS']."' and A_ADM_COMPANY like '".$_SESSION['ADM_COMPANY']."' ORDER BY ID limit 0,1 ;";
-		$result=DB::query($query);
-		while ($h = DB::fetch_row($result)) {
+		$result=$db->query($query);
+		while ($h = $db->fetch_row($result)) {
 			foreach ($h as $value) {
 				$MAKE_ORDERER_DEVICE_TELBOX_INFO = $MAKE_ORDERER_DEVICE_TELBOX_INFO . " $value";
 			}
@@ -294,8 +292,8 @@ function ZLECENIE() {
                 from `BILLING_USERS_ADD`
                 where `id_users`='" . $SES_A['ID_BILLING_USERS'] . "'
         ";
-	$result=DB::query($query);
-	if ($h = DB::fetch_assoc($result)) {
+	$result=$db->query($query);
+	if ($h = $db->fetch_assoc($result)) {
 		$out_P_NAME = $h['P_NAME'] . ' ' . $h['P_NAME_SECOND'];
 		$out_P_PHONE = $h['P_PHONE'];
 		$out_P_FAX = $h['P_FAX'];
@@ -322,8 +320,8 @@ function ZLECENIE() {
                         left join `DEALS_TABLE` as d on (d.`ID`=t2.`ID_DEALS_TABLE`)
                 where t2.`ID`='" . $ID_SERVICES . "'
         ";
-	$result=DB::query($query);
-	if ($h = DB::fetch_assoc($result)) {
+	$result=$db->query($query);
+	if ($h = $db->fetch_assoc($result)) {
 		$out_P_DEALNUMBER = $h['P_DEALNUMBER'];
 		$out_P_DEAL_DATE = $h['P_DEALDATE'];
 	}
@@ -335,8 +333,8 @@ function ZLECENIE() {
                         join BILLING_OWNER BO on BU.BILLING_OWNER=BO.ID
                 where BU.`ID`='" . $SES_A['ID_BILLING_USERS'] . "'
         ";
-	$result=DB::query($query);
-	if ($h = DB::fetch_assoc($result)) {
+	$result=$db->query($query);
+	if ($h = $db->fetch_assoc($result)) {
 		$out_OPERATOR = $h['OPERATOR'];
 	}
 ?>
@@ -424,8 +422,6 @@ function ZLECENIE() {
 
 	if ($TYP_ZLECENIA=="ZLECENIE_MONTAZU") {
 		echo "<p style=\"page-break-before: always\">";
-		KONFIGURACJA($SES_A);
+		ZLECENIE_KONFIGURACJA($SES_A);
 	}
 }
-
-?>