From 3f2dbcc5008eb4639613038869dd84a74adfe950 Mon Sep 17 00:00:00 2001
From: oricgn <oliver@riesen.org>
Date: Wed, 5 Aug 2015 14:22:44 +0200
Subject: [PATCH 1/4] Correcting handling for https; new german language files

---
 google_maps/Changelog                         | 20 +++++++----
 google_maps/info.txt                          |  2 +-
 .../german-informal-female.iso-8859-1.php     | 16 +++++++++
 .../lang/german-informal-female.utf-8.php     | 16 +++++++++
 .../lang/german-informal-male.iso-8859-1.php  | 18 ++++++++++
 .../lang/german-informal-male.utf-8.php       | 18 ++++++++++
 google_maps/lang/german.iso-8859-1.php        | 31 +++++++++++++++++
 google_maps/lang/german.php                   | 34 -------------------
 google_maps/lang/german.utf-8.php             | 31 +++++++++++++++++
 google_maps/lang/german_du.php                | 34 -------------------
 google_maps/maptool/mapframe.php              | 22 ++++++------
 11 files changed, 156 insertions(+), 86 deletions(-)
 create mode 100644 google_maps/lang/german-informal-female.iso-8859-1.php
 create mode 100644 google_maps/lang/german-informal-female.utf-8.php
 create mode 100644 google_maps/lang/german-informal-male.iso-8859-1.php
 create mode 100644 google_maps/lang/german-informal-male.utf-8.php
 create mode 100644 google_maps/lang/german.iso-8859-1.php
 delete mode 100644 google_maps/lang/german.php
 create mode 100644 google_maps/lang/german.utf-8.php
 delete mode 100644 google_maps/lang/german_du.php

diff --git a/google_maps/Changelog b/google_maps/Changelog
index c35e335..ba58fbb 100644
--- a/google_maps/Changelog
+++ b/google_maps/Changelog
@@ -1,6 +1,14 @@
 Changelog:
 ----------
 
+2015-08-05 v2.0.6 (Oliver Riesen)
+
+    - Correct handling of http/https in javascript links to Google.
+
+    - Escaping ampersand in URL.
+
+    - Language files from German Language Files Package added.
+
 2011-04-11 v2.0.5 (Maurice Makaay)
 
     - Restored the functionality of searching for the user's location
@@ -14,7 +22,7 @@ Changelog:
       customized module template.
 
     - Fixed the usermap addon for MSIE8 and before. The markers did not
-      show up due to a javascript issue. 
+      show up due to a javascript issue.
 
 2011-04-01 v2.0.4 (Maurice Makaay)
 
@@ -72,9 +80,9 @@ Changelog:
 
 2010-10-20 v1.2.0 (Thomas Seifert)
 
-    - Added retrieving the city and country of the user on saving their 
-      position. This makes it possible to show the city and/or country 
-      e.g. on the read page. 
+    - Added retrieving the city and country of the user on saving their
+      position. This makes it possible to show the city and/or country
+      e.g. on the read page.
       (requires json_decode and a way to do remote access)
 
     - Dropped support for the (ancient) Real Names module for Phorum 5.1.
@@ -209,10 +217,10 @@ Changelog:
     - If a user saved some profile data on another control center page
       than the page on which the Google map was, then the location
       info would get lost. This bug is now fixed.
-      Thanks to Bert Körn for reporting this problem.
+      Thanks to Bert Körn for reporting this problem.
 
     - Added language support (german_du.php).
-      Also thanks to Bert Körn for this one.
+      Also thanks to Bert Körn for this one.
 
     - Changed Stammgast -> Benutzer in the German language file and
       created a german_sie.php based on german_du.php.
diff --git a/google_maps/info.txt b/google_maps/info.txt
index 04e66d5..5ac5f25 100644
--- a/google_maps/info.txt
+++ b/google_maps/info.txt
@@ -1,6 +1,6 @@
 title: Google Maps
 desc: This module implements Google Maps functionality in the user profile. The user can indicate in the control center where he/she lives and this location can be displayed to others on the profile viewing screen.
-version: 2.0.5
+version: 2.0.6
 require_version: 5.2.16
 author: Maurice Makaay <maurice@phorum.org>
 link: http://www.phorum.org/phorum5/read.php?16,119681
