diff --git a/admin/survey/minify/builder/index.php b/admin/survey/minify/builder/index.php index 11f5dfd40..6798ddc4b 100644 --- a/admin/survey/minify/builder/index.php +++ b/admin/survey/minify/builder/index.php @@ -24,13 +24,13 @@ if (!$config->enableBuilder) { die('This application is not enabled. See https://github.com/mrclay/minify/blob/master/docs/BuilderApp.wiki.md'); } -require_once( dirname(__FILE__) .'/../../../../settings.php' ); +require_once (dirname(__FILE__) .'/../../../../settings.php'); if ($minify_builder_password !== '') { $auth = new Intervention\Httpauth\Httpauth(array( 'username' => 'admin', - 'password' => $config->builderPassword, + 'password' => $minify_builder_passwordd, 'type' => 'digest', 'realm' => 'Minify Builder', )); diff --git a/admin/survey/minify/lib/Minify/Config.php b/admin/survey/minify/lib/Minify/Config.php index ae5b58cf9..8921cdabd 100644 --- a/admin/survey/minify/lib/Minify/Config.php +++ b/admin/survey/minify/lib/Minify/Config.php @@ -4,6 +4,7 @@ namespace Minify; use Minify_CacheInterface; + class Config { /** @@ -21,11 +22,6 @@ class Config */ public $concatOnly = false; - /** - * @var string - */ - public $builderPassword = 'admin'; - /** * @var bool|object */ diff --git a/utils/SurveySyncMergeImport.php b/utils/SurveySyncMergeImport.php index e5c727ed9..01603e5c5 100644 --- a/utils/SurveySyncMergeImport.php +++ b/utils/SurveySyncMergeImport.php @@ -70,9 +70,7 @@ if ($handle = opendir($sync_server_path)) { if (count($struktura) == 0) { - $num = substr_count($raw, '"recnum"'); - - mysql_query ("UPDATE srv_fieldwork SET lastnum='$num' WHERE id='" .$r[1] ."'"); + mysql_query ("UPDATE srv_fieldwork SET lastnum='" .intval(substr_count($raw, '"recnum"')) ."' WHERE id='" .intval($r[1]) ."'"); // $struktura['version'] = $kljuc['version']; $struktura['version'] = time();