Skip to content

Commit 04c6865

Browse files
callcenter-magnuscallcenter-magnus
committed
fix some issue on DEBIAN 12
1 parent c110f76 commit 04c6865

15 files changed

+66
-28
lines changed

‎build/MagnusBilling-current.tar.gz

610 Bytes
Binary file not shown.

‎protected/components/BaseController.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -824,6 +824,9 @@ public function actionReport()
824824
$sort = $sort ? $firstSort . implode(',', $sort) : null;
825825

826826
$this->sort = $this->replaceOrder();
827+
if ( ! strlen($this->sort)) {
828+
$this->order = $this->attributeOrder;
829+
}
827830

828831
$this->select = $this->getColumnsFromReport($columns, $fieldGroup, 'pdf');
829832

‎protected/controllers/RateProviderController.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ public function importRates($values)
191191

192192
}
193193

194-
$sql = "UPDATE pkg_rate_provider t JOIN pkg_prefix p ON t.dialprefix = p.prefix SET t.id_prefix = p.id, t.dialprefix = NULL, t.destination = NULL WHERE dialprefix > 0 AND p.prefix > 0";
194+
$sql = "UPDATE pkg_rate_provider t JOIN pkg_prefix p ON t.dialprefix = p.prefix SET t.id_prefix = p.id, t.dialprefix = NULL, t.destination = NULL WHERE dialprefix IS NOT NULL AND p.prefix > 0";
195195
try {
196196
Yii::app()->db->createCommand($sql)->execute();
197197
} catch (Exception $e) {
@@ -203,7 +203,7 @@ public function importRates($values)
203203

204204
}
205205

206-
$modelRate = RateProvider::model()->findAll('dialprefix > 0');
206+
$modelRate = RateProvider::model()->findAll('dialprefix IS NOT NULL');
207207
if (isset($modelRate[0]->id)) {
208208
//check if there are more than 2000 new prefix, if yes, import using LOAD DATA.
209209
if (count($modelRate) > 2000) {
@@ -226,7 +226,7 @@ public function importRates($values)
226226
}
227227
}
228228

229-
$sql = "UPDATE pkg_rate_provider t JOIN pkg_prefix p ON t.dialprefix = p.prefix SET t.id_prefix = p.id, t.dialprefix = NULL, t.destination = NULL WHERE dialprefix > 0";
229+
$sql = "UPDATE pkg_rate_provider t JOIN pkg_prefix p ON t.dialprefix = p.prefix SET t.id_prefix = p.id, t.dialprefix = NULL, t.destination = NULL WHERE dialprefix IS NOT NULL";
230230
try {
231231
Yii::app()->db->createCommand($sql)->execute();
232232
} catch (Exception $e) {
@@ -238,7 +238,7 @@ public function importRates($values)
238238

239239
}
240240

241-
RateProvider::model()->updateAll(['dialprefix' => null, 'destination' => null], 'dialprefix > 0');
241+
RateProvider::model()->updateAll(['dialprefix' => null, 'destination' => null], 'dialprefix IS NOT NULL');
242242

243243
}
244244

‎resources/asterisk/CallbackAgi.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020