diff --git a/google_maps/lang/german-informal-female.iso-8859-1.php b/google_maps/lang/german-informal-female.iso-8859-1.php
new file mode 100644
index 0000000..5dfc96d
--- /dev/null
+++ b/google_maps/lang/german-informal-female.iso-8859-1.php
@@ -0,0 +1,16 @@
+<?php
+
+// This file ist part of the German Language Files Package
+// Get the complete package here:
+// http://www.phorum.org/phorum5/read.php?65,129717
+
+// Diese Datei ist Teil des Deutschen Sprachpakets
+// Das komplette Paket gibt es hier:
+// http://www.phorum.org/phorum5/read.php?65,129717
+
+include(str_replace('-informal-female', '-informal-male', __FILE__));
+
+$PHORUM['DATA']['LANG']['mod_google_maps']['ProfileTitle'] = 'Standort dieser Teilnehmerin:';
+$PHORUM['DATA']['LANG']['mod_google_maps']['UserMapTitle'] = 'Standorte unserer Teilnehmerinnen';
+
+?>
diff --git a/google_maps/lang/german-informal-female.utf-8.php b/google_maps/lang/german-informal-female.utf-8.php
new file mode 100644
index 0000000..5dfc96d
--- /dev/null
+++ b/google_maps/lang/german-informal-female.utf-8.php
@@ -0,0 +1,16 @@
+<?php
+
+// This file ist part of the German Language Files Package
+// Get the complete package here:
+// http://www.phorum.org/phorum5/read.php?65,129717
+
+// Diese Datei ist Teil des Deutschen Sprachpakets
+// Das komplette Paket gibt es hier:
+// http://www.phorum.org/phorum5/read.php?65,129717
+
+include(str_replace('-informal-female', '-informal-male', __FILE__));
+
+$PHORUM['DATA']['LANG']['mod_google_maps']['ProfileTitle'] = 'Standort dieser Teilnehmerin:';
+$PHORUM['DATA']['LANG']['mod_google_maps']['UserMapTitle'] = 'Standorte unserer Teilnehmerinnen';
+
+?>
diff --git a/google_maps/lang/german-informal-male.iso-8859-1.php b/google_maps/lang/german-informal-male.iso-8859-1.php
new file mode 100644
index 0000000..b338766
--- /dev/null
+++ b/google_maps/lang/german-informal-male.iso-8859-1.php
@@ -0,0 +1,18 @@
+<?php
+
+// This file ist part of the German Language Files Package
+// Get the complete package here:
+// http://www.phorum.org/phorum5/read.php?65,129717
+
+// Diese Datei ist Teil des Deutschen Sprachpakets
+// Das komplette Paket gibt es hier:
+// http://www.phorum.org/phorum5/read.php?65,129717
+
+include(str_replace('-informal-male', '', __FILE__));
+
+$PHORUM['DATA']['LANG']['mod_google_maps']['CCIntroduction']      = 'Du kannst in der Karte Deinen Standort (Wohnort) markieren. Die Markierung kannst Du mit einem Doppelklick setzen und mit der Maus verschieben. Alternativ kannst Du auch die Suche benutzen.';
+$PHORUM['DATA']['LANG']['mod_google_maps']['IncompatibleBrowser'] = 'Entschuldige, Dein Browser ist inkompatibel. Die für Google Maps benötigten Funktionen fehlen.';
+$PHORUM['DATA']['LANG']['mod_google_maps']['NoSearchResults']     = 'Entschuldige, es wurde kein Ergebnis für Deine Suchanfrage gefunden.';
+$PHORUM['DATA']['LANG']['mod_google_maps']['YourLocation']        = 'Dein Standort';
+
+?>
diff --git a/google_maps/lang/german-informal-male.utf-8.php b/google_maps/lang/german-informal-male.utf-8.php
new file mode 100644
index 0000000..db70491
--- /dev/null
+++ b/google_maps/lang/german-informal-male.utf-8.php
@@ -0,0 +1,18 @@
+<?php
+
+// This file ist part of the German Language Files Package
+// Get the complete package here:
+// http://www.phorum.org/phorum5/read.php?65,129717
+
+// Diese Datei ist Teil des Deutschen Sprachpakets
+// Das komplette Paket gibt es hier:
+// http://www.phorum.org/phorum5/read.php?65,129717
+
+include(str_replace('-informal-male', '', __FILE__));
+
+$PHORUM['DATA']['LANG']['mod_google_maps']['CCIntroduction']      = 'Du kannst in der Karte Deinen Standort (Wohnort) markieren. Die Markierung kannst Du mit einem Doppelklick setzen und mit der Maus verschieben. Alternativ kannst Du auch die Suche benutzen.';
+$PHORUM['DATA']['LANG']['mod_google_maps']['IncompatibleBrowser'] = 'Entschuldige, Dein Browser ist inkompatibel. Die für Google Maps benötigten Funktionen fehlen.';
+$PHORUM['DATA']['LANG']['mod_google_maps']['NoSearchResults']     = 'Entschuldige, es wurde kein Ergebnis für Deine Suchanfrage gefunden.';
+$PHORUM['DATA']['LANG']['mod_google_maps']['YourLocation']        = 'Dein Standort';
+
+?>
diff --git a/google_maps/lang/german.iso-8859-1.php b/google_maps/lang/german.iso-8859-1.php
new file mode 100644
index 0000000..b4ca0ce
--- /dev/null
+++ b/google_maps/lang/german.iso-8859-1.php
@@ -0,0 +1,31 @@
+<?php
+
+// This file ist part of the German Language Files Package
+// Get the complete package here:
+// http://www.phorum.org/phorum5/read.php?65,129717
+
+// Diese Datei ist Teil des Deutschen Sprachpakets
+// Das komplette Paket gibt es hier:
+// http://www.phorum.org/phorum5/read.php?65,129717
+
+$PHORUM['DATA']['LANG']['mod_google_maps'] = array
+(
+    'CCIntroduction'      => 'Sie können in der Karte Ihren Standort (Wohnort) markieren. Die Markierung können Sie mit einem Doppelklick setzen und mit der Maus verschieben. Alternativ können Sie auch die Suche benutzen.',
+    'CCMenuItem'          => 'Standort',
+    'Clear'               => 'Standort löschen',
+    'GetMyLocation'       => 'Meinen aktuellen Standort verwenden',
+    'IncompatibleBrowser' => 'Entschuldigen Sie, Ihr Browser ist inkompatibel. Die für Google Maps benötigten Funktionen fehlen.',
+    'Location'            => 'Standort',
+    'NoLocationSet'       => 'Kein Standort ausgewählt.',
+    'NoSearchResults'     => 'Entschuldigen Sie, es wurde kein Ergebnis für Ihre Suchanfrage gefunden.',
+    'ProfileTitle'        => 'Standort dieses Teilnehmers:',
+    'Search'              => 'Standort suchen',
+    'YourLocation'        => 'Ihr Standort',
+    // usermap addon
+    'UserMapTitle'        => 'Standorte unserer Teilnehmer',
+    'UserMapNoUsers'      => 'Leider sind noch keine Standorte vorhanden.',
+    // Language for reverse geocoding (retrieving the name of the city)
+    'geocoding_lang'      => 'de'
+);
+
+?>
diff --git a/google_maps/lang/german.php b/google_maps/lang/german.php
deleted file mode 100644
index 1bd7bc0..0000000
--- a/google_maps/lang/german.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-$PHORUM["DATA"]["LANG"]["mod_google_maps"] = array
-(
-    "YourLocation"        => "Ihr Standort:",
-    "CCMenuItem"          => "Standort",
-    "CCIntroduction"      => "Sie k&ouml;nnen in der Karte unten Ihren " .
-                             "Standort ausw&auml;hlen an dem Sie wohnen. " .
-                             "Die Markierung k&ouml;nnen Sie mit einem " .
-                             "Doppelklick platzieren und mit der Maus " .
-                             "verschieben. Alternativ k&ouml;nnen Sie die " .
-                             "Suche benutzen. Siehe Hilfe.<br />" .
-                             "Beispiel: \"Platz der Republik 1, " .
-                             "11011 Berlin, Germany\"",
-    "Search"              => "Standort suchen",
-    "Clear"               => "Standort l&ouml;schen",
-    "GetMyLocation"       => "Meinen Standort verwenden",
-    "Location"            => "Standort",
-    "NoLocationSet"       => "Kein Standort ausgew&auml;hlt",
-    "IncompatibleBrowser" => "Sorry, Ihr Browser ist inkompatibel." .
-                             "Die ben&ouml;tigten Funktionen fehlen " .
-                             "f&uuml;r Google Maps.",
-    "NoSearchResults"     => "Sorry, es wurden keine Ergebnisse f&uuml;r " .
-                             "Ihre Suchanfrage gefunden.",
-    "ProfileTitle"        => "Standort dieses Benutzers:",
-
-    // usermap addon
-    "UserMapTitle"        => "Standorte unserer Benutzer",
-    "UserMapNoUsers"      => "Leider sind noch keine Standorte vorhanden",
-
-    // Language for reverse geocoding (retrieving the name of the city)
-    "geocoding_lang"      => "de"
-);
-?>
diff --git a/google_maps/lang/german.utf-8.php b/google_maps/lang/german.utf-8.php
new file mode 100644
index 0000000..76e2bd8
--- /dev/null
+++ b/google_maps/lang/german.utf-8.php
@@ -0,0 +1,31 @@
+<?php
+
+// This file ist part of the German Language Files Package
+// Get the complete package here:
+// http://www.phorum.org/phorum5/read.php?65,129717
+
+// Diese Datei ist Teil des Deutschen Sprachpakets
+// Das komplette Paket gibt es hier:
+// http://www.phorum.org/phorum5/read.php?65,129717
+
+$PHORUM['DATA']['LANG']['mod_google_maps'] = array
+(
+    'CCIntroduction'      => 'Sie können in der Karte Ihren Standort (Wohnort) markieren. Die Markierung können Sie mit einem Doppelklick setzen und mit der Maus verschieben. Alternativ können Sie auch die Suche benutzen.',
+    'CCMenuItem'          => 'Standort',
+    'Clear'               => 'Standort löschen',
+    'GetMyLocation'       => 'Meinen aktuellen Standort verwenden',
+    'IncompatibleBrowser' => 'Entschuldigen Sie, Ihr Browser ist inkompatibel. Die für Google Maps benötigten Funktionen fehlen.',
+    'Location'            => 'Standort',
+    'NoLocationSet'       => 'Kein Standort ausgewählt.',
+    'NoSearchResults'     => 'Entschuldigen Sie, es wurde kein Ergebnis für Ihre Suchanfrage gefunden.',
+    'ProfileTitle'        => 'Standort dieses Teilnehmers:',
+    'Search'              => 'Standort suchen',
+    'YourLocation'        => 'Ihr Standort',
+    // usermap addon
+    'UserMapTitle'        => 'Standorte unserer Teilnehmer',
+    'UserMapNoUsers'      => 'Leider sind noch keine Standorte vorhanden.',
+    // Language for reverse geocoding (retrieving the name of the city)
+    'geocoding_lang'      => 'de'
+);
+
+?>
diff --git a/google_maps/lang/german_du.php b/google_maps/lang/german_du.php
deleted file mode 100644
index 8fbfe35..0000000
--- a/google_maps/lang/german_du.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-$PHORUM["DATA"]["LANG"]["mod_google_maps"] = array
-(
-    "YourLocation"        => "Dein Standort:",
-    "CCMenuItem"          => "Standort",
-    "CCIntroduction"      => "Du kannst in der Karte unten Deinen Standort " .
-                             "ausw&auml;hlen an dem Du wohnst. Die " .
-                             "Markierung kannst Du mit einem Doppelklick " .
-                             "platzieren und mit der Maus verschieben. " .
-                             "Alternativ kannst Du die Suche benutzen. " .
-                             "Siehe Hilfe.<br />" .
-                             "Beispiel: \"Platz der Republik 1, " .
-                             "11011 Berlin, Germany\"",
-    "Search"              => "Standort suchen",
-    "Clear"               => "Standort l&ouml;schen",
-    "GetMyLocation"       => "Meinen Standort verwenden",
-    "Location"            => "Standort",
-    "NoLocationSet"       => "Kein Standort ausgew&auml;hlt",
-    "IncompatibleBrowser" => "Sorry, Dein Browser ist inkompatibel " .
-                             "die ben&ouml;tigten Funktionen fehlen " .
-                             "f&uuml;r Google Maps.",
-    "NoSearchResults"     => "Sorry, es wurden keine Ergebnisse f&uuml;r " .
-                             "Deine Suchanfrage gefunden.",
-    "ProfileTitle"        => "Standort dieses Benutzers:",
-
-    // usermap addon
-    "UserMapTitle"        => "Standorte unserer Benutzer",
-    "UserMapNoUsers"      => "Leider sind noch keine Standorte vorhanden",
-
-    // Language for reverse geocoding (retrieving the name of the city)
-    "geocoding_lang"      => "de"
-);
-?>
diff --git a/google_maps/maptool/mapframe.php b/google_maps/maptool/mapframe.php
index 554cf67..704d738 100644
--- a/google_maps/maptool/mapframe.php
+++ b/google_maps/maptool/mapframe.php
@@ -66,7 +66,7 @@
       #map { height: 100%; width: 100%; }
     </style>
     <title>Google Map interface</title>
