Changeset 16079

Timestamp:

04/14/08 13:40:02 (8 months ago)

Author:

rambo

Message:

forward port r16078

Files:

• trunk/midcom/midcom.helper.search/config/manifest.inc (modified) (1 diff)
• trunk/midcom/midcom.helper.search/style/advanced_form.php (modified) (2 diffs)
• trunk/midcom/midcom.helper.search/style/basic_form.php (modified) (1 diff)
• trunk/midcom/midcom.helper.xsspreventer (copied) (copied from branches/MidCOM_2_8/midcom.helper.xsspreventer)
• trunk/midcom/midcom.helper.xsspreventer/config (copied) (copied from branches/MidCOM_2_8/midcom.helper.xsspreventer/config)
• trunk/midcom/midcom.helper.xsspreventer/config/config.inc (copied) (copied from branches/MidCOM_2_8/midcom.helper.xsspreventer/config/config.inc)
• trunk/midcom/midcom.helper.xsspreventer/config/manifest.inc (copied) (copied from branches/MidCOM_2_8/midcom.helper.xsspreventer/config/manifest.inc)
• trunk/midcom/midcom.helper.xsspreventer/main.php (copied) (copied from branches/MidCOM_2_8/midcom.helper.xsspreventer/main.php)
• trunk/midcom/midcom.helper.xsspreventer/midcom (copied) (copied from branches/MidCOM_2_8/midcom.helper.xsspreventer/midcom)
• trunk/midcom/midcom.helper.xsspreventer/midcom/interfaces.php (copied) (copied from branches/MidCOM_2_8/midcom.helper.xsspreventer/midcom/interfaces.php)
• trunk/midcom/org.openpsa.qbpager/config/manifest.inc (modified) (1 diff)
• trunk/midcom/org.openpsa.qbpager/pager.php (modified) (14 diffs)

trunk/midcom/midcom.helper.search/config/manifest.inc

