Index: tensions/Media_Icon/config_default.inc.php
===================================================================
--- /extensions/Media_Icon/config_default.inc.php (revision 19630)
+++ (revision )
@@ -1,79 +1,0 @@
- array(
- 'logo' => 'Logo',
- 'page' => 'Page',
- 'folder' => 'Folder',
- 'foldercolor' => 'Folder color',
- 'folderpicture' => 'Folder picture',
- ),
- 'style' => 'logo',
- 'support' => array(
- 'youtube' => array(
- 'name' => 'Youtube videos',
- 'infos' => 'Videos added with Embedded Videos',
- ),
- 'vimeo' => array(
- 'name' => 'Vimeo videos',
- 'infos' => 'Videos added with Embedded Videos',
- ),
- 'dailymotion' => array(
- 'name' => 'Dailymotion videos',
- 'infos' => 'Videos added with Embedded Videos',
- ),
- 'wideo' => array(
- 'name' => 'Wideo videos',
- 'infos' => 'Videos added with Embedded Videos',
- ),
- 'wat' => array(
- 'name' => 'Wat videos',
- 'infos' => 'Videos added with Embedded Videos',
- ),
- 'video' => array(
- 'name' => 'Videos',
- 'infos' => 'Files supported: webm, webmv, ogv, m4v, flv, mp4',
- ),
- 'music' => array(
- 'name' => 'Musics',
- 'infos' => 'Files supported: mp3, ogg, oga, m4a, webma, fla, wav',
- ),
- 'pdf' => array(
- 'name' => 'pdf files',
- 'infos' => 'Files supported: pdf',
- ),
- 'document' => array(
- 'name' => 'Documents',
- 'infos' => 'Files supported: doc, docx and odt',
- ),
- 'spreadsheet' => array(
- 'name' => 'Spreadsheets',
- 'infos' => 'Files supported: xls, xlsx and ods',
- ),
- 'presentation' => array(
- 'name' => 'Presentations',
- 'infos' => 'Files supported: ppt, pptx and odp',
- ),
- ),
- 'active' => array(
- 'youtube' => 1,
- 'vimeo' => 1,
- 'dailymotion' => 1,
- 'wideo' => 1,
- 'wat' => 1,
- 'video' => 1,
- 'music' => 1,
- 'pdf' => 1,
- 'document' => 1,
- 'spreadsheet' => 1,
- 'presentation' => 1,
- ),
-);
-$config_default_advanced = array(
- 'position' => 'bottomright',
- 'xposition' => 'right: 5px',
- 'yposition' => 'bottom: 5px',
- 'opacity' => 100,
-);
-
-?>
Index: /extensions/Media_Icon/include/picture.inc.php
===================================================================
--- /extensions/Media_Icon/include/picture.inc.php (revision 19631)
+++ /extensions/Media_Icon/include/picture.inc.php (revision 19631)
@@ -0,0 +1,83 @@
+]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i',$content,$match);
+
+ $content = str_replace($match[0],''.$match[0],$content);
+ }
+
+ return $content;
+}
+
+function media_icon_picture_css() {
+ global $template, $conf;
+
+ $conf_media_icon_general = unserialize($conf['media_icon_general']);
+ $conf_media_icon_advanced = unserialize($conf['media_icon_advanced']);
+
+ $template->set_filename('media_icon_template', MEDIA_ICON_PATH.'template/media_icon.tpl');
+
+ $template->assign(
+ 'media_icon_advanced',
+ array(
+ 'xposition' => $conf_media_icon_advanced['xposition'],
+ 'yposition' => $conf_media_icon_advanced['yposition'],
+ 'opacity' => $conf_media_icon_advanced['opacity'],
+ )
+ );
+
+ $template->concat('PLUGIN_INDEX_CONTENT_END', $template->parse('media_icon_template', true));
+}
+?>
Index: /extensions/Media_Icon/include/thumbnails.inc.php
===================================================================
--- /extensions/Media_Icon/include/thumbnails.inc.php (revision 19631)
+++ /extensions/Media_Icon/include/thumbnails.inc.php (revision 19631)
@@ -0,0 +1,41 @@
+set_prefilter('index_thumbnails', 'media_icon_prefilter_thumbnails');
+
+ $template->set_filename('media_icon_template', MEDIA_ICON_PATH.'template/media_icon.tpl');
+
+ $template->assign('media_icon_style',$conf_media_icon_general['style']);
+
+ $template->assign('media_icon_active', $conf_media_icon_general['active']);
+ $template->assign(
+ 'media_icon_advanced',
+ array(
+ 'xposition' => $conf_media_icon_advanced['xposition'],
+ 'yposition' => $conf_media_icon_advanced['yposition'],
+ 'opacity' => $conf_media_icon_advanced['opacity'],
+ )
+ );
+
+ $template->concat('PLUGIN_INDEX_CONTENT_END', $template->parse('media_icon_template', true));
+
+ return $tpl_thumbnails_var;
+}
+
+function media_icon_prefilter_thumbnails($content, &$smarty) {
+ global $template;
+
+ $search = 'class="thumbnail"';
+
+ $replacement = 'class="thumbnail" media_icon="{$thumbnail.file}"';
+ $content= str_replace($search, $replacement, $content);
+
+ return $content;
+}
+?>
Index: /extensions/Media_Icon/install/config_default.inc.php
===================================================================
--- /extensions/Media_Icon/install/config_default.inc.php (revision 19630)
+++ /extensions/Media_Icon/install/config_default.inc.php (revision 19631)
@@ -1,4 +1,3 @@
array(
Index: /extensions/Media_Icon/install/functions.inc.php
===================================================================
--- /extensions/Media_Icon/install/functions.inc.php (revision 19630)
+++ /extensions/Media_Icon/install/functions.inc.php (revision 19631)
@@ -1,3 +1,75 @@
$value) {
+ if (is_array($config_default_general[$key])) {
+ foreach ($config_default_general[$key] as $key2 => $value2) {
+ if (is_array($config_default_general[$key][$key2])) {
+ foreach ($config_default_general[$key][$key2] as $key3 => $value3) {
+ if (isset($conf_media_icon_general[$key][$key2][$key3]))
+ $config_general[$key][$key2][$key3] = $conf_media_icon_general[$key][$key2][$key3];
+ else
+ $config_general[$key][$key2][$key3] = $config_default_general[$key][$key2][$key3];
+ }
+ } else {
+ if (isset($conf_media_icon_general[$key][$key2]))
+ $config_general[$key][$key2] = $conf_media_icon_general[$key][$key2];
+ else
+ $config_general[$key][$key2] = $config_default_general[$key][$key2];
+ }
+ }
+ } else {
+ if (isset($conf_media_icon_general[$key][$key2]))
+ $config_general[$key] = $conf_media_icon_general[$key];
+ else
+ $config_general[$key] = $config_default_general[$key];
+ }
+ }
+ media_icon_delete_conf("media_icon_general");
+ media_icon_install_general($config_general);
+ } else {
+ media_icon_install_general($config_default_general);
+ }
+
+ if (isset($conf_media_icon_advanced)) {
+ foreach ($config_default_advanced as $key => $value) {
+ if (isset($conf_media_icon_advanced[$key][$key2]))
+ $config_advanced[$key] = $conf_media_icon_advanced[$key];
+ else
+ $config_advanced[$key] = $config_default_advanced[$key];
+ }
+ media_icon_delete_conf("media_icon_advanced");
+ media_icon_install_advanced($config_advanced);
+ } else {
+ media_icon_install_advanced($config_default_advanced);
+ }
+}
+
+function media_icon_delete_conf($where) {
+ $query = 'DELETE FROM ' . CONFIG_TABLE . ' WHERE (param="'.$where.'");';
+ pwg_query($query);
+}
?>
Index: /extensions/Media_Icon/main.inc.php
===================================================================
--- /extensions/Media_Icon/main.inc.php (revision 19630)
+++ /extensions/Media_Icon/main.inc.php (revision 19631)
@@ -37,6 +37,6 @@
* +-----------------------------------------------------------------------+ */
-include_once(MEDIA_ICON_PATH.'thumbnails.php');
-include_once(MEDIA_ICON_PATH.'picture.php');
+include_once(MEDIA_ICON_PATH.'include/thumbnails.inc.php');
+include_once(MEDIA_ICON_PATH.'include/picture.inc.php');
/* +-----------------------------------------------------------------------+
Index: /extensions/Media_Icon/maintain.inc.php
===================================================================
--- /extensions/Media_Icon/maintain.inc.php (revision 19630)
+++ /extensions/Media_Icon/maintain.inc.php (revision 19631)
@@ -3,19 +3,20 @@
function plugin_install() {
- include(dirname(__FILE__).'/config_default.inc.php');
+ include(dirname(__FILE__).'/install/functions.inc.php');
+ include(dirname(__FILE__).'/install/config_default.inc.php');
- $query = 'INSERT INTO '.CONFIG_TABLE.' (param,value,comment) VALUES ("media_icon_general" ,"'.addslashes(serialize($config_default_general)).'", "Media Icon plugin general parameters");';
- pwg_query($query);
- $query = 'INSERT INTO '.CONFIG_TABLE.' (param,value,comment) VALUES ("media_icon_advanced" ,"'.addslashes(serialize($config_default_advanced)).'", "Media Icon plugin advanced parameters");';
- pwg_query($query);
+ media_icon_install_general($config_default_general);
+ media_icon_install_advanced($config_default_advanced);
}
function plugin_activate() {
-
+ include(dirname(__FILE__).'/install/functions.inc.php');
+
+ media_icon_update_db();
}
function plugin_uninstall() {
- $query = 'DELETE FROM ' . CONFIG_TABLE . ' WHERE (param="media_icon_general" OR param="media_icon_advanced");';
- pwg_query($query);
+ media_icon_delete_conf("media_icon_general");
+ media_icon_delete_conf("media_icon_advanced");
}
Index: tensions/Media_Icon/picture.php
===================================================================
--- /extensions/Media_Icon/picture.php (revision 19630)
+++ (revision )
@@ -1,83 +1,0 @@
-]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i',$content,$match);
-
- $content = str_replace($match[0],''.$match[0],$content);
- }
-
- return $content;
-}
-
-function media_icon_picture_css() {
- global $template, $conf;
-
- $conf_media_icon_general = unserialize($conf['media_icon_general']);
- $conf_media_icon_advanced = unserialize($conf['media_icon_advanced']);
-
- $template->set_filename('media_icon_template', dirname(__FILE__).'/template/media_icon.tpl');
-
- $template->assign(
- 'media_icon_advanced',
- array(
- 'xposition' => $conf_media_icon_advanced['xposition'],
- 'yposition' => $conf_media_icon_advanced['yposition'],
- 'opacity' => $conf_media_icon_advanced['opacity'],
- )
- );
-
- $template->concat('PLUGIN_INDEX_CONTENT_END', $template->parse('media_icon_template', true));
-}
-?>