extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-25 20:31:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Working on merging in a patch for the addressbook, but first cleaning up some code

Browse Source
This commit is contained in:
jengo 2000-11-01 10:26:14 +00:00
parent 46ca74feff
commit 793040b5ba
9 changed files with 157 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
addressbook/inc/functions.inc.php
View File

@ -12,31 +12,49 @@
/* $Id$ */ /* $Id$ */
$abc = array('company' => 'company', // AddressBook Columns and their descriptions
'firstname' => 'first name',
'lastname' => 'last name',
'email' => 'email',
'wphone' => 'work phone',
'hphone' => 'home phone',
'fax' => 'fax',
'pager' => 'pager',
'mphone' => 'mobile phone',
'ophone' => 'other phone',
'street' => 'street',
'city' => 'city',
'state' => 'state',
'zip' => 'zip code',
'bday' => 'birthday',
'url' => 'URL'
);
function form($format,$action,$title,$fields) function form($format,$action,$title,$fields)
{ {
global $phpgw; global $phpgw;
global $phpgw_info; global $phpgw_info;
$email = $fields["email"]; $email = $fields["email"];
$firstname = $fields["firstname"]; $firstname = $fields["firstname"];
$lastname = $fields["lastname"]; $lastname = $fields["lastname"];
$title = $fields["title"]; $title = $fields["title"];
$hphone = $fields["hphone"]; $hphone = $fields["hphone"];
$wphone = $fields["wphone"]; $wphone = $fields["wphone"];
$fax = $fields["fax"]; $fax = $fields["fax"];
$pager = $fields["pager"]; $pager = $fields["pager"];
$mphone = $fields["mphone"]; $mphone = $fields["mphone"];
$ophone = $fields["ophone"]; $ophone = $fields["ophone"];
$street = $fields["street"]; $street = $fields["street"];
$address2 = $fields["address2"]; $address2 = $fields["address2"];
$city = $fields["city"]; $city = $fields["city"];
$state = $fields["state"]; $state = $fields["state"];
$zip = $fields["zip"]; $zip = $fields["zip"];
$bday = $fields["bday"]; $bday = $fields["bday"];
$notes = $fields["notes"]; $notes = $fields["notes"];
$access = $fields["access"]; $access = $fields["access"];
$ab_company = $fields["company"]; $ab_company = $fields["company"];
$company_id = $fields["company_id"]; $company_id = $fields["company_id"];
$company_name = $fields["company_name"]; $company_name = $fields["company_name"];
if ($format != "view") { if ($format != "view") {

195
addressbook/index.php
View File

@ -52,7 +52,7 @@
. "%$query%' OR a.ab_firstname like '%$query%' OR a.ab_email like '%$query%' OR " . "%$query%' OR a.ab_firstname like '%$query%' OR a.ab_email like '%$query%' OR "
. "a.ab_street like '%$query%' OR a.ab_city like '%$query%' OR a.ab_state " . "a.ab_street like '%$query%' OR a.ab_city like '%$query%' OR a.ab_state "
. "like '%$query%' OR a.ab_zip like '%$query%' OR a.ab_notes like " . "like '%$query%' OR a.ab_zip like '%$query%' OR a.ab_notes like "
. "'%$query%' OR c.company_name like '%$query%')"); . "'%$query%' OR c.company_name like '%$query%' OR a.ab_url like '%$query%')");
// . "'%$query%' OR c.company_name like '%$query%')" // . "'%$query%' OR c.company_name like '%$query%')"
// . " $ordermethod limit $limit"); // . " $ordermethod limit $limit");
} else { } else {
@ -62,7 +62,7 @@
. "%$query%' OR ab_firstname like '%$query%' OR ab_email like '%$query%' OR " . "%$query%' OR ab_firstname like '%$query%' OR ab_email like '%$query%' OR "
. "ab_street like '%$query%' OR ab_city like '%$query%' OR ab_state " . "ab_street like '%$query%' OR ab_city like '%$query%' OR ab_state "
. "like '%$query%' OR ab_zip like '%$query%' OR ab_notes like " . "like '%$query%' OR ab_zip like '%$query%' OR ab_notes like "
. "'%$query%' OR ab_company like '%$query%')"); . "'%$query%' OR ab_company like '%$query%' OR ab_url like '%$query$%')");
// . "'%$query%' OR ab_company like '%$query%')" // . "'%$query%' OR ab_company like '%$query%')"
// . " $ordermethod limit $limit"); // . " $ordermethod limit $limit");
} }
@ -100,39 +100,17 @@
<table width=75% border=0 cellspacing=1 cellpadding=3> <table width=75% border=0 cellspacing=1 cellpadding=3>
<tr bgcolor="<?php echo $phpgw_info["theme"]["th_bg"]; ?>"> <tr bgcolor="<?php echo $phpgw_info["theme"]["th_bg"]; ?>">
<?php <?php
if ($phpgw_info["user"]["preferences"]["addressbook"]["company"]) { while ($column = each($abc)) {
echo '<td height="21">'; if ($phpgw_info["user"]["preferences"]["addressbook"][$column[0]]) {
echo '<font size="-1" face="Arial, Helvetica, sans-serif">'; echo '<td height="21">';
echo $phpgw->nextmatchs->show_sort_order($sort,$company_sortorder,$order,"index.php",lang("Company Name")); echo '<font size="-1" face="Arial, Helvetica, sans-serif">';
echo '</font></td>'; echo $phpgw->nextmatchs->show_sort_order($sort,"ab_" . $column[0],$order,"index.php",lang($column[1]));
} echo '</font></td>';
if ($phpgw_info["user"]["preferences"]["addressbook"]["lastname"]) { echo "\n";
echo '<td height="21">';
echo '<font size="-1" face="Arial, Helvetica, sans-serif">'; // To be used when displaying the rows
echo $phpgw->nextmatchs->show_sort_order($sort,"ab_lastname",$order,"index.php", $columns_to_display[$column[0]] = True;
lang("Last Name")); }
echo '</font></td>';
}
if ($phpgw_info["user"]["preferences"]["addressbook"]["firstname"]) {
echo '<td height="21">';
echo '<font size="-1" face="Arial, Helvetica, sans-serif">';
echo $phpgw->nextmatchs->show_sort_order($sort,"ab_firstname",$order,"index.php",
lang("First Name"));
echo '</font></td>';
}
if ($phpgw_info["user"]["preferences"]["addressbook"]["email"]) {
echo '<td height="21">';
echo '<font size="-1" face="Arial, Helvetica, sans-serif">';
echo $phpgw->nextmatchs->show_sort_order($sort,"ab_email",$order,"index.php",
lang("Email"));
echo '</font></td>';
}
if ($phpgw_info["user"]["preferences"]["addressbook"]["wphone"]) {
echo '<td height="21">';
echo '<font size="-1" face="Arial, Helvetica, sans-serif">';
echo $phpgw->nextmatchs->show_sort_order($sort,"ab_wphone",$order,"index.php",
lang("Work Phone"));
echo '</font></td>';
} }
?> ?>
@ -149,97 +127,80 @@
</tr> </tr>
</form> </form>
<?php <?php
if ($query) { if ($query) {
if($phpgw_info["apps"]["timetrack"]["enabled"]){ if ($phpgw_info["apps"]["timetrack"]["enabled"]){
$phpgw->db->query("SELECT a.ab_id,a.ab_owner,a.ab_firstname,a.ab_lastname," $phpgw->db->query("SELECT a.ab_id,a.ab_owner,a.ab_firstname,a.ab_lastname,"
. "a.ab_email,a.ab_wphone,c.company_name " . "a.ab_email,a.ab_wphone,c.company_name "
. "from addressbook as a, customers as c where a.ab_company_id = c.company_id " . "from addressbook as a, customers as c where a.ab_company_id = c.company_id "
. "AND $filtermethod AND (a.ab_lastname like '" . "AND $filtermethod AND (a.ab_lastname like '"
. "%$query%' OR a.ab_firstname like '%$query%' OR a.ab_email like '%$query%' OR " . "%$query%' OR a.ab_firstname like '%$query%' OR a.ab_email like '%$query%' OR "
. "a.ab_street like '%$query%' OR a.ab_city like '%$query%' OR a.ab_state " . "a.ab_street like '%$query%' OR a.ab_city like '%$query%' OR a.ab_state "
. "like '%$query%' OR a.ab_zip like '%$query%' OR a.ab_notes like " . "like '%$query%' OR a.ab_zip like '%$query%' OR a.ab_notes like "
. "'%$query%' OR c.company_name like '%$query%') $ordermethod limit $limit"); . "'%$query%' OR c.company_name like '%$query%') $ordermethod limit $limit");
} else { } else {
$phpgw->db->query("SELECT ab_id,ab_owner,ab_firstname,ab_lastname," $phpgw->db->query("SELECT ab_id,ab_owner,ab_firstname,ab_lastname,"
. "ab_email,ab_wphone,ab_company " . "ab_email,ab_wphone,ab_company "
. "from addressbook " . "from addressbook "
. "WHERE $filtermethod AND (ab_lastname like '" . "WHERE $filtermethod AND (ab_lastname like '"
. "%$query%' OR ab_firstname like '%$query%' OR ab_email like '%$query%' OR " . "%$query%' OR ab_firstname like '%$query%' OR ab_email like '%$query%' OR "
. "ab_street like '%$query%' OR ab_city like '%$query%' OR ab_state " . "ab_street like '%$query%' OR ab_city like '%$query%' OR ab_state "
. "like '%$query%' OR ab_zip like '%$query%' OR ab_notes like " . "like '%$query%' OR ab_zip like '%$query%' OR ab_notes like "
. "'%$query%' OR ab_company like '%$query%') $ordermethod limit $limit"); . "'%$query%' OR ab_company like '%$query%') $ordermethod limit $limit");
} }
} else { } else {
if($phpgw_info["apps"]["timetrack"]["enabled"]){ if ($phpgw_info["apps"]["timetrack"]["enabled"]){
$phpgw->db->query("SELECT a.ab_id,a.ab_owner,a.ab_firstname,a.ab_lastname," $phpgw->db->query("SELECT a.ab_id,a.ab_owner,a.ab_firstname,a.ab_lastname,"
. "a.ab_email,a.ab_wphone,c.company_name " . "a.ab_email,a.ab_wphone,c.company_name "
. "from addressbook as a, customers as c where a.ab_company_id = c.company_id " . "from addressbook as a, customers as c where a.ab_company_id = c.company_id "
. "AND $filtermethod $ordermethod limit $limit"); . "AND $filtermethod $ordermethod limit $limit");
} else { } else {
$phpgw->db->query("SELECT ab_id,ab_owner,ab_firstname,ab_lastname," $phpgw->db->query("SELECT * from addressbook WHERE $filtermethod $ordermethod limit $limit");
. "ab_email,ab_wphone,ab_company " }
. "from addressbook " } // else $query
. "WHERE $filtermethod $ordermethod limit $limit");
}
}
while ($phpgw->db->next_record()) { while ($phpgw->db->next_record()) {
$tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color); $tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color);
echo '<tr bgcolor="#' . $tr_color . '">';
while ($column = each($columns_to_display)) {
if ($phpgw_info["apps"]["timetrack"]["enabled"]) {
if ($column[0] == "company") {
$field = $phpgw->db->f("company_name");
} else {
$field = $phpgw->db->f("ab_company");
}
} else {
$field = $phpgw->db->f("ab_" . $column[0]);
}
$firstname = $phpgw->db->f("ab_firstname"); if (! $field) {
$lastname = $phpgw->db->f("ab_lastname"); $field = "&nbsp;";
$email = $phpgw->db->f("ab_email"); } else {
if ($phpgw_info["apps"]["timetrack"]["enabled"]) { $field = htmlentities($field);
$company = $phpgw->db->f("company_name"); }
} else {
$company = $phpgw->db->f("ab_company"); // Some fields require special formating.
if ($column[0] == "url") {
echo '<td valign="top"><font face="' . $phpgw_info["theme"]["font"] . '" size="2">'
. '<a href="' . $field . '" target="_top">' . $field. '</a></font></td>';
} else if ($column[0] == "email") {
if ($phpgw_info["user"]["apps"]["email"]) {
echo '<td valign="top"><font face="' . $phpgw_info["theme"]["font"] . '" size="2">'
. '<a href="' . $phpgw->link($phpgw_info["server"]["webserver_url"] . "/email/compose.php",
"to=" . urlencode($field)) . '" target="_top">' . $field . '</a></font></td>';
} else {
echo '<td valign="top"><font face="' . $phpgw_info["theme"]["font"] . '" size="2">'
. '<a href="mailto:' . $field . '" target="_top">' . $field. '</a></font></td>';
}
} else {
echo '<td valign="top"><font face="' . $phpgw_info["theme"]["font"] . '" size="2">'
. $field . '</font></td>';
}
} }
$wphone = $phpgw->db->f("ab_wphone");
$ab_id = $phpgw->db->f("ab_id");
if ($firstname == "") $firstname = "&nbsp;";
if ($lastname == "") $lastname = "&nbsp;";
if ($email == "") $email = "&nbsp;";
if ($company == "") $company = "&nbsp;";
if ($wphone == "") $wphone = "&nbsp;";
?> ?>
<?php <td valign=top width=3%>
echo '<tr bgcolor="#'.$tr_color.'";>';
if ($phpgw_info["user"]["preferences"]["addressbook"]["company"]) {
echo '<td valign=top>';
echo '<font face=Arial, Helvetica, sans-serif size=2>';
echo $company;
echo '</font></td>';
};
if ($phpgw_info["user"]["preferences"]["addressbook"]["lastname"]) {
echo '<td valign=top>';
echo '<font face=Arial, Helvetica, sans-serif size=2>';
echo $lastname;
echo '</font></td>';
};
if ($phpgw_info["user"]["preferences"]["addressbook"]["firstname"]) {
echo '<td valign=top>';
echo '<font face=Arial, Helvetica, sans-serif size=2>';
echo $firstname;
echo '</font></td>';
};
if ($phpgw_info["user"]["preferences"]["addressbook"]["email"]) {
echo '<td valign=top>';
echo '<font face=Arial, Helvetica, sans-serif size=2>';
echo '<a href="mailto:' . $email . '">' . $email . '</a>';
echo '</font></td>';
};
if ($phpgw_info["user"]["preferences"]["addressbook"]["wphone"]) {
echo '<td valign=top>';
echo '<font face=Arial, Helvetica, sans-serif size=2>';
echo $wphone;
echo '</font></td>';
};
?>
<td valign=top width=3%>
<font face=Arial, Helvetica, sans-serif size=2> <font face=Arial, Helvetica, sans-serif size=2>
<a href="<?php echo $phpgw->link("view.php","ab_id=$ab_id&start=$start&order=$order&filter=" <a href="<?php echo $phpgw->link("view.php","ab_id=$ab_id&start=$start&order=$order&filter="
. "$filter&query=$query&sort=$sort"); . "$filter&query=$query&sort=$sort");

