Merge branch 'bugfix/FREEPBX-11857' of ssh://git.freepbx.org/freepbx/…

…superfecta into release/13.0
udo1toni · Apr 4, 2016 · 482f972 · 482f972
2 parents 658c122 + 4263b70
commit 482f972
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Superfecta.class.php b/Superfecta.class.php
@@ -204,7 +204,6 @@ public function execute($scheme='ALL', $request, $debug=0, $keepGoing=false) {
 			//Set Spam text
 			$spam_text = ($superfecta->isSpam()) ? $options['scheme_settings']['SPAM_Text'] : '';
 			if($superfecta->isSpam() && $options['scheme_settings']['SPAM_Text_Substitute'] == 'Y') {
-				dbug($options['scheme_settings']);
 				$callerid = $spam_text;
 			} else {
 				$callerid = $spam_text . " " . $superfecta->get_Prefix() . $callerid;
@@ -461,7 +460,6 @@ public function ajaxHandler() {
 
 				$scheme = $_REQUEST['scheme'];
 				$source = $_REQUEST['source'];
-
 				$sql = "REPLACE INTO superfectaconfig (source,field,value) VALUES (?, ?, ?)";
 				$sth = $this->db->prepare($sql);
 				foreach($params as $key => $data) {
@@ -533,6 +531,9 @@ public function ajaxHandler() {
 							$form_html .= '<label for="'.$key.'">'.str_replace("_", " ", $key).'</label><a class="info"><span>'.$data['description'].'</span></a>';
 							$form_html .= '<input type="number" class="form-control" name="'.$key.'" id="'.$key.'" value="'.$value.'" /></td>';
 						break;
+						case "info":
+							$form_html .= $default;
+						break;
 						case "select":
 							$value = isset($n_settings[$key]) ? $n_settings[$key] : $default;
 							$form_html .= '<label for="'.$key.'">'.str_replace("_", " ", $key).'</label><a class="info"><span>'.$data['description'].'</span></a>';

diff --git a/sources/source-GooglePlaces.module b/sources/source-GooglePlaces.module
@@ -31,7 +31,7 @@ class GooglePlaces extends superfecta_base {
          'Privacy_Policy' => array (
               'description' => _('Google Maps API requires this module provide the this privacy policy'),
               'type' => 'info',
-              'default' => '<textarea readonly cols="40" rows="5">Privacy Policy and Terms of Use:
+              'default' => '<input type = "hidden" name="Privacy_Policy" value=""><textarea readonly cols="40" name = "Google_Agreements" rows="5">Privacy Policy and Terms of Use:
   To comply with the Google Maps TOS,
   this module must have a privacy policy
   and terms of use. This is the privacy