Index: worldclock.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/worldclock/Attic/worldclock.install,v retrieving revision 1.1.2.1.2.3 diff -u -F^f -r1.1.2.1.2.3 worldclock.install --- worldclock.install 20 Dec 2008 11:29:58 -0000 1.1.2.1.2.3 +++ worldclock.install 24 Dec 2008 20:04:51 -0000 @@ -105,65 +105,23 @@ function worldclock_schema() { $schema['worldclock_locations'] = array( 'fields' => array( 'wid' => array( + 'description' => t('Primary Key: Unique locations ID.'), 'type' => 'serial', 'not null' => TRUE, 'size' => 'tiny', ), 'name' => array( + 'description' => t('Name of the location.'), 'type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => '', ), - 'gmt' => array( - 'type' => 'int', + 'values' => array( + 'description' => t('Values for the location.'), + 'type' => 'text', 'not null' => TRUE, - 'size' => 'tiny', - ), - 'dst' => array( - 'type' => 'int', - 'not null' => TRUE, - 'size' => 'tiny', - ), - 's_mon' => array( - 'type' => 'int', - 'not null' => TRUE, - 'size' => 'tiny', - ), - 's_nth' => array( - 'type' => 'int', - 'not null' => TRUE, - 'size' => 'tiny', - ), - 's_dow' => array( - 'type' => 'int', - 'not null' => TRUE, - 'size' => 'tiny', - ), - 's_time' => array( - 'type' => 'int', - 'not null' => TRUE, - 'size' => 'tiny', - ), - 'e_mon' => array( - 'type' => 'int', - 'not null' => TRUE, - 'size' => 'tiny', - ), - 'e_nth' => array( - 'type' => 'int', - 'not null' => TRUE, - 'size' => 'tiny', - ), - 'e_dow' => array( - 'type' => 'int', - 'not null' => TRUE, - 'size' => 'tiny', - ), - 'e_time' => array( - 'type' => 'int', - 'not null' => TRUE, - 'size' => 'tiny', + 'size' => 'big', ), ), 'primary key' => array('wid') @@ -172,7 +130,7 @@ function worldclock_schema() { return $schema; } -function worldclock_load_locations() { +function worldclock_default_locations() { // Note: wc_location array // // Name Country or area name @@ -192,126 +150,142 @@ function worldclock_load_locations() { $locations = array( // Name GMT DST ----- Start ------ ------ End ------- // Diff Y/N Mon Nth DOW Time Mon Nth DOW Time - array( t('Afghanistan'), 4.5, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Argentina'), -3, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Australia ET'), 10, 1, 10, 9, 0, 2, 3, 9, 0, 3 ), - array( t('Australia CT'), 9.5, 1, 10, 9, 0, 2, 3, 9, 0, 3 ), - array( t('Australia WT'), 8, 1, 10, 9, 0, 2, 3, 9, 0, 3 ), - array( t('Austria'), 1, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), - array( t('Bangladesh'), 6, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Belgium'), 1, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), - array( t('Bhutan'), 6, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Bolivia'), -4, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Brazil'), -3, 1, 10, 3, 0, 0, 2, 3, 0, 0 ), - array( t('Bulgaria'), 2, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), - array( t('Cambodia'), 7, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Cameroon'), 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Canada AB'), -7, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), - array( t('Canada BC'), -8, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), - array( t('Canada MB'), -6, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), - array( t('Canada NB'), -4, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), - array( t('Canada NF'), -3.5, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), - array( t('Canada NT'), -7, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), - array( t('Canada NS'), -4, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), - array( t('Canada NU(M)'), -7, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), - array( t('Canada NU(C)'), -6, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), - array( t('Canada NU(E)'), -5, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), - array( t('Canada ON(E)'), -5, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), - array( t('Canada ON(W)'), -6, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), - array( t('Canada PE'), -4, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), - array( t('Canada QC'), -5, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), - array( t('Canada QC(E)'), -4, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Canada SK'), -7, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Canada SK(L)'), -6, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Canada YK'), -8, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), - array( t('Chile'), -4, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('China'), 8, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Christmas Islands'),7, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Colombia'), -5, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Cook Islands'), -10, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Costa Rica'), -6, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Croatia'), 1, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), - array( t('Czech Republic'), 1, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), - array( t('Denmark'), 1, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), - array( t('Ecuador'), -5, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Egypt'), 2, 1, 4, 9, 5, 0, 9, 9, 4, 0 ), - array( t('Ethiopia'), 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Fiji'), 12, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Finland'), 2, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), - array( t('France'), 1, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), - array( t('Germany'), 1, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), - array( t('Ghana'), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Greece'), 2, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), - array( t('Hungary'), 1, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), - array( t('Iceland'), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('India'), 5.5, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Iran'), 3.5, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Iraq'), 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Israel'), 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Italy'), 1, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), - array( t('Japan'), 9, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Jordan'), 2, 1, 3, 9, 4, 0, 10, 9, 5, 1 ), - array( t('Kenya'), 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Korea'), 9, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Laos'), 7, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Libya'), 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Madagascar'), 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Malaysia'), 8, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Marshall Islands'),12, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Mauritius'), 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Monaco'), 1, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), - array( t('Mongolia'), 8, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Morocco'), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Myanmar'), 6.3, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Nepal'), 5.45, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Netherlands'), 1, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), - array( t('New Caledonia'), 11, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('New Zealand'), 12, 1, 9, 9, 0, 2, 4, 1, 0, 3 ), - array( t('Nigeria'), 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Norway'), 1, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), - array( t('Oman'), 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Pakistan'), 5, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Palau'), 9, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Panama'), -5, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Papau New Guinea'),10, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Peru'), -5, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Philippines'), 8, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Porland'), 1, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), - array( t('Portugal'), 0, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), - array( t('Romania'), 2, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), - array( t('Rwanda'), 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Russia Moscow'), 3, 1, 3, 9, 0, 2, 10, 9, 0, 3 ), - array( t('Samoa'), -11, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Saudi Arabia'), 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Senegal'), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Seychells'), 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Singapore'), 8, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Solomon Islands'), 11, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('South Africa'), 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Spain'), 1, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), - array( t('Sudan'), 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Sweden'), 1, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), - array( t('Switzerland'), 1, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), - array( t('Taiwan'), 8, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Thailand'), 7, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Tonga'), 13, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Turkey'), 2, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), - array( t('UK'), 0, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), - array( t('USA Alaska'), -9, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), - array( t('USA Hawaii'), -10, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('USA PT'), -8, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), - array( t('USA MT'), -7, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), - array( t('USA CT'), -6, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), - array( t('USA ET'), -5, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), - array( t('Vanuatu'), 11, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Venezuela'), -4.5, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Vietnam'), 7, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), - array( t('Zambia'), 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Afghanistan' => array( 4.5, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Argentina' => array( -3, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Australia ET' => array( 10, 1, 10, 9, 0, 2, 3, 9, 0, 3 ), + 'Australia CT' => array( 9.5, 1, 10, 9, 0, 2, 3, 9, 0, 3 ), + 'Australia WT' => array( 8, 1, 10, 9, 0, 2, 3, 9, 0, 3 ), + 'Austria' => array( 1, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), + 'Bangladesh' => array( 6, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Belgium' => array( 1, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), + 'Bhutan' => array( 6, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Bolivia' => array( -4, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Brazil' => array( -3, 1, 10, 3, 0, 0, 2, 3, 0, 0 ), + 'Bulgaria' => array( 2, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), + 'Cambodia' => array( 7, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Cameroon' => array( 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Canada AB' => array( -7, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), + 'Canada BC' => array( -8, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), + 'Canada MB' => array( -6, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), + 'Canada NB' => array( -4, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), + 'Canada NF' => array( -3.5, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), + 'Canada NT' => array( -7, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), + 'Canada NS' => array( -4, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), + 'Canada NU(M)' => array( -7, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), + 'Canada NU(C)' => array( -6, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), + 'Canada NU(E)' => array( -5, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), + 'Canada ON(E)' => array( -5, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), + 'Canada ON(W)' => array( -6, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), + 'Canada PE' => array( -4, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), + 'Canada QC' => array( -5, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), + 'Canada QC(E)' => array( -4, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Canada SK' => array( -7, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Canada SK(L)' => array( -6, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Canada YK' => array( -8, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), + 'Chile' => array( -4, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'China' => array( 8, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Christmas Islands' => array( 7, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Colombia' => array( -5, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Cook Islands' => array( -10, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Costa Rica' => array( -6, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Croatia' => array( 1, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), + 'Czech Republic' => array( 1, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), + 'Denmark' => array( 1, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), + 'Ecuador' => array( -5, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Egypt' => array( 2, 1, 4, 9, 5, 0, 9, 9, 4, 0 ), + 'Ethiopia' => array( 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Fiji' => array( 12, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Finland' => array( 2, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), + 'France' => array( 1, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), + 'Germany' => array( 1, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), + 'Ghana' => array( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Greece' => array( 2, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), + 'Hungary' => array( 1, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), + 'Iceland' => array( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'India' => array( 5.5, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Iran' => array( 3.5, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Iraq' => array( 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Israel' => array( 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Italy' => array( 1, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), + 'Japan' => array( 9, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Jordan' => array( 2, 1, 3, 9, 4, 0, 10, 9, 5, 1 ), + 'Kenya' => array( 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Korea' => array( 9, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Laos' => array( 7, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Libya' => array( 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Madagascar' => array( 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Malaysia' => array( 8, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Marshall Islands' => array( 12, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Mauritius' => array( 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Monaco' => array( 1, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), + 'Mongolia' => array( 8, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Morocco' => array( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Myanmar' => array( 6.3, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Nepal' => array( 5.45, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Netherlands' => array( 1, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), + 'New Caledonia' => array( 11, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'New Zealand' => array( 12, 1, 9, 9, 0, 2, 4, 1, 0, 3 ), + 'Nigeria' => array( 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Norway' => array( 1, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), + 'Oman' => array( 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Pakistan' => array( 5, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Palau' => array( 9, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Panama' => array( -5, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Papau New Guinea' => array( 10, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Peru' => array( -5, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Philippines' => array( 8, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Porland' => array( 1, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), + 'Portugal' => array( 0, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), + 'Romania' => array( 2, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), + 'Rwanda' => array( 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Russia Moscow' => array( 3, 1, 3, 9, 0, 2, 10, 9, 0, 3 ), + 'Samoa' => array( -11, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Saudi Arabia' => array( 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Senegal' => array( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Seychells' => array( 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Singapore' => array( 8, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Solomon Islands' => array( 11, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'South Africa' => array( 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Spain' => array( 1, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), + 'Sudan' => array( 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Sweden' => array( 1, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), + 'Switzerland' => array( 1, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), + 'Taiwan' => array( 8, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Thailand' => array( 7, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Tonga' => array( 13, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Turkey' => array( 2, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), + 'UK' => array( 0, 1, 3, 9, 0, 1, 10, 9, 0, 1 ), + 'USA Alaska' => array( -9, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), + 'USA Hawaii' => array( -10, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'USA PT' => array( -8, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), + 'USA MT' => array( -7, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), + 'USA CT' => array( -6, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), + 'USA ET' => array( -5, 1, 3, 2, 0, 2, 11, 1, 0, 2 ), + 'Vanuatu' => array( 11, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Venezuela' => array( -4.5, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Vietnam' => array( 7, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), + 'Zambia' => array( 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), ); + return $locations; +} +function worldclock_load_locations() { + $locations = worldclock_default_locations(); //Preload the database with the locations - foreach ($locations as $id => $loc) { - db_query("INSERT INTO {worldclock_locations} (`wid`, `name`, `gmt`, `dst`, `s_mon`, `s_nth`, `s_dow`, `s_time`, `e_mon`, `e_nth`, `e_dow`, `e_time`) VALUES (%d, '%s', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d')", ($id + 1), $loc[0], $loc[1], $loc[2], $loc[3], $loc[4], $loc[5], $loc[6], $loc[7], $loc[8], $loc[9], $loc[10], $loc[11]); + foreach ($locations as $location => $values) { + db_query("INSERT INTO {worldclock_locations} (`name`, `values`) VALUES ('%s', '%s')", $location, serialize(_worldclock_keyed_array($values))); } } +/** + * Map each element of a location array to its index. + */ +function _worldclock_keyed_array($array) { + $ret = array(); + // Properties of a location in the order they appear in the array. + $properties = array("gmt", "dst", "s_mon", "s_nth", "s_dow", "s_time", "e_mon", "e_nth", "e_dow", "e_time"); + foreach ($properties as $index => $property) { + $ret[$property] = $array[$index]; + } + return $ret; +} Index: worldclock.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/worldclock/worldclock.module,v retrieving revision 1.1.4.7.2.7 diff -u -F^f -r1.1.4.7.2.7 worldclock.module --- worldclock.module 18 Dec 2008 18:41:24 -0000 1.1.4.7.2.7 +++ worldclock.module 24 Dec 2008 20:04:56 -0000 @@ -16,6 +16,15 @@ function _worldclock_get_locations() { if (empty($locations)) { $result = db_query("SELECT * FROM {worldclock_locations} ORDER BY name"); while ($row = db_fetch_object($result)) { + $row->values = unserialize($row->values); + // Make values easier to access and overwrite 'name' in case it was + // overridden. + foreach ($row->values as $name => $value) { + $row->$name = $value; + } + // Now that we are done with values, unset it, so it doesn't pollute the + // object when it'll be converted for use with JS. + unset($row->values); $locations[$row->wid] = $row; } } @@ -23,7 +32,7 @@ function _worldclock_get_locations() { } /** - * Construct an array for location pulldown menu + * Construct an array for location pulldown menu. */ function _worldclock_get_location_options() { $locations = _worldclock_get_locations(); @@ -35,7 +44,7 @@ function _worldclock_get_location_option } /** - * Construct location information text string + * Construct location information text string. */ function _worldclock_get_location_info($location) { // in: $loc - location record object