11
addressbook/preferences.php
View File

@ -47,17 +47,18 @@
// I need to create a common function to handle displaying multiable columns // I need to create a common function to handle displaying multiable columns
echo '<tr bgcolor="' . $phpgw_info["theme"]["th_bg"] . '"><td colspan="3">&nbsp;</td></tr>'; echo '<tr bgcolor="' . $phpgw_info["theme"]["th_bg"] . '"><td colspan="3">&nbsp;</td></tr>';
$abc = get_abc(); # AddressBook Columns
$i = 0; $j = 0; $i = 0; $j = 0;
$tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color); $tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color);
echo '<tr bgcolor="' . $tr_color . '">'; echo '<tr bgcolor="' . $tr_color . '">';
while (list($col, $descr) = each($abc)) { while (list($col, $descr) = each($abc)) {
// echo "<br>test: $col - $i $j - " . count($abc);
$i++; $j++; $i++; $j++;
echo '<td><input type="checkbox" name="ab_selected[' . $col . ']" value="True"' echo '<td><input type="checkbox" name="ab_selected[' . $col . ']" value="True"'
. ($phpgw_info["user"]["preferences"]["addressbook"][$col]?" checked":"") . '>' . $descr . ($phpgw_info["user"]["preferences"]["addressbook"][$col]?" checked":"") . '>' . $descr
. '</option></td>'; . '</option></td>';
if ($i ==3) { if ($i == 3) {
echo "</tr>"; echo "</tr>";
$i = 0; $i = 0;
} }
@ -66,6 +67,12 @@
echo '<tr bgcolor="' . $tr_color . '">'; echo '<tr bgcolor="' . $tr_color . '">';
} }
if ($j == count($abc)) { if ($j == count($abc)) {
if ($i == 1) {
echo "<td>&nbsp;</td><td>&nbsp;</td>";
}
if ($i == 2) {
echo "<td>&nbsp;</td>";
}
echo "</tr>"; echo "</tr>";
} }
} }

