holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove some unused code

Browse Source 
(thanks, Scrutenizer)
This commit is contained in:
nathangray 2017-02-01 09:36:41 -07:00
parent aafd2f8271
commit 2612681e44
2 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
infolog/inc/class.infolog_egw_record.inc.php
View File

@ -83,9 +83,6 @@ class infolog_egw_record implements importexport_iface_egw_record
*@return string tiltle *@return string tiltle
*/ */
public function get_title() { public function get_title() {
if (empty($this->record)) {
$this->get_record();
}
return self::$bo->link_title($this->record); return self::$bo->link_title($this->record);
} }

50
infolog/inc/class.infolog_import_infologs_csv.inc.php
View File

@ -16,7 +16,8 @@ use EGroupware\Api\Link;
/** /**
* class import_csv for infolog * class import_csv for infolog
*/ */
class infolog_import_infologs_csv implements importexport_iface_import_plugin { class infolog_import_infologs_csv implements importexport_iface_import_plugin
{
private static $plugin_options = array( private static $plugin_options = array(
'fieldsep', // char 'fieldsep', // char
@ -172,7 +173,8 @@ class infolog_import_infologs_csv implements importexport_iface_import_plugin {
$this->errors = array(); $this->errors = array();
$this->warnings = array(); $this->warnings = array();
while ( $record = $import_csv->get_record() ) { while ( $record = $import_csv->get_record() )
{
$success = false; $success = false;
// don't import empty records // don't import empty records
@ -186,12 +188,14 @@ class infolog_import_infologs_csv implements importexport_iface_import_plugin {
if($record['info_type'] && $key = array_search(strtolower($record['info_type']),$types)) if($record['info_type'] && $key = array_search(strtolower($record['info_type']),$types))
{ {
$lookups['info_status'] = $this->boinfolog->status[$key]; $lookups['info_status'] = $this->boinfolog->status[$key];
break;
} }
} }
$result = importexport_import_csv::convert($record, infolog_egw_record::$types, 'infolog', $lookups, $_definition->plugin_options['convert']); $result = importexport_import_csv::convert($record, infolog_egw_record::$types, 'infolog', $lookups, $_definition->plugin_options['convert']);
if($result) $this->warnings[$import_csv->get_current_position()] = $result; if($result)
{
$this->warnings[$import_csv->get_current_position()] = $result;
}
// Make sure type is valid // Make sure type is valid
if(!$record['info_type'] || $record['info_type'] && !$this->boinfolog->enums['type'][$record['info_type']]) if(!$record['info_type'] || $record['info_type'] && !$this->boinfolog->enums['type'][$record['info_type']])
@ -297,10 +301,12 @@ class infolog_import_infologs_csv implements importexport_iface_import_plugin {
$success = $this->action( 'insert', $record, $import_csv->get_current_position() ); $success = $this->action( 'insert', $record, $import_csv->get_current_position() );
} }
if($success) $count++; if($success) $count++;
if($this->warnings[$import_csv->get_current_position()]) { if($this->warnings[$import_csv->get_current_position()])
{
$this->warnings[$import_csv->get_current_position()] .= "\nRecord:\n" .array2string($record); $this->warnings[$import_csv->get_current_position()] .= "\nRecord:\n" .array2string($record);
} }
if($this->errors[$import_csv->get_current_position()]) { if($this->errors[$import_csv->get_current_position()])
{
$this->errors[$import_csv->get_current_position()] .= "\nRecord:\n" .array2string($record); $this->errors[$import_csv->get_current_position()] .= "\nRecord:\n" .array2string($record);
} }
} }
@ -314,7 +320,8 @@ class infolog_import_infologs_csv implements importexport_iface_import_plugin {
* @param array $_data contact data for the action * @param array $_data contact data for the action
* @return bool success or not * @return bool success or not
*/ */
private function action ( $_action, $_data, $record_num = 0 ) { private function action ( $_action, $_data, $record_num = 0 )
{
$result = true; $result = true;
switch ($_action) { switch ($_action) {
case 'none' : case 'none' :
@ -323,7 +330,8 @@ class infolog_import_infologs_csv implements importexport_iface_import_plugin {
// Only update if there are changes // Only update if there are changes
$old = $this->boinfolog->read($_data['info_id']); $old = $this->boinfolog->read($_data['info_id']);
if(!$this->definition->plugin_options['change_owner']) { if(!$this->definition->plugin_options['change_owner'])
{
// Don't change addressbook of an existing contact // Don't change addressbook of an existing contact
unset($_data['owner']); unset($_data['owner']);
} }
@ -331,13 +339,15 @@ class infolog_import_infologs_csv implements importexport_iface_import_plugin {
// Merge to deal with fields not in import record // Merge to deal with fields not in import record
$_data = array_merge($old, $_data); $_data = array_merge($old, $_data);
$changed = $this->tracking->changed_fields($_data, $old); $changed = $this->tracking->changed_fields($_data, $old);
if(count($changed) == 0 && !$this->definition->plugin_options['update_timestamp']) { if(count($changed) == 0 && !$this->definition->plugin_options['update_timestamp'])
{
break; break;
} }
// Fall through // Fall through
case 'insert' : case 'insert' :
if ( $this->dry_run ) { if ( $this->dry_run )
{
//print_r($_data); //print_r($_data);
// Check for link during dry run // Check for link during dry run
@ -349,7 +359,9 @@ class infolog_import_infologs_csv implements importexport_iface_import_plugin {
$this->results[$_action]++; $this->results[$_action]++;
break; break;
} else { }
else
{
$result = $this->boinfolog->write( $result = $this->boinfolog->write(
$_data, true, 2,true, // 2 = dont touch modification date $_data, true, 2,true, // 2 = dont touch modification date
$this->definition->plugin_options['no_notification'] $this->definition->plugin_options['no_notification']
@ -379,13 +391,16 @@ class infolog_import_infologs_csv implements importexport_iface_import_plugin {
} }
// Process some additional fields // Process some additional fields
if(!is_numeric($result)) { if(!is_numeric($result))
{
return $result; return $result;
} }
$info_link_id = $_data['info_link_id']; $info_link_id = $_data['info_link_id'];
foreach(array_keys(self::$special_fields) as $field) { foreach(array_keys(self::$special_fields) as $field)
{
if(!$_data[$field]) continue; if(!$_data[$field]) continue;
if(strpos($field, 'link') === 0) { if(strpos($field, 'link') === 0)
{
list($app, $app_id) = explode(':', $_data[$field],2); list($app, $app_id) = explode(':', $_data[$field],2);
// Linking to another entry based on matching custom fields // Linking to another entry based on matching custom fields
@ -393,11 +408,14 @@ class infolog_import_infologs_csv implements importexport_iface_import_plugin {
{ {
$app_id = $this->link_by_cf($record_num, $app, $field, $app_id); $app_id = $this->link_by_cf($record_num, $app, $field, $app_id);
} }
} else { }
else
{
$app = $field; $app = $field;
$app_id = $_data[$field]; $app_id = $_data[$field];
} }
if ($app && $app_id) { if ($app && $app_id)
{
$id = $_data['info_id'] ? $_data['info_id'] : (int)$result; $id = $_data['info_id'] ? $_data['info_id'] : (int)$result;
//echo "<p>linking infolog:$id with $app:$app_id</p>\n"; //echo "<p>linking infolog:$id with $app:$app_id</p>\n";
$link_id = Link::link('infolog',$id,$app,$app_id); $link_id = Link::link('infolog',$id,$app,$app_id);