@@ -30 +30 @@
-    (
-        'midcom' => array(),
+        'midcom_helper_xsspreventer' => array(),
-        'http_request' => array
-        (

trunk/midcom/midcom.helper.search/style/advanced_form.php

@@ -45 +45 @@
-
-midcom_helper_search_process_node($nap->get_root_node(), $nap, $topics, $components, '');
-
+
+
-
-?>
@@ -55 +56 @@
-    <tr>
-        <td><?php echo $data['l10n']->get('query');?>:</td>
-'&(query);'
+&(query:h);
-    </tr>
-    <tr>

trunk/midcom/midcom.helper.search/style/basic_form.php

@@ -2 +2 @@
-//$data =& $_MIDCOM->get_custom_context_data('request_data');
-$prefix = $_MIDCOM->get_context_data(MIDCOM_CONTEXT_ANCHORPREFIX);
-
+
+
-?>
-<form method='get' name='midcom_helper_search_form' action='&(prefix);result/' class='midcom.helper.search'>
-<label for="midcom_helper_search_query">
-<?php echo $data['l10n']->get('query');?>:
-'&(query);'
+&(query:h);
-</label>
-<input type='hidden' name='type' value='basic' />

trunk/midcom/org.openpsa.qbpager/config/manifest.inc

@@ -21 +21 @@
-    (
-        'midcom' => array(),
+        'midcom_helper_xsspreventer' => array(),
-    ),
-),

trunk/midcom/org.openpsa.qbpager/pager.php

@@ -172 +172 @@
-        {
-            debug_add("{$page_var} has value: {$_REQUEST[$page_var]}");
-
+(int)
-        }
-        if (   array_key_exists($results_var, $_REQUEST)
@@ -178 +178 @@
-        {
-            debug_add("{$results_var} has value: {$_REQUEST[$results_var]}");
-
+(int)
-        }
-        $this->_offset = ($this->_current_page-1)*$this->results_per_page;
@@ -204 +204 @@
-    function _get_query_string()
-    {
-
-
-
-( !preg_match('/org_openpsa_qbpager/', $key)
-
-
-$query_string .= '&'.
+    
+ 
+
+ (   strpos($key, 'org_openpsa_qbpager') === false
+        
+
+        $query_string .= '&' . 
-            }
-        }
@@ -222 +222 @@
-    function show_previousnext($acl_checks=false)
-    {
+        $_MIDCOM->load_library('midcom.helper.xsspreventer');
-        $this->_request_data['prefix'] = $this->_prefix;
-        $this->_request_data['current_page'] = $this->_current_page;
@@ -247 +248 @@
-        {
-            $previous = $data['current_page'] - 1;
-\"?{$page_var}={$previous}" . $this->_get_query_string() . "\
+" . midcom_helper_xsspreventer::escape_attribute("?{$page_var}={$previous}" . $this->_get_query_string()) . 
-        }
-
@@ -253 +254 @@
-        {
-            $next = $data['current_page'] + 1;
-\"?{$page_var}={$next}" . $this->_get_query_string() . "\
+" . midcom_helper_xsspreventer::escape_attribute("?{$page_var}={$next}" . $this->_get_query_string()) . 
-        }
-
@@ -266 +267 @@
-    function show_pages($acl_checks=false)
-    {
+        $_MIDCOM->load_library('midcom.helper.xsspreventer');
-        $this->_request_data['prefix'] = $this->_prefix;
-        $this->_request_data['current_page'] = $this->_current_page;
@@ -304 +306 @@
-            if ($previous != 1)
-            {
-\"?{$page_var}=1" . $this->_get_query_string() . "\
-
-\"?{$page_var}={$previous}" . $this->_get_query_string() . "\
+" . midcom_helper_xsspreventer::escape_attribute("?{$page_var}=1" . $this->_get_query_string()) . 
+
+" . midcom_helper_xsspreventer::escape_attribute("?{$page_var}={$previous}" . $this->_get_query_string()) . 
-        }
-
@@ -321 +323 @@
-                continue;
-            }
-\"?{$page_var}={$page}" . $this->_get_query_string() . "\
+" . midcom_helper_xsspreventer::escape_attribute("?{$page_var}={$page}" . $this->_get_query_string()) . 
-        }
-
@@ -327 +329 @@
-        {
-            $next = $data['current_page'] + 1;
-\"?{$page_var}={$next}" . $this->_get_query_string() . "\
+" . midcom_helper_xsspreventer::escape_attribute("?{$page_var}={$next}" . $this->_get_query_string()) . 
-
-            if ($next != $data['page_count'])
-            {
-\"?{$page_var}={$data['page_count']}" . $this->_get_query_string() . "\
+" . midcom_helper_xsspreventer::escape_attribute("?{$page_var}={$data['page_count']}" . $this->_get_query_string()) . 
-            }
-        }
@@ -345 +347 @@
-    function show_pages_as_xml($acl_checks=false, $echo=true)
-    {
+        $_MIDCOM->load_library('midcom.helper.xsspreventer');
-        $pages_xml_str = "<pages ";
-        
@@ -393 +396 @@
-            if ($previous != 1)
-            {
-\"?{$page_var}=1" . $this->_get_query_string() . "\
-
-\"?{$page_var}={$previous}" . $this->_get_query_string() . "\
+" . midcom_helper_xsspreventer::escape_attribute("?{$page_var}=1" . $this->_get_query_string()) . 
+
+" . midcom_helper_xsspreventer::escape_attribute("?{$page_var}={$previous}" . $this->_get_query_string()) . 
-        }
-
@@ -412 +415 @@
-            }
-            
-\"?{$page_var}={$page}" . $this->_get_query_string() . "\
+" . midcom_helper_xsspreventer::escape_attribute("?{$page_var}={$page}" . $this->_get_query_string()) . 
-        }
-
@@ -418 +421 @@
-        {
-            $next = $data['current_page'] + 1;
-\"?{$page_var}={$next}" . $this->_get_query_string() . "\
+" . midcom_helper_xsspreventer::escape_attribute("?{$page_var}={$next}" . $this->_get_query_string()) . 
-
-            if ($next != $data['page_count'])
-            {
-\"?{$page_var}={$data['page_count']}" . $this->_get_query_string() . "\
+" . midcom_helper_xsspreventer::escape_attribute("?{$page_var}={$data['page_count']}" . $this->_get_query_string()) . 
-            }
-        }