-    <script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false&region=<?php print $lang['geocoding_lang'] ?>"></script>
+    <script type="text/javascript" src="http<?php echo ($_SERVER['SERVER_PORT']==443 ? 's' : ''); ?>://maps.google.com/maps/api/js?sensor=false&amp;region=<?php print $lang['geocoding_lang'] ?>"></script>
     <script type="text/javascript" src="<?php print $PHORUM['http_path'] ?>/mods/google_maps/maptool/fluster/lib/Fluster2.packed.js"></script>
 
     <script type="text/javascript">
@@ -358,7 +358,7 @@ function placeViewMarker(point, info)
                     content     : info,
                     pixelOffset : new google.maps.Size(0, 16)
                 });
-                info_window.open(map, marker); 
+                info_window.open(map, marker);
             });
         }
     }
@@ -492,15 +492,15 @@ function setMapState(state)
         }
 
         // Set the streetview state.
-        if (state.streetview_latitude  !== null      && 
-            state.streetview_latitude  !== undefined && 
-            state.streetview_longitude !== null      && 
-            state.streetview_longitude !== undefined && 
-            state.streetview_pitch     !== null      && 
-            state.streetview_pitch     !== undefined && 
-            state.streetview_heading   !== null      && 
-            state.streetview_heading   !== undefined && 
-            state.streetview_zoom      !== null      && 
+        if (state.streetview_latitude  !== null      &&
+            state.streetview_latitude  !== undefined &&
+            state.streetview_longitude !== null      &&
+            state.streetview_longitude !== undefined &&
+            state.streetview_pitch     !== null      &&
+            state.streetview_pitch     !== undefined &&
+            state.streetview_heading   !== null      &&
+            state.streetview_heading   !== undefined &&
+            state.streetview_zoom      !== null      &&
             state.streetview_zoom      !== undefined)
         {
             streetview.setPosition(new google.maps.LatLng(

From aeda6c1dda2d6a7ee2164b0446eb8df94e350baa Mon Sep 17 00:00:00 2001
From: oricgn <oliver@riesen.org>
Date: Wed, 5 Aug 2015 15:14:53 +0200
Subject: [PATCH 2/4] removed javascript warning

---
 google_maps/addon/usermap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google_maps/addon/usermap.php b/google_maps/addon/usermap.php
index 805b77b..04b6026 100644
--- a/google_maps/addon/usermap.php
+++ b/google_maps/addon/usermap.php
@@ -62,7 +62,7 @@
           : $user['display_name']);
     $plot['info'] =
         "<a href=\"#\" onclick=\"parent.document.location.href='".addslashes($url)."';" .
-                  "return false\">$name</a>";
+                  "return false\">$name<\/a>";
 
     // Provide a hook for modules to influence the info window.
     if (isset($PHORUM['hooks']['google_maps_user_info']))

From cd6bd35bcd1ce86533822dae607ce8a14052fcb8 Mon Sep 17 00:00:00 2001
From: oricgn <oliver@riesen.org>
Date: Thu, 13 Aug 2015 13:15:09 +0200
Subject: [PATCH 3/4] Conversion for module v1 user settings data

- Fixed conversion of module v1 user settings data to v2 user settings
data. Longitude was replaced by Latitude during conversion.

- Added conversion script for module v1 user settings data.
---
 google_maps/Changelog                         |  9 ++-
 google_maps/README                            |  7 +-
 google_maps/api.php                           |  4 +-
 google_maps/info.txt                          |  2 +-
 .../conversion-v1-user-settings-to-v2.php     | 73 +++++++++++++++++++
 5 files changed, 90 insertions(+), 5 deletions(-)
 create mode 100644 google_maps/scripts/conversion-v1-user-settings-to-v2.php

diff --git a/google_maps/Changelog b/google_maps/Changelog
index ba58fbb..2619a4c 100644
--- a/google_maps/Changelog
+++ b/google_maps/Changelog
@@ -1,9 +1,16 @@
 Changelog:
 ----------
 
+2015-08-05 v2.0.7 (Oliver Riesen)
+
+    - Fixed conversion of module v1 user settings data to v2 user settings
+      data. Longitude was replaced by Latitude during conversion.
+
+    - Added conversion script for module v1 user settings data.
+
 2015-08-05 v2.0.6 (Oliver Riesen)
 
-    - Correct handling of http/https in javascript links to Google.
+    - Fixed handling of http/https in javascript links to Google.
 
     - Escaping ampersand in URL.
 
diff --git a/google_maps/README b/google_maps/README
index 0cdde6c..459aaac 100644
--- a/google_maps/README
+++ b/google_maps/README
@@ -1,5 +1,5 @@
 Module  : Google Maps Module
-Version : 2.0.5
+Version : 2.0.7
 Author  : Maurice Makaay <maurice@phorum.org>
 
 This module implements Google Maps functionality in the user profile.
@@ -75,6 +75,11 @@ Contents:
 
   - Go to the Modules administration and enable the module "Google Maps".
 
+  - Convert module v1 user settings data to v2 user settings data with
+    conversion-v1-user-settings-to-v2.php in the scripts directory of
+    google_maps. Do not call this script from a browser. Yos have to call it
+    from your server command line.
+
 
 3. Customization
 ----------------
diff --git a/google_maps/api.php b/google_maps/api.php
index b52530b..1479c1f 100644
--- a/google_maps/api.php
+++ b/google_maps/api.php
@@ -189,7 +189,7 @@ function mod_google_maps_upgrade_userdata($d)
             $d['center'], $m
         )) {
             $d['map_latitude']  = $m[1];
-            $d['map_longitude'] = $m[1];
+            $d['map_longitude'] = $m[2];
             unset($d['center']);
         }
     }
