@@ -69,16 +69,16 @@ discard block |
||
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | /** |
| 72 | - * Hook called by link-class to include mail in the appregistry of the linkage |
|
| 73 | - * |
|
| 74 | - * @param array|string $location location and other parameters (not used) |
|
| 75 | - * @return array with method-names |
|
| 76 | - */ |
|
| 77 | - static function search_link($location) |
|
| 78 | - { |
|
| 72 | + * Hook called by link-class to include mail in the appregistry of the linkage |
|
| 73 | + * |
|
| 74 | + * @param array|string $location location and other parameters (not used) |
|
| 75 | + * @return array with method-names |
|
| 76 | + */ |
|
| 77 | + static function search_link($location) |
|
| 78 | + { |
|
| 79 | 79 | unset($location); // not used, but required by function signature |
| 80 | 80 | |
| 81 | - return array( |
|
| 81 | + return array( |
|
| 82 | 82 | 'view' => array( |
| 83 | 83 | 'menuaction' => 'mail.mail_ui.displayMessage', |
| 84 | 84 | ), |
@@ -107,8 +107,8 @@ discard block |
||
| 107 | 107 | ), |
| 108 | 108 | 'entry' => 'Mail', |
| 109 | 109 | 'entries' => 'Mails', |
| 110 | - ); |
|
| 111 | - } |
|
| 110 | + ); |
|
| 111 | + } |
|
| 112 | 112 | |
| 113 | 113 | /** |
| 114 | 114 | * Settings hook |
@@ -3117,7 +3117,7 @@ discard block |
||
| 3117 | 3117 | * @param string $_partID |
| 3118 | 3118 | * @param string $_type |
| 3119 | 3119 | * @return string|boolean returns the replace |
| 3120 | - */ |
|
| 3120 | + */ |
|
| 3121 | 3121 | $replace_callback = function ($matches) use ($_mailbox,$_uid, $_partID, $_type) |
| 3122 | 3122 | { |
| 3123 | 3123 | if (!$_type) return false; |
@@ -3249,10 +3249,10 @@ discard block |
||
| 3249 | 3249 | try |
| 3250 | 3250 | { |
| 3251 | 3251 | $messageUid = $this->importMessageToFolder($file,$destination,$importID); |
| 3252 | - $linkData = array |
|
| 3253 | - ( |
|
| 3252 | + $linkData = array |
|
| 3253 | + ( |
|
| 3254 | 3254 | 'id' => $this->createRowID($destination, $messageUid, true), |
| 3255 | - ); |
|
| 3255 | + ); |
|
| 3256 | 3256 | } |
| 3257 | 3257 | catch (Api\Exception\WrongUserinput $e) |
| 3258 | 3258 | { |
@@ -3418,7 +3418,7 @@ discard block |
||
| 3418 | 3418 | $messageUid = $this->importMessageToFolder($formData,$draftFolder,$importID); |
| 3419 | 3419 | $linkData = array |
| 3420 | 3420 | ( |
| 3421 | - 'menuaction' => ($mode=='display'?'mail.mail_ui.displayMessage':'mail.mail_compose.composeFromDraft'), |
|
| 3421 | + 'menuaction' => ($mode=='display'?'mail.mail_ui.displayMessage':'mail.mail_compose.composeFromDraft'), |
|
| 3422 | 3422 | 'id' => $this->createRowID($draftFolder,$messageUid,true), |
| 3423 | 3423 | 'deleteDraftOnClose' => 1, |
| 3424 | 3424 | ); |
@@ -11,4 +11,4 @@ |
||
| 11 | 11 | * @version $Id$ |
| 12 | 12 | */ |
| 13 | 13 | header('Location: ../index.php?menuaction=mail.mail_ui.index'. |
| 14 | - (isset($_GET['sessionid']) ? '&sessionid='.$_GET['sessionid'].'&kp3='.$_GET['kp3'] : '')); |
|
| 14 | + (isset($_GET['sessionid']) ? '&sessionid='.$_GET['sessionid'].'&kp3='.$_GET['kp3'] : '')); |
|
@@ -98,13 +98,13 @@ |
||
| 98 | 98 | } |
| 99 | 99 | |
| 100 | 100 | /** |
| 101 | - * generate the module content AND process submitted forms |
|
| 102 | - * Overridden from parent to pass arguments |
|
| 103 | - * |
|
| 104 | - * @param array &$arguments $arguments['arg1']-$arguments['arg3'] will be passed for non-submitted forms (first call) |
|
| 105 | - * @param array $properties |
|
| 106 | - * @return string the Api\Html content |
|
| 107 | - */ |
|
| 101 | + * generate the module content AND process submitted forms |
|
| 102 | + * Overridden from parent to pass arguments |
|
| 103 | + * |
|
| 104 | + * @param array &$arguments $arguments['arg1']-$arguments['arg3'] will be passed for non-submitted forms (first call) |
|
| 105 | + * @param array $properties |
|
| 106 | + * @return string the Api\Html content |
|
| 107 | + */ |
|
| 108 | 108 | function get_content(&$arguments,$properties) |
| 109 | 109 | { |
| 110 | 110 | list($app) = explode('.',$this->etemplate_method); |
@@ -44,7 +44,7 @@ |
||
| 44 | 44 | 'long_description' => lang('Long description'), |
| 45 | 45 | 'inventory_number' => lang('inventory number'), |
| 46 | 46 | 'accessory_of' => lang('Accessory of') |
| 47 | - ); |
|
| 47 | + ); |
|
| 48 | 48 | |
| 49 | 49 | $custom = Api\Storage\Customfields::get('resources', true); |
| 50 | 50 | foreach($custom as $name => $data) { |
@@ -170,9 +170,9 @@ |
||
| 170 | 170 | * Get selectbox values |
| 171 | 171 | */ |
| 172 | 172 | protected function get_selects() |
| 173 | - { |
|
| 173 | + { |
|
| 174 | 174 | $this->selects = array(); |
| 175 | - } |
|
| 175 | + } |
|
| 176 | 176 | |
| 177 | 177 | /** |
| 178 | 178 | * Customize automatically generated filter fields |
@@ -58,7 +58,7 @@ |
||
| 58 | 58 | } else { |
| 59 | 59 | $data['msg']= '<div class="confirm">'.lang('Unable to process confirmation.').'</div>'; |
| 60 | 60 | } |
| 61 | - } |
|
| 61 | + } |
|
| 62 | 62 | |
| 63 | 63 | $this->tmpl->read('resources.sitemgr_book'); |
| 64 | 64 | |
@@ -45,15 +45,15 @@ discard block |
||
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | /** |
| 48 | - * Import a single record |
|
| 49 | - * |
|
| 50 | - * You don't need to worry about mappings or translations, they've been done already. |
|
| 51 | - * You do need to handle the conditions and the actions taken. |
|
| 52 | - * |
|
| 53 | - * Updates the count of actions taken |
|
| 54 | - * |
|
| 55 | - * @return boolean success |
|
| 56 | - */ |
|
| 48 | + * Import a single record |
|
| 49 | + * |
|
| 50 | + * You don't need to worry about mappings or translations, they've been done already. |
|
| 51 | + * You do need to handle the conditions and the actions taken. |
|
| 52 | + * |
|
| 53 | + * Updates the count of actions taken |
|
| 54 | + * |
|
| 55 | + * @return boolean success |
|
| 56 | + */ |
|
| 57 | 57 | protected function import_record(importexport_iface_egw_record &$record, &$import_csv) |
| 58 | 58 | { |
| 59 | 59 | // Check for an un-matched accessory of, try again on just name |
@@ -250,14 +250,14 @@ discard block |
||
| 250 | 250 | } |
| 251 | 251 | |
| 252 | 252 | /** |
| 253 | - * Returns warnings that were encountered during importing |
|
| 254 | - * Maximum of one warning message per record, but you can append if you need to |
|
| 255 | - * |
|
| 256 | - * @return Array ( |
|
| 257 | - * record_# => warning message |
|
| 258 | - * ) |
|
| 259 | - */ |
|
| 260 | - public function get_warnings() { |
|
| 253 | + * Returns warnings that were encountered during importing |
|
| 254 | + * Maximum of one warning message per record, but you can append if you need to |
|
| 255 | + * |
|
| 256 | + * @return Array ( |
|
| 257 | + * record_# => warning message |
|
| 258 | + * ) |
|
| 259 | + */ |
|
| 260 | + public function get_warnings() { |
|
| 261 | 261 | return $this->warnings; |
| 262 | 262 | } |
| 263 | 263 | } |
@@ -26,20 +26,20 @@ |
||
| 26 | 26 | $this->id_field = 'res_id'; |
| 27 | 27 | |
| 28 | 28 | $this->field2history = array( |
| 29 | - 'res_id' => 'res_id', |
|
| 30 | - 'name' => 'name', |
|
| 31 | - 'short_description' => 'short_description', |
|
| 32 | - 'cat_id' => 'cat_id', |
|
| 33 | - 'quantity' => 'quantity', |
|
| 34 | - 'useable' => 'useable', |
|
| 35 | - 'location' => 'location', |
|
| 36 | - 'storage_info' => 'storage_info', |
|
| 37 | - 'bookable' => 'bookable', |
|
| 38 | - 'buyable' => 'buyable', |
|
| 39 | - 'prize' => 'prize', |
|
| 40 | - 'long_description' => 'long_description', |
|
| 41 | - 'inventory_number' => 'inventory_number', |
|
| 42 | - 'accessory_of' => 'accessory_of' |
|
| 29 | + 'res_id' => 'res_id', |
|
| 30 | + 'name' => 'name', |
|
| 31 | + 'short_description' => 'short_description', |
|
| 32 | + 'cat_id' => 'cat_id', |
|
| 33 | + 'quantity' => 'quantity', |
|
| 34 | + 'useable' => 'useable', |
|
| 35 | + 'location' => 'location', |
|
| 36 | + 'storage_info' => 'storage_info', |
|
| 37 | + 'bookable' => 'bookable', |
|
| 38 | + 'buyable' => 'buyable', |
|
| 39 | + 'prize' => 'prize', |
|
| 40 | + 'long_description' => 'long_description', |
|
| 41 | + 'inventory_number' => 'inventory_number', |
|
| 42 | + 'accessory_of' => 'accessory_of' |
|
| 43 | 43 | ); |
| 44 | 44 | parent::__construct($this->appname); |
| 45 | 45 | } |