1
0
mirror of https://github.com/nerzhul/ocsms.git synced 2025-06-07 16:06:15 +00:00

Remove useless code

This commit is contained in:
Loic Blot 2014-10-23 08:52:51 +00:00
parent 0e013b0645
commit 714f0c0d9e

View File

@ -132,7 +132,6 @@ class SmsController extends Controller {
for ($i=0; $i < $ctPn; $i++) { for ($i=0; $i < $ctPn; $i++) {
// Remove slashes // Remove slashes
$fmtPN = preg_replace("#[/]#"," ", $iContacts[$contactName][$i]); $fmtPN = preg_replace("#[/]#"," ", $iContacts[$contactName][$i]);
$fmtPN2 = preg_replace("#[/]#","", $iContacts[$contactName][$i]);
$messages = $messages + $messages = $messages +
$this->smsMapper->getAllMessagesForPhoneNumber($this->userId, $fmtPN, $lastDate); $this->smsMapper->getAllMessagesForPhoneNumber($this->userId, $fmtPN, $lastDate);
@ -140,31 +139,16 @@ class SmsController extends Controller {
$msgCount += $this->smsMapper->countMessagesForPhoneNumber($this->userId, $fmtPN); $msgCount += $this->smsMapper->countMessagesForPhoneNumber($this->userId, $fmtPN);
$phoneNumbers[] = $fmtPN; $phoneNumbers[] = $fmtPN;
if ($fmtPN != $fmtPN2) {
$messages = $messages +
$this->smsMapper->getAllMessagesForPhoneNumber($this->userId, $fmtPN2, $lastDate);
$msgCount += $this->smsMapper->countMessagesForPhoneNumber($this->userId, $fmtPN2);
}
} }
} }
else { else {
// remove slashes // remove slashes
$fmtPN = preg_replace("#[/]#"," ", $phoneNumber); $fmtPN = preg_replace("#[/]#"," ", $phoneNumber);
$fmtPN2 = preg_replace("#[/]#","", $phoneNumber);
$messages = $this->smsMapper->getAllMessagesForPhoneNumber($this->userId, $fmtPN, $lastDate); $messages = $this->smsMapper->getAllMessagesForPhoneNumber($this->userId, $fmtPN, $lastDate);
$msgCount = $this->smsMapper->countMessagesForPhoneNumber($this->userId, $fmtPN); $msgCount = $this->smsMapper->countMessagesForPhoneNumber($this->userId, $fmtPN);
$phoneNumbers[] = $fmtPN; $phoneNumbers[] = $fmtPN;
if ($fmtPN != $fmtPN2) {
$messages = $messages +
$this->smsMapper->getAllMessagesForPhoneNumber($this->userId, $fmtPN2, $lastDate);
$msgCount += $this->smsMapper->countMessagesForPhoneNumber($this->userId, $fmtPN2);
}
} }
// Order by id (date) // Order by id (date)