Index: openid_ax.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/openid_ax/openid_ax.install,v
retrieving revision 1.6
diff -u -r1.6 openid_ax.install
--- openid_ax.install	10 Aug 2008 18:33:57 -0000	1.6
+++ openid_ax.install	23 Sep 2008 20:42:20 -0000
@@ -43,6 +43,27 @@
         'default' => '',
         'description' => t('URI placeholder of the attribute identifier.')
       ),
+      'label' => array(
+        'type' => 'varchar',
+        'length' => 255,
+        'not null' => TRUE,
+        'default' => '',
+        'description' => t('Label of the attribute identifier.')
+      ),
+      'description' => array(
+        'type' => 'varchar',
+        'length' => 255,
+        'not null' => TRUE,
+        'default' => '',
+        'description' => t('Description of the attribute identifier.')
+      ),
+      'type' => array(
+        'type' => 'varchar',
+        'length' => 255,
+        'not null' => TRUE,
+        'default' => '',
+        'description' => t('Data type of the attribute identifier.')
+      ),
     ),
        'indexes' => array('ax_id' => array('ax_id')),
        'primary key' => array('identifier')
@@ -133,10 +154,11 @@
   * Insert values into table openid_ax_attributes
   */
 function _openid_ax_attributes_fill() {
-  $identifiers = _openid_ax_attributes_identifiers();
-  $identifiers_string = implode("'),('",$identifiers);
-  $query = "INSERT INTO {openid_ax_attributes} (identifier) VALUES ('$identifiers_string') ";
-  db_query($query);
+  $attributes = _openid_ax_attributes_identifiers();
+  foreach ($attributes as $attribute) {
+    $query = "INSERT INTO {openid_ax_attributes} (identifier, label, description, type) VALUES ('%s', '%s', '%s', '%s')";
+    db_query($query, $attribute['type_URI'], $attribute['label'], $attribute['description'], $attribute['type']);
+  }
   return;
 }
 
