added global attributes uid_format and did_format

db/schema/attr_types.xml

@@ -42,7 +42,7 @@
 	    string value (type is 2).
 	</description>
     </column>
-    <column role="serweb">
+    <column role="serweb" id="at.type_spec">
 	<name>type_spec</name>
 	<type>string</type>
 	<size>255</size>
@@ -349,7 +349,27 @@
          <value col="at.flags">0</value>
          <value col="at.prior">1073807616</value>
          <value col="at.order">130</value>
-   </row>
-								       
+    </row>
+    <row><value col="at.name">uid_format</value>
+         <value col="at.type">2</value>
+         <value col="at.rich_t">list</value>
+         <value col="at.desc">@ff_uid_format</value>
+         <value col="at.d_flags">32</value>
+         <value col="at.flags">0</value>
+         <value col="at.prior">1073741824</value>
+         <value col="at.order">160</value>
+	 <value col="at.type_spec">a:3:{i:0;s:14:"username@realm";i:1;s:21:"integer (incremental)";i:2;s:15:"UUID by RFC4122";}</value>
+    </row>
+    <row><value col="at.name">did_format</value>
+         <value col="at.type">2</value>
+         <value col="at.rich_t">list</value>
+         <value col="at.desc">@ff_did_format</value>
+         <value col="at.d_flags">32</value>
+         <value col="at.flags">0</value>
+         <value col="at.prior">1073741824</value>
+         <value col="at.order">170</value>
+	 <value col="at.type_spec">a:3:{i:0;s:11:"domain name";i:1;s:21:"integer (incremental)";i:2;s:15:"UUID by RFC4122";}</value>
+    </row>
+								      
 
 </table>

db/schema/global_attrs.xml

@@ -242,4 +242,16 @@
 	<value col="global_attrs.flags">32</value>
     </row>
 
+    <row><value col="global_attrs.name">uid_format</value>
+         <value col="global_attrs.type">2</value>
+         <value col="global_attrs.value">0</value>
+         <value col="global_attrs.flags">32</value>
+    </row>
+
+    <row><value col="global_attrs.name">did_format</value>
+         <value col="global_attrs.type">2</value>
+         <value col="global_attrs.value">0</value>
+         <value col="global_attrs.flags">32</value>
+    </row>
+								
 </table>

scripts/dbtext/ser_db/attr_types

@@ -28,3 +28,5 @@ sw_confirmation:string:2::registration confirmation:32:0:0:0
 sw_pending_ts:string:2::registration timestamp:32:0:0:0
 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
+uid_format:list:2:a\:3\:{i\:0;s\:14\:"username@realm";i\:1;s\:21\:"integer (incremental)";i\:2;s\:15\:"UUID by RFC4122";}:@ff_uid_format:32:0:1073741824:160
+did_format:list:2:a\:3\:{i\:0;s\:11\:"domain name";i\:1;s\:21\:"integer (incremental)";i\:2;s\:15\:"UUID by RFC4122";}:@ff_did_format:32:0:1073741824:170

scripts/dbtext/ser_db/global_attrs

@@ -6,3 +6,5 @@ sw_show_status:0:1:32
 sw_require_conf:0:1:32
 lang:2:en:33
 sw_timezone:2:Europe/Prague:32
+uid_format:2:0:32
+did_format:2:0:32

scripts/mysql/my_create.sql

