fixes #1591 specific processing for piwigo-openstreetmap and piwigo-videojs

admin/include/plugins.class.php

@@ -74,6 +74,10 @@ class plugins
     $file_to_include = PHPWG_PLUGINS_PATH . $plugin_id . '/maintain';
     $classname = $plugin_id.'_maintain';
 
+    // piwigo-videojs and piwigo-openstreetmap unfortunately have a "-" in their folder
+    // name (=plugin_id) and a class name can't have a "-". So we have to replace with a "_"
+    $classname = str_replace('-', '_', $classname);
+
     // 2.7 pattern (OO only)
     if (file_exists($file_to_include.'.class.php'))
     {

admin/plugins_installed.php

@@ -97,6 +97,11 @@ foreach($plugins->fs_plugins as $plugin_id => $fs_plugin)
     $setting_url = $settings_url_for_plugin_deprec[$plugin_id];
   } else if ($fs_plugin['hasSettings']) { // new version
     $setting_url = "admin.php?page=plugin-".$plugin_id;
+
+    if (preg_match('/^piwigo-(videojs|openstreetmap)$/', $plugin_id))
+    {
+      $setting_url = str_replace('piwigo-', 'piwigo_', $setting_url);
+    }
   }
 
   $tpl_plugin = array(