Changeset 12372

Timestamp:

09/19/07 00:44:21 (1 year ago)

Author:

flack

Message:

some more XHMTL validation fixes for onxxx attributes

Files:

• trunk/midcom/midcom.helper.datamanager/widget_contactchooser.php (modified) (17 diffs)
• trunk/midcom/org.openpsa.contacts/style/show-group-persons-item.php (modified) (1 diff)
• trunk/midcom/org.openpsa.contacts/style/show-person-groups-item.php (modified) (1 diff)

trunk/midcom/midcom.helper.datamanager/widget_contactchooser.php

@@ -2 +2 @@
-/**
- * @package midcom.helper.datamanager
- 
+
- * @version $Id$
- * @copyright The Midgard Project, http://www.midgard-project.org
@@ -16 +16 @@
-
-class midcom_helper_datamanager_widget_contactchooser extends midcom_helper_datamanager_widget {
-
+
-    /**
- 
+
-     * For example https://openpsa.example.net/contacts/search/foaf/
- 
+
-     * @var string
-     */
-    var $contacts_url;
-
+
-    /**
-     * Whether this is a multiple select or not
@@ -30 +30 @@
-     */
-    var $_multiple = false;
-
+
-    /**
-     * Whether to look up DBE parameters of persons
@@ -39 +39 @@
-    function _constructor (&$datamanager, $field, $defaultvalue) {
-            parent::_constructor ($datamanager, $field, $defaultvalue);
-
+
-        if (!array_key_exists('widget_contactchooser_contacts_url', $this->_field))
-        {
@@ -46 +46 @@
-            $this->_field['widget_contactchooser_contacts_url'] = $this->_find_contacts_url();
-        }
-
+
-        if (array_key_exists('datatype', $this->_field))
-        {
@@ -54 +54 @@
-            }
-        }
-
+
-        $this->contacts_url = $this->_field['widget_contactchooser_contacts_url'];
-
+
-        // This component uses Ajax, include the handler javascripts
-        
+
-        $_MIDCOM->add_jsfile(MIDCOM_STATIC_URL."/org.openpsa.helpers/ajaxutils.js");
-        $_MIDCOM->add_jsfile(MIDCOM_STATIC_URL."/midcom.helper.datamanager/contactchooser_ajax.js");
@@ -75 +75 @@
-    }
-
- 
+
-    {
-        debug_push_class(__CLASS__, __FUNCTION__);
@@ -89 +89 @@
-
-        // Read form data only if we have submitted
- 
+
-        {
-            //Reset multiple selection array (since we only get information about checked boxes)
@@ -129 +129 @@
-        else
-        {
-  
-
-
-
- 
+
+
+
+
+
-    {
-        if (!$this->_value) {
@@ -142 +142 @@
-        //Do we have IDs or GUIDs as values.
-        $idtype = $this->_datatype2identifier();
-
+
-        if ($this->_multiple)
-        {
@@ -163 +163 @@
-        echo "</div>\n";
-    }
-
+
-    function draw_widget () {
-        echo '<script type="text/javascript" language="text/javascript" src="'.MIDCOM_STATIC_URL . '/org.openpsa.helpers/ajaxutils.js"></script>';
@@ -171 +171 @@
-        echo '<div class="widget_contactchooser">';
-        // This should be hidden unless there are selected results, then made visible using JS
-        
+
-        if ($this->_value)
-        {
@@ -202 +202 @@
-            {
-                $person = new midcom_baseclasses_database_person($this->_value);
- 
+
-                echo "<li><input type='checkbox' checked='checked' name='{$this->_fieldname}[{$this->_value}]' id='widget_contactchooser_{$this->_fieldname}' />";
-                echo "<label for=\"widget_contactchooser_{$this->_fieldname}\">{$person->rname}</label></li>\n";
@@ -216 +216 @@
-        //Check datatype, set return mode
-        $modeString = $this->_datatype2identifier();
-
+
-        //Check multiple, set action mode
-        if ($this->_multiple)
@@ -226 +226 @@
-            $modeString .= ', single';
-        }
-
+
-        echo "<input type='hidden' id='{$this->_fieldname}_ajaxWidgetMode' value='{$modeString}' />\n";
-        echo "<input type='hidden' id='{$this->_fieldname}_ajaxUrl' value='{$this->contacts_url}' />\n";
@@ -232 +232 @@
-        // TODO: Support Safari <input type="search" />
-        // http://weblogs.mozillazine.org/hyatt/archives/2004_07.html#005890
-Focus='ooAjaxFocus(this);' onBlur='ooAjaxBlur_noSave(this);' onKeyU
-
+focus='ooAjaxFocus(this);' onblur='ooAjaxBlur_noSave(this);' onkeyu
+
-        // Here we place the search results, hidden by default
-        echo "<ul class=\"widget_contactchooser_resultset\" style=\"display: none;\" id=\"widget_contactchooser_resultset_{$this->_fieldname}\"></ul>\n";
-        echo '</div>';
-
-
-
+
+
+
-    function _datatype2identifier()
-    {
@@ -253 +253 @@
-                return 'guid';
-            break;
-    
-
-
+
+
+
-}
-

trunk/midcom/org.openpsa.contacts/style/show-group-persons-item.php

@@ -15 +15 @@
-        <input id=\"editable_title_{$data['person']->guid}_ajaxDefault\" value=\"".$data['l10n']->get('<title>')."\" type=\"hidden\" />
-        <input id=\"editable_title_{$data['person']->guid}_ajaxUrl\" value=\"{$node[MIDCOM_NAV_FULLURL]}group/{$data['group']->guid}/update_member_title/\" type=\"hidden\" />
-Focus=\"ooAjaxFocus(this)\" onB
+focus=\"ooAjaxFocus(this)\" onb
-        </li>\n";
-}

trunk/midcom/org.openpsa.contacts/style/show-person-groups-item.php

@@ -10 +10 @@
-    $view_title_form = "<input id=\"editable_title_{$group_guid}_ajaxDefault\" value=\"".$data['l10n']->get('<title>')."\" type=\"hidden\" />\n";
-    $view_title_form .= "<input id=\"editable_title_{$group_guid}_ajaxUrl\" value=\"{$node[MIDCOM_NAV_FULLURL]}group/{$group_guid}/update_member_title/\" type=\"hidden\" />\n";
-Focus=\"ooAjaxFocus(this)\" onB
+focus=\"ooAjaxFocus(this)\" onb
-}
-else