Merge branch 'master' of bn.git:plabudda/se

SE/se-lib/Route/Install.php

@@ -3,6 +3,8 @@
 Lib::loadClass('RouteBase');
 Lib::loadClass('UI');
 
+//TODO install nie kopiuje aktualnej /config/.config_base_structure.php @2017-09-24 bindera - sprawdzone na medicalu
+
 class Route_Install extends RouteBase {
 
 	public function handleAuth() {

SE/se-lib/VAT.php

@@ -0,0 +1,194 @@
+<?php
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
+ *
+ *  Value Add Tax (VAT) library
+ *  Author: Mariusz Muszyński
+ *
+ *  Public static methods:
+ *
+ *    public bool VAT::validateNIP ( string $nip )
+ *      Tells whether the given string is a correct polish tax identification number (TIN/NIP)
+ *
+ *      Parameters:
+ *
+ *        nip
+ *          Polish tax identification number
+ *
+ *  Public dynamic methods:
+ *
+ *    public VAT::__construct ( void )
+ *      Creates a new VAT object.
+ *
+ *    public bool VAT::isActiveVatPayer ( string $nip )
+ *      Tells whether the given NIP belongs to an active VAT payer
+ *
+ *      Parameters:
+ *
+ *        nip
+ *          Polish tax identification number
+ *
+ *    public mixed VAT::getMessage ( [ bool $whole = false ] )
+ *      Returns last message after using VAT::isActiveVatPayer
+ *
+ *      Parameters:
+ *
+ *        whole
+ *          When TRUE, whole message is returned as an array
+ *          When FALSE, only main message is returned as a string
+ *
+ *  HINT:
+ *    It's faster to create one object and do many executes of VAT::isActiveVatPayer method
+ *    than creating separate objects for each VAT::isActiveVatPayer execute.
+ *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ *
+ *  An example of usage:
+ *
+ *  $vat = new VAT();
+ *  $nip_array = ["5932268672", "6040018535"];
+ *  foreach ($nip_array as $nip)
+ *  {
+ *      echo $nip . " - ";
+ *      try
+ *      {
+ *          $result = $vat->isActiveVatPayer($nip);
+ *          if ($result) echo "is active VAT payer";
+ *          else echo "is not active VAT payer";
+ *          echo " (" . $vat->getMessage() . ")\n";
+ *      }
+ *      catch (Exception $e)
+ *      {
+ *          echo "An error occurred (" . $e->getMessage() . ")\n";
+ *      }
+ *  }
+ *
+\* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+Class VAT {
+
+	private $ch, $dom, $headers;
+	private $cookies = "php://memory";
+	private $message = [];
+	private $initialized = false;
+
+	private function getHeaders($ch, $header) {
+		$len = strlen($header);
+		$header = explode(':', $header, 2);
+		if (count($header) < 2) return $len;
+		$this->headers[trim($header[0])] = trim($header[1]);
+		return $len;
+	}
+
+	private function checkHeaders() {
+		if (!(isset($this->headers['Fast-Ver-Last']) && $this->headers['Fast-Ver-Last'])) throw new Exception("Błąd danych ze strony Ministerstwa Finansów");
+	}
+
+	public static function validateNIP($nip) {
+		$prefix = substr($nip, 0, 2);
+		if (!is_numeric($prefix)) $nip = substr($nip, 2);
+		else $prefix = null;
+		if ($prefix && $prefix != "PL") return false;
+		if (strlen($nip) != 10 || (!is_numeric($nip))) return false;
+		$control = (($nip[0] * 6 + $nip[1] * 5 + $nip[2] * 7 + $nip[3] * 2 + $nip[4] * 3 + $nip[5] * 4 + $nip[6] * 5 + $nip[7] * 6 + $nip[8] * 7) % 11 ) % 10;
+		return ($control == $nip[9]);
+	}
+
+	private static function paramsUrlEncode($params) {
+		$array = [];
+		foreach ($params as $param => $value) $array[] = $param . "=" . urlencode($value);
+		return implode("&", $array);
+	}
+
+	private function execute() {
+		$this->headers = [];
+		$result = curl_exec($this->ch);
+		if (curl_getinfo($this->ch)['http_code'] != 200) throw new Exception("Błąd połączenia ze stroną Ministerstwa Finansów");
+		return $result;
+	}
+
+	private function initialize() {
+		$this->ch = curl_init();
+		curl_setopt($this->ch, CURLOPT_URL, "http://www.finanse.mf.gov.pl/web/wp/pp/sprawdzanie-statusu-podmiotu-w-vat");
+		curl_setopt($this->ch, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($this->ch, CURLOPT_FOLLOWLOCATION, true);
+		curl_setopt($this->ch, CURLOPT_SSL_VERIFYHOST, false);
+		curl_setopt($this->ch, CURLOPT_SSL_VERIFYPEER, false);
+		curl_setopt($this->ch, CURLOPT_CONNECTTIMEOUT, 10);
+		curl_setopt($this->ch, CURLOPT_COOKIEJAR, $this->cookies);
+		curl_setopt($this->ch, CURLOPT_COOKIEFILE, $this->cookies);
+		curl_setopt($this->ch, CURLOPT_HEADERFUNCTION, "self::getHeaders");
+		$this->execute();
+		
+		$this->checkHeaders();
+		$params = [
+			"Load" => "1",
+			"FAST_VERLAST__" => $this->headers['Fast-Ver-Last'],
+		];
+		curl_setopt($this->ch, CURLOPT_URL, "https://ppuslugi.mf.gov.pl/_/?" . self::paramsUrlEncode($params));
+		$this->execute();
+
+		curl_setopt($this->ch, CURLOPT_URL, "https://ppuslugi.mf.gov.pl/_/EventOccurred");
+		$this->initialized = true;
+	}
+
+	private function reinitialize() {
+		$this->checkHeaders();
+		$params = [
+			"DOC_MODAL_ID__" => "0",
+			"EVENT__" => "b-9",
+			"FAST_VERLAST__" => $this->headers['Fast-Ver-Last'],
+		];
+		curl_setopt($this->ch, CURLOPT_POSTFIELDS, self::paramsUrlEncode($params));
+		$this->execute();
+	}
+
+	private function getResult($result) {
+		$search = ['/\<br(\s*)?\/?\>/i', '/[[:blank:]]{2,}/', '/[\x00-\x1F\x80-\xFF]/'];
+		$replace = ['|', ' ', ''];
+		$json = preg_replace($search, $replace, $result);
+		$array = json_decode($json, true);
+		if (!($array && isset($array['html']))) throw new Exception("Błąd danych ze strony Ministerstwa Finansów");
+		$html = $array['html'];
+		$this->dom->loadHTML(mb_convert_encoding($html, 'HTML-ENTITIES', 'UTF-8'));
+		$this->message = array_map("trim", array_values(array_diff(explode("|", $this->dom->getElementById("caption2_b-3")->textContent), [''])));
+		if (!$this->message) throw new Exception("Błąd danych ze strony Ministerstwa Finansów");
+		switch ($this->message[0]) {
+			case "Podmiot o podanym identyfikatorze podatkowym NIP jest zarejestrowany jako podatnik VAT czynny" : return true;
+			case "Podmiot o podanym identyfikatorze podatkowym NIP nie jest zarejestrowany jako podatnik VAT" : return false;
+			default: throw new Exception("Nieznany rezultat");
+		}
+	}
+
+	public function getMessage($whole = false) {
+		if (!$this->message) $this->message = ["Brak wyniku"];
+		if ($whole) return $this->message;
+		else return $this->message[0];
+	}
+
+	public function isActiveVatPayer($nip) {
+		$this->message = [];
+		$nip = str_replace("-", "", trim($nip));
+		if (!$this->validateNIP($nip)) throw new Exception("Błędny NIP");
+
+		if (!$this->initialized) $this->initialize();
+		else $this->reinitialize();
+
+		$this->checkHeaders();
+		$params = [
+			"b-7" => $nip,
+			"DOC_MODAL_ID__" => "0",
+			"EVENT__" => "b-8",
+			"FAST_VERLAST__" => $this->headers['Fast-Ver-Last'],
+		];
+		curl_setopt($this->ch, CURLOPT_POSTFIELDS, self::paramsUrlEncode($params));
+		return $this->getResult($this->execute());
+	}
+
+	function __construct() {
+		$this->dom = new DOMDocument();
+	}
+
+	function __destruct() {
+		curl_close($this->ch);
+	}
+}

SE/superedit-BUDGET_ANALYTICS.php

@@ -491,90 +491,90 @@ jQuery(document).ready(function () {
 				
 			union				
 				select `p`.`ID_PROJECT` AS `ID_PROJECT`
-					, concat(`p`.YEAR,'-04') AS `MONTH`
-					, p.MONTH_4_VALUE AS `COST`
+					, concat(`k`.YEAR,'-04') AS `MONTH`
+					, k.MONTH_4_VALUE AS `COST`
 					, 0 AS `INCOME`
 					, 'CHILD' AS `TYPE`
 				from `projects_budget_year_month` p
 					join `projects_budget_year_month` k
-						on k.`path` like concat('%-',`p`.`ID_PROJECT`,'-%')		
+						on k.`path` like concat('%-',`p`.`ID_PROJECT`,'-%')	and `p`.`YEAR`=`k`.`YEAR` and k.MONTH_4_VALUE > 0	
 				where `p`.`YEAR` > 0
 				
 			union				
 				select `p`.`ID_PROJECT` AS `ID_PROJECT`
-					, concat(`p`.YEAR,'-05') AS `MONTH`
-					, p.MONTH_5_VALUE AS `COST`
+					, concat(`k`.YEAR,'-05') AS `MONTH`
+					, k.MONTH_5_VALUE AS `COST`
 					, 0 AS `INCOME`
 					, 'CHILD' AS `TYPE`
 				from `projects_budget_year_month` p
 					join `projects_budget_year_month` k
-						on k.`path` like concat('%-',`p`.`ID_PROJECT`,'-%')		
+						on k.`path` like concat('%-',`p`.`ID_PROJECT`,'-%')	and `p`.`YEAR`=`k`.`YEAR` and k.MONTH_5_VALUE > 0		
 				where `p`.`YEAR` > 0
 				
 			union				
 				select `p`.`ID_PROJECT` AS `ID_PROJECT`
-					, concat(`p`.YEAR,'-06') AS `MONTH`
-					, p.MONTH_6_VALUE AS `COST`
+					, concat(`k`.YEAR,'-06') AS `MONTH`
+					, k.MONTH_6_VALUE AS `COST`
 					, 0 AS `INCOME`
 					, 'CHILD' AS `TYPE`
 				from `projects_budget_year_month` p
 					join `projects_budget_year_month` k
-						on k.`path` like concat('%-',`p`.`ID_PROJECT`,'-%')		
+						on k.`path` like concat('%-',`p`.`ID_PROJECT`,'-%')	and `p`.`YEAR`=`k`.`YEAR` and k.MONTH_6_VALUE > 0	
 				where `p`.`YEAR` > 0
 				
 			union				
 				select `p`.`ID_PROJECT` AS `ID_PROJECT`
-					, concat(`p`.YEAR,'-07') AS `MONTH`
-					, p.MONTH_7_VALUE AS `COST`
+					, concat(`k`.YEAR,'-07') AS `MONTH`
+					, k.MONTH_7_VALUE AS `COST`
 					, 0 AS `INCOME`
 					, 'CHILD' AS `TYPE`
 				from `projects_budget_year_month` p
 					join `projects_budget_year_month` k
-						on k.`path` like concat('%-',`p`.`ID_PROJECT`,'-%')		
+						on k.`path` like concat('%-',`p`.`ID_PROJECT`,'-%')	and `p`.`YEAR`=`k`.`YEAR` and k.MONTH_7_VALUE > 0		
 				where `p`.`YEAR` > 0
 				
 			union				
 				select `p`.`ID_PROJECT` AS `ID_PROJECT`
-					, concat(`p`.YEAR,'-08') AS `MONTH`
-					, p.MONTH_8_VALUE AS `COST`
+					, concat(`k`.YEAR,'-08') AS `MONTH`
+					, k.MONTH_8_VALUE AS `COST`
 					, 0 AS `INCOME`
 					, 'CHILD' AS `TYPE`
 				from `projects_budget_year_month` p
 					join `projects_budget_year_month` k
-						on k.`path` like concat('%-',`p`.`ID_PROJECT`,'-%')		
+						on k.`path` like concat('%-',`p`.`ID_PROJECT`,'-%')		and `p`.`YEAR`=`k`.`YEAR` and k.MONTH_8_VALUE > 0	
 				where `p`.`YEAR` > 0
 				
 			union				
 				select `p`.`ID_PROJECT` AS `ID_PROJECT`
-					, concat(`p`.YEAR,'-09') AS `MONTH`
-					, p.MONTH_9_VALUE AS `COST`
+					, concat(`k`.YEAR,'-09') AS `MONTH`
+					, k.MONTH_9_VALUE AS `COST`
 					, 0 AS `INCOME`
 					, 'CHILD' AS `TYPE`
 				from `projects_budget_year_month` p
 					join `projects_budget_year_month` k
-						on k.`path` like concat('%-',`p`.`ID_PROJECT`,'-%')		
+						on k.`path` like concat('%-',`p`.`ID_PROJECT`,'-%')	and `p`.`YEAR`=`k`.`YEAR` and k.MONTH_9_VALUE > 0
 				where `p`.`YEAR` > 0
 				
 			union				
 				select `p`.`ID_PROJECT` AS `ID_PROJECT`
-					, concat(`p`.YEAR,'-10') AS `MONTH`
-					, p.MONTH_10_VALUE AS `COST`
+					, concat(`k`.YEAR,'-10') AS `MONTH`
+					, k.MONTH_10_VALUE AS `COST`
 					, 0 AS `INCOME`
 					, 'CHILD' AS `TYPE`
 				from `projects_budget_year_month` p
 					join `projects_budget_year_month` k
-						on k.`path` like concat('%-',`p`.`ID_PROJECT`,'-%')		
+						on k.`path` like concat('%-',`p`.`ID_PROJECT`,'-%')		and `p`.`YEAR`=`k`.`YEAR` and k.MONTH_10_VALUE > 0	
 				where `p`.`YEAR` > 0
 				
 			union				
 				select `p`.`ID_PROJECT` AS `ID_PROJECT`
-					, concat(`p`.YEAR,'-11') AS `MONTH`
-					, p.MONTH_11_VALUE AS `COST`
+					, concat(`k`.YEAR,'-11') AS `MONTH`
+					, k.MONTH_11_VALUE AS `COST`
 					, 0 AS `INCOME`
 					, 'CHILD' AS `TYPE`
 				from `projects_budget_year_month` p
 					join `projects_budget_year_month` k
-						on k.`path` like concat('%-',`p`.`ID_PROJECT`,'-%')		
+						on k.`path` like concat('%-',`p`.`ID_PROJECT`,'-%')		and `p`.`YEAR`=`k`.`YEAR` and k.MONTH_11_VALUE > 0		
 				where `p`.`YEAR` > 0
 				
 			union				
@@ -585,7 +585,7 @@ jQuery(document).ready(function () {
 					, 'CHILD' AS `TYPE`
 				from `projects_budget_year_month` p
 					join `projects_budget_year_month` k
-						on k.`path` like concat('%-',`p`.`ID_PROJECT`,'-%')		
+						on k.`path` like concat('%-',`p`.`ID_PROJECT`,'-%')			and `p`.`YEAR`=`k`.`YEAR` and k.MONTH_12_VALUE > 0	
 				where `p`.`YEAR` > 0
 				
 			

SE/superedit-DB_PROCEDURES_CREATE.php

@@ -533,7 +533,7 @@ $sql['alter__CRM_PROCES_STATS_unique_id']="alter table _CRM_PROCES_STATS add uni
 
 $sql['drop__CRM_PROCES_INIT_STATS']="drop table if exists _CRM_PROCES_INIT_STATS";
 
-$sql_tmp['select_CRM_PROCES_INIT_STATS']="select t1.ID_PROCES_INIT as ID,left(t2.`DESC`,100) as `DESC`,t3.path, t3.lvl,sum(CSteps) as SCSteps,sum(CPics) as SCPics ,sum(CProcEdits+CResorEdits) as SCPREdits,
+$sql_tmp['select_CRM_PROCES_INIT_STATS']="select t1.ID_PROCES_INIT as ID, t1.ID_PROCES_INIT , left(t2.`DESC`,100) as `DESC`,t3.path, t3.lvl,sum(CSteps) as SCSteps,sum(CPics) as SCPics ,sum(CProcEdits+CResorEdits) as SCPREdits,
  sum(CQuestEdits) as SCQuestEdits,sum(CResPics) as SCResPics , sum(CResPicsS) as SCResPicsS,sum(CQuest) as SCQuest,sum(CQuestPract) as SCQuestPract,
  sum(CQRes) as SCQRes,sum(CQPRes) as SCQPRes,sum(CQErrRes) as CQErrRes,sum(CWorkers) as SCWorkers,sum(CQTAnsOk) as SCQTAnsOk,sum(CQPWAnsOk) as CQPWAnsOk, sum(CQPAnsOk) as SCQPAnsOk
  ,(select count(ID) from CRM_TESTY where ID_PROCES_INIT=t1.ID_PROCES_INIT and TEST_TYPE='TEORETYCZNY') as STestTeor
@@ -1381,6 +1381,12 @@ END
 
 
 
+//$sql['WORKER_GPS_LOG_current_view_drop']="DROP view if exists WORKER_GPS_LOG_current_view";
+
+//$sql['WORKER_GPS_LOG_current_view']="create view WORKER_GPS_LOG_current_view as  select * from  `WORKER_GPS_LOG` group by `A_RECORD_CREATE_AUTHOR` order by `ID` desc";
+
+
+
 foreach($sql as $ind=>$sql_) {
 	
 	if( is_array($sql_)) {

SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -662,8 +662,8 @@ if($SERVER_VERSION=='10.9Maverick') $cmd[]['rsh']="gcc 2>&1 |grep 'no input file
  	 	 $cmd[]['scp']=array($INSTALL_ROOT.'/stuff/MacPorts-2.3.4-10.11-ElCapitan.pkg','/tmp/MacPorts-2.3.4-10.11-ElCapitan.pkg');
 	 	 $cmd[]['rsh']='installer -package /tmp/MacPorts-2.3.4-10.11-ElCapitan.pkg -target "/" -verbose';
     } else if($SERVER_VERSION=='10.12-Sierra') {
-        $cmd[]['scp']=array($INSTALL_ROOT.'/stuff/MacPorts-2.3.5-10.12-Sierra.pkg','/tmp/MacPorts-2.3.5-10.12-Sierra.pkg');
-        $cmd[]['rsh']='installer -package /tmp/MacPorts-2.3.5-10.12-Sierra.pkg -target "/" -verbose';
+        $cmd[]['scp']=array($INSTALL_ROOT.'/stuff/MacPorts-2.4.1-10.12-Sierra.pkg','/tmp/MacPorts-2.4.1-10.12-Sierra.pkg');
+        $cmd[]['rsh']='installer -package /tmp/MacPorts-2.4.1-10.12-Sierra.pkg -target "/" -verbose';
  	} else {
 
 	 	 $cmd[]['scp']=array('/Library/Server/Web/Data/Sites/Default/SE/se-dev-pl/stuff/MacPorts-2.3.2-10.9-Mavericks.pkg','/tmp/MacPorts-2.3.2-10.9-Mavericks.pkg');
@@ -1518,6 +1518,11 @@ function INSTALL_GETCOMMANDS_SE($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADMIN_USERNA
   $cmd[]['scp_root']=array($INSTALL_ROOT.'/procesy5*','/Library/Server/Web/Data/Sites/Default/SE/');
   $cmd[]['rsh']='rm -R /Library/Server/Web/Data/Sites/Default/SE/przypomnij.php || echo PASSED';
   $cmd[]['scp_root']=array($INSTALL_ROOT.'/przypomnij.php','/Library/Server/Web/Data/Sites/Default/SE/');
+  
+  $cmd[]['rsh']='rm -R /Library/Server/Web/Data/Sites/Default/SE/api.php || echo PASSED';
+  $cmd[]['scp_root']=array($INSTALL_ROOT.'/api.php','/Library/Server/Web/Data/Sites/Default/SE/');
+
+  
   $cmd[]['rsh']='rm -R /Library/Server/Web/Data/Sites/Default/SE/se-lib || echo PASSED';
   $cmd[]['scp_root']=array($INSTALL_ROOT.'/se-lib','/Library/Server/Web/Data/Sites/Default/SE/');
 	$cmd[]['rsh']='rm -R /Library/Server/Web/Data/Sites/Default/SE/schema || echo PASSED';
@@ -2077,18 +2082,19 @@ database=\"SES_USERS2\"
 // TODO $cmd[]['rsh']='php /Library/Server/Web/Data/Sites/Default/SE/bash_Route_Users_Task_syncGroup.php '.$SERVER_ADDRESS.' 3';
 
 
-// $cmd[]['rsh']=' echo " delete from ADMIN_USERS  where ADM_ACCOUNT=\''.$ADMIN_USERNAME_L1.'\'" |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
-// $cmd[]['rsh']=' echo " insert into ADMIN_USERS (ADM_ACCOUNT,ADM_ADMIN_LEVEL,ADM_PASSWD,A_STATUS) values (\''.$ADMIN_USERNAME_L1.'\',\'0\',\''.$ADMIN_USERNAME_L1_PASS.'\',\'NORMAL\')" |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
+ $cmd[]['rsh']=' echo " delete from ADMIN_USERS  where ADM_ACCOUNT=\''.$ADMIN_USERNAME_L1.'\'" |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
+ $cmd[]['rsh']=' echo " insert into ADMIN_USERS (ADM_ACCOUNT,ADM_ADMIN_LEVEL,ADM_PASSWD,A_STATUS) values (\''.$ADMIN_USERNAME_L1.'\',\'0\',\''.$ADMIN_USERNAME_L1_PASS.'\',\'NORMAL\')" |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
 																												//addUser($usrLogin, $idGroup, $idTelboxes,  $ADM_ADMIN_LEVEL, $ADM_NAME,             $ADM_ADMIN_DESC,											 $EMPLOYEE_TYPE, $ADM_PASSWD, $A_ADM_COMPANY, $A_CLASSIFIED, $DEFAULT_ACL_GROUP )
 
- $cmd[]['rsh']='php /Library/Server/Web/Data/Sites/Default/SE/bash_Route_Users_Task_AddUser.php '.$SERVER_ADDRESS.' '.$ADMIN_USERNAME_L1.' 3  0              0               '.$ADMIN_USERNAME_L1.' Podstawowe_konto_uzytkownika_z_licencji_instalatora_systemu  Pracownik  '.$ADMIN_USERNAME_L1_PASS.' 3  3 ' ;
+// $cmd[]['rsh']='php /Library/Server/Web/Data/Sites/Default/SE/bash_Route_Users_Task_AddUser.php '.$SERVER_ADDRESS.' '.$ADMIN_USERNAME_L1.' 3  0              0               '.$ADMIN_USERNAME_L1.' Podstawowe_konto_uzytkownika_z_licencji_instalatora_systemu  Pracownik  '.$ADMIN_USERNAME_L1_PASS.' 3  3 ' ;
  
  $cmd[]['rsh']=' echo " delete from ADMIN_USERS  where ADM_ACCOUNT=\''.$ADMIN_USERNAME_DIRECTORY.'\'" |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
  $cmd[]['rsh']=' echo " insert into ADMIN_USERS (ADM_ACCOUNT,ADM_ADMIN_LEVEL,ADM_PASSWD,A_STATUS) values (\''.$ADMIN_USERNAME_DIRECTORY.'\',\'0\',\''.$ADMIN_USERNAME_PASSWD.'\',\'NORMAL\')" |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
 
 
 //dodanie domyslnego uprawnienia admina dla glownego usera na bazie tabeli KONTAKTY_view
- $cmd[]['rsh']=' echo " insert ignore into CRM_AUTH_PROFILE (ID_ZASOB, REMOTE_TABLE,REMOTE_ID) select czp1.ID , \'ADMIN_USERS\', au.ID
+//DEFAULT_ADMIN_ROLE
+/* $cmd[]['rsh']=' echo " insert ignore into CRM_AUTH_PROFILE (ID_ZASOB, REMOTE_TABLE,REMOTE_ID) select czp1.ID , \'ADMIN_USERS\', au.ID
                           from CRM_LISTA_ZASOBOW cz
                           left join CRM_LISTA_ZASOBOW czp on czp.PARENT_ID=cz.ID
                           left join CRM_WSKAZNIK cw on cw.ID_ZASOB=czp.ID
@@ -2096,9 +2102,16 @@ database=\"SES_USERS2\"
                           left join CRM_WSKAZNIK as cw1 on cw1.ID_PROCES=cpi.ID_PROCES_INIT
                           left join CRM_LISTA_ZASOBOW as czp1 on czp1.ID=cw1.ID_ZASOB and czp1.\\`TYPE\\`=\'STANOWISKO\'
                           left join ADMIN_USERS au on au.ADM_ACCOUNT=\''.$ADMIN_USERNAME_DIRECTORY.'\'
-                          where cz.\\`DESC\\` like \'KONTAKTY_view\' and cz.\\`TYPE\\`=\'TABELA\' limit 1 " |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
+                          where cz.\\`DESC\\` like \'KONTAKTY_view\' and cz.\\`TYPE\\`=\'TABELA\' limit 1 " |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap*/
 
- $cmd[]['rsh']=' echo " insert ignore into CRM_AUTH_PROFILE (ID_ZASOB, REMOTE_TABLE,REMOTE_ID) select czp1.ID , \'ADMIN_USERS\', au.ID
+$cmd[]['rsh']=' echo " insert ignore into CRM_AUTH_PROFILE (ID_ZASOB, REMOTE_TABLE,REMOTE_ID) select cz.ID , \'ADMIN_USERS\', au.ID
+                          from CRM_LISTA_ZASOBOW cz
+                          left join ADMIN_USERS au on au.ADM_ACCOUNT=\''.$ADMIN_USERNAME_DIRECTORY.'\'
+                          where cz.TAGS like \'%DEFAULT_ADMIN_ROLE%\' limit 10 " |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
+
+
+
+/* $cmd[]['rsh']=' echo " insert ignore into CRM_AUTH_PROFILE (ID_ZASOB, REMOTE_TABLE,REMOTE_ID) select czp1.ID , \'ADMIN_USERS\', au.ID
                           from CRM_LISTA_ZASOBOW cz
                           left join CRM_LISTA_ZASOBOW czp on czp.PARENT_ID=cz.ID
                           left join CRM_WSKAZNIK cw on cw.ID_ZASOB=czp.ID
@@ -2106,7 +2119,15 @@ database=\"SES_USERS2\"
                           left join CRM_WSKAZNIK as cw1 on cw1.ID_PROCES=cpi.ID_PROCES_INIT
                           left join CRM_LISTA_ZASOBOW as czp1 on czp1.ID=cw1.ID_ZASOB and czp1.\\`TYPE\\`=\'STANOWISKO\'
                           left join ADMIN_USERS au on au.ADM_ACCOUNT=\''.$ADMIN_USERNAME_L1.'\'
-                          where cz.\\`DESC\\` like \'KONTAKTY_view\' and cz.\\`TYPE\\`=\'TABELA\' limit 1 " |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
+                          where cz.\\`DESC\\` like \'KONTAKTY_view\' and cz.\\`TYPE\\`=\'TABELA\' limit 1 " |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap */
+
+$cmd[]['rsh']=' echo " insert ignore into CRM_AUTH_PROFILE (ID_ZASOB, REMOTE_TABLE,REMOTE_ID) select cz.ID , \'ADMIN_USERS\', au.ID
+                          from CRM_LISTA_ZASOBOW cz
+                          left join ADMIN_USERS au on au.ADM_ACCOUNT=\''.$ADMIN_USERNAME_L1.'\'
+                          where cz.TAGS like \'%DEFAULT_ADMIN_ROLE%\' limit 10 " |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
+
+
+
 
 $cmd[]['rsh']=' echo " insert ignore into CRM_AUTH_PROFILE (ID_ZASOB, REMOTE_TABLE,REMOTE_ID) select cz.ID , \'ADMIN_USERS\', au.ID
                           from CRM_LISTA_ZASOBOW cz
@@ -2185,17 +2206,22 @@ return $cmd;
 
 function INSTALL_GETCOMMANDS_MYADMIN($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADMIN_USERNAME_PASSWD,$SERVER_MOUNT_POINT_ROOT,$SERVER_ADDRESS,$SERVER_ADDRESS_LDAP_DC,$SERVER_ADDRESS_SHORT,$INSTALL_ROOT,$REMOTE_FOLDER_ROOT,$ADMIN_USERNAME_L1,$ADMIN_USERNAME_L1_PASS,$ADMIN_USERNAME_DIRECTORY,$ADMIN_USERNAME_INITIAL_PASSWD,$BACKUP_USB_DEVICE,$SERVER_VERSION,$OPTIONS) {
  $cmd[]['rsh']='test -f /Library/Server/Web/Data/Sites/Default/phpMyAdmin-4.4.11-all-languages.tar.gz && rm -R /Library/Server/Web/Data/Sites/Default/phpMyAdmin-4.4.11-all-languages.tar.gz || echo PASSED';
+ $cmd[]['rsh']='test -f /Library/Server/Web/Data/Sites/Default/phpMyAdmin-4.7.4-all-languages.tar.gz  && rm -R /Library/Server/Web/Data/Sites/Default/phpMyAdmin-4.7.4-all-languages.tar.gz  || echo PASSED';
+ $cmd[]['rsh']='test -f /Library/Server/Web/Data/Sites/Default/phpMyAdmin.tar.gz && rm -R /Library/Server/Web/Data/Sites/Default/phpMyAdmin.tar.gz || echo PASSED';
+
+
  $cmd[]['rsh']='test -d /Library/Server/Web/Data/Sites/Default/phpMyAdmin-4.4.11-all-languages && rm -R /Library/Server/Web/Data/Sites/Default/phpMyAdmin-4.4.11-all-languages || echo PASSED';
+ $cmd[]['rsh']='test -d /Library/Server/Web/Data/Sites/Default/phpMyAdmin-4.7.4-all-languages && rm -R /Library/Server/Web/Data/Sites/Default/phpMyAdmin-4.7.4-all-languages || echo PASSED';
+
 
- $cmd[]['rsh']='test -f /Library/Server/Web/Data/Sites/Default/phpMyAdmin.tar.gz && rm -R /Library/Server/Web/Data/Sites/Default/phpMyAdmin-4.4.11-all-languages.tar.gz || echo PASSED';
 
  $cmd[]['rsh']='test -d /Library/Server/Web/Data/Sites/Default/garbage && rm -R /Library/Server/Web/Data/Sites/Default/garbage || echo PASSED';
 //! phpMyAdmin garbage
- $cmd[]['scp']=array($INSTALL_ROOT.'/stuff/phpMyAdmin-4.4.11-all-languages.tar.gz','/Library/Server/Web/Data/Sites/Default/phpMyAdmin-4.4.11-all-languages.tar.gz');
+ $cmd[]['scp']=array($INSTALL_ROOT.'/stuff/phpMyAdmin-4.7.4-all-languages.tar.gz','/Library/Server/Web/Data/Sites/Default/phpMyAdmin-4.7.4-all-languages.tar.gz');
  $cmd[]['rsh']='cd /Library/Server/Web/Data/Sites/Default/ || exit 1
-  tar -zxpvf phpMyAdmin-4.4.11-all-languages.tar.gz || exit 1';
+  tar -zxpvf phpMyAdmin-4.7.4-all-languages.tar.gz || exit 1';
  $cmd[]['rsh']='cd /Library/Server/Web/Data/Sites/Default/ || exit 1
- mv phpMyAdmin-4.4.11-all-languages garbage || exit 1 ';
+ mv phpMyAdmin-4.7.4-all-languages garbage || exit 1 ';
  $cmd[]['rsh']='cd /Library/Server/Web/Data/Sites/Default/garbage || exit 1
 echo "<?
 \\$cfg[\'PmaAbsoluteUri\'] = \'https://'.$SERVER_ADDRESS.'/garbage/\';