1
doc/CHANGELOG
View File

@ -19,6 +19,7 @@
- mcrypt should be working correctly now. - mcrypt should be working correctly now.
- Fixed problem with email's addressbook not retrieving records. - Fixed problem with email's addressbook not retrieving records.
- Applied patch for accounts->listusers(). Thanks Mathieu van Loon <mathieu@playcollevtive.com> - Applied patch for accounts->listusers(). Thanks Mathieu van Loon <mathieu@playcollevtive.com>
- Fixed check for new version not working.
[0.9.2] - Fixed sorting bug in currentusers.php [0.9.2] - Fixed sorting bug in currentusers.php
- Cleaned up error reporting and form in newaccount.php - Cleaned up error reporting and form in newaccount.php

11
index.php
View File

@ -33,8 +33,17 @@
$phpgw->common->read_preferences($phpgw_info["user"]["userid"],"addressbook",True); $phpgw->common->read_preferences($phpgw_info["user"]["userid"],"addressbook",True);
$phpgw->common->read_preferences($phpgw_info["user"]["userid"],"email",True); $phpgw->common->read_preferences($phpgw_info["user"]["userid"],"email",True);
$phpgw->common->read_preferences($phpgw_info["user"]["userid"],"calendar",True); $phpgw->common->read_preferences($phpgw_info["user"]["userid"],"calendar",True);
if ($phpgw_info["user"]["apps"]["admin"]) {
if ($phpgw_info["server"]["version"] > $phpgw_info["server"]["phpgroupware_api_version"]) {
echo "<p><b>" . lang("Your are running a newer version of phpGroupWare then your database is setup for")
. "<br>" . lang("It is recommend that you run setup to upgrade your tables to the current version")
. "</b>";
}
}
if ($phpgw_info["user"]["permissions"]["admin"] && $phpgw_info["server"]["checkfornewversion"]) { if ($phpgw_info["user"]["apps"]["admin"] && $phpgw_info["server"]["checkfornewversion"]) {
$phpgw->network->set_addcrlf(False); $phpgw->network->set_addcrlf(False);
if ($phpgw->network->open_port("phpgroupware.org",80,30)) { if ($phpgw->network->open_port("phpgroupware.org",80,30)) {
$phpgw->network->write_port("GET /currentversion HTTP/1.0\nHOST: www.phpgroupware.org\n\n"); $phpgw->network->write_port("GET /currentversion HTTP/1.0\nHOST: www.phpgroupware.org\n\n");

6
setup/createtables_mysql.inc.php
View File

@ -223,8 +223,9 @@
PRIMARY KEY (message_id,app_name,lang) PRIMARY KEY (message_id,app_name,lang)
)"; )";
$db->query($sql); $db->query($sql);
$sql = "create table domains ( // I decied too hold off on this table until 0.9.4pre1 (jengo)
/* $sql = "create table domains (
domain_id int NOT NULL auto_increment, domain_id int NOT NULL auto_increment,
domain_name varchar(255), domain_name varchar(255),
domain_database varchar(255), domain_database varchar(255),
@ -232,5 +233,6 @@
primary key(domain_id) primary key(domain_id)
)"; )";
$db->query($sql); $db->query($sql);
*/
?> ?>

3
setup/default_records.inc.php
View File

@ -126,5 +126,6 @@
$db->query("insert into preferences (preference_owner, preference_name, preference_value, preference_appname) values ('demo','firstname','True','addressbook')"); $db->query("insert into preferences (preference_owner, preference_name, preference_value, preference_appname) values ('demo','firstname','True','addressbook')");
$db->query("insert into preferences (preference_owner, preference_name, preference_value, preference_appname) values ('demo','lastname','True','addressbook')"); $db->query("insert into preferences (preference_owner, preference_name, preference_value, preference_appname) values ('demo','lastname','True','addressbook')");
$db->query("insert into preferences (preference_owner, preference_name, preference_value, preference_appname) values ('demo','company','True','addressbook')"); $db->query("insert into preferences (preference_owner, preference_name, preference_value, preference_appname) values ('demo','company','True','addressbook')");
$db->query("insert into config (config_name, config_value) values ('phpgroupware_api_version','" . $phpgw_info["server"]["version"] . "')");
?> ?>

17
setup/upgradetables_mysql.inc.php
View File

@ -294,17 +294,19 @@
if ($currentver == "0.9.3pre4") { if ($currentver == "0.9.3pre4") {
$db->query("alter table config change config_name config_name varchar(255) NOT NULL"); $db->query("alter table config change config_name config_name varchar(255) NOT NULL");
$db->query("create table domains (domain_id int NOT NULL auto_increment, domain_name varchar(255),"
. "domain_database varchar(255),domain_status enum('Active,Disabled'),primary key(domain_id))"); // I decied too hold off on this table until 0.9.4pre1 (jengo)
// $db->query("create table domains (domain_id int NOT NULL auto_increment, domain_name varchar(255),"
// . "domain_database varchar(255),domain_status enum('Active,Disabled'),primary key(domain_id))");
$currentver = "0.9.3pre5"; $currentver = "0.9.3pre5";
update_version_table(); update_version_table();
} }
if ($currentver == "0.9.3pre5") { if ($currentver == "0.9.3pre5") {
$db->query("CREATE TABLE categories ( $db->query("CREATE TABLE categories (
cat_id int(9) DEFAULT '0' NOT NULL auto_increment, cat_id int(9) DEFAULT '0' NOT NULL auto_increment,
account_id int(11) DEFAULT '0' NOT NULL, account_id int(11) DEFAULT '0' NOT NULL,
app_name varchar(25) NOT NULL, app_name varchar(25) NOT NULL,
cat_name varchar(150) NOT NULL, cat_name varchar(150) NOT NULL,
cat_description text NOT NULL, cat_description text NOT NULL,
PRIMARY KEY (cat_id))" PRIMARY KEY (cat_id))"
); );
@ -330,6 +332,9 @@
v9072000to0_9_1(); v9072000to0_9_1();
v0_9_1to0_9_2(); v0_9_1to0_9_2();
v0_9_2to0_9_3(); v0_9_2to0_9_3();
$db->query("update config set config_value='" . $phpgw_info["server"]["version"] . "' where "
. "config_name='phpgroupware_api_version'");
if (!$tablechanges == True){ if (!$tablechanges == True){
echo " <tr bgcolor=\"e6e6e6\">\n"; echo " <tr bgcolor=\"e6e6e6\">\n";

4
setup/upgradetables_pgsql.inc.php
View File

@ -310,6 +310,10 @@
v0_9_2to0_9_3pre5(); v0_9_2to0_9_3pre5();
$db->query("update applications set app_version='".$phpgw_info["server"]["version"]."' where (app_name='admin' or app_name='filemanager' or app_name='addressbook' or app_name='todo' or app_name='calendar' or app_name='email' or app_name='nntp' or app_name='cron_apps')"); $db->query("update applications set app_version='".$phpgw_info["server"]["version"]."' where (app_name='admin' or app_name='filemanager' or app_name='addressbook' or app_name='todo' or app_name='calendar' or app_name='email' or app_name='nntp' or app_name='cron_apps')");
$db->query("update config set config_value='" . $phpgw_info["server"]["version"] . "' where "
. "config_name='phpgroupware_api_version'");
if (!$didupgrade == True){ if (!$didupgrade == True){
echo " <tr bgcolor=\"e6e6e6\">\n"; echo " <tr bgcolor=\"e6e6e6\">\n";
echo " <td>No table changes were needed. The script only updated your version setting.</td>\n"; echo " <td>No table changes were needed. The script only updated your version setting.</td>\n";