From 1c983a69a0f7fe3c72d4f4b658be8ef8b141a407 Mon Sep 17 00:00:00 2001
From: Mafoo <github@mafoo.org>
Date: Thu, 25 Aug 2016 18:12:00 +0100
Subject: [PATCH] BugFix-Vars (#1818)

corrected the system default us-ring category to 'Ringtones'
remove var_name like as var_cat now takes care of this
---
 app/vars/app_defaults.php       | 4 ++--
 resources/classes/ringbacks.php | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/vars/app_defaults.php b/app/vars/app_defaults.php
index 3a6bdab63f..2d2aa11cbd 100644
--- a/app/vars/app_defaults.php
+++ b/app/vars/app_defaults.php
@@ -47,7 +47,7 @@ $vars = <<<EOD
 {"var_name":"call_debug","var_value":"false","var_cat":"Defaults","var_enabled":"true","var_description":""},
 {"var_name":"console_loglevel","var_value":"info","var_cat":"Defaults","var_enabled":"true","var_description":""},
 {"var_name":"default_areacode","var_value":"208","var_cat":"Defaults","var_enabled":"true","var_description":""},
-{"var_name":"us-ring","var_value":"%(2000,4000,440,480)","var_cat":"ringtone","var_enabled":"true","var_description":"RGVmYXVsdCByaW5ndG9uZSAoVVMp"},
+{"var_name":"us-ring","var_value":"%(2000,4000,440,480)","var_cat":"Ringtones","var_enabled":"true","var_description":"RGVmYXVsdCByaW5ndG9uZSAoVVMp"},
 {"var_name":"sit","var_value":"%(274,0,913.8);%(274,0,1370.6);%(380,0,1776.7)","var_cat":"Defaults","var_enabled":"true","var_description":""},
 {"var_name":"sip_tls_version","var_value":"tlsv1","var_cat":"SIP","var_enabled":"true","var_description":"U0lQIGFuZCBUTFMgc2V0dGluZ3Mu"},
 {"var_name":"internal_auth_calls","var_value":"true","var_cat":"SIP Profile: Internal","var_enabled":"true","var_description":""},
@@ -234,7 +234,7 @@ EOD;
 					}
 					$row['var_description'] = $item->attributes()->description;
 					if(!isset($row['var_description'])){
-						$row['var_description'] = 'SW1wb3J0ZWQgZnJvbSB2YXJzLnhtbA==';
+						$row['var_description'] = base64_encode('Imported from vars.xml');
 					}
 					$result[] = $row;
 				}
diff --git a/resources/classes/ringbacks.php b/resources/classes/ringbacks.php
index ba8c0f3fc3..b387d18ff2 100644
--- a/resources/classes/ringbacks.php
+++ b/resources/classes/ringbacks.php
@@ -52,7 +52,6 @@ if (!class_exists('ringbacks')) {
 			//get the ringback types
 				$sql = "select * from v_vars ";
 				$sql .= "where var_cat = 'Ringtones' ";
-				$sql .= "and var_name LIKE '%-ring' ";
 				$sql .= "order by var_name asc ";
 				$prep_statement = $this->db->prepare(check_sql($sql));
 				$prep_statement->execute();