diff --git a/Layout/default/Voicenumberblock/Form.php b/Layout/default/Voicenumberblock/Form.php
index 0e6e8c92c..98fbf1180 100644
--- a/Layout/default/Voicenumberblock/Form.php
+++ b/Layout/default/Voicenumberblock/Form.php
@@ -55,7 +55,7 @@
@@ -63,7 +63,7 @@
diff --git a/application/Voicenumberblock/Voicenumberblock.php b/application/Voicenumberblock/Voicenumberblock.php
index 35d20085e..84bf423f2 100644
--- a/application/Voicenumberblock/Voicenumberblock.php
+++ b/application/Voicenumberblock/Voicenumberblock.php
@@ -18,14 +18,14 @@ class Voicenumberblock extends mfBaseModel {
}
public function getFirst() {
- if($this->number_add_zero) {
+ if($this->number_prepend_zero) {
return "0".$this->first;
}
return $this->first;
}
public function getLast() {
- if($this->number_add_zero) {
+ if($this->number_prepend_zero) {
return "0".$this->last;
}
return $this->last;
diff --git a/application/Voicenumberblock/VoicenumberblockController.php b/application/Voicenumberblock/VoicenumberblockController.php
index 2d534e621..f092578c5 100644
--- a/application/Voicenumberblock/VoicenumberblockController.php
+++ b/application/Voicenumberblock/VoicenumberblockController.php
@@ -99,9 +99,9 @@ class VoicenumberblockController extends mfBaseController {
$data['areacode'] = $r->areacode;
if(substr($r->first,0,1) === "0") {
- $data['number_add_zero'] = 1;
+ $data['number_prepend_zero'] = 1;
} else {
- $data['number_add_zero'] = 0;
+ $data['number_prepend_zero'] = 0;
}
$data['first'] = $r->first;
$data['last'] = $r->last;
diff --git a/application/Voicenumberblock/VoicenumberblockModel.php b/application/Voicenumberblock/VoicenumberblockModel.php
index 37396d897..53b4cb824 100644
--- a/application/Voicenumberblock/VoicenumberblockModel.php
+++ b/application/Voicenumberblock/VoicenumberblockModel.php
@@ -6,7 +6,7 @@ class VoicenumberblockModel {
public $areacode;
public $first;
public $last;
- public $number_add_zero;
+ public $number_prepend_zero;
public $comment;
public $create_by;
@@ -93,6 +93,15 @@ class VoicenumberblockModel {
mfLoghandler::singleton()->debug($where);
//mfLoghandler::singleton()->log->debug($where);
$res = $db->select("Voicenumberblock", "*", "$where ORDER BY countrycode, areacode, first, last");
+
+ if(is_array($limit) && count($limit)) {
+ if(is_numeric($limit['start']) && is_numeric($limit['count'])) {
+ $sql .= " LIMIT ".$limit['start'].", ".$limit['count'];
+ } elseif(is_numeric($count)) {
+ $sql .= " LIMIT ".$limit['count'];
+ }
+ }
+
if($db->num_rows($res)) {
while($data = $db->fetch_object($res)) {
$items[] = new Voicenumberblock($data);
@@ -138,7 +147,7 @@ class VoicenumberblockModel {
if(is_numeric($first)) {
$where .= " AND first like '%$first%'";
if($add_zero) {
- $where .= " AND number_add_zero = 1";
+ $where .= " AND number_prepend_zero = 1";
}
}
}
@@ -173,7 +182,7 @@ class VoicenumberblockModel {
$where .= " AND first <= $number AND last >= $number";
if($add_zero) {
- $where .= " AND number_add_zero = 1";
+ $where .= " AND number_prepend_zero = 1";
}
}
}