| 15,7 → 15,9 |
|---|
| 'export_comment' => $line['export_comment'], |
| )); |
| array_push($export_header, array( |
| 'html' => ellipsis($line['export_name'], 1), |
| 'html' => '<a href="' . htmlspecialchars( |
| 'telbook_export_details.php?id=' . $line['export_id']) . '">' |
| . ellipsis($line['export_name'], 1), |
| 'comment' => $line['export_name'], |
| )); |
| } |
| 32,12 → 34,16 |
|---|
| |
| if($new_person) { |
| $table->addcell(array( |
| 'text' => $person['person_name'], |
| 'html' => display_link('telbook_details.php?id=' |
| . $person['person_id'], $person['person_name']), |
| 'comment' => $person['person_comment'], |
| 'rowspan' => count($person['entries']), |
| )); |
| $table->addcell(array( |
| 'text' => $person['category_name'], |
| 'html' => ($person['category_id'] |
| ? display_link('telbook_categories_details.php?id=' |
| . $person['category_id'], $person['category_name']) |
| : ' '), |
| 'comment' => $person['category_comment'], |
| 'rowspan' => count($person['entries']), |
| )); |
| 75,7 → 81,7 |
|---|
| } |
| } |
| |
| $db->query("select person_id, person_name, person_comment, category_name," |
| $db->query("select person_id, person_name, person_comment, category_id, category_name," |
| . " category_comment, e.entry_id, entry_title, entry_value, entry_comment, export_id" |
| . " from telbook_persons p" |
| . " left join telbook_categories c on p.person_category=c.category_id" |
| 86,10 → 92,12 |
|---|
| |
| $table = new Table(array( |
| array('text' => 'Name', 'rowspan' => 2), |
| array('text' => 'Category', 'rowspan' => 2), |
| array('html' => display_link('telbook_categories_list.php', 'Category'), |
| 'rowspan' => 2), |
| array('text' => 'Type', 'rowspan' => 2), |
| array('text' => 'Number', 'rowspan' => 2), |
| array('text' => 'Export', 'colspan' => count($export_targets)), |
| array('html' => display_link('telbook_export_list.php', 'Export'), |
| 'colspan' => count($export_targets)), |
| array('text' => '', 'rowspan' => 2), |
| array('text' => '', 'rowspan' => 2), |
| )); |
| 106,6 → 114,7 |
|---|
| 'person_id' => $line['person_id'], |
| 'person_name' => $line['person_name'], |
| 'person_comment' => $line['person_comment'], |
| 'category_id' => $line['category_id'], |
| 'category_name' => $line['category_name'], |
| 'category_comment' => $line['category_comment'], |
| 'entries' => array(), |
| 114,7 → 123,6 |
|---|
| } |
| |
| if($entry == NULL || $entry['entry_id'] != $line['entry_id']) { |
| $export = array(); |
| $entry = array( |
| 'entry_id' => $line['entry_id'], |
| 'entry_title' => $line['entry_title'], |