2121
class CallbackAgi
2222
{
23-
public function callbackCID($agi, $MAGNUS, $CalcAgi, $DidAgi)
23+
public static function callbackCID($agi, $MAGNUS, $CalcAgi, $DidAgi)
2424
{
2525
$agi->verbose("MAGNUS CID CALLBACK");
2626
$MAGNUS->agiconfig['cid_enable'] = 1;
2727

28-
if ($MAGNUS->dnid == 'failed' || !is_numeric($MAGNUS->dnid)) {
28+
if ($MAGNUS->dnid == 'failed' || ! is_numeric($MAGNUS->dnid)) {
2929
$agi->verbose("Hangup becouse dnid is OutgoingSpoolFailed", 25);
3030
$MAGNUS->hangup($agi);
3131
exit;
@@ -119,7 +119,7 @@ public function callback0800($agi, $MAGNUS, $CalcAgi, $DidAgi)
119119

120120
$agi->verbose("MAGNUS 0800 CALLBACK");
121121

122-
if ($MAGNUS->dnid == 'failed' || !is_numeric($MAGNUS->dnid)) {
122+
if ($MAGNUS->dnid == 'failed' || ! is_numeric($MAGNUS->dnid)) {
123123
$agi->verbose("Hangup becouse dnid is OutgoingSpoolFailed");
124124
$MAGNUS->hangup($agi);
125125
exit;
@@ -140,7 +140,7 @@ public function callback0800($agi, $MAGNUS, $CalcAgi, $DidAgi)
140140
$sql = "SELECT * FROM pkg_sip WHERE id_user = " . $DidAgi->modelDestination[0]['id_user'] . " LIMIT 1";
141141
$MAGNUS->modelSip = $agi->query($sql)->fetch(PDO::FETCH_OBJ);
142142

143-
if (!isset($MAGNUS->modelSip->id)) {
143+
if ( ! isset($MAGNUS->modelSip->id)) {
144144
$agi->verbose("Username not have SIP ACCOUNT");
145145
$MAGNUS->hangup($agi);
146146
return;
@@ -188,7 +188,7 @@ public function callback0800($agi, $MAGNUS, $CalcAgi, $DidAgi)
188188
public static function chargeFistCall($agi, $MAGNUS, $CalcAgi, $sessiontime = 0)
189189
{
190190

191-
if ($MAGNUS->dnid == 'failed' || !is_numeric($MAGNUS->dnid)) {
191+
if ($MAGNUS->dnid == 'failed' || ! is_numeric($MAGNUS->dnid)) {
192192
$agi->verbose("Hangup becouse dnid is OutgoingSpoolFailed", 25);
193193
$MAGNUS->hangup($agi);
194194
exit;

‎resources/asterisk/DidAgi.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,8 @@ public function call_did(&$agi, &$MAGNUS, &$CalcAgi, $destinationIvr = false)
394394

395395
$MAGNUS->extension = $MAGNUS->destination = $MAGNUS->dnid = $modelSip->name;
396396

397-
$dialResult = SipCallAgi::processCall($MAGNUS, $agi, $CalcAgi, $this->did);
397+
$SipCallAgi = new SipCallAgi();
398+
$dialResult = $SipCallAgi->processCall($MAGNUS, $agi, $CalcAgi, $this->did);
398399

399400
$dialstatus = $dialResult['dialstatus'];
400401
$answeredtime = $dialResult['answeredtime'];

‎resources/asterisk/IvrAgi.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
class IvrAgi
2222
{
23-
public function callIvr(&$agi, &$MAGNUS, &$CalcAgi, &$DidAgi = null, $type = 'ivr')
23+
public static function callIvr(&$agi, &$MAGNUS, &$CalcAgi, &$DidAgi = null, $type = 'ivr')
2424
{
2525

2626
$agi->verbose("Ivr module", 5);

‎resources/asterisk/MassiveCall.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
class MassiveCall
2222
{
23-
public function send($agi, &$MAGNUS, &$CalcAgi)
23+
public static function send($agi, &$MAGNUS, &$CalcAgi)
2424
{
2525

2626
require_once 'Tts.php';

‎resources/asterisk/PickupAgi.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
class PickupAgi
2222
{
23-
public function execute(&$agi, &$MAGNUS)
23+
public static function execute(&$agi, &$MAGNUS)
2424
{
2525
$sql = "SELECT * FROM pkg_sip WHERE ( name = '" . substr($MAGNUS->dnid, 2) . "' OR alias = '" . substr($MAGNUS->dnid, 2) . "' ) AND accountcode = '$MAGNUS->accountcode' LIMIT 1";
2626

‎resources/asterisk/PortalDeVozAgi.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
class PortalDeVozAgi
2121
{
2222

23-
public function send(&$agi, &$MAGNUS, &$CalcAgi, &$DidAgi)
23+
public static function send(&$agi, &$MAGNUS, &$CalcAgi, &$DidAgi)
2424
{
2525
$agi->answer();
2626
$agi->verbose('PortalDeVozAgi');
@@ -31,7 +31,7 @@ public function send(&$agi, &$MAGNUS, &$CalcAgi, &$DidAgi)
3131
$sql = "SELECT * FROM pkg_sip WHERE name = '$MAGNUS->dnid' OR alias = '$MAGNUS->dnid' LIMIT 1 ";
3232
$MAGNUS->modelSip = $agi->query($sql)->fetch(PDO::FETCH_OBJ);
3333

34-
if (!isset($MAGNUS->modelSip->id)) {
34+
if ( ! isset($MAGNUS->modelSip->id)) {
3535
$agi->verbose('User no found', 15);
3636
$agi->stream_file('prepaid-invalid-digits', '#');
3737
continue;

‎resources/asterisk/QueueAgi.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
class QueueAgi
2222
{
23-
public function callQueue(&$agi, &$MAGNUS, &$CalcAgi, $DidAgi = null, $type = 'queue', $startTime = 0)
23+
public static function callQueue(&$agi, &$MAGNUS, &$CalcAgi, $DidAgi = null, $type = 'queue', $startTime = 0)
2424
{
2525
$agi->verbose("Queue module", 5);
2626
$MAGNUS->sip_account = '';
@@ -125,7 +125,7 @@ public function callQueue(&$agi, &$MAGNUS, &$CalcAgi, $DidAgi = null, $type = 'q
125125
if ($siptransfer['data'] != 'yes' && $type == 'queue') {
126126

127127
$CalcAgi->real_sessiontime = intval($CalcAgi->sessiontime);
128-
if (!is_null($DidAgi)) {
128+
if ( ! is_null($DidAgi)) {
129129
$DidAgi->billDidCall($agi, $MAGNUS, $CalcAgi->sessiontime, $CalcAgi);
130130
}
131131

0 commit comments

Comments
 (0)