Changeset 27279 for extensions/pwgCumulus/include

Timestamp:

Feb 9, 2014, 1:26:25 PM (11 years ago)

Author:

nikrou

Message:

Fix issue with tag with an ampersand (need encoding)
Allow to choose width and height in menu (either null)

Location:

extensions/pwgCumulus/include

Files:

• admin_tags.inc.php (modified) (3 diffs)
• pwgCumulusContent.class.php (modified) (2 diffs)

extensions/pwgCumulus/include/admin_tags.inc.php

@@ -27 +27 @@
 
 if (!empty($_POST['submit'])) {
-  if (!empty($_POST['pwg_cumulus_width']) && intval($_POST['pwg_cumulus_width'])!=$me->pwg_cumulus_width) {
-    $me->pwg_cumulus_width = intval($_POST['pwg_cumulus_width']);
+  if (!empty($_POST['pwg_cumulus_width']) && $_POST['pwg_cumulus_width']!=$me->pwg_cumulus_width) {
+    $me->pwg_cumulus_width = $_POST['pwg_cumulus_width'];
     $page['infos'][] = l10n('Width updated');
     $save_config = true;
   }
-  if (!empty($_POST['pwg_cumulus_height']) && intval($_POST['pwg_cumulus_height'])!=$me->pwg_cumulus_height) {
-    $me->pwg_cumulus_height = intval($_POST['pwg_cumulus_height']);
+  if (isset($_POST['pwg_cumulus_height']) && $_POST['pwg_cumulus_height']!=$me->pwg_cumulus_height) {
+    $me->pwg_cumulus_height = $_POST['pwg_cumulus_height'];
     $page['infos'][] = l10n('Height updated');
     $save_config = true;
@@ -40 +40 @@
     $me->pwg_cumulus_coeff = intval($_POST['pwg_cumulus_coeff']);
     $page['infos'][] = l10n('Coefficient for tags size updated');
+    $save_config = true;
+  }
+
+  // size in menu 
+  if (!empty($_POST['pwg_cumulus_width_in_menu']) && $_POST['pwg_cumulus_width_in_menu']!=$me->pwg_cumulus_width_in_menu) {
+    $me->pwg_cumulus_width_in_menu = $_POST['pwg_cumulus_width_in_menu'];
+    $page['infos'][] = l10n('Width in menu updated');
+    $save_config = true;
+  }
+  if (isset($_POST['pwg_cumulus_height_in_menu']) && $_POST['pwg_cumulus_height_in_menu']!=$me->pwg_cumulus_height_in_menu) {
+    $me->pwg_cumulus_height_in_menu = $_POST['pwg_cumulus_height_in_menu'];
+    $page['infos'][] = l10n('Height in menu updated');
     $save_config = true;
   }
@@ -80 +92 @@
 $template->assign('PWG_CUMULUS_WIDTH', $me->pwg_cumulus_width); 
 $template->assign('PWG_CUMULUS_HEIGHT', $me->pwg_cumulus_height); 
+$template->assign('PWG_CUMULUS_WIDTH_IN_MENU', $me->pwg_cumulus_width_in_menu); 
+$template->assign('PWG_CUMULUS_HEIGHT_IN_MENU', $me->pwg_cumulus_height_in_menu); 
 $template->assign('PWG_CUMULUS_COEFF', $me->pwg_cumulus_coeff); 
 $template->assign('PWG_CUMULUS_MODE_TRANSPARENT', $me->pwg_cumulus_mode_transparent);

extensions/pwgCumulus/include/pwgCumulusContent.class.php

@@ -101 +101 @@
             $template->assign('PWG_CUMULUS_IMGS', PWG_CUMULUS_PLUGIN_IMGS);
       
-            $template->assign('PWG_CUMULUS_WIDTH', $this->plugin_config->pwg_cumulus_width);
-            $template->assign('PWG_CUMULUS_HEIGHT', $this->plugin_config->pwg_cumulus_height);
+            $template->assign('PWG_CUMULUS_WIDTH', htmlspecialchars($this->plugin_config->pwg_cumulus_width,ENT_COMPAT,'UTF-8'));
+            $template->assign('PWG_CUMULUS_HEIGHT', htmlspecialchars($this->plugin_config->pwg_cumulus_height,ENT_COMPAT,'UTF-8'));
+            $template->assign('PWG_CUMULUS_WIDTH_IN_MENU', htmlspecialchars($this->plugin_config->pwg_cumulus_width_in_menu,ENT_COMPAT,'UTF-8'));
+            $template->assign('PWG_CUMULUS_HEIGHT_IN_MENU', htmlspecialchars($this->plugin_config->pwg_cumulus_height_in_menu,ENT_COMPAT,'UTF-8'));
             $template->assign('PWG_CUMULUS_MODE_TRANSPARENT', $this->plugin_config->pwg_cumulus_mode_transparent);
-            $template->assign('PWG_CUMULUS_BGCOLOR', $this->plugin_config->pwg_cumulus_bgcolor);
-            $template->assign('PWG_CUMULUS_COLOR1', '0x'.$this->plugin_config->pwg_cumulus_color1);
-            $template->assign('PWG_CUMULUS_COLOR2', '0x'.$this->plugin_config->pwg_cumulus_color2);
-            $template->assign('PWG_CUMULUS_HICOLOR', '0x'.$this->plugin_config->pwg_cumulus_hicolor);
+            $template->assign('PWG_CUMULUS_BGCOLOR', htmlspecialchars($this->plugin_config->pwg_cumulus_bgcolor,ENT_COMPAT,'UTF-8'));
+            $template->assign('PWG_CUMULUS_COLOR1', '0x'.htmlspecialchars($this->plugin_config->pwg_cumulus_color1,ENT_COMPAT,'UTF-8'));
+            $template->assign('PWG_CUMULUS_COLOR2', '0x'.htmlspecialchars($this->plugin_config->pwg_cumulus_color2,ENT_COMPAT,'UTF-8'));
+            $template->assign('PWG_CUMULUS_HICOLOR', '0x'.htmlspecialchars($this->plugin_config->pwg_cumulus_hicolor,ENT_COMPAT,'UTF-8'));
             foreach ($mbCumulus->data as &$tag) {
                 $tag['size'] = $this->plugin_config->pwg_cumulus_coeff * $tag['level'];
@@ -113 +115 @@
                     $tag['URL'] = $tag['U_ADD'];
                 }
+                $tag['display_name'] = urlencode($tag['name']);
             }
             $template->assign('PWG_CUMULUS_TAGS', $mbCumulus->data);