@@ -18,20 +18,20 @@ |
||
| 18 | 18 | parent::__construct(); |
| 19 | 19 | |
| 20 | 20 | // Field mapping |
| 21 | - $this->export_fields = array( |
|
| 21 | + $this->export_fields = array( |
|
| 22 | 22 | 'account_id' => lang('Account ID'), |
| 23 | - 'account_lid' => lang('LoginID'), |
|
| 24 | - 'account_firstname' => lang('First Name'), |
|
| 25 | - 'account_lastname' => lang('Last Name'), |
|
| 26 | - 'account_email' => lang('email'), |
|
| 27 | - 'account_pwd' => lang('Password'), |
|
| 28 | - 'account_status' => lang('Status'), |
|
| 29 | - 'account_primary_group' => lang('Primary Group'), |
|
| 30 | - 'account_groups' => lang('Groups'), |
|
| 31 | - 'account_expires' => lang('Expires'), |
|
| 32 | - 'account_lastlogin' => lang('Last login'), |
|
| 33 | - 'account_lastpwd_change'=> lang('Last password change'), |
|
| 34 | - ); |
|
| 23 | + 'account_lid' => lang('LoginID'), |
|
| 24 | + 'account_firstname' => lang('First Name'), |
|
| 25 | + 'account_lastname' => lang('Last Name'), |
|
| 26 | + 'account_email' => lang('email'), |
|
| 27 | + 'account_pwd' => lang('Password'), |
|
| 28 | + 'account_status' => lang('Status'), |
|
| 29 | + 'account_primary_group' => lang('Primary Group'), |
|
| 30 | + 'account_groups' => lang('Groups'), |
|
| 31 | + 'account_expires' => lang('Expires'), |
|
| 32 | + 'account_lastlogin' => lang('Last login'), |
|
| 33 | + 'account_lastpwd_change'=> lang('Last password change'), |
|
| 34 | + ); |
|
| 35 | 35 | |
| 36 | 36 | // Custom fields - not really used in admin... |
| 37 | 37 | unset($this->export_fields['customfields']); |
@@ -239,11 +239,11 @@ |
||
| 239 | 239 | unset($postdata[$name]); |
| 240 | 240 | } |
| 241 | 241 | $opts = array('http' => |
| 242 | - array( |
|
| 243 | - 'method' => 'POST', |
|
| 244 | - 'header' => 'Content-type: application/x-www-form-urlencoded', |
|
| 245 | - 'content' => http_build_query($postdata), |
|
| 246 | - ) |
|
| 242 | + array( |
|
| 243 | + 'method' => 'POST', |
|
| 244 | + 'header' => 'Content-type: application/x-www-form-urlencoded', |
|
| 245 | + 'content' => http_build_query($postdata), |
|
| 246 | + ) |
|
| 247 | 247 | ); |
| 248 | 248 | $url = $remote['remote_url'].'/admin/remote.php?domain='.urlencode($remote['remote_domain']).'&secret='.urlencode($secret); |
| 249 | 249 | //echo "sending command to $url\n"; _debug_array($opts); |
@@ -152,8 +152,8 @@ |
||
| 152 | 152 | const EXTRA_TABLE = 'egw_timesheet_extra'; |
| 153 | 153 | |
| 154 | 154 | /** |
| 155 | - * Columns to search when user does a text search |
|
| 156 | - */ |
|
| 155 | + * Columns to search when user does a text search |
|
| 156 | + */ |
|
| 157 | 157 | var $columns_to_search = array('egw_timesheet.ts_id', 'ts_project', 'ts_title', 'ts_description', 'ts_duration', 'ts_quantity', 'ts_unitprice'); |
| 158 | 158 | |
| 159 | 159 | /** |
@@ -660,14 +660,14 @@ |
||
| 660 | 660 | } |
| 661 | 661 | |
| 662 | 662 | /** |
| 663 | - * returns notification chains based on admin prefs |
|
| 664 | - * @abstract the available chains can be retrieved in two different output formats: |
|
| 665 | - * routing: array with common and enabled chains, chain-name as key and the chain-array as value (used for message-routing) |
|
| 666 | - * human: array with common, enabled and disabled chains, chain-name as key and a human-readable description as value (used for config) |
|
| 667 | - * |
|
| 668 | - * @param string $_output one of: 'routing' or 'human', defaults to 'routing' |
|
| 669 | - * @return array containing notification chains, output like given in $_output |
|
| 670 | - */ |
|
| 663 | + * returns notification chains based on admin prefs |
|
| 664 | + * @abstract the available chains can be retrieved in two different output formats: |
|
| 665 | + * routing: array with common and enabled chains, chain-name as key and the chain-array as value (used for message-routing) |
|
| 666 | + * human: array with common, enabled and disabled chains, chain-name as key and a human-readable description as value (used for config) |
|
| 667 | + * |
|
| 668 | + * @param string $_output one of: 'routing' or 'human', defaults to 'routing' |
|
| 669 | + * @return array containing notification chains, output like given in $_output |
|
| 670 | + */ |
|
| 671 | 671 | public function get_available_chains($_output = 'routing') { |
| 672 | 672 | // determine enabled backends from Api\Config |
| 673 | 673 | $enabled_backends = array(); |
@@ -275,7 +275,7 @@ discard block |
||
| 275 | 275 | |
| 276 | 276 | //$ruleID is calculated by priority from the selected rule and is an unique ID |
| 277 | 277 | $content['ruleID'] = $ruleID = ($this->rulesByID['priority'] -1) / 2; |
| 278 | - $error = 0; |
|
| 278 | + $error = 0; |
|
| 279 | 279 | switch ($button) |
| 280 | 280 | { |
| 281 | 281 | case 'save': |
@@ -1202,7 +1202,7 @@ discard block |
||
| 1202 | 1202 | /** |
| 1203 | 1203 | * |
| 1204 | 1204 | * Get the data for iterating the rows on rules list grid |
| 1205 | - * |
|
| 1205 | + * |
|
| 1206 | 1206 | * @return {boolean|array} Array of rows | false if failed |
| 1207 | 1207 | */ |
| 1208 | 1208 | function get_rows() |
@@ -1222,7 +1222,7 @@ discard block |
||
| 1222 | 1222 | { |
| 1223 | 1223 | $row['class'] = 'mail_sieve_DISABLED'; |
| 1224 | 1224 | } |
| 1225 | - } |
|
| 1225 | + } |
|
| 1226 | 1226 | } |
| 1227 | 1227 | else |
| 1228 | 1228 | { |
@@ -1247,7 +1247,7 @@ discard block |
||
| 1247 | 1247 | 'caption' => 'Edit', |
| 1248 | 1248 | 'default' => true, |
| 1249 | 1249 | 'onExecute' => 'javaScript:app.mail.action', |
| 1250 | - 'disableClass' => 'th' |
|
| 1250 | + 'disableClass' => 'th' |
|
| 1251 | 1251 | ), |
| 1252 | 1252 | 'add' => array( |
| 1253 | 1253 | 'caption' => 'Add', |
@@ -1257,13 +1257,13 @@ discard block |
||
| 1257 | 1257 | 'caption' => 'Enable', |
| 1258 | 1258 | 'onExecute' => 'javaScript:app.mail.action', |
| 1259 | 1259 | 'enableClass' => 'mail_sieve_DISABLED', |
| 1260 | - 'hideOnDisabled' => true |
|
| 1260 | + 'hideOnDisabled' => true |
|
| 1261 | 1261 | ), |
| 1262 | 1262 | 'disable' => array( |
| 1263 | 1263 | 'caption' => 'Disable', |
| 1264 | 1264 | 'onExecute' => 'javaScript:app.mail.action', |
| 1265 | 1265 | 'disableClass' => 'mail_sieve_DISABLED', |
| 1266 | - 'hideOnDisabled' => true |
|
| 1266 | + 'hideOnDisabled' => true |
|
| 1267 | 1267 | ), |
| 1268 | 1268 | 'delete' => array( |
| 1269 | 1269 | 'caption' => 'Delete', |
@@ -2126,11 +2126,11 @@ discard block |
||
| 2126 | 2126 | } else { |
| 2127 | 2127 | //$this->sessionData['body'] = @htmlspecialchars(lang("on")." ".$headers['DATE']." ".$mail_bo->decode_header($fromAddress), ENT_QUOTES) . " ".lang("wrote").":\r\n"; |
| 2128 | 2128 | // take care the way the ReplyHeader is created here, is used later on in uicompose::compose, in case you force replys to be HTML (prefs) |
| 2129 | - $this->sessionData['body'] = " \r\n \r\n".'----------------'.lang("original message").'-----------------'."\r\n". |
|
| 2130 | - @htmlspecialchars(lang("from")).": ".$fromAddress."\r\n". |
|
| 2129 | + $this->sessionData['body'] = " \r\n \r\n".'----------------'.lang("original message").'-----------------'."\r\n". |
|
| 2130 | + @htmlspecialchars(lang("from")).": ".$fromAddress."\r\n". |
|
| 2131 | 2131 | $toAddress.$ccAddress. |
| 2132 | 2132 | @htmlspecialchars(lang("date").": ".$headers['DATE'], ENT_QUOTES | ENT_IGNORE,Mail::$displayCharset, false)."\r\n". |
| 2133 | - '-------------------------------------------------'."\r\n \r\n "; |
|
| 2133 | + '-------------------------------------------------'."\r\n \r\n "; |
|
| 2134 | 2134 | $this->sessionData['mimeType'] = 'plain'; |
| 2135 | 2135 | |
| 2136 | 2136 | for($i=0; $i<count($bodyParts); $i++) { |
@@ -2968,7 +2968,7 @@ discard block |
||
| 2968 | 2968 | //error_log(__METHOD__.__LINE__."Number of Folders to move copy the message to:".count($folder)); |
| 2969 | 2969 | //error_log(__METHOD__.__LINE__.array2string($folder)); |
| 2970 | 2970 | if ((count($folder) > 0) || (isset($this->sessionData['uid']) && isset($this->sessionData['messageFolder'])) |
| 2971 | - || (isset($this->sessionData['forwardFlag']) && isset($this->sessionData['sourceFolder']))) { |
|
| 2971 | + || (isset($this->sessionData['forwardFlag']) && isset($this->sessionData['sourceFolder']))) { |
|
| 2972 | 2972 | $mail_bo = $this->mail_bo; |
| 2973 | 2973 | $mail_bo->openConnection(); |
| 2974 | 2974 | //$mail_bo->reopen($this->sessionData['messageFolder']); |
@@ -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 |
@@ -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); |