names of attributes changed

db/schema/attr_types.xml

@@ -129,7 +129,7 @@
 	 <value col="at.prior">65536</value>
     </row>
     
-    <row><value col="at.name">sw_fname</value>      
+    <row><value col="at.name">first_name</value>      
          <value col="at.type">2</value>
          <value col="at.rich_t">string</value>
          <value col="at.desc">@ff_first_name</value>
@@ -138,7 +138,7 @@
          <value col="at.prior">256</value>
          <value col="at.order">10</value>
          </row>
-    <row><value col="at.name">sw_lname</value>      
+    <row><value col="at.name">last_name</value>      
          <value col="at.type">2</value>
          <value col="at.rich_t">string</value>
          <value col="at.desc">@ff_last_name</value>
@@ -147,7 +147,7 @@
          <value col="at.prior">256</value>
          <value col="at.order">20</value>
          </row>
-    <row><value col="at.name">sw_email</value>      
+    <row><value col="at.name">email</value>      
          <value col="at.type">2</value>
          <value col="at.rich_t">email_adr</value>
          <value col="at.desc">@ff_email</value>
@@ -156,7 +156,7 @@
          <value col="at.prior">256</value>
          <value col="at.order">30</value>
          </row>
-    <row><value col="at.name">sw_timezone</value>   
+    <row><value col="at.name">timezone</value>   
          <value col="at.type">2</value>
          <value col="at.rich_t">timezone</value>
          <value col="at.desc">@ff_timezone</value>
@@ -224,7 +224,7 @@
          <value col="at.flags">0</value>
          <value col="at.prior">0</value>
          </row>
-    <row><value col="at.name">sw_phone</value>      
+    <row><value col="at.name">phone</value>      
          <value col="at.type">2</value>
          <value col="at.rich_t">string</value>
          <value col="at.desc">@ff_phone</value>
@@ -289,7 +289,7 @@
          <value col="at.flags">0</value>
          <value col="at.prior">0</value>
          </row>
-    <row><value col="at.name">sw_require_conf</value>
+    <row><value col="at.name">sw_require_confirm</value>
          <value col="at.type">0</value>
          <value col="at.rich_t">boolean</value>
          <value col="at.desc">@ff_reg_confirmation</value>

scripts/dbtext/ser_db/attr_types

@@ -7,10 +7,10 @@ fr_inv_timer:string:2:::1:0:0:0
 flags:string:0:::1:0:0:0
 gflags:string:0:::1:0:0:0
 digest_realm:string:2::digest realm:33:0:65536:0
-sw_fname:string:2::@ff_first_name:32:2:256:10
-sw_lname:string:2::@ff_last_name:32:2:256:20
-sw_email:email_adr:2::@ff_email:32:2:256:30
-sw_timezone:timezone:2::@ff_timezone:32:2:1073807616:60
+first_name:string:2::@ff_first_name:32:2:256:10
+last_name:string:2::@ff_last_name:32:2:256:20
+email:email_adr:2::@ff_email:32:2:256:30
+timezone:timezone:2::@ff_timezone:32:2:1073807616:60
 sw_allow_find:boolean:0::@ff_allow_lookup_for_me:32:0:256:110
 lang:lang:2::@ff_language:33:0:1073807616:50
 sw_show_status:boolean:0::@ff_status_visibility:32:0:1073742080:100
@@ -18,7 +18,7 @@ sw_admin:string:2::admin of domain:32:1:0:0
 sw_owner:string:2::owner of domain:32:0:0:0
 sw_domain_default_flags:int:0::@ff_domain_def_f:32:0:1073741824:0
 sw_deleted_ts:int:0::deleted timestamp:32:0:0:0
-sw_phone:string:2::@ff_phone:32:2:256:40
+phone:string:2::@ff_phone:32:2:256:40
 sw_acl_control:string:2::acl control:32:1:0:0
 sw_credential_default_flags:int:0::@ff_credential_def_f:32:0:1073741824:0
 sw_uri_default_flags:int:0::@ff_uri_def_f:32:0:1073741824:0
@@ -26,5 +26,5 @@ sw_is_admin:boolean:0::admin privilege:32:0:0:0
 sw_is_hostmaster:boolean:0::hostmaster privilege:32:0:0:0
 sw_confirmation:string:2::registration confirmation:32:0:0:0
 sw_pending_ts:string:2::registration timestamp:32:0:0:0
