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

SE/bash_sync_perms.php

@@ -545,7 +545,7 @@ class SyncPerms {
 		echo "DBG: UrlAction_WmsGenerate->doGenerate() END\n";
 
 		echo "DBG: UrlAction_BiAuditGenerate->doGenerate() START...\n";
-		//Router::getRoute('UrlAction_BiAuditGenerate')->doGenerate();
+		Router::getRoute('UrlAction_BiAuditGenerate')->doGenerate();
 		echo "DBG: UrlAction_BiAuditGenerate->doGenerate() END\n";
 	}
 

SE/projects/bocian

@@ -1 +1 @@
-Subproject commit 8dbd287f9fd6d93f4f7a42817077838ecd6ddaa9
+Subproject commit 4a46aa8d574e6af56df9af7203ea73605a1ddec9

SE/se-lib/Route/UrlAction/BiAuditGenerate.php

@@ -36,7 +36,7 @@ class Route_UrlAction_BiAuditGenerate extends RouteBase {
 		$record->ID = $id;
 		$uploader = new FileUploader($table.'_COLUMN', $record);
 		$errMsg = "";
-		if (!$uploader->setConfig($folderConf, $errMsg)) throw new HttpException("Błąd danych konfiguracyjnych<br>\n{$$errMsg}", 404);
+		if (!$uploader->setConfig($folderConf, $errMsg)) throw new HttpException("Błąd danych konfiguracyjnych<br>\n{$errMsg}", 404);
 		$uploader->findFolder();
 		return $uploader->getDestLocalPath(true);
 	}
@@ -47,7 +47,7 @@ class Route_UrlAction_BiAuditGenerate extends RouteBase {
 		$record->ID = $id;
 		$uploader = new FileUploader($table.'_COLUMN', $record);
 		$errMsg = "";
-		if (!$uploader->setConfig($folderConf, $errMsg)) throw new HttpException("Błąd danych konfiguracyjnych<br>\n{$$errMsg}", 404);
+		if (!$uploader->setConfig($folderConf, $errMsg)) throw new HttpException("Błąd danych konfiguracyjnych<br>\n{$errMsg}", 404);
 		return $uploader->getFolderWeb() . "/" . $uploader->getDestFolder(true);
 	}
 

SE/se-lib/VAT.php

@@ -165,7 +165,11 @@ Class VAT {
 		$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");
+		if (!$this->message) {
+			$this->message = array_map("trim", array_values(array_diff(explode("\n", $this->dom->getElementById("indicator_b-7")->getAttribute("title")), [''])));
+			if ($this->message) throw new Exception($this->message[0]);
+			else throw new Exception("Błąd danych ze strony Ministerstwa Finansów");
+		}
 		if (isset($this->messages[$this->message[0]])) return $this->messages[$this->message[0]]['active'];
 		else throw new Exception("Nieznany rezultat");
 	}