@@ -200,7 +200,7 @@ function mod_google_maps_upgrade_userdata($d)
             $d['marker'], $m
         )) {
             $d['marker_latitude']  = $m[1];
-            $d['marker_longitude'] = $m[1];
+            $d['marker_longitude'] = $m[2];
             unset($d['marker']);
         }
     }
diff --git a/google_maps/info.txt b/google_maps/info.txt
index 5ac5f25..49af706 100644
--- a/google_maps/info.txt
+++ b/google_maps/info.txt
@@ -1,6 +1,6 @@
 title: Google Maps
 desc: This module implements Google Maps functionality in the user profile. The user can indicate in the control center where he/she lives and this location can be displayed to others on the profile viewing screen.
-version: 2.0.6
+version: 2.0.7
 require_version: 5.2.16
 author: Maurice Makaay <maurice@phorum.org>
 link: http://www.phorum.org/phorum5/read.php?16,119681
diff --git a/google_maps/scripts/conversion-v1-user-settings-to-v2.php b/google_maps/scripts/conversion-v1-user-settings-to-v2.php
new file mode 100644
index 0000000..074b35c
--- /dev/null
+++ b/google_maps/scripts/conversion-v1-user-settings-to-v2.php
@@ -0,0 +1,73 @@
+#!/usr/bin/php
+<?php
+
+// Conversion of module v1 user settings data to v2 user settings data
+
+// if we are running in the webserver, bail out
+if ('cli' != php_sapi_name()) {
+    echo 'This script cannot be run from a browser.';
+    return;
+}
+
+define('PHORUM_ADMIN', 1);
+define('phorum_page', 'conversion_google_maps_user_data');
+
+require_once '../api.php';
+
+chdir(dirname(__FILE__).'/../../..');
+require_once './common.php';
+require_once './include/api/user.php';
+require_once './include/api/custom_profile_fields.php';
+
+// Make sure that the output is not buffered.
+phorum_ob_clean();
+
+if (! ini_get('safe_mode')) {
+    set_time_limit(0);
+    ini_set('memory_limit', '64M');
+}
+
+print "\nConversion of module v1 user settings data to v2 user settings data ...\n";
+
+// Collect all users which have a "mod_google_maps" custom user profile field.
+$field = phorum_api_custom_profile_field_byname('mod_google_maps');
+if (empty($field)) trigger_error(
+    'No custom profile field named "mod_google_maps" available',
+    E_USER_ERROR
+);
+$user_ids = phorum_api_user_search_custom_profile_field(
+    $field['id'], '%', '*', TRUE
+);
+$count_total = count($user_ids);
+$size = strlen($count_total);
+
+// Retrieve the data for the users that were found.
+$users = phorum_api_user_get($user_ids);
+
+$count = 0;
+foreach ($users as $user) {
+    $mapstate = $user['mod_google_maps'];
+
+    // Upgrade the user data if it looks like version 1 data.
+    if (isset($mapstate['marker'])) {
+        $mapstate = mod_google_maps_upgrade_userdata($mapstate);
+        phorum_api_user_save
+            ( array
+                  ( 'user_id'         => $user['user_id'],
+                    'mod_google_maps' => $mapstate ) );
+    }
+
+    $count ++;
+
+    $perc = floor(($count/$count_total)*100);
+    $barlen = floor(20*($perc/100));
+    $bar = '[';
+    $bar .= str_repeat('=', $barlen);
+    $bar .= str_repeat(' ', (20-$barlen));
+    $bar .= ']';
+    printf
+        ( "updating %{$size}d / %{$size}d  %s (%d%%)\r",
+          $count, $count_total, $bar, $perc );
+}
+print "\n\n";
+?>

