[pkg-horde] [SCM] Debian Horde Packages repository: horde3 package branch, debian-lenny, updated. 2aaac3bfc2929998f4a745bb532367ceeebd271e

Gregory Colpart reg at debian.org
Sun Oct 31 11:24:52 UTC 2010


The following commit has been merged in the debian-lenny branch:
commit 2aaac3bfc2929998f4a745bb532367ceeebd271e
Author: Gregory Colpart <reg at debian.org>
Date:   Sun Oct 31 01:56:15 2010 +0200

    Fix the last patch

diff --git a/lib/Horde/Prefs/UI.php b/lib/Horde/Prefs/UI.php
index b4b2b8c..909ac98 100644
--- a/lib/Horde/Prefs/UI.php
+++ b/lib/Horde/Prefs/UI.php
@@ -67,7 +67,11 @@ class Prefs_UI {
         /* Run through the action handlers */
         if (Util::getPost('actionID') == 'update_prefs') {
             if (isset($group) && Prefs_UI::groupIsEditable($group)) {
-                $updated = false;
+                $result = Horde::checkRequestToken('horde.prefs', Util::getFormData('horde_prefs_token'));
+                if (is_a($result, 'PEAR_Error')) {
+                    $notification->push($result, 'horde.error');
+                    return $updated;
+                }
 
                 foreach ($prefGroups[$group]['members'] as $pref) {
                     if (!$prefs->isLocked($pref) ||
diff --git a/services/portal/rpcsum.php b/services/portal/rpcsum.php
index e2c2916..6ad77a1 100644
--- a/services/portal/rpcsum.php
+++ b/services/portal/rpcsum.php
@@ -36,6 +36,14 @@ if (is_null($actionID)) {
     }
 }
 
+if ($actionID) {
+    $result = Horde::checkRequestToken('horde.prefs', Util::getFormData('horde_prefs_token'));
+    if (is_a($result, 'PEAR_Error')) {
+        $notification->push($result, 'horde.error');
+        $actionID = null;
+    }
+}
+
 /* Run through the action handlers */
 switch ($actionID) {
 case 'save':
diff --git a/services/portal/syncml.php b/services/portal/syncml.php
index 3fe571c..eacf99e 100644
--- a/services/portal/syncml.php
+++ b/services/portal/syncml.php
@@ -19,6 +19,14 @@ require_once 'SyncML/Backend.php';
 $backend = SyncML_Backend::factory('Horde');
 
 $actionID = Util::getFormData('actionID');
+if ($actionID) {
+    $result = Horde::checkRequestToken('horde.prefs', Util::getFormData('horde_prefs_token'));
+    if (is_a($result, 'PEAR_Error')) {
+        $notification->push($result, 'horde.error');
+        $actionID = null;
+    }
+}
+
 switch ($actionID) {
 case 'deleteanchor':
     $deviceid = Util::getFormData('deviceid');
diff --git a/templates/portal/layout.inc b/templates/portal/layout.inc
index a6cb299..fc9884c 100644
--- a/templates/portal/layout.inc
+++ b/templates/portal/layout.inc
@@ -72,7 +72,7 @@
           </tr>
           <tr>
             <td colspan="2">
-              <?php echo $blocks->getBlocksWidget($blockInfo['app'], $blockInfo['block'], ($layout->isRemovable($row, $col) ? true : false), ($layout->isRemovable($row, $col) ? false : true)) ?>
+              <?php echo $blocks->getBlocksWidget($blockInfo['app'], $blockInfo['block'], true) ?>
             </td>
           </tr>
 <?php

-- 
Debian Horde Packages repository: horde3 package



More information about the pkg-horde-hackers mailing list