Remove more Yahoo map api references.

horde · Jan 13, 2017 · 9aebc21 · 9aebc21
1 parent 86dcf10
commit 9aebc21
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 23 deletions.
diff --git a/framework/Core/lib/Horde/Core/Ui/VarRenderer/Html.php b/framework/Core/lib/Horde/Core/Ui/VarRenderer/Html.php
@@ -1270,28 +1270,6 @@ protected function _renderVarDisplay_address($form, &$var, &$vars, $text = true)
                     }
                     $mapurl .= '&zipcode=' . urlencode($info['zip']);
                 }
-
-                /* Yahoo! generated map. */
-                $mapurl2 = 'http://us.rd.yahoo.com/maps/home/submit_a/*-http://maps.yahoo.com/maps?srchtype=a&getmap=Get+Map&';
-                $desc2 = Horde_Core_Translation::t("Yahoo! map");
-                $icon2 = 'map.png';
-                if (!empty($info['street'])) {
-                    $mapurl2 .= '&addr=' . urlencode($info['street']);
-                }
-                /* Give precedence to zipcode over city/state */
-                if (empty($info['zip']) &&
-                    !empty($info['city']) && !empty($info['state'])) {
-                    $mapurl2 .= '&csz='
-                        . urlencode($info['city'] . ' ' . $info['state']);
-                }
-                if (!empty($info['zip'])) {
-                    if (preg_match('|([a-zA-Z]\d[a-zA-Z])\s?(\d[a-zA-Z]\d)|', $info['zip'], $pcParts)) {
-                        $mapurl2 .= '&country=ca';
-                        /* make sure the postal-code has a space */
-                        $info['zip'] = $pcParts[1] . ' ' . $pcParts[2];
-                    }
-                    $mapurl2 .= '&csz=' . urlencode($info['zip']);
-                }
                 break;
 
             default:

diff --git a/horde/config/conf.xml b/horde/config/conf.xml
@@ -1903,7 +1903,6 @@
    required="false"/>
    <configstring name="googlesearch" desc="Google AJAX Search API Key"
    required="false"/>
-   <configstring name="yahoomaps" desc="Yahoo Maps API Key" required="false" />
    <configstring name="cloudmade" desc="Cloudmade API Key" required="false" />
    <configstring name="mytopo" desc="Mytopo Maps API Key" required="false" />
    <configstring name="mytopo_partnerID" desc="Mytopo partner id" required="false" />