@@ -147,71 +169,385 @@
  *   Array containing the identifiers
  */
 function _openid_ax_attributes_identifiers() {
-  $identifiers = array(
-	'http://openid.net/schema/namePerson/prefix',
-	'http://openid.net/schema/namePerson/first',
-	'http://openid.net/schema/namePerson/last',
-	'http://openid.net/schema/namePerson/middle',
-	'http://openid.net/schema/namePerson/suffix',
-	'http://openid.net/schema/namePerson/friendly',
-	'http://openid.net/schema/person/guid',
-	'http://openid.net/schema/birthDate/birthYear',
-	'http://openid.net/schema/birthDate/birthMonth',
-	'http://openid.net/schema/birthDate/birthday',
-	'http://openid.net/schema/gender',
-	'http://openid.net/schema/language/pref',
-	'http://openid.net/schema/contact/phone/default',
-	'http://openid.net/schema/contact/phone/home',
-	'http://openid.net/schema/contact/phone/business',
-	'http://openid.net/schema/contact/phone/cell',
-	'http://openid.net/schema/contact/phone/fax',
-	'http://openid.net/schema/contact/postaladdress/home',
-	'http://openid.net/schema/contact/postaladdressadditional/home',
-	'http://openid.net/schema/contact/city/home',
-	'http://openid.net/schema/contact/state/home',
-	'http://openid.net/schema/contact/country/home',
-	'http://openid.net/schema/contact/postalcode/home',
-	'http://openid.net/schema/contact/postaladdress/business',
-	'http://openid.net/schema/contact/postaladdressadditional/business',
-	'http://openid.net/schema/contact/city/business',
-	'http://openid.net/schema/contact/state/business',
-	'http://openid.net/schema/contact/country/business',
-	'http://openid.net/schema/contact/postalcode/business',
-	'http://openid.net/schema/contact/IM/default',
-	'http://openid.net/schema/contact/IM/AIM',
-	'http://openid.net/schema/contact/IM/ICQ',
-	'http://openid.net/schema/contact/IM/MSN',
-	'http://openid.net/schema/contact/IM/Yahoo',
-	'http://openid.net/schema/contact/IM/Jabber',
-	'http://openid.net/schema/contact/IM/Skype',
-	'http://openid.net/schema/contact/internet/email',
-	'http://openid.net/schema/contact/web/default',
-	'http://openid.net/schema/contact/web/blog',
-	'http://openid.net/schema/contact/web/Linkedin',
-	'http://openid.net/schema/contact/web/Amazon',
-	'http://openid.net/schema/contact/web/Flickr',
-	'http://openid.net/schema/contact/web/Delicious',
-	'http://openid.net/schema/company/name',
-	'http://openid.net/schema/company/title',
-	'http://openid.net/schema/media/spokenname',
-	'http://openid.net/schema/media/greeting/audio',
-	'http://openid.net/schema/media/greeting/video',
-	'http://openid.net/schema/media/biography',
-	'http://openid.net/schema/media/image',
-	'http://openid.net/schema/media/image/16x16',
-	'http://openid.net/schema/media/image/32x32',
-	'http://openid.net/schema/media/image/48x48',
-	'http://openid.net/schema/media/image/64x64',
-	'http://openid.net/schema/media/image/80x80',
-	'http://openid.net/schema/media/image/128x128',
-	'http://openid.net/schema/media/image/160x120',
-	'http://openid.net/schema/media/image/320x240',
-	'http://openid.net/schema/media/image/640x480',
-	'http://openid.net/schema/media/image/120x160',
-	'http://openid.net/schema/media/image/240x320',
-	'http://openid.net/schema/media/image/480x640',
-	'http://openid.net/schema/media/image/favicon',
-	'http://openid.net/schema/timezone'
+  $attributes = array(
+    array(
+      'type_URI'    => 'http://openid.net/schema/namePerson/prefix',
+      'label'       => 'Name prefix',
+      'description' => 'Honorific prefix for the subject\'s name; i.e. "Mr.", "Mrs.", "Dr."',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#normalizedString',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/namePerson/first',
+      'label'       => 'First name',
+      'description' => 'First or given name of subject',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#normalizedString',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/namePerson/last',
+      'label'       => 'Last name',
+      'description' => 'Last name or surname of subject',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#normalizedString',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/namePerson/middle',
+      'label'       => 'Middle name',
+      'description' => 'Middle name(s) of subject',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#normalizedString',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/namePerson/suffix',
+      'label'       => 'Name suffix',
+      'description' => 'Suffix of subject\'s name',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#normalizedString',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/namePerson/friendly',
+      'label'       => 'Alias',
+      'description' => 'Subject\'s alias or "screen" name',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#normalizedString',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/person/guid',
+      'label'       => 'GUID',
+      'description' => 'Subject\'s globally unique identifier',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#normalizedString',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/birthDate/birthYear',
+      'label'       => 'Birth year',
+      'description' => 'Year of birth (four digits) ',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#gYear',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/birthDate/birthMonth',
+      'label'       => 'Birth month',
+      'description' => 'Month of birth (1-12)',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#gMonth',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/birthDate/birthday',
+      'label'       => 'Birth day',
+      'description' => 'Day of birth',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#gDay',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/gender',
+      'label'       => 'Gender',
+      'description' => 'Gender, either "M" or "F"',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#normalizedString',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/language/pref',
+      'label'       => 'Language',
+      'description' => 'Preferred language',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#normalizedString',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/contact/phone/default',
+      'label'       => 'Phone (preferred) ',
+      'description' => 'Main phone number (preferred) ',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#normalizedString',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/contact/phone/home',
+      'label'       => 'Phone (home) ',
+      'description' => 'Home phone number',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#normalizedString',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/contact/phone/business',
+      'label'       => 'Phone (work) ',
+      'description' => 'Business phone number ',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#normalizedString',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/contact/phone/cell',
+      'label'       => 'Phone (mobile) ',
+      'description' => 'Cellular (or mobile) phone number ',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#normalizedString',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/contact/phone/fax',
+      'label'       => 'Phone (fax) ',
+      'description' => 'Fax number',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#normalizedString',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/contact/postaladdress/home',
+      'label'       => 'Address',
+      'description' => 'Home postal address: street number, name and apartment number',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#normalizedString',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/contact/postaladdressadditional/home',
+      'label'       => 'Address 2',
+      'description' => 'Home postal address: supplementary information',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#normalizedString',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/contact/city/home',
+      'label'       => 'City',
+      'description' => 'Home city name',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#normalizedString',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/contact/state/home',
+      'label'       => 'State/Province',
+      'description' => 'Home state or province name',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#normalizedString',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/contact/country/home',
+      'label'       => 'Country',
+      'description' => 'Home country code',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#normalizedString',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/contact/postalcode/home',
+      'label'       => 'Postal code',
+      'description' => 'Home postal code',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#normalizedString',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/contact/postaladdress/business',
+      'label'       => 'Address',
+      'description' => 'Business postal address: street number, name and apartment number',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#normalizedString',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/contact/postaladdressadditional/business',
+      'label'       => 'Address 2 ',
+      'description' => 'Business postal address: supplementary information',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#normalizedString',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/contact/city/business',
+      'label'       => 'City',
+      'description' => 'Business city name',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#normalizedString',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/contact/state/business',
+      'label'       => 'State/Province',
+      'description' => 'Business state or province name ',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#normalizedString',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/contact/country/business',
+      'label'       => 'Country',
+      'description' => 'Business country code',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#normalizedString',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/contact/IM/default',
+      'label'       => 'IM',
+      'description' => 'Preferred instant messaging service (one of http://openid.net/schema/contact/IM/*)',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#anyURI',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/contact/IM/AIM',
+      'label'       => 'AOL IM',
+      'description' => 'AOL instant messaging service handle',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#normalizedString',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/contact/IM/ICQ',
+      'label'       => 'ICQ IM',
+      'description' => 'ICQ instant messaging service handle',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#normalizedString',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/contact/IM/MSN',
+      'label'       => 'MSN IM',
+      'description' => 'MSN instant messaging service handle',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#normalizedString',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/contact/IM/Yahoo',
+      'label'       => 'Yahoo! IM',
+      'description' => 'Yahoo! instant messaging service handle',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#normalizedString',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/contact/IM/Jabber',
+      'label'       => 'Jabber IM',
+      'description' => 'Jabber instant messaging service handle',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#normalizedString',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/contact/IM/Skype',
+      'label'       => 'Skype IM ',
+      'description' => 'Skype instant messaging service handle',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#normalizedString',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/contact/internet/email',
+      'label'       => 'Email',
+      'description' => 'Internet SMTP email address',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#normalizedString',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/contact/web/default',
+      'label'       => 'Web page',
+      'description' => 'Web site URL',
+      'http://www.w3.org/2001/XMLSchema#anyURI',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/contact/web/blog',
+      'label'       => 'Blog',
+      'description' => 'Blog URL',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#anyURI',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/contact/web/Linkedin',
+      'label'       => 'LinkedIn URL',
+      'description' => 'LinkedIn URL',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#anyURI',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/contact/web/Amazon',
+      'label'       => 'Amazon URL',
+      'description' => 'Amazon URL',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#anyURI',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/contact/web/Flickr',
+      'label'       => 'Flickr URL',
+      'description' => 'Flickr URL',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#anyURI',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/contact/web/Delicious',
+      'label'       => 'del.icio.us URL',
+      'description' => 'del.icio.us URL',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#anyURI',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/company/name',
+      'label'       => 'Company',
+      'description' => 'Company name (employer) ',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#normalizedString',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/company/title',
+      'label'       => 'Title',
+      'description' => 'Employee title',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#normalizedString',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/media/spokenname',
+      'label'       => 'Spoken name',
+      'description' => 'Spoken name (web URL) ',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#anyURI',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/media/greeting/audio',
+      'label'       => 'Audio greeting',
+      'description' => 'Audio greeting (web URL) ',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#anyURI',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/media/greeting/video',
+      'label'       => 'Video greeting',
+      'description' => 'Video greeting (web URL) ',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#anyURI',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/media/biography',
+      'label'       => 'Biography',
+      'description' => 'Biography (text) ',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#string',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/media/image',
+      'label'       => 'Image',
+      'description' => 'Image (web URL); unspecified dimension',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#anyURI',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/media/image/16x16',
+      'label'       => '16x16 image',
+      'description' => 'Image (web URL); 16x16 pixels',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#anyURI',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/media/image/32x32',
+      'label'       => '32x32 image',
+      'description' => 'Image (web URL); 32x32 pixels ',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#anyURI',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/media/image/48x48',
+      'label'       => '48x48 image',
+      'description' => 'Image (web URL); 48x48 pixels',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#anyURI',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/media/image/64x64',
+      'label'       => '64x64 image',
+      'description' => 'Image (web URL); 64x64 pixels',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#anyURI',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/media/image/80x80',
+      'label'       => '80x80 image',
+      'description' => 'Image (web URL); 80x80 pixels',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#anyURI',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/media/image/128x128',
+      'label'       => '128x128 image',
+      'description' => 'Image (web URL); 128x128 pixels ',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#anyURI',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/media/image/160x120',
+      'label'       => '160x120 image',
+      'description' => 'Image (web URL) 4:3 ratio - landscape; 160x120 pixels',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#anyURI',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/media/image/320x240',
+      'label'       => '320x240 image',
+      'description' => 'Image (web URL) 4:3 ratio - landscape; 320x240 pixels ',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#anyURI',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/media/image/640x480',
+      'label'       => ' 640x480 image',
+      'description' => 'Image (web URL) 4:3 ratio - landscape; 640x480 pixels',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#anyURI',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/media/image/120x160',
+      'label'       => ' 120x160 image',
+      'description' => 'Image (web URL) 4:3 ratio - portrait; 120x160 pixels',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#anyURI',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/media/image/240x320',
+      'label'       => '240x320 image',
+      'description' => 'Image (web URL) 4:3 ratio - portrait; 240x320 pixels',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#anyURI',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/media/image/480x640',
+      'label'       => '480x640 image',
+      'description' => 'Image (web URL) 4:3 ratio - portrait; 480x640 pixels',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#anyURI',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/media/image/favicon',
+      'label'       => 'Favicon image',
+      'description' => 'Image (web URL); favicon format',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#anyURI',
+    ),
+    array(
+      'type_URI'    => 'http://openid.net/schema/timezone',
+      'label'       => 'Time zone',
+      'description' => 'Home time zone information',
+      'type'        => 'http://www.w3.org/2001/XMLSchema#normalizedString',
+    ),
   );
-  return $identifiers;
+  return $attributes;
 }