Changeset 11667 for extensions/pwgCumulus/include

Timestamp:

07/08/11 17:58:37 (10 months ago)

Author:

nikrou

Message:

Fix issue preventing config to be persistent.
Thanks to xtouf and Billr for reporting bug.

Update Italian translations, thanks to rio.

Location:

extensions/pwgCumulus/include

Files:

• admin_menu.inc.php (modified) (2 diffs)
• pwgCumulusConfig.class.php (modified) (3 diffs)

extensions/pwgCumulus/include/admin_menu.inc.php

@@ -20 +20 @@
 // +-----------------------------------------------------------------------+
 
+if (!defined('PHPWG_ROOT_PATH')) {
+  die('Hacking attempt!');
+}
+
+$save_config = false;
 $Positions = array('before' => l10n('Before'), 
                    'after' => l10n('After')
                    );
-
-$position_order = $me->position_order;
-$position_block_id = $me->position_block_id;
 
 include_once(PHPWG_ROOT_PATH.'include/block.class.php');
@@ -37 +39 @@
 }
 
-if (!empty($_POST['pwg_cumulus_in_main_menu']) && !$me->pwg_cumulus_in_main_menu) {
-  $me->pwg_cumulus_in_main_menu = true;
-  $page['infos'][] = l10n('Tags cloud added in main menu');
-  $save_config = true;
-} elseif (empty($_POST['pwg_cumulus_in_main_menu']) && $me->pwg_cumulus_in_main_menu) {
-  $me->pwg_cumulus_in_main_menu = false;
-  $page['infos'][] = l10n('Tags cloud removed from main menu');
-  $save_config = true;
-}
+if (!empty($_POST['submit'])) {
+  if (!empty($_POST['pwg_cumulus_in_main_menu']) && $_POST['pwg_cumulus_in_main_menu']!=$me->pwg_cumulus_in_main_menu) {
+    $me->pwg_cumulus_in_main_menu = true;
+    $page['infos'][] = l10n('Tags cloud added in main menu');
+    $save_config = true;
+  } elseif (empty($_POST['pwg_cumulus_in_main_menu']) && $me->pwg_cumulus_in_main_menu) {
+    $me->pwg_cumulus_in_main_menu = false;
+    $page['infos'][] = l10n('Tags cloud removed from main menu');
+    $save_config = true;
+  }
 
-if (!empty($_POST['position_order']) && isset($Positions[$_POST['position_order']])) {
-  $position_order = $_POST['position_order'];
-}
+  if (!empty($_POST['position_order']) && isset($Positions[$_POST['position_order']])
+      && !empty($_POST['position_block_id']) && isset($Blocks[$_POST['position_block_id']])
+      && ($_POST['position_order']!=$me->position_order || $_POST['position_block_id']!=$me->position_block_id)) {
+    
+    $me->position_order = $_POST['position_order'];
+    $me->position_block_id = $_POST['position_block_id'];
+    $page['infos'][] = l10n('Block\'s position has been updated');    
+    $save_config = true;
+  }
 
-if (!empty($_POST['position_block_id']) && isset($Blocks[$_POST['position_block_id']])) {
-  $position_block_id = $_POST['position_block_id'];
-}
-
-if ($position_order!=null && $position_block_id!=null) {
-  $me->position_order = $position_order;
-  $me->position_block_id = $position_block_id;  
-  $page['infos'][] = l10n('Position in main menu has been updated');  
-  $me->save_config();
+  if ($save_config) {
+    $me->save_config();
+  }
 }
 
 $template->assign('MENUBAR_BLOCKS', $Blocks);
-$template->assign('POSITION_ORDER', $position_order);
+$template->assign('POSITION_ORDER', $me->position_order);
 $template->assign('POSITIONS', $Positions);
-$template->assign('POSITION_BLOCK_ID', $position_block_id);
+$template->assign('POSITION_BLOCK_ID', $me->position_block_id);
 $template->assign('PWG_CUMULUS_IN_MAIN_MENU', $me->pwg_cumulus_in_main_menu);
 ?>

extensions/pwgCumulus/include/pwgCumulusConfig.class.php

@@ -35 +35 @@
 
     if (!file_exists($this->get_config_filename())) {
+      $this->setDefaults();
       $this->save_config();
     }
@@ -45 +46 @@
       $this->config = $c;
     }
-    $this->setDefaults();
   }
 
@@ -79 +79 @@
 
   private function setDefaults() {
-    include_once $this->plugin_dir.'/default_values.inc.php';
+    include $this->plugin_dir.'/default_values.inc.php';
 
     foreach ($default_values as $key => $value) {