From ba0d6fc1939da1485ab2496f4f82b3d6f535bb84 Mon Sep 17 00:00:00 2001 From: Klas Lindfors Date: Mon, 7 Mar 2016 21:16:21 +0100 Subject: [PATCH] put building syncurl in a function --- ykval-synclib.php | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/ykval-synclib.php b/ykval-synclib.php index 27feb33..589124b 100644 --- a/ykval-synclib.php +++ b/ykval-synclib.php @@ -315,10 +315,7 @@ class SyncLib $handle = $ch[$entry['server']]; $this->log(LOG_INFO, "server=" . $entry['server'] . ", server_nonce=" . $entry['server_nonce'] . ", info=" . $entry['info']); - $url = $entry['server'] . - "?otp=" . $entry['otp'] . - "&modified=" . $entry['modified'] . - "&" . $this->otpPartFromInfoString($entry['info']); + $url = $this->buildSyncUrl($entry); curl_settings($this, 'YK-VAL resync', $handle, $url, $timeout, $this->curlopts); $entries[$entry['server']] = $entry; @@ -432,10 +429,7 @@ class SyncLib } $this->log(LOG_INFO, "server=" . $entry['server'] . ", server_nonce=" . $entry['server_nonce'] . ", info=" . $entry['info']); - $url = $entry['server'] . - "?otp=" . $entry['otp'] . - "&modified=" . $entry['modified'] . - "&" . $this->otpPartFromInfoString($entry['info']); + $url = $this->buildSyncUrl($entry); curl_settings($this, 'YK-VAL resync', $handle, $url, $timeout, $this->curlopts); $entries[$server] = $entry; @@ -469,10 +463,7 @@ class SyncLib )); foreach ($res as $row) { - $urls[] = $row['server'] . - "?otp=" . $row['otp'] . - "&modified=" . $row['modified'] . - "&" . $this->otpPartFromInfoString($row['info']); + $urls[] = $this->buildSyncUrl($row); } // send out requests @@ -665,4 +656,12 @@ class SyncLib 'server' => $server )); } + + private function buildSyncUrl($entry) + { + return $entry['server'] . + "?otp=" . $entry['otp'] . + "&modified=" . $entry['modified'] . + "&" . $this->otpPartFromInfoString($entry['info']); + } }