witherornot/api
1
0
Fork 0
forked from uup-dump/api
Code Pull Requests Activity

Some unnecessary fixes

Browse Source
This commit is contained in:
mkuba50 2018-08-10 23:55:45 +02:00
parent 7f859eb6df
commit 212b54a98e
3 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
listid.php
View File

@ -68,9 +68,14 @@ function uupListIds($search = null) {
); );
$tmp = explode('.', $build); $tmp = explode('.', $build);
if(isset($tmp[1])) {
$tmp[0] = str_pad($tmp[0], 10, '0', STR_PAD_LEFT); $tmp[0] = str_pad($tmp[0], 10, '0', STR_PAD_LEFT);
$tmp[1] = str_pad($tmp[1], 10, '0', STR_PAD_LEFT); $tmp[1] = str_pad($tmp[1], 10, '0', STR_PAD_LEFT);
$tmp = $tmp[0].$tmp[1]; $tmp = $tmp[0].$tmp[1];
} else {
consoleLogger($uuid.'.json appears to be broken and may be useless.');
$tmp = 0;
}
$buildAssoc[$tmp][] = $arch.$title.$uuid; $buildAssoc[$tmp][] = $arch.$title.$uuid;
$builds[$tmp.$arch.$title.$uuid] = $temp; $builds[$tmp.$arch.$title.$uuid] = $temp;

2
shared/main.php
View File

@ -16,7 +16,7 @@ limitations under the License.
*/ */
function uupApiVersion() { function uupApiVersion() {
return '1.15.3'; return '1.15.4';
} }
function uupApiPrintBrand() { function uupApiPrintBrand() {

37
shared/requests.php
View File

@ -21,41 +21,47 @@ function composeDeviceAttributes($flight, $ring, $build, $arch, $sku) {
if($ring == 'RETAIL') { if($ring == 'RETAIL') {
$flightEnabled = 0; $flightEnabled = 0;
$isRetail = 1;
} else { } else {
$flightEnabled = 1; $flightEnabled = 1;
$isRetail = 0;
} }
$attrib = array( $attrib = array(
'App=WU', 'App=WU_OS',
'AppVer='.$build, 'AppVer='.$build,
'AttrDataVer=38', 'AttrDataVer=45',
'BranchReadinessLevel=CB', 'BranchReadinessLevel=CB',
'CurrentBranch='.$branch, 'CurrentBranch='.$branch,
'DeviceFamily=Windows.Desktop', 'DeviceFamily=Windows.Desktop',
'FirmwareVersion=6.00', 'FirmwareVersion=6.00',
'FlightContent='.$flight, 'FlightContent='.$flight,
'FlightingBranchName=external',
'FlightRing='.$ring, 'FlightRing='.$ring,
'FlightingBranchName=external',
'Free=32to64', 'Free=32to64',
'GStatus_RS3=2', 'GStatus_RS3=2',
'GStatus_RS4=2', 'GStatus_RS4=2',
'InstallationType=Client', 'GStatus_RS5=2',
'InstallDate=1438196400',
'InstallLanguage=en-US', 'InstallLanguage=en-US',
'InstallationType=Client',
'IsDeviceRetailDemo=0', 'IsDeviceRetailDemo=0',
'IsFlightingEnabled='.$flightEnabled, 'IsFlightingEnabled='.$flightEnabled,
'OEMModel=Microsoft', 'IsRetailOS='.$isRetail,
'OEMName_Uncleaned=Microsoft', 'OEMModel=Largehard Device Model 42069',
'OEMModelBaseBoard=Largehard Base Board',
'OEMName_Uncleaned=Largehard',
'OSArchitecture='.$arch, 'OSArchitecture='.$arch,
'OSSkuId='.$sku, 'OSSkuId='.$sku,
'OSUILocale=en-US', 'OSUILocale=en-US',
'OSVersion='.$build, 'OSVersion='.$build,
'PonchAllow=1',
'ProcessorIdentifier=Intel64 Family 6 Model 142 Stepping 9', 'ProcessorIdentifier=Intel64 Family 6 Model 142 Stepping 9',
'ProcessorManufacturer=GenuineIntel', 'ProcessorManufacturer=GenuineIntel',
'TelemetryLevel=1', 'TelemetryLevel=1',
'UpdateManagementGroup=2', 'UpdateManagementGroup=2',
'UpgEx_RS3=Green', 'UpgEx_RS3=Green',
'UpgEx_RS4=Green', 'UpgEx_RS4=Green',
'UpgEx_RS5=Green',
'WuClientVer='.$build, 'WuClientVer='.$build,
); );
@ -76,6 +82,10 @@ function branchFromBuild($build) {
$branch = 'rs3_release'; $branch = 'rs3_release';
break; break;
case 17134:
$branch = 'rs4_release';
break;
default: default:
$branch = 'rs_prerelease'; $branch = 'rs_prerelease';
break; break;
@ -120,19 +130,22 @@ function composeFetchUpdRequest($device, $encData, $arch, $flight, $ring, $build
$branch = branchFromBuild($build); $branch = branchFromBuild($build);
$products = array( $products = array(
'Branch='.$branch, 'PN=Client.OS.rs2.'.$arch.'&Branch='.$branch.'&PrimaryOSProduct=1&V='.$build,
'PN=Client.OS.rs2.'.$arch, 'PN=Windows.Appraiser.'.$arch.'&V='.$build,
'PrimaryOSProduct=1', 'PN=Windows.AppraiserData.'.$arch.'&V='.$build,
'V='.$build, 'PN=Windows.EmergencyUpdate.'.$arch.'&V='.$build,
'PN=Windows.OOBE.'.$arch.'&V='.$build,
'PN=Windows.UpdateStackPackage.'.$arch.'&Name=Update Stack Package&V='.$build,
); );
$callerAttrib = array( $callerAttrib = array(
'Id=UpdateOrchestrator', 'Id=UpdateOrchestrator',
'SheddingAware=1',
'Interactive=1', 'Interactive=1',
'IsSeeker=1', 'IsSeeker=1',
); );
$products = implode('&', $products); $products = implode(';', $products);
$callerAttrib = 'E:'.implode('&', $callerAttrib); $callerAttrib = 'E:'.implode('&', $callerAttrib);
$deviceAttributes = composeDeviceAttributes( $deviceAttributes = composeDeviceAttributes(