@@ -121,6 +121,8 @@ 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_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_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');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering, type_spec) VALUES ('uid_format', '2', 'list', '@ff_uid_format', '32', '0', '1073741824', '160', 'a:3:{i:0;s:14:"username@realm";i:1;s:21:"integer (incremental)";i:2;s:15:"UUID by RFC4122";}');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering, type_spec) VALUES ('did_format', '2', 'list', '@ff_did_format', '32', '0', '1073741824', '170', 'a:3:{i:0;s:11:"domain name";i:1;s:21:"integer (incremental)";i:2;s:15:"UUID by RFC4122";}');
 
 INSERT INTO version (table_name, table_version) values ('global_attrs','1');
 CREATE TABLE global_attrs (
@@ -138,6 +140,8 @@ INSERT INTO global_attrs (name, type, value, flags) VALUES ('sw_show_status', '0
 INSERT INTO global_attrs (name, type, value, flags) VALUES ('sw_require_conf', '0', '1', '32');
 INSERT INTO global_attrs (name, type, value, flags) VALUES ('lang', '2', 'en', '33');
 INSERT INTO global_attrs (name, type, value, flags) VALUES ('sw_timezone', '2', 'Europe/Prague', '32');
+INSERT INTO global_attrs (name, type, value, flags) VALUES ('uid_format', '2', '0', '32');
+INSERT INTO global_attrs (name, type, value, flags) VALUES ('did_format', '2', '0', '32');
 
 INSERT INTO version (table_name, table_version) values ('domain_attrs','1');
 CREATE TABLE domain_attrs (

scripts/oracle/or_create.sql

@@ -119,6 +119,8 @@ 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_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_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');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering, type_spec) VALUES ('uid_format', '2', 'list', '@ff_uid_format', '32', '0', '1073741824', '160', 'a:3:{i:0;s:14:"username@realm";i:1;s:21:"integer (incremental)";i:2;s:15:"UUID by RFC4122";}');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering, type_spec) VALUES ('did_format', '2', 'list', '@ff_did_format', '32', '0', '1073741824', '170', 'a:3:{i:0;s:11:"domain name";i:1;s:21:"integer (incremental)";i:2;s:15:"UUID by RFC4122";}');
 
 INSERT INTO version (table_name, table_version) values ('global_attrs','1');
 CREATE TABLE global_attrs (
@@ -136,6 +138,8 @@ INSERT INTO global_attrs (name, type, value, flags) VALUES ('sw_show_status', '0
 INSERT INTO global_attrs (name, type, value, flags) VALUES ('sw_require_conf', '0', '1', '32');
 INSERT INTO global_attrs (name, type, value, flags) VALUES ('lang', '2', 'en', '33');
 INSERT INTO global_attrs (name, type, value, flags) VALUES ('sw_timezone', '2', 'Europe/Prague', '32');
+INSERT INTO global_attrs (name, type, value, flags) VALUES ('uid_format', '2', '0', '32');
+INSERT INTO global_attrs (name, type, value, flags) VALUES ('did_format', '2', '0', '32');
 
 INSERT INTO version (table_name, table_version) values ('domain_attrs','1');
 CREATE TABLE domain_attrs (

scripts/postgres/pg_create.sql

@@ -121,6 +121,8 @@ 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_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_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');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering, type_spec) VALUES ('uid_format', '2', 'list', '@ff_uid_format', '32', '0', '1073741824', '160', 'a:3:{i:0;s:14:"username@realm";i:1;s:21:"integer (incremental)";i:2;s:15:"UUID by RFC4122";}');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering, type_spec) VALUES ('did_format', '2', 'list', '@ff_did_format', '32', '0', '1073741824', '170', 'a:3:{i:0;s:11:"domain name";i:1;s:21:"integer (incremental)";i:2;s:15:"UUID by RFC4122";}');
 
 CREATE TABLE global_attrs (
     name VARCHAR(32) NOT NULL,
@@ -137,6 +139,8 @@ INSERT INTO global_attrs (name, type, value, flags) VALUES ('sw_show_status', '0
 INSERT INTO global_attrs (name, type, value, flags) VALUES ('sw_require_conf', '0', '1', '32');
 INSERT INTO global_attrs (name, type, value, flags) VALUES ('lang', '2', 'en', '33');
 INSERT INTO global_attrs (name, type, value, flags) VALUES ('sw_timezone', '2', 'Europe/Prague', '32');
+INSERT INTO global_attrs (name, type, value, flags) VALUES ('uid_format', '2', '0', '32');
+INSERT INTO global_attrs (name, type, value, flags) VALUES ('did_format', '2', '0', '32');
 
 CREATE TABLE domain_attrs (
     did VARCHAR(64),