X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-updates.php;h=497430cfa84737245c2aab3a39d7aa6b10f753f7;hp=a2d5dbc4620fb340bebdd2f8816abb519ef09b1a;hb=263a089d8a499e0e26d0af9e7aa7639f88b8ca60;hpb=9b27fd714bd5db5ca84ec1bd019c7614441f504b diff --git a/inc/modules/admin/what-updates.php b/inc/modules/admin/what-updates.php index a2d5dbc462..497430cfa8 100644 --- a/inc/modules/admin/what-updates.php +++ b/inc/modules/admin/what-updates.php @@ -1,6 +1,6 @@ $v) { $v = trim($v); if (empty($v)) { @@ -71,48 +75,11 @@ if (empty($response[0]) && empty($response[1]) && empty($response[2])) { // Which is the latest version on server? $ONLINE = array( - 'version' => str_replace("\n", "", $response[0]), - 'changed' => str_replace("\n", "", $response[1]) + 'version' => str_replace("\n", '', $response[0]), + 'changed' => str_replace("\n", '', $response[1]), + 'revision' => str_replace("\n", '', $response[2]), + 'code' => '200 OK' ); - - // Array for available patches - $PATCHES = array( - 'fname' => array(), - 'fsize' => array(), - 'ctime' => array() - ); - - if (($response[2] != "[EOF]") && ($ONLINE['version'] == FULL_VERSION)) { - // We have found new patches (newer than FULL_VERSION) - $max = str_replace("\n", "", $response[sizeof($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($_CONFIG['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) > bigintval($_CONFIG['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]; @@ -122,46 +89,17 @@ if (empty($response[0]) && empty($response[1]) && empty($response[2])) { // 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'] != FULL_VERSION) { + loadTemplate('admin_settings_saved', false, "
{--ADMIN_CANNOT_CHECK_VERSION--} (".$ONLINE['code'].")
"); +} elseif (($ONLINE['version'] != getConfig('FULL_VERSION')) || ($ONLINE['revision'] != getConfig('CURR_SVN_REVISION'))) { // 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")); + $ONLINE['changed'] = generateDateTime($ONLINE['changed'], 2); // Load template - LOAD_TEMPLATE("admin_update_download"); -} elseif (sizeof($PATCHES['fname']) > 0) { - // Some patches are available - $OUT = ""; $SW = "2"; - foreach ($PATCHES['fname'] as $idx => $file) { - $SIZE = TRANSLATE_COMMA(round($PATCHES['fsize'][$idx]/102.4)/10); - $content = array( - 'sw' => $SW, - 'patch_url' => SERVER_URL."/patches/".$file, - 'patch_title' => str_replace("_", " ", str_replace(".zip", "", $file)), - 'patch_ctime' => MAKE_DATETIME($PATCHES['ctime'][$idx], "2"), - 'patch_size' => $SIZE, - 'patch_desc' => COMPILE_CODE($PATCHES['descr'][$idx]), - ); - // Evaluate descrition code - $eval = "\$content['patch_desc'] = \"".$content['patch_desc']."\";"; - eval($eval); - - // Load template, switch color and count total size up - $OUT .= LOAD_TEMPLATE("admin_patches_row", true, $content); - $SW = 3 - $SW; - } - define('__PATCH_ROWS', $OUT); - - // Total size - define('__TOTAL_SIZE', TRANSLATE_COMMA($TOTAL_SIZE / 1024)); - - // Load main template - LOAD_TEMPLATE("admin_patches"); + loadTemplate('admin_update_download', false, $ONLINE); } else { // You have the latest version! - LOAD_TEMPLATE("admin_settings_saved", false, NO_UPDATES_AVAILABLE); + loadTemplate('admin_settings_saved', false, getMessage('NO_UPDATES_AVAILABLE')); } -// +// [EOF] ?>