X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-updates.php;h=204e21e02b0febabc8ab82daf51f5ba3f03d2141;hb=61621983cc6d7195fcc7eab29b5f6080ff283b34;hp=6ffa7bd290f89a408da9b0a879a6e14d5d60a754;hpb=508228c85fba8448d00865b1639cb8cd7a69e457;p=mailer.git diff --git a/inc/modules/admin/what-updates.php b/inc/modules/admin/what-updates.php index 6ffa7bd290..204e21e02b 100644 --- a/inc/modules/admin/what-updates.php +++ b/inc/modules/admin/what-updates.php @@ -1,7 +1,7 @@ $v) { - $v = trim($v); - if (empty($v)) { - // Header ends here (+1) - $pos = $k + 1; break; - } - } - - $response2 = array(); - for($i = $pos; $i < count($response); $i++) { - $response2[] = trim($response[$i]); - } - $response = $response2; unset($response2); - unset($pos); + $response = removeHttpHeaderFromResponse($response); // Which is the latest version on server? $ONLINE = array( - 'version' => str_replace("\n", "", $response[0]), - 'changed' => str_replace("\n", "", $response[1]), - 'revision' => str_replace("\n", "", $response[2]), + 'version' => trim(str_replace(PHP_EOL, '', $response[0])), + 'changed' => trim(str_replace(PHP_EOL, '', $response[1])), + 'code' => '200 OK' ); - - // Array for available patches - $PATCHES = array( - 'fname' => array(), - 'fsize' => array(), - 'ctime' => array() - ); - - if (($response[3] != "[EOF]") && ($ONLINE['version'] == constant('FULL_VERSION'))) { - // We have found new patches (newer than FULL_VERSION) - $max = str_replace("\n", "", $response[count($response) - 2]); $TOTAL_SIZE = 0; - - // Maximum of available pacthes extracted (above). Now we can get all informations - for ($idx = 0; $idx < $max; $idx++) { - // List only newer patches - $TEST = substr(str_replace("\n", "", $response[$idx * 5 + 2]), 0, strlen(getConfig('patch_level'))); - - // I have removed the addional test for the stored timemark in database or you cannot find - // new updates on my server when you haven't installed it before I upload a patch... :-( - if (bigintval($TEST) > getConfig(('patch_level'))) { - // Copy every data from the response array - $PATCHES['fname'][] = str_replace("\n", "", $response[$idx * 5 + 2]); - $PATCHES['fsize'][] = str_replace("\n", "", $response[$idx * 5 + 3]); - $PATCHES['ctime'][] = str_replace("\n", "", $response[$idx * 5 + 4]); - switch (GET_LANGUAGE()) { - case "de": $PATCHES['descr'][] = str_replace("\n", "", $response[$idx * 5 + 5]); break; // Load german description - default : $PATCHES['descr'][] = str_replace("\n", "", $response[$idx * 5 + 6]); break; // Load english description as default - } - - // Add patch's size to total - $TOTAL_SIZE += $PATCHES['fsize'][$idx]; - } - } - - array_pk_sort($PATCHES, array("ctime", "fname")); - - // All done here! - $ONLINE['code'] = "200 OK"; - } } else { // 404 / 403 error from server $ONLINE['code'] = $response[0]; @@ -128,19 +73,17 @@ if (empty($response[0]) && empty($response[1]) && empty($response[2]) && empty($ // Is a newer version available? if (empty($ONLINE['version'])) { // Disconnected? - LOAD_TEMPLATE("admin_settings_saved", false, "
{--ADMIN_CANNOT_CHECK_VERSION--} (".$ONLINE['code'].")
"); -} elseif (($ONLINE['version'] != constant('FULL_VERSION')) || ($ONLINE['revision'] != constant('CURR_SVN_REVISION'))) { + displayErrorMessage('{--ADMIN_CANNOT_CHECK_VERSION--} (' . $ONLINE['code'] . ')'); +} elseif ($ONLINE['version'] != getFullVersion()) { // New full-version available (all previous released patches are included in this version!) - define('__ONLINE_VERSION', $ONLINE['version']); - define('__ONLINE_CHANGE' , MAKE_DATETIME($ONLINE['changed'], "2")); - define('__ONLINE_REVISION', $ONLINE['revision']); + $ONLINE['changed'] = generateDateTime($ONLINE['changed'], 2); // Load template - LOAD_TEMPLATE("admin_update_download"); + loadTemplate('admin_update_download', FALSE, $ONLINE); } else { // You have the latest version! - LOAD_TEMPLATE("admin_settings_saved", false, getMessage('NO_UPDATES_AVAILABLE')); + displayMessage('{--ADMIN_NO_UPDATES_AVAILABLE--}'); } -// +// [EOF] ?>