[Phpgroupware-cvs] sitemgr/inc class.Content_UI.inc.php, 1.3.2.4.2.2

[skwashd]

Update of sitemgr/inc

Modified Files:
     Branch: skwashd-16-compat
            class.Content_UI.inc.php lines: +19 -28

Log Message:
apply patch #3098

====================================================
Index: sitemgr/inc/class.Content_UI.inc.php
diff -u sitemgr/inc/class.Content_UI.inc.php:1.3.2.4.2.1 
sitemgr/inc/class.Content_UI.inc.php:1.3.2.4.2.2
--- sitemgr/inc/class.Content_UI.inc.php:1.3.2.4.2.1    Sat Nov 12 14:11:58 2005
+++ sitemgr/inc/class.Content_UI.inc.php        Fri Dec  9 00:40:38 2005
@@ -83,7 +83,7 @@
                        global 
$inputstate,$btnSaveBlock,$btnDeleteBlock,$btnCreateVersion;
                        global $inputmoduleid, $inputarea, $btnAddBlock, 
$btnDeleteVersion, $element;

-                       global $page_id,$cat_id;
+                       global $page_id, $cat_id;
                        $page_id = $_GET['page_id'];
                        $cat_id = $_GET['cat_id'];
                        $block_id = $_GET['block_id'];
@@ -534,7 +534,7 @@
                                $editorstandardelements = array(
                                        array('label' => lang('Title'),
                                                  'form' => ('<input 
type="text" name="inputblocktitle" value="' .
-                                                       ($block->title ? 
$block->title : $moduleobject->title) . '" />')
+                                                       ($block->title ? 
htmlspecialchars($block->title) : htmlspecialchars($moduleobject->title)) . '" 
/>')
                                        ),
                                        array('label' => lang('Seen by'),
                                                  'form' => ('<select 
name="inputblockview">' .
@@ -542,7 +542,7 @@
                                        ),
                                        array('label' => lang('Sort order'),
                                                  'form' => ('<input 
type="text" name="inputblocksort" size="2" value="' .
-                                                       (int)$block->sort_order 
. '">')
+                                                       (int)$block->sort_order 
. '" />')
                                        )
                                );
                                if ($standalone)
@@ -614,31 +614,22 @@
                                        $blockscope =  lang('Site');
                                }

-                               $viewstandardelements = array(
-                                       array('label' => lang('Scope'),
-                                                 'value' => $blockscope
-                                       ),
-                                       array('label' => lang('Title'),
-                                                 'value' => ($block->title ? 
$block->title : $moduleobject->title)
-                                       ),
-                                       array('label' => lang('Seen by'),
-                                                 'value' => 
$this->viewable[(int)$block->view]
-                                       ),
-                                       array('label' => lang('Sort order'),
-                                                 'value' => 
(int)$block->sort_order
-                                       )
-                               );
-//                                                             
$viewmoduleelements = array();
-//                                                             while 
(list($argument,$argdef) = @each($moduleobject->arguments))
-//                                                             {
-//                                                                     $value 
= $block->arguments[$argument];
-//                                                                     
$viewmoduleelements[] = array(
-//                                                                             
'label' => $argdef['label'],
-//                                                                             
'value' => $GLOBALS['phpgw']->strip_html($value)
-//                                                                     );
-//                                                             }
-//                                                             $interface = 
array_merge($viewstandardelements,$viewmoduleelements);
-$interface = $viewstandardelements;
+                               $viewstandardelements = array
+                                       (
+                                               array('label' => lang('Scope'),
+                                                         'value' => $blockscope
+                                               ),
+                                               array('label' => lang('Title'),
+                                                         'value' => 
($block->title ? $block->title : $moduleobject->title)
+                                               ),
+                                               array('label' => lang('Seen 
by'),
+                                                         'value' => 
$this->viewable[(int)$block->view]
+                                               ),
+                                               array('label' => lang('Sort 
order'),
+                                                         'value' => 
(int)$block->sort_order
+                                               )
+                                       );
+                               $interface = $viewstandardelements;
                                $this->t->set_var('VeBlock','');
                                while (list(,$element) = each($interface))
                                {