From c6127550c44fb93b22c61db47ae78030f520bcb4 Mon Sep 17 00:00:00 2001
From: oricgn <oliver@riesen.org>
Date: Wed, 20 Apr 2016 10:36:45 +0200
Subject: [PATCH 4/4] Obsolete assignment by reference (&new) removed

See: http://www.phorum.org/phorum5/read.php?61,156894,157057#msg-157057;
thanks to Fabian Bastin
(http://www.phorum.org/phorum5/profile.php?61,3024).
---
 bbcode_google/Changelog         |  16 ++++++++++++++++
 bbcode_google/README            |   2 +-
 bbcode_google/bbcode_google.php |   8 ++++----
 bbcode_google/google.png        | Bin 1197 -> 1541 bytes
 bbcode_google/icon.gif          | Bin 1099 -> 995 bytes
 bbcode_google/info.txt          |   3 ++-
 bbcode_google/settings.php      |   2 +-
 7 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/bbcode_google/Changelog b/bbcode_google/Changelog
index e60017c..cddfc8b 100644
--- a/bbcode_google/Changelog
+++ b/bbcode_google/Changelog
@@ -1,6 +1,22 @@
 Changelog:
 ----------
 
+2016-04-20 v1.1.2 Oliver Riesen-Mallmann (oliver@riesen.org)
+
+   - Obsolete assignment by reference (&new) removed; see:
+     http://www.phorum.org/phorum5/read.php?61,156894,157057#msg-157057;
+     thanks to Fabian Bastin
+     (http://www.phorum.org/phorum5/profile.php?61,3024).
+
+2015-09-18 v1.1.1 Oliver Riesen <oliver@riesen.org>
+
+   - Google icon updated, see:
+     http://googleblog.blogspot.de/2015/09/google-update.html
+
+   - URL in info.txt added.
+
+   - Performance improvements.
+
 2007-11-02 v1.1.0
 
    - Branched off the 5.1.x version of the module. From now on, 1.1.0 and
diff --git a/bbcode_google/README b/bbcode_google/README
index 2a19c6d..42aeea6 100644
--- a/bbcode_google/README
+++ b/bbcode_google/README
@@ -1,5 +1,5 @@
 Module  : BBcode Google
-Version : 1.1.0
+Version : 1.1.1
 Author  : Maurice Makaay
 
 This module will turn [google]search words[/google] into a link that
diff --git a/bbcode_google/bbcode_google.php b/bbcode_google/bbcode_google.php
index 90de98e..f9ba1b5 100644
--- a/bbcode_google/bbcode_google.php
+++ b/bbcode_google/bbcode_google.php
@@ -9,7 +9,7 @@
 // The function that is used for generating the CSS for this module.
 function mod_bbcode_google_css()
 {
-    $PHORUM = $GLOBALS['PHORUM'];
+    global $PHORUM;
     $padding_left = "5px";
     $background = "";
 
@@ -39,7 +39,7 @@ function mod_bbcode_google_css()
 // Register the additional CSS code with Phorum.
 function phorum_mod_bbcode_google_css_register($data)
 {
-    $PHORUM = $GLOBALS['PHORUM'];
+    global $PHORUM;
 
     // Do not add the built-in styling in case the built-in style is disabled.
     if (isset($PHORUM["mod_bbcode_google"]["builtin_style"]) &&
@@ -73,7 +73,7 @@ function phorum_mod_bbcode_google_javascript_register($data)
 // Format the Google links in the message body.
 function phorum_mod_bbcode_google_format($data)
 {
-    $PHORUM = $GLOBALS["PHORUM"];
+    global $PHORUM;
 
     foreach($data as $message_id => $message)
     {
@@ -129,7 +129,7 @@ function phorum_mod_bbcode_google_format($data)
 // be enabled for this to work.
 function phorum_mod_bbcode_google_editor_tool_plugin()
 {
-    $PHORUM = $GLOBALS['PHORUM'];
+    global $PHORUM;
     if (empty($PHORUM["mod_bbcode_google"]["enable_editor_tool"])) return;
     $lang = $PHORUM['DATA']['LANG']['bbcode_google'];
 
diff --git a/bbcode_google/google.png b/bbcode_google/google.png
index 52dd0941ce96442b6e11e57d0e8c929e7e3cfb42..32893b7f8441c7ca21a16364e6f26ff527e8edd3 100644
GIT binary patch
literal 1541
zcmV+g2KxDlP)<h;3K|Lk000e1NJLTq001ul000sQ0ssI3Go~OO0000LbVXQnLvm$d
zbZKvHAXI5>WdH}?2@(wf6>+0nwg3PC2XskIMF-yr5)BA5r)`0900009a7bBm000XT
z000XT0n*)m`~Uz2gGod|RCwC0R(nuXRT#hb?p=0Q!V!Fw&R~wFF`<Fh;3LBY%|Js(
z7){a4(gwBiA7_-bhvtfpA{{6*O--H3CLJA|$>O2n2#A`if+iw?DeFEEcDZ-=-o59Z
zbNcQsj|FLTCce4%?03%j?)Uw^*E!2lN|~<2-Lk1A)rhu}xHq4nAyj!s+hZU7kcSoV
zhux+LH$J|$okoAN_K>wxO8bOmH4b9}kBSK_5z=K`bN&mBCxqiT_S2)X<+uzRO=)Hr
z)zU#QW`6A(+-IQo$Nf_AsU9FaN?h`0u>(32Ix-Ac3Nl<q0$*z<DcihiU9B_q73zP0
ziVZTNW{Zezjh^gPnks;nvQ>c5y<v?~TZ695!rq3J2fR}@2`a|U)X5#XyVL!LYS70v
z7{I$)ags$aZxW_%7Gwp}C!p-}xnL)Bg|DbZjm`A*`ls$cBrbv6Y$WkR8CRN_@ymS{
zE)8Guo_eMqLliD1pB=Jn`c^Li+msofM8KV<%vq$#6`r*!JY#|88^E!(XgKQ}>dfte
zx8SJnQ~^vK$uFb29Mx4w2v!RD?I)!=JK!MTHslMndR+5oLPq7w7rOW#;%{KmId9|7
z*C;tBq>9^U*<NqRW*hfJ$$fnGLCZ%+q$G<7Pu?H$ljsC^=3{SlDeNr;{=^tv&YMP<
zc>R=N1N9u((~3HT4{-2;1dAzQ+67^YE3Q^k;`A`NdKW{rH8`>K`$^Zd1Xs!=a2wyv
zQ%g+hnMjDi?h^mBE#CS0-dZ~bc~pN#6MKCkh%pd$2tH78l~Q<J*?7!nPZ|eP)#Gt*
z%vOpFz+>?iy1fpP2>fqWe~k@I{x#EX9w(KRI;KzXU;UH&EZy+oK?#s0#qtNwDIdHR
z#xj~C_@8=iz(9s#4Y*Ln7>3A5bFHDNEpn{Ezz-Wfpx}&tOuSY#*YBd)x#FC!#5;DV
z9jZDWIMd9{tCt5*)F`L>qpNd)zi}U>ZWAoWCBU+zFdHMqHE%}K;&j+zdMJ@@bB)nl
zhIXlUs_8pKj7c}Ko*S=60!2ktiqDU`*bA+?;Q3JRBv%@+DAUMrHerNra6hgs-@QR#
z0TC6z8+2j+rIXdp8Xtv3+1>PwvHXm9eg6oyv6&pLM2#(E$0AdNiR%?S+UZi3TW+_O
zW*p{Nu16W(?WJ?`d@l~=4lVB!u&TXL;oO*LK2#Bm*yTjlOAJ=^qvLha&vx!gf76yS
zhUM7EMAjJHv0mpOf7!^u2=@8GoJ*k5{aJ?XR7ibZ<x&L^1$}HB)Lt+NJfsFpCCBmr
z1?G^-T}8^Vi>N(z%%taZ8xm|SSqu3Qqas$XXAMSiPo7eKuJ5KV!(w#!$}~1=DmN;Z
zp(?3fOg$HM3FT++#ad4IlV9N9nWAqN>52oA-9z^*HMT(^)cyY3*xuN8oy9OZPS~*p
zU`6getRFs-K`L30FV4;t9twfx3?XX+g1S9YE_-%vwI{uVTRp)$4$e$x#&l>EbS+aU
zi6R&Ui<ux%DKet!tgP?FMZ3g6vun%NdX)IN0R01}F0`{;bHiaC=bV}7NSWl`u-0$A
z3{4fhW!S(E^UDQge<=#nF=L1621Kyn3LHET*H7jcCXVE(<ZD^67&{%N)HKFul1~*t
ztRufY%ti6IGJzpJZpgcE>r&f3M*oa%e8oLa#L5GbNzbOl@erHBDpe)ScT0`?>vlrj
zoJ~LE+qX;l`C!<@SNWJ&rLs(|x!G^$p0L=s(Eip)K}3+SqILwRy(t5PWeNMdq}}WG
zbqrA<s#jxzN>l>>L;Q${GN{5omC0}}+TFN&@Daj7D^b-BOTBZibn6{Zx$mrUqypi9
r?m>OooO#9(PjinwEP5Z!|Dk^Yma8aTDo!NS00000NkvXXu0mjfW|-d4

literal 1197
zcmW+!YfKbZ6dnZ?K^m2$UA2w77NZlQ*<BxDX`-@aTXu?+EU2(H4LCf+#ft8lP^U3r
zoj!m|Q97g=CTU4~tEksh)3IW`tx!55>itpUtyX(|RJ{_DPNP32R?T$UFZs?n`I3{I
z^PSUCQT}Fb_S|ei5OSlXB{4TIbvZjL!;N`2U%u?7f>fkB_4<y6x>WPF_q<ijTN{Ko
zb~Jkny~R75yg|QznK!V!XnC+`#Y*oIzl%T91JG@omWr;8OuL+wm0OT+&02ETm8Q3r
z)+7ZXXZC-b^y?qHpSfaYQ}NnjK{(!%^Q>-)AWU9ZQC1ak{s&`>xG)K&)UqrC(@-2r
zNizwEs#A!tZQEiTE5I!r4KWo!%XV~#Y|BEJh2t8=Cg<EBwyYQiHpQ5cR1Mp4EY2C@
zj%~-2$S1*=Vgkr?#9|4ksG6ZFC?*l0VuUbKkuFgaP^@6X;Fe>URzfArVsQ|cflL_D
zLm~_Za5BM|Wl}4y(3lKJQbyuT+v0{4LJ-=HO|fif9>?K^E}Et(1M1U76{?QyP$hvq
z0@Z-cd0Zi$Fd~FY3geWTzAOu<Knin4OekQa*fb85u&m%f9Gb*ZbOto2>Z(V=j$@nD
z)(}Ug?GO`-Gfj*wpn!nS9n;hWSJM=q>!=umt|KB89ZIn1F%hJMXwYyN!y%DL0VstW
zn{ezyS_l)HamyzehGBB3QQ&%_Q)WYGAOI-TnPFH=LQv(@NCH!Y0hW{*rN|?gP?wTK
z1v=N=vn5$9%n`DfN^ydl0gE9Sa9JhLAdY1*O{KD=8J1&P0T>{J24Y$Og%nNEba!7f
z0TP7Sh#Qc=)lUakxeqic6)Ue4*4)3^=+@_=CB;>3zst4WSF&27Y^1A_wme)}ADuKT
z&P&`|xy1No;GG@M8}sjttO_4(ky;YJ^)=OQAg6ZkS)KlVyuEK${@D1`{Jyrnv*|fU
z=G@K>(yylr4Vvdh+w(b@jh8;!2$wI~{MVT$Yo_GPcxh?;;@R4x$4=Hy1leFSxUeCG
zW>h?C-1Ok~!w>sEyLoPu&M$1QyOSR|Idb*<h>!JFR#mr;KR-Ajm46Y)J2bi!zxd7R
zW2<`FhkqJ4K3JM=FaB`|uIT6(K=^00Ab0WQYgaB!PJOxkba1TeK+UyuXy|=!L3Vam
zXM5^{j_S?gp4OVswn)5T-Ola>qnCUGb!&RNLpOX2VmV`-ou77eXNYg_Ei04Cqw889
zug&ZJZr{g6!|T`67fP<b_IFW{=r8=?)afB*vA=EC(0JFbr>&*IQ&0YRGA(ne*fDj_
zm1W|QLx%@*wrqa%XiM|M2M<mJzMYtu=b0M~diwVtK9t>mU}N=(=9-%8rQwUbp>J<(
z<EBk={jI+G-ptUf@LSOf{>NkE=L>{uXUdLtN^O<B{)3+^&iHD7;k@nBdp_@(@99s6
x&y0#qwfxrIJNN4r##Us!nzt;cU|;$03&Pflch5(_BKN$45RH_V91GW`{{^3XY4rdA

diff --git a/bbcode_google/icon.gif b/bbcode_google/icon.gif
index 433759cf6eb604a1c5a0c62b0cd05f4a78778fe7..6805bc5215d99e99c637c0af963fad766f1b79fb 100644
GIT binary patch
literal 995
zcmZ?wbhEHb6k!lx_|Cv!xHiZVgrb~UzI!d5<F(c+XlrrQ+MXyNxwklZ&iCS_->cVt
zZ&~}lXY2nd*Otz?wsz^gty{149J}}b+_j!_@2}l^{{Ov`;d>{`_g<FogACtC1-(xO
zqNw-TQSbK(y#N0G{rCUhi?hGaneu&U_V=|*zaP{54ix$S|NmBw|9ct!@8$S^&hY=a
zDgUpX`+x1)|K~vCw*G(r9w<KwMnizsA)vzm1faaYz;S}XnM0=H5lfe(x&U8{#3Pmt
zVcv9)IT{xgkF+x>s!a(z<jlq+>!otV<HJK930b{_9Sc4+bu^2Kdp#*oJj@}k=a$n@
z7@*kEV;q%n-~m(XMM+z2J{HA`E?h#Mnp%G)ogQ`Z8>;c$*fq7$Wu|f1iW6EBUtePt
zTIpu;(b37Ni-*l3K;wc+D-(lOz?KcAhj_L!2}&^tJaBB~;^*KA_+ZL%b$&fN^9&h=
n1B~2uubFHG85<iII23wV*34XarK{gmU#DZkf~ZxDj11NQV{8=;

delta 808
zcmV+@1K0fH2g?Y5M@dFFIbjt56aeP|00000|NsBa6dBeaFZ=cP|M2$z_4@zu`Tz6(
z|Mma>`2Y9u|NHv?;os~iCX4Rw|M2km4-%g-H?a#Aq#!QEiI3S8AAlMqk0mp<DKK<~
zkI)V(%M~iB8ZyQtI<X@)nWL%A6EVdTETCFwuhZH2042SD6EnITIJLsg{s0qJH(S=q
z)AHcv`~V`B7C*loLbM-N_a{@<95{?GTiAh_-+Yh9$=Ck`HnAaC=odSaLT=kvbG&7R
z*cDv%97(W#p6McB*(O`d8DHBVT*@(ExJGo!Z<^^8Vc{KU=Nn$p2V>~G*Z<Aj^WE$J
z6=TmFTCo*>Ytnk8*3jkuZ>;ZPgsHF6`XX+*s<y)Q`~Sb*@Z|RY%If*o^8f1j|HRwl
z=lTE2($vBA|LOn#<o5RN|Nry<|M&m@`2YXt|Mu<w_V@q$@c;Mk|MM-kKts4tJhenm
ztyN96Qb)N;O|wPx|MN(;IZd%aR<=q^v^!9^Jyo+_IrRVP_y6tq`}Fw#=KB8c_WJAm
z|MU3&;r{>l{r~Cy|MdR<<Nx^C|M=$r`Sbtu?f?4t%_;!SCIH7H0Nfe?(kKts9}Ubd
zBHJYz(j*zt5C_W?4&4|M(H|ZE^z^Z@G68=f`2+y~0RI3i0RRF36aWwa00{m7|NT>P
zrw*JsZuHoR^CpiRJZ;{*5h!p5pa296i8-UCK^X{V5-d6(iQ>N=XU>q}@?(UD4mXHQ
z$wCKFBa==Br3q8SL=!Oq#MqFL;Q@k5CWjb0!{b92Lw^FC3BUvlokWmKBEdo<2MK>O
ze%1)0lYl`0I)oUR#9_wBi3EcRDJWAW)0ski6j(ADgN&6Yga#={5I})}0EPA}x@7VQ
znIJwE6)02&?x3lJ4h=Awq>PRheF7{9PzH^cEmBqxa%2+7o+u@1q&cIY5DEz#FlZ=5
z$s~*bUnoRaq9%Z%01Tv90AWagNg+Um1hH^1p~9CyY{*neam7$1lTgShm@%Ve#|04~
mTx@tjWlR7}CRHFX6rjHS`dA8Qnq*R<|Nj8K@rXbH0RTJj2%T;K

diff --git a/bbcode_google/info.txt b/bbcode_google/info.txt
index 40fee79..df4aa6a 100644
--- a/bbcode_google/info.txt
+++ b/bbcode_google/info.txt
@@ -1,6 +1,7 @@
 title: BBcode Google
 desc:  This module will turn [google]search words[/google] into a link that will search for the search words on Google.
-version: 1.1.0
+version: 1.1.2
+url: http://www.phorum.org/phorum5/read.php?62,123949
 require_version: 5.2.2
 category: bbcode
 
diff --git a/bbcode_google/settings.php b/bbcode_google/settings.php
index 3b6c6b3..76441be 100644
--- a/bbcode_google/settings.php
+++ b/bbcode_google/settings.php
@@ -26,7 +26,7 @@
     }
 
     include_once "./include/admin/PhorumInputForm.php";
-    $frm =& new PhorumInputForm ("", "post", "Save");
+    $frm = new PhorumInputForm ("", "post", "Save");
     $frm->hidden("module", "modsettings");
     $frm->hidden("mod", "bbcode_google");