-sw_require_conf:boolean:0::@ff_reg_confirmation:32:0:1073807360:120
+sw_require_confirm:boolean:0::@ff_reg_confirmation:32:0:1073807360:120
 sw_send_missed:boolean:0::@ff_send_daily_missed_calls:32:0:1073807616:130

scripts/mysql/my_create.sql

@@ -124,10 +124,10 @@ INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('fr_inv_timer', '
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('flags', '0', '1');
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('gflags', '0', '1');
 INSERT INTO attr_types (name, raw_type, description, default_flags, priority) VALUES ('digest_realm', '2', 'digest realm', '33', '65536');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_fname', '2', 'string', '@ff_first_name', '32', '2', '256', '10');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_lname', '2', 'string', '@ff_last_name', '32', '2', '256', '20');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_email', '2', 'email_adr', '@ff_email', '32', '2', '256', '30');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_timezone', '2', 'timezone', '@ff_timezone', '32', '2', '1073807616', '60');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('first_name', '2', 'string', '@ff_first_name', '32', '2', '256', '10');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('last_name', '2', 'string', '@ff_last_name', '32', '2', '256', '20');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('email', '2', 'email_adr', '@ff_email', '32', '2', '256', '30');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('timezone', '2', 'timezone', '@ff_timezone', '32', '2', '1073807616', '60');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_allow_find', '0', 'boolean', '@ff_allow_lookup_for_me', '32', '0', '256', '110');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('lang', '2', 'lang', '@ff_language', '33', '0', '1073807616', '50');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_show_status', '0', 'boolean', '@ff_status_visibility', '32', '0', '1073742080', '100');
@@ -135,7 +135,7 @@ INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, f
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_owner', '2', 'string', 'owner of domain', '32', '0', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_domain_default_flags', '0', 'int', '@ff_domain_def_f', '32', '0', '1073741824');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_deleted_ts', '0', 'int', 'deleted timestamp', '32', '0', '0');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_phone', '2', 'string', '@ff_phone', '32', '2', '256', '40');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('phone', '2', 'string', '@ff_phone', '32', '2', '256', '40');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_acl_control', '2', 'string', 'acl control', '32', '1', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_credential_default_flags', '0', 'int', '@ff_credential_def_f', '32', '0', '1073741824');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_uri_default_flags', '0', 'int', '@ff_uri_def_f', '32', '0', '1073741824');
@@ -143,7 +143,7 @@ INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, f
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_is_hostmaster', '0', 'boolean', 'hostmaster privilege', '32', '0', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_confirmation', '2', 'string', 'registration confirmation', '32', '0', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_pending_ts', '2', 'string', 'registration timestamp', '32', '0', '0');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_require_conf', '0', 'boolean', '@ff_reg_confirmation', '32', '0', '1073807360', '120');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_require_confirm', '0', 'boolean', '@ff_reg_confirmation', '32', '0', '1073807360', '120');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_send_missed', '0', 'boolean', '@ff_send_daily_missed_calls', '32', '0', '1073807616', '130');
 
 CREATE TABLE global_attrs (

scripts/oracle/or_create.sql

@@ -119,10 +119,10 @@ INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('fr_inv_timer', '
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('flags', '0', '1');
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('gflags', '0', '1');
 INSERT INTO attr_types (name, raw_type, description, default_flags, priority) VALUES ('digest_realm', '2', 'digest realm', '33', '65536');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_fname', '2', 'string', '@ff_first_name', '32', '2', '256', '10');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_lname', '2', 'string', '@ff_last_name', '32', '2', '256', '20');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_email', '2', 'email_adr', '@ff_email', '32', '2', '256', '30');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_timezone', '2', 'timezone', '@ff_timezone', '32', '2', '1073807616', '60');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('first_name', '2', 'string', '@ff_first_name', '32', '2', '256', '10');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('last_name', '2', 'string', '@ff_last_name', '32', '2', '256', '20');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('email', '2', 'email_adr', '@ff_email', '32', '2', '256', '30');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('timezone', '2', 'timezone', '@ff_timezone', '32', '2', '1073807616', '60');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_allow_find', '0', 'boolean', '@ff_allow_lookup_for_me', '32', '0', '256', '110');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('lang', '2', 'lang', '@ff_language', '33', '0', '1073807616', '50');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_show_status', '0', 'boolean', '@ff_status_visibility', '32', '0', '1073742080', '100');
