@@ -30,14 +30,12 @@ discard block |
||
| 30 | 30 | /** |
| 31 | 31 | * Shows the contactform and stores the submitted data |
| 32 | 32 | * |
| 33 | - * @param array $content=null submitted eTemplate content |
|
| 34 | - * @param int $addressbook=null int owner-id of addressbook to save contacts too |
|
| 35 | - * @param array $fields=null field-names to show |
|
| 36 | - * @param string $msg=null message to show after submitting the form |
|
| 37 | - * @param string $email=null comma-separated email addresses |
|
| 38 | - * @param string $tpl_name=null custom etemplate to use |
|
| 39 | - * @param string $subject=null subject for email |
|
| 40 | - * @param string $copytoreceiver=false send a copy of notification to receiver |
|
| 33 | + * @param array $content submitted eTemplate content |
|
| 34 | + * @param int $addressbook int owner-id of addressbook to save contacts too |
|
| 35 | + * @param array $fields field-names to show |
|
| 36 | + * @param string $tpl_name custom etemplate to use |
|
| 37 | + * @param string $subject subject for email |
|
| 38 | + * @param string $copytoreceiver send a copy of notification to receiver |
|
| 41 | 39 | * @return string html content |
| 42 | 40 | */ |
| 43 | 41 | function display(array $content=null,$addressbook=null,$fields=null,$msg=null,$email=null,$tpl_name=null,$subject=null,$copytoreceiver=false,$sel_options=array()) |
@@ -49,13 +47,11 @@ discard block |
||
| 49 | 47 | * Shows the contactform and stores the submitted data ($content is a var parameter, eg. for extending classes) |
| 50 | 48 | * |
| 51 | 49 | * @param array &$content=null submitted eTemplate content |
| 52 | - * @param int $addressbook=null int owner-id of addressbook to save contacts too |
|
| 53 | - * @param array $fields=null field-names to show |
|
| 54 | - * @param string $msg=null message to show after submitting the form |
|
| 55 | - * @param string $email=null comma-separated email addresses |
|
| 56 | - * @param string $tpl_name=null custom etemplate to use |
|
| 57 | - * @param string $subject=null subject for email |
|
| 58 | - * @param string $copytoreceiver=false send a copy of notification to receiver |
|
| 50 | + * @param int $addressbook int owner-id of addressbook to save contacts too |
|
| 51 | + * @param array $fields field-names to show |
|
| 52 | + * @param string $tpl_name custom etemplate to use |
|
| 53 | + * @param string $subject subject for email |
|
| 54 | + * @param string $copytoreceiver send a copy of notification to receiver |
|
| 59 | 55 | * @return string html content |
| 60 | 56 | */ |
| 61 | 57 | function display_var(array &$content=null,$addressbook=null,$fields=null,$msg=null,$email=null,$tpl_name=null,$subject=null,$copytoreceiver=false,$sel_options=array()) |
@@ -44,9 +44,7 @@ discard block |
||
| 44 | 44 | |
| 45 | 45 | /** |
| 46 | 46 | * imports entries according to given definition object. |
| 47 | - * @param resource $_stream |
|
| 48 | - * @param string $_charset |
|
| 49 | - * @param definition $_definition |
|
| 47 | + * @param importexport_definition $_definition |
|
| 50 | 48 | */ |
| 51 | 49 | public function init(importexport_definition &$_definition ) { |
| 52 | 50 | |
@@ -84,7 +82,7 @@ discard block |
||
| 84 | 82 | * |
| 85 | 83 | * Updates the count of actions taken |
| 86 | 84 | * |
| 87 | - * @return boolean success |
|
| 85 | + * @return null|boolean success |
|
| 88 | 86 | */ |
| 89 | 87 | protected function import_record(importexport_iface_egw_record &$record, &$import_csv) |
| 90 | 88 | { |
@@ -29,8 +29,8 @@ discard block |
||
| 29 | 29 | private $bocontacts; |
| 30 | 30 | |
| 31 | 31 | /** |
| 32 | - * For figuring out if a contact has changed |
|
| 33 | - */ |
|
| 32 | + * For figuring out if a contact has changed |
|
| 33 | + */ |
|
| 34 | 34 | protected $tracking; |
| 35 | 35 | |
| 36 | 36 | /** |
@@ -377,39 +377,39 @@ discard block |
||
| 377 | 377 | } |
| 378 | 378 | |
| 379 | 379 | /** |
| 380 | - * Returns warnings that were encountered during importing |
|
| 381 | - * Maximum of one warning message per record, but you can append if you need to |
|
| 382 | - * |
|
| 383 | - * @return Array ( |
|
| 384 | - * record_# => warning message |
|
| 385 | - * ) |
|
| 386 | - */ |
|
| 387 | - public function get_warnings() { |
|
| 380 | + * Returns warnings that were encountered during importing |
|
| 381 | + * Maximum of one warning message per record, but you can append if you need to |
|
| 382 | + * |
|
| 383 | + * @return Array ( |
|
| 384 | + * record_# => warning message |
|
| 385 | + * ) |
|
| 386 | + */ |
|
| 387 | + public function get_warnings() { |
|
| 388 | 388 | return $this->warnings; |
| 389 | 389 | } |
| 390 | 390 | |
| 391 | 391 | /** |
| 392 | - * Returns errors that were encountered during importing |
|
| 393 | - * Maximum of one error message per record, but you can append if you need to |
|
| 394 | - * |
|
| 395 | - * @return Array ( |
|
| 396 | - * record_# => error message |
|
| 397 | - * ) |
|
| 398 | - */ |
|
| 399 | - public function get_errors() { |
|
| 392 | + * Returns errors that were encountered during importing |
|
| 393 | + * Maximum of one error message per record, but you can append if you need to |
|
| 394 | + * |
|
| 395 | + * @return Array ( |
|
| 396 | + * record_# => error message |
|
| 397 | + * ) |
|
| 398 | + */ |
|
| 399 | + public function get_errors() { |
|
| 400 | 400 | return $this->errors; |
| 401 | 401 | } |
| 402 | 402 | |
| 403 | 403 | /** |
| 404 | - * Returns a list of actions taken, and the number of records for that action. |
|
| 405 | - * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin. |
|
| 406 | - * |
|
| 407 | - * @return Array ( |
|
| 408 | - * action => record count |
|
| 409 | - * ) |
|
| 410 | - */ |
|
| 411 | - public function get_results() { |
|
| 412 | - return $this->results; |
|
| 413 | - } |
|
| 404 | + * Returns a list of actions taken, and the number of records for that action. |
|
| 405 | + * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin. |
|
| 406 | + * |
|
| 407 | + * @return Array ( |
|
| 408 | + * action => record count |
|
| 409 | + * ) |
|
| 410 | + */ |
|
| 411 | + public function get_results() { |
|
| 412 | + return $this->results; |
|
| 413 | + } |
|
| 414 | 414 | } // end of iface_export_plugin |
| 415 | 415 | ?> |
@@ -255,11 +255,10 @@ |
||
| 255 | 255 | * |
| 256 | 256 | * @param type $action |
| 257 | 257 | * @param type $checked |
| 258 | - * @param type $use_all |
|
| 259 | 258 | * @param type $success |
| 260 | 259 | * @param int $failed |
| 261 | 260 | * @param type $action_msg |
| 262 | - * @return type number of failed |
|
| 261 | + * @return boolean number of failed |
|
| 263 | 262 | */ |
| 264 | 263 | function action($action,$checked,&$success,&$failed,&$action_msg) |
| 265 | 264 | { |
@@ -679,6 +679,8 @@ |
||
| 679 | 679 | * @param int &$failed number of failed actions (not enought permissions) |
| 680 | 680 | * @param string &$action_msg translated verb for the actions, to be used in a message like '%1 entries deleted' |
| 681 | 681 | * @param array $query get_rows parameter |
| 682 | + * @param integer $success |
|
| 683 | + * @param integer $failed |
|
| 682 | 684 | * @return boolean true if all actions succeded, false otherwise |
| 683 | 685 | */ |
| 684 | 686 | function action($_action, $checked, $use_all, &$success, &$failed, &$action_msg, array $query) |
@@ -291,7 +291,7 @@ |
||
| 291 | 291 | * Check if next submission is due, in which case we call submit and NOT return to the admin hook |
| 292 | 292 | * |
| 293 | 293 | * @param boolean $redirect should we redirect or return true |
| 294 | - * @return boolean true if statistic submission is due |
|
| 294 | + * @return boolean|null true if statistic submission is due |
|
| 295 | 295 | */ |
| 296 | 296 | public static function check($redirect=true) |
| 297 | 297 | { |
@@ -491,6 +491,10 @@ |
||
| 491 | 491 | protected static function call_hook() |
| 492 | 492 | { |
| 493 | 493 | self::$hook_data = array(); |
| 494 | + |
|
| 495 | + /** |
|
| 496 | + * @param string $appname |
|
| 497 | + */ |
|
| 494 | 498 | function display_section($appname,$file,$file2=False) |
| 495 | 499 | { |
| 496 | 500 | admin_ui::$hook_data[$appname] = $file2 ? $file2 : $file; |
@@ -271,7 +271,7 @@ discard block |
||
| 271 | 271 | * |
| 272 | 272 | * If you have cached data in your stream but not yet stored it into the underlying storage, you should do so now. |
| 273 | 273 | * |
| 274 | - * @return booelan TRUE if the cached data was successfully stored (or if there was no data to store), or FALSE if the data could not be stored. |
|
| 274 | + * @return boolean TRUE if the cached data was successfully stored (or if there was no data to store), or FALSE if the data could not be stored. |
|
| 275 | 275 | */ |
| 276 | 276 | function stream_flush ( ) |
| 277 | 277 | { |
@@ -507,7 +507,7 @@ discard block |
||
| 507 | 507 | * |
| 508 | 508 | * @param string $url URL that was passed to opendir() and that this object is expected to explore. |
| 509 | 509 | * @param int $options |
| 510 | - * @return booelan |
|
| 510 | + * @return boolean |
|
| 511 | 511 | */ |
| 512 | 512 | function dir_opendir ( $url, $options ) |
| 513 | 513 | { |
@@ -616,7 +616,7 @@ discard block |
||
| 616 | 616 | * It should reset the output generated by dir_readdir(). i.e.: |
| 617 | 617 | * The next call to dir_readdir() should return the first entry in the location returned by dir_opendir(). |
| 618 | 618 | * |
| 619 | - * @return boolean |
|
| 619 | + * @return boolean|null |
|
| 620 | 620 | */ |
| 621 | 621 | function dir_rewinddir ( ) |
| 622 | 622 | { |
@@ -80,10 +80,10 @@ |
||
| 80 | 80 | * Important: PHP 5.0 introduced a bug that wasn't fixed until 5.1: the return value has to be the oposite! |
| 81 | 81 | * |
| 82 | 82 | * if(version_compare(PHP_VERSION,'5.0','>=') && version_compare(PHP_VERSION,'5.1','<')) |
| 83 | - * { |
|
| 83 | + * { |
|
| 84 | 84 | * $eof = !$eof; |
| 85 | 85 | * } |
| 86 | - * |
|
| 86 | + * |
|
| 87 | 87 | * @return boolean true if the read/write position is at the end of the stream and no more data availible, false otherwise |
| 88 | 88 | */ |
| 89 | 89 | function stream_eof ( ); |
@@ -316,7 +316,7 @@ |
||
| 316 | 316 | * |
| 317 | 317 | * @param string $url URL that was passed to opendir() and that this object is expected to explore. |
| 318 | 318 | * @param $options |
| 319 | - * @return booelan |
|
| 319 | + * @return boolean |
|
| 320 | 320 | */ |
| 321 | 321 | function dir_opendir ( $url, $options ) |
| 322 | 322 | { |
@@ -454,7 +454,7 @@ discard block |
||
| 454 | 454 | * |
| 455 | 455 | * If you have cached data in your stream but not yet stored it into the underlying storage, you should do so now. |
| 456 | 456 | * |
| 457 | - * @return booelan TRUE if the cached data was successfully stored (or if there was no data to store), or FALSE if the data could not be stored. |
|
| 457 | + * @return boolean TRUE if the cached data was successfully stored (or if there was no data to store), or FALSE if the data could not be stored. |
|
| 458 | 458 | */ |
| 459 | 459 | function stream_flush ( ) |
| 460 | 460 | { |
@@ -856,7 +856,7 @@ discard block |
||
| 856 | 856 | * This method is called immediately when your stream object is created for examining directory contents with opendir(). |
| 857 | 857 | * |
| 858 | 858 | * @param string $path URL that was passed to opendir() and that this object is expected to explore. |
| 859 | - * @return booelan |
|
| 859 | + * @return boolean |
|
| 860 | 860 | */ |
| 861 | 861 | function dir_opendir ( $path, $options ) |
| 862 | 862 | { |
@@ -1213,7 +1213,7 @@ discard block |
||
| 1213 | 1213 | * It should reset the output generated by dir_readdir(). i.e.: |
| 1214 | 1214 | * The next call to dir_readdir() should return the first entry in the location returned by dir_opendir(). |
| 1215 | 1215 | * |
| 1216 | - * @return boolean |
|
| 1216 | + * @return boolean|null |
|
| 1217 | 1217 | */ |
| 1218 | 1218 | function dir_rewinddir ( ) |
| 1219 | 1219 | { |
@@ -1227,7 +1227,7 @@ discard block |
||
| 1227 | 1227 | * |
| 1228 | 1228 | * You should release any resources which were locked or allocated during the opening and use of the directory stream. |
| 1229 | 1229 | * |
| 1230 | - * @return boolean |
|
| 1230 | + * @return boolean|null |
|
| 1231 | 1231 | */ |
| 1232 | 1232 | function dir_closedir ( ) |
| 1233 | 1233 | { |
@@ -411,10 +411,10 @@ discard block |
||
| 411 | 411 | * Important: PHP 5.0 introduced a bug that wasn't fixed until 5.1: the return value has to be the oposite! |
| 412 | 412 | * |
| 413 | 413 | * if(version_compare(PHP_VERSION,'5.0','>=') && version_compare(PHP_VERSION,'5.1','<')) |
| 414 | - * { |
|
| 414 | + * { |
|
| 415 | 415 | * $eof = !$eof; |
| 416 | 416 | * } |
| 417 | - * |
|
| 417 | + * |
|
| 418 | 418 | * @return boolean true if the read/write position is at the end of the stream and no more data availible, false otherwise |
| 419 | 419 | */ |
| 420 | 420 | function stream_eof ( ) |
@@ -1053,7 +1053,7 @@ discard block |
||
| 1053 | 1053 | if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path',$flags,'$url'): ".function_backtrace(1)); |
| 1054 | 1054 | |
| 1055 | 1055 | while (($rel_path = Vfs::basename($url).($rel_path ? '/'.$rel_path : '')) && |
| 1056 | - ($url = Vfs::dirname($url))) |
|
| 1056 | + ($url = Vfs::dirname($url))) |
|
| 1057 | 1057 | { |
| 1058 | 1058 | if (($stat = self::url_stat($url,0,false,false))) |
| 1059 | 1059 | { |