[evolvis-commits] r9473: changes for new fields in database↵
mirabilos at evolvis.org
mirabilos at evolvis.org
Thu Feb 24 17:25:44 CET 2011
Author: mirabilos
Date: 2011-02-24 17:25:44 +0100 (Thu, 24 Feb 2011)
New Revision: 9473
Added:
trunk/gforge_base/evolvisforge-5.1/gforge/db/20040325.sql
trunk/gforge_base/evolvisforge-5.1/gforge/db/ccodes.txt
Modified:
trunk/gforge_base/evolvisforge-5.1/gforge/common/include/User.class
trunk/gforge_base/evolvisforge-5.1/gforge/www/account/index.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/account/register.php
Log:
changes for new fields in database
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/include/User.class
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/include/User.class 2011-02-24 16:25:42 UTC (rev 9472)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/include/User.class 2011-02-24 16:25:44 UTC (rev 9473)
@@ -192,7 +192,8 @@
* create() - Create a new user
*
* @param string The unix username
- * @param string The real username
+ * @param string The real firstname
+ * @param string The real lastname
* @param string The first password
* @param string The confirmation password
* @param string The users email address
@@ -204,21 +205,32 @@
* @param string The users preferred timezone
* @param string The users Jabber address
* @param int The users Jabber preference
+ * @param string The users unix_box.
+ * @param string The users address.
+ * @param string The users address part 2.
+ * @param string The users phone.
+ * @param string The users fax.
+ * @param string The users title.
+ * @param char(2) The users ISO country_code.
* @returns The newly created user ID
*
*/
- function create($unix_name,$realname,$password1,$password2,$email,
+ function create($unix_name,$firstname,$lastname,$password1,$password2,$email,
$mail_site,$mail_va,$language_id,$timezone,$jabber_address,$jabber_only,
- $unix_box='shell',$address='',$phone='',$fax='',$title='') {
+ $unix_box='shell',$address='',$address2,$phone='',$fax='',$title='',$ccode='US') {
global $Language;
if (!$unix_name) {
$this->setError($Language->getText('account_register','err_username'));
return false;
}
- if (!$realname) {
- $this->setError($Language->getText('account_register','err_realname'));
+ if (!$firstname) {
+ $this->setError($Language->getText('account_register','err_firstname'));
return false;
}
+ if (!$lastname) {
+ $this->setError($Language->getText('account_register','err_lastname'));
+ return false;
+ }
if (!$password1) {
$this->setError($Language->getText('account_register','err_passwd'));
return false;
@@ -262,13 +274,15 @@
// if we got this far, it must be good
$confirm_hash = substr(md5($session_hash . $password1 . time()),0,16);
db_begin();
- $sql="INSERT INTO users (user_name,user_pw,unix_pw,realname,email,add_date,
+ $sql="INSERT INTO users (user_name,user_pw,unix_pw,realname,firstname,lastname,email,add_date,
status,confirm_hash,mail_siteupdates,mail_va,language,timezone,jabber_address,jabber_only,
- unix_box,address,phone,fax,title)
+ unix_box,address,address2,phone,fax,title,ccode)
VALUES ('$unix_name',
'". md5($password1) . "',
'". account_genunixpw($password1) . "',
- '". htmlspecialchars($realname). "',
+ '". htmlspecialchars($firstname.' '.$lastname). "',
+ '". htmlspecialchars($firstname). "',
+ '". htmlspecialchars($lastname). "',
'$email',
'" . time() . "',
'P',
@@ -281,9 +295,11 @@
'$jabber_only',
'$unix_box',
'". htmlspecialchars($address) ."',
+ '". htmlspecialchars($address2) ."',
'". htmlspecialchars($phone) ."',
'". htmlspecialchars($fax) ."',
- '". htmlspecialchars($title) ."')";
+ '". htmlspecialchars($title) ."',
+ '$ccode')";
$result=db_query($sql);
@@ -331,21 +347,28 @@
}
/**
- * update() - update *common* properties of User object
+ * update() - update *common* properties of User object.
*
- * Use specific setter to change other properties
+ * Use specific setter to change other properties.
*
- * @param string The users real name
- * @param int The ID of the users language preference
- * @param string The useres timezone preference
- * @param string The users preference for receiving site updates by email
- * @param string The users preference for receiving community updates by email
- * @param string The users preference for being participating in "peer ratings"
- * @param string The users Jabber account address
- * @param int The users Jabber preference
+ * @param string The users first name.
+ * @param string The users last name.
+ * @param int The ID of the users language preference.
+ * @param string The useres timezone preference.
+ * @param string The users preference for receiving site updates by email.
+ * @param string The users preference for receiving community updates by email.
+ * @param string The users preference for being participating in "peer ratings".
+ * @param string The users Jabber account address.
+ * @param int The users Jabber preference.
+ * @param string The users address.
+ * @param string The users address2.
+ * @param string The users phone.
+ * @param string The users fax.
+ * @param string The users title.
+ * @param string The users ccode.
*/
- function update($realname,$language_id,$timezone,$mail_site,$mail_va,$use_ratings,
- $jabber_address,$jabber_only,$address,$phone,$fax,$title) {
+ function update($firstname,$lastname,$language_id,$timezone,$mail_site,$mail_va,$use_ratings,
+ $jabber_address,$jabber_only,$address,$address2,$phone,$fax,$title,$ccode) {
global $Language;
$mail_site = $mail_site ? 1 : 0;
$mail_va = $mail_va ? 1 : 0;
@@ -366,7 +389,9 @@
$res = db_query("
UPDATE users
SET
- realname='".htmlspecialchars($realname)."',
+ realname='".htmlspecialchars($firstname . ' ' .$lastname)."',
+ firstname='".htmlspecialchars($firstname)."',
+ lastname='".htmlspecialchars($lastname)."',
language='$language_id',
timezone='$timezone',
mail_siteupdates=$mail_site,
@@ -375,9 +400,11 @@
jabber_address='$jabber_address',
jabber_only='$jabber_only',
address='". htmlspecialchars($address) ."',
+ address2='". htmlspecialchars($address2) ."',
phone='". htmlspecialchars($phone) ."',
fax='". htmlspecialchars($fax) ."',
- title='". htmlspecialchars($title) ."'
+ title='". htmlspecialchars($title) ."',
+ ccode='$ccode'
WHERE user_id='".$this->getID()."'
");
@@ -684,10 +711,28 @@
* @return string This user's real name.
*/
function getRealName() {
- return $this->data_array['realname'];
+ return $this->getFirstName(). ' ' .$this->getLastName();
}
/**
+ * getFirstName - get the user's first name.
+ *
+ * @return string This user's first name.
+ */
+ function getFirstName() {
+ return $this->data_array['firstname'];
+ }
+
+ /**
+ * getLastName - get the user's last name.
+ *
+ * @return string This user's last name.
+ */
+ function getLastName() {
+ return $this->data_array['lastname'];
+ }
+
+ /**
* getAddDate - this user's unix time when account was opened.
*
* @return int This user's unix time when account was opened.
@@ -706,6 +751,15 @@
}
/**
+ * getCountryCode - this user's ccode setting.
+ *
+ * @return string This user's ccode setting.
+ */
+ function getCountryCode() {
+ return $this->data_array['ccode'];
+ }
+
+ /**
* getShell - this user's preferred shell.
*
* @return string This user's preferred shell.
@@ -802,13 +856,22 @@
/**
* getAddress - get this user's address.
*
- * @return text This user's address..
+ * @return text This user's address.
*/
function getAddress() {
return $this->data_array['address'];
}
/**
+ * getAddress2 - get this user's address2.
+ *
+ * @return text This user's address2.
+ */
+ function getAddress2() {
+ return $this->data_array['address2'];
+ }
+
+ /**
* getPhone - get this person's phone number.
*
* @return text This user's phone number.
@@ -1012,11 +1075,11 @@
$this->setError('ERROR - Could Not Get Next Unix UID');
return false;
} else {
- $res=db_query("
- UPDATE users
+ $sql="UPDATE users
SET unix_status='A',unix_uid='$unixid'
- WHERE user_id='". $this->getID()."'
- ");
+ WHERE user_id='". $this->getID()."'";
+//echo "\n<br>$sql";
+ $res=db_query($sql);
if (!$res || db_affected_rows($res) < 1) {
$this->setError('ERROR - Could Not Update User Account Flags: '.db_error());
Added: trunk/gforge_base/evolvisforge-5.1/gforge/db/20040325.sql
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/db/20040325.sql (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/db/20040325.sql 2011-02-24 16:25:44 UTC (rev 9473)
@@ -0,0 +1,14 @@
+ALTER TABLE users ADD COLUMN firstname varchar(60);
+ALTER TABLE users ADD COLUMN lastname varchar(60);
+ALTER TABLE users ADD COLUMN address2 text;
+ALTER TABLE users ADD COLUMN ccode char(2);
+ALTER TABLE users ALTER COLUMN ccode SET DEFAULT 'US';
+UPDATE USERS SET ccode='US',firstname=realname WHERE firstname is null;
+
+CREATE TABLE country_code (
+country_name varchar(80),
+ccode char(2) primary key
+);
+
+COPY country_code FROM '/tmp/ccodes.txt';
+
Added: trunk/gforge_base/evolvisforge-5.1/gforge/db/ccodes.txt
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/db/ccodes.txt (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/db/ccodes.txt 2011-02-24 16:25:44 UTC (rev 9473)
@@ -0,0 +1,239 @@
+AFGHANISTAN AF
+ALBANIA AL
+ALGERIA DZ
+AMERICAN SAMOA AS
+ANDORRA AD
+ANGOLA AO
+ANGUILLA AI
+ANTARCTICA AQ
+ANTIGUA AND BARBUDA AG
+ARGENTINA AR
+ARMENIA AM
+ARUBA AW
+AUSTRALIA AU
+AUSTRIA AT
+AZERBAIJAN AZ
+BAHAMAS BS
+BAHRAIN BH
+BANGLADESH BD
+BARBADOS BB
+BELARUS BY
+BELGIUM BE
+BELIZE BZ
+BENIN BJ
+BERMUDA BM
+BHUTAN BT
+BOLIVIA BO
+BOSNIA AND HERZEGOVINA BA
+BOTSWANA BW
+BOUVET ISLAND BV
+BRAZIL BR
+BRITISH INDIAN OCEAN TERRITORY IO
+BRUNEI DARUSSALAM BN
+BULGARIA BG
+BURKINA FASO BF
+BURUNDI BI
+CAMBODIA KH
+CAMEROON CM
+CANADA CA
+CAPE VERDE CV
+CAYMAN ISLANDS KY
+CENTRAL AFRICAN REPUBLIC CF
+CHAD TD
+CHILE CL
+CHINA CN
+CHRISTMAS ISLAND CX
+COCOS (KEELING) ISLANDS CC
+COLOMBIA CO
+COMOROS KM
+CONGO CG
+CONGO, THE DEMOCRATIC REPUBLIC OF THE CD
+COOK ISLANDS CK
+COSTA RICA CR
+COTE D'IVOIRE CI
+CROATIA HR
+CUBA CU
+CYPRUS CY
+CZECH REPUBLIC CZ
+DENMARK DK
+DJIBOUTI DJ
+DOMINICA DM
+DOMINICAN REPUBLIC DO
+EAST TIMOR TP
+ECUADOR EC
+EGYPT EG
+EL SALVADOR SV
+EQUATORIAL GUINEA GQ
+ERITREA ER
+ESTONIA EE
+ETHIOPIA ET
+FALKLAND ISLANDS (MALVINAS) FK
+FAROE ISLANDS FO
+FIJI FJ
+FINLAND FI
+FRANCE FR
+FRENCH GUIANA GF
+FRENCH POLYNESIA PF
+FRENCH SOUTHERN TERRITORIES TF
+GABON GA
+GAMBIA GM
+GEORGIA GE
+GERMANY DE
+GHANA GH
+GIBRALTAR GI
+GREECE GR
+GREENLAND GL
+GRENADA GD
+GUADELOUPE GP
+GUAM GU
+GUATEMALA GT
+GUINEA GN
+GUINEA-BISSAU GW
+GUYANA GY
+HAITI HT
+HEARD ISLAND AND MCDONALD ISLANDS HM
+HOLY SEE (VATICAN CITY STATE) VA
+HONDURAS HN
+HONG KONG HK
+HUNGARY HU
+ICELAND IS
+INDIA IN
+INDONESIA ID
+IRAN, ISLAMIC REPUBLIC OF IR
+IRAQ IQ
+IRELAND IE
+ISRAEL IL
+ITALY IT
+JAMAICA JM
+JAPAN JP
+JORDAN JO
+KAZAKSTAN KZ
+KENYA KE
+KIRIBATI KI
+KOREA, DEMOCRATIC PEOPLE'S REPUBLIC OF KP
+KOREA, REPUBLIC OF KR
+KUWAIT KW
+KYRGYZSTAN KG
+LAO PEOPLE'S DEMOCRATIC REPUBLIC LA
+LATVIA LV
+LEBANON LB
+LESOTHO LS
+LIBERIA LR
+LIBYAN ARAB JAMAHIRIYA LY
+LIECHTENSTEIN LI
+LITHUANIA LT
+LUXEMBOURG LU
+MACAU MO
+MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF MK
+MADAGASCAR MG
+MALAWI MW
+MALAYSIA MY
+MALDIVES MV
+MALI ML
+MALTA MT
+MARSHALL ISLANDS MH
+MARTINIQUE MQ
+MAURITANIA MR
+MAURITIUS MU
+MAYOTTE YT
+MEXICO MX
+MICRONESIA, FEDERATED STATES OF FM
+MOLDOVA, REPUBLIC OF MD
+MONACO MC
+MONGOLIA MN
+MONTSERRAT MS
+MOROCCO MA
+MOZAMBIQUE MZ
+MYANMAR MM
+NAMIBIA NA
+NAURU NR
+NEPAL NP
+NETHERLANDS NL
+NETHERLANDS ANTILLES AN
+NEW CALEDONIA NC
+NEW ZEALAND NZ
+NICARAGUA NI
+NIGER NE
+NIGERIA NG
+NIUE NU
+NORFOLK ISLAND NF
+NORTHERN MARIANA ISLANDS MP
+NORWAY NO
+OMAN OM
+PAKISTAN PK
+PALAU PW
+PALESTINIAN TERRITORY, OCCUPIED PS
+PANAMA PA
+PAPUA NEW GUINEA PG
+PARAGUAY PY
+PERU PE
+PHILIPPINES PH
+PITCAIRN PN
+POLAND PL
+PORTUGAL PT
+PUERTO RICO PR
+QATAR QA
+REUNION RE
+ROMANIA RO
+RUSSIAN FEDERATION RU
+RWANDA RW
+SAINT HELENA SH
+SAINT KITTS AND NEVIS KN
+SAINT LUCIA LC
+SAINT PIERRE AND MIQUELON PM
+SAINT VINCENT AND THE GRENADINES VC
+SAMOA WS
+SAN MARINO SM
+SAO TOME AND PRINCIPE ST
+SAUDI ARABIA SA
+SENEGAL SN
+SEYCHELLES SC
+SIERRA LEONE SL
+SINGAPORE SG
+SLOVAKIA SK
+SLOVENIA SI
+SOLOMON ISLANDS SB
+SOMALIA SO
+SOUTH AFRICA ZA
+SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS GS
+SPAIN ES
+SRI LANKA LK
+SUDAN SD
+SURINAME SR
+SVALBARD AND JAN MAYEN SJ
+SWAZILAND SZ
+SWEDEN SE
+SWITZERLAND CH
+SYRIAN ARAB REPUBLIC SY
+TAIWAN, PROVINCE OF CHINA TW
+TAJIKISTAN TJ
+TANZANIA, UNITED REPUBLIC OF TZ
+THAILAND TH
+TOGO TG
+TOKELAU TK
+TONGA TO
+TRINIDAD AND TOBAGO TT
+TUNISIA TN
+TURKEY TR
+TURKMENISTAN TM
+TURKS AND CAICOS ISLANDS TC
+TUVALU TV
+UGANDA UG
+UKRAINE UA
+UNITED ARAB EMIRATES AE
+UNITED STATES US
+UNITED STATES MINOR OUTLYING ISLANDS UM
+URUGUAY UY
+UZBEKISTAN UZ
+VANUATU VU
+VENEZUELA VE
+VIET NAM VN
+VIRGIN ISLANDS, BRITISH VG
+VIRGIN ISLANDS, U.S. VI
+WALLIS AND FUTUNA WF
+WESTERN SAHARA EH
+YEMEN YE
+YUGOSLAVIA YU
+ZAMBIA ZM
+ZIMBABWE ZW
+UNITED KINGDOM UK
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/account/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/account/index.php 2011-02-24 16:25:42 UTC (rev 9472)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/account/index.php 2011-02-24 16:25:44 UTC (rev 9473)
@@ -22,13 +22,6 @@
if ($submit) {
- if (trim($realname)=="") {
- exit_error(
- 'Missing Paramater',
- 'Please fill in real name.'
- );
- }
-
/*
//needs security audit
if ($remember_user) {
@@ -44,8 +37,8 @@
$refresh = 1;
}
- if (!$u->update($realname, $language, $timezone, $mail_site, $mail_va, $use_ratings,
- $jabber_address,$jabber_only,$address,$phone,$fax,$title)) {
+ if (!$u->update($firstname, $lastname, $language, $timezone, $mail_site, $mail_va, $use_ratings,
+ $jabber_address,$jabber_only,$address,$address2,$phone,$fax,$title,$ccode)) {
$feedback .= $u->getErrorMessage().'<br />';
} else {
$feedback .= $Language->getText('account','updated').'<br />';
@@ -102,12 +95,18 @@
</tr>
<tr valign="top">
-<td><?php echo $Language->getText('account_options', 'real_name'); ?></td>
-<td><input type="text" name="realname" value="<?php print $u->getRealName(); ?>" />
+<td><?php echo $Language->getText('account_options', 'firstname'); ?></td>
+<td><input type="text" name="firstname" value="<?php print $u->getFirstName(); ?>" />
</td>
</tr>
<tr valign="top">
+<td><?php echo $Language->getText('account_options', 'lastname'); ?></td>
+<td><input type="text" name="lastname" value="<?php print $u->getLastName(); ?>" />
+</td>
+</tr>
+
+<tr valign="top">
<td><?php echo $Language->getText('account_options', 'language'); ?> </td>
<td><?php echo html_get_language_popup ($Language,'language',$u->getLanguage()); ?>
</td>
@@ -120,6 +119,12 @@
</tr>
<tr valign="top">
+<td><?php echo $Language->getText('account_options', 'ccode'); ?> </td>
+<td><?php echo html_get_ccode_popup('ccode', $u->getCountryCode()); ?>
+</td>
+</tr>
+
+<tr valign="top">
<td><?php echo $Language->getText('account_options', 'email_address'); ?> </td>
<td><strong><?php print $u->getEmail(); ?></strong>
<br /><a href="change_email.php">[<?php echo $Language->getText('account_options', 'change_email_address'); ?>]</a>
@@ -132,6 +137,11 @@
</tr>
<tr valign="top">
+ <td><?php echo $Language->getText('account_options', 'address'); ?></td>
+ <td><input type="text" name="address2" value="<?php echo $u->getAddress2(); ?>" size="80"></td>
+</tr>
+
+<tr valign="top">
<td><?php echo $Language->getText('account_options', 'phone'); ?></td>
<td><input type="text" name="phone" value="<?php echo $u->getPhone(); ?>" size="20"></td>
</tr>
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/account/register.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/account/register.php 2011-02-24 16:25:42 UTC (rev 9472)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/account/register.php 2011-02-24 16:25:44 UTC (rev 9473)
@@ -23,9 +23,9 @@
*/
$new_user = new User();
- $register = $new_user->create($unix_name,$realname,$password1,$password2,
+ $register = $new_user->create($unix_name,$firstname,$lastname,$password1,$password2,
$email,$mail_site,$mail_va,$language_id,$timezone,$jabber_address,$jabber_only,'',
- $address,$phone,$fax,$title);
+ $address,$address2,$phone,$fax,$title,$ccode);
if ($register) {
echo $HTML->header(array('title'=>'Register Confirmation','pagename'=>'account_register'));
@@ -63,15 +63,21 @@
<?php echo $Language->getText('account_register','password2'); echo utils_requiredField(); ?><br />
<input type="password" name="password2">
<p>
-<?php echo $Language->getText('account_register','realname'); echo utils_requiredField(); ?><br />
-<input size=30 type="text" name="realname" value="<?php print($realname); ?>">
+<?php echo $Language->getText('account_register','firstname'); echo utils_requiredField(); ?><br />
+<input size=30 type="text" name="firstname" value="<?php print($firstname); ?>">
<p>
+<?php echo $Language->getText('account_register','lastname'); echo utils_requiredField(); ?><br />
+<input size=30 type="text" name="lastname" value="<?php print($lastname); ?>">
+<p>
<?php echo $Language->getText('account_register','language'); ?><br />
<?php echo html_get_language_popup ($Language,'language_id',1); ?>
<p>
<?php echo $Language->getText('account_register','timezone'); ?><br />
<?php echo html_get_timezone_popup('timezone', $timezone); ?>
<p>
+<?php echo $Language->getText('account_register','ccode'); ?><br />
+<?php echo html_get_ccode_popup('ccode', $ccode); ?>
+<p>
@<?php echo $Language->getText('account_register','emailaddr', $GLOBALS[sys_users_host]); ?>
<br /><input size=30 type="text" name="email" value="<?php print($email); ?>">
<p>
@@ -87,6 +93,9 @@
<?php echo $Language->getText('account_options', 'address'); ?><br />
<input type="text" name="address" value="<?php echo $address; ?>" size="80">
<p>
+<?php echo $Language->getText('account_options', 'address'); ?><br />
+<input type="text" name="address2" value="<?php echo $address2; ?>" size="80">
+<p>
<?php echo $Language->getText('account_options', 'phone'); ?><br />
<input type="text" name="phone" value="<?php echo $phone; ?>" size="20">
<p>
More information about the evolvis-commits
mailing list