@@ -130,7 +130,7 @@ INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, f
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_owner', '2', 'string', 'owner of domain', '32', '0', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_domain_default_flags', '0', 'int', '@ff_domain_def_f', '32', '0', '1073741824');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_deleted_ts', '0', 'int', 'deleted timestamp', '32', '0', '0');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_phone', '2', 'string', '@ff_phone', '32', '2', '256', '40');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('phone', '2', 'string', '@ff_phone', '32', '2', '256', '40');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_acl_control', '2', 'string', 'acl control', '32', '1', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_credential_default_flags', '0', 'int', '@ff_credential_def_f', '32', '0', '1073741824');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_uri_default_flags', '0', 'int', '@ff_uri_def_f', '32', '0', '1073741824');
@@ -138,7 +138,7 @@ INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, f
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_is_hostmaster', '0', 'boolean', 'hostmaster privilege', '32', '0', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_confirmation', '2', 'string', 'registration confirmation', '32', '0', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_pending_ts', '2', 'string', 'registration timestamp', '32', '0', '0');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_require_conf', '0', 'boolean', '@ff_reg_confirmation', '32', '0', '1073807360', '120');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_require_confirm', '0', 'boolean', '@ff_reg_confirmation', '32', '0', '1073807360', '120');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_send_missed', '0', 'boolean', '@ff_send_daily_missed_calls', '32', '0', '1073807616', '130');
 
 CREATE TABLE global_attrs (

scripts/postgres/pg_create.sql

@@ -127,10 +127,10 @@ INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('fr_inv_timer', '
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('flags', '0', '1');
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('gflags', '0', '1');
 INSERT INTO attr_types (name, raw_type, description, default_flags, priority) VALUES ('digest_realm', '2', 'digest realm', '33', '65536');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_fname', '2', 'string', '@ff_first_name', '32', '2', '256', '10');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_lname', '2', 'string', '@ff_last_name', '32', '2', '256', '20');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_email', '2', 'email_adr', '@ff_email', '32', '2', '256', '30');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_timezone', '2', 'timezone', '@ff_timezone', '32', '2', '1073807616', '60');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('first_name', '2', 'string', '@ff_first_name', '32', '2', '256', '10');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('last_name', '2', 'string', '@ff_last_name', '32', '2', '256', '20');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('email', '2', 'email_adr', '@ff_email', '32', '2', '256', '30');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('timezone', '2', 'timezone', '@ff_timezone', '32', '2', '1073807616', '60');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_allow_find', '0', 'boolean', '@ff_allow_lookup_for_me', '32', '0', '256', '110');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('lang', '2', 'lang', '@ff_language', '33', '0', '1073807616', '50');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_show_status', '0', 'boolean', '@ff_status_visibility', '32', '0', '1073742080', '100');
@@ -138,7 +138,7 @@ INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, f
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_owner', '2', 'string', 'owner of domain', '32', '0', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_domain_default_flags', '0', 'int', '@ff_domain_def_f', '32', '0', '1073741824');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_deleted_ts', '0', 'int', 'deleted timestamp', '32', '0', '0');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_phone', '2', 'string', '@ff_phone', '32', '2', '256', '40');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('phone', '2', 'string', '@ff_phone', '32', '2', '256', '40');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_acl_control', '2', 'string', 'acl control', '32', '1', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_credential_default_flags', '0', 'int', '@ff_credential_def_f', '32', '0', '1073741824');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_uri_default_flags', '0', 'int', '@ff_uri_def_f', '32', '0', '1073741824');
@@ -146,7 +146,7 @@ INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, f
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_is_hostmaster', '0', 'boolean', 'hostmaster privilege', '32', '0', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_confirmation', '2', 'string', 'registration confirmation', '32', '0', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_pending_ts', '2', 'string', 'registration timestamp', '32', '0', '0');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_require_conf', '0', 'boolean', '@ff_reg_confirmation', '32', '0', '1073807360', '120');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_require_confirm', '0', 'boolean', '@ff_reg_confirmation', '32', '0', '1073807360', '120');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_send_missed', '0', 'boolean', '@ff_send_daily_missed_calls', '32', '0', '1073807616', '130');
 
 CREATE TABLE global_attrs (