@@ -1528,7 +1528,7 @@ |
||
1528 | 1528 | if (!$set_recurrences) |
1529 | 1529 | { |
1530 | 1530 | $set_recurrences = (isset($event['cal_start']) && (int)$old_min != (int) $event['cal_start']) || |
1531 | - $event['recur_type'] != $old_repeats['recur_type'] || $event['recur_data'] != $old_repeats['recur_data'] || |
|
1531 | + $event['recur_type'] != $old_repeats['recur_type'] || $event['recur_data'] != $old_repeats['recur_data'] || |
|
1532 | 1532 | (int)$event['recur_interval'] != (int)$old_repeats['recur_interval'] || $event['tz_id'] != $old_tz_id; |
1533 | 1533 | } |
1534 | 1534 |
@@ -82,9 +82,9 @@ discard block |
||
82 | 82 | private $user = null; |
83 | 83 | |
84 | 84 | /** |
85 | - * List of import errors |
|
86 | - */ |
|
87 | - protected $errors = array(); |
|
85 | + * List of import errors |
|
86 | + */ |
|
87 | + protected $errors = array(); |
|
88 | 88 | |
89 | 89 | /** |
90 | 90 | * List of actions, and how many times that action was taken |
@@ -305,26 +305,26 @@ discard block |
||
305 | 305 | } |
306 | 306 | |
307 | 307 | /** |
308 | - * Returns errors that were encountered during importing |
|
309 | - * Maximum of one error message per record, but you can append if you need to |
|
310 | - * |
|
311 | - * @return Array ( |
|
312 | - * record_# => error message |
|
313 | - * ) |
|
314 | - */ |
|
315 | - public function get_errors() { |
|
308 | + * Returns errors that were encountered during importing |
|
309 | + * Maximum of one error message per record, but you can append if you need to |
|
310 | + * |
|
311 | + * @return Array ( |
|
312 | + * record_# => error message |
|
313 | + * ) |
|
314 | + */ |
|
315 | + public function get_errors() { |
|
316 | 316 | return $this->errors; |
317 | 317 | } |
318 | 318 | |
319 | 319 | /** |
320 | - * Returns a list of actions taken, and the number of records for that action. |
|
321 | - * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin. |
|
322 | - * |
|
323 | - * @return Array ( |
|
324 | - * action => record count |
|
325 | - * ) |
|
326 | - */ |
|
327 | - public function get_results() { |
|
320 | + * Returns a list of actions taken, and the number of records for that action. |
|
321 | + * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin. |
|
322 | + * |
|
323 | + * @return Array ( |
|
324 | + * action => record count |
|
325 | + * ) |
|
326 | + */ |
|
327 | + public function get_results() { |
|
328 | 328 | return $this->results; |
329 | 329 | } |
330 | 330 | } // end of iface_export_plugin |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | * |
44 | 44 | * @param string $extra_vars for login url |
45 | 45 | * @param string $change_passwd =null string with message to render input fields for password change |
46 | - */ |
|
46 | + */ |
|
47 | 47 | function screen($extra_vars, $change_passwd=null) |
48 | 48 | { |
49 | 49 | Api\Header\ContentSecurityPolicy::add('frame-src', array()); // array() no external frame-sources |
@@ -226,8 +226,8 @@ discard block |
||
226 | 226 | } |
227 | 227 | |
228 | 228 | /** |
229 | - * displays a login denied message |
|
230 | - */ |
|
229 | + * displays a login denied message |
|
230 | + */ |
|
231 | 231 | function denylogin_screen() |
232 | 232 | { |
233 | 233 | try { |
@@ -337,16 +337,16 @@ discard block |
||
337 | 337 | } |
338 | 338 | |
339 | 339 | /** |
340 | - * called by hooks to add an icon in the topmenu info location |
|
341 | - * |
|
342 | - * @param string $id unique element id |
|
343 | - * @param string $icon_src src of the icon image. Make sure this nog height then 18pixels |
|
344 | - * @param string $iconlink where the icon links to |
|
345 | - * @param booleon $blink set true to make the icon blink |
|
346 | - * @param mixed $tooltip string containing the tooltip Api\Html, or null of no tooltip |
|
347 | - * @todo implement in a reasonable way for jdots |
|
348 | - * @return void |
|
349 | - */ |
|
340 | + * called by hooks to add an icon in the topmenu info location |
|
341 | + * |
|
342 | + * @param string $id unique element id |
|
343 | + * @param string $icon_src src of the icon image. Make sure this nog height then 18pixels |
|
344 | + * @param string $iconlink where the icon links to |
|
345 | + * @param booleon $blink set true to make the icon blink |
|
346 | + * @param mixed $tooltip string containing the tooltip Api\Html, or null of no tooltip |
|
347 | + * @todo implement in a reasonable way for jdots |
|
348 | + * @return void |
|
349 | + */ |
|
350 | 350 | function topmenu_info_icon($id,$icon_src,$iconlink,$blink=false,$tooltip=null) |
351 | 351 | { |
352 | 352 | unset($id,$icon_src,$iconlink,$blink,$tooltip); // not used |
@@ -354,14 +354,14 @@ discard block |
||
354 | 354 | } |
355 | 355 | |
356 | 356 | /** |
357 | - * Add menu items to the topmenu template class to be displayed |
|
358 | - * |
|
359 | - * @param array $app application data |
|
360 | - * @param mixed $alt_label string with alternative menu item label default value = null |
|
361 | - * @param string $urlextra string with alternate additional code inside <a>-tag |
|
362 | - * @access protected |
|
363 | - * @return void |
|
364 | - */ |
|
357 | + * Add menu items to the topmenu template class to be displayed |
|
358 | + * |
|
359 | + * @param array $app application data |
|
360 | + * @param mixed $alt_label string with alternative menu item label default value = null |
|
361 | + * @param string $urlextra string with alternate additional code inside <a>-tag |
|
362 | + * @access protected |
|
363 | + * @return void |
|
364 | + */ |
|
365 | 365 | function _add_topmenu_item(array $app_data,$alt_label=null) |
366 | 366 | { |
367 | 367 | switch($app_data['name']) |
@@ -21,29 +21,29 @@ discard block |
||
21 | 21 | class Minimal extends Api\Framework |
22 | 22 | { |
23 | 23 | /** |
24 | - * Instance of the phplib Template class for the API's template dir (EGW_TEMPLATE_DIR) |
|
25 | - * |
|
26 | - * @var Template |
|
27 | - */ |
|
24 | + * Instance of the phplib Template class for the API's template dir (EGW_TEMPLATE_DIR) |
|
25 | + * |
|
26 | + * @var Template |
|
27 | + */ |
|
28 | 28 | var $tpl; |
29 | 29 | |
30 | 30 | /** |
31 | - * Constructor |
|
32 | - * |
|
33 | - * @param string $template ='default' name of the template |
|
34 | - * @return idots_framework |
|
35 | - */ |
|
31 | + * Constructor |
|
32 | + * |
|
33 | + * @param string $template ='default' name of the template |
|
34 | + * @return idots_framework |
|
35 | + */ |
|
36 | 36 | function __construct($template='default') |
37 | 37 | { |
38 | 38 | parent::__construct($template); // call the constructor of the extended class |
39 | 39 | } |
40 | 40 | |
41 | 41 | /** |
42 | - * Returns the html-header incl. the opening body tag |
|
43 | - * |
|
44 | - * @param array $extra =array() extra attributes passed as data-attribute to egw.js |
|
45 | - * @return string with html |
|
46 | - */ |
|
42 | + * Returns the html-header incl. the opening body tag |
|
43 | + * |
|
44 | + * @param array $extra =array() extra attributes passed as data-attribute to egw.js |
|
45 | + * @return string with html |
|
46 | + */ |
|
47 | 47 | function header(array $extra=array()) |
48 | 48 | { |
49 | 49 | // make sure header is output only once |
@@ -76,10 +76,10 @@ discard block |
||
76 | 76 | } |
77 | 77 | |
78 | 78 | /** |
79 | - * Returns the html from the body-tag til the main application area (incl. opening div tag) |
|
80 | - * |
|
81 | - * @return string with html |
|
82 | - */ |
|
79 | + * Returns the html from the body-tag til the main application area (incl. opening div tag) |
|
80 | + * |
|
81 | + * @return string with html |
|
82 | + */ |
|
83 | 83 | function navbar() |
84 | 84 | { |
85 | 85 | return ''; |
@@ -101,37 +101,37 @@ discard block |
||
101 | 101 | } |
102 | 102 | |
103 | 103 | /** |
104 | - * Add menu items to the topmenu template class to be displayed |
|
105 | - * |
|
106 | - * @param array $app application data |
|
107 | - * @param mixed $alt_label string with alternative menu item label default value = null |
|
108 | - * @param string $urlextra string with alternate additional code inside <a>-tag |
|
109 | - * @access protected |
|
110 | - * @return void |
|
111 | - */ |
|
104 | + * Add menu items to the topmenu template class to be displayed |
|
105 | + * |
|
106 | + * @param array $app application data |
|
107 | + * @param mixed $alt_label string with alternative menu item label default value = null |
|
108 | + * @param string $urlextra string with alternate additional code inside <a>-tag |
|
109 | + * @access protected |
|
110 | + * @return void |
|
111 | + */ |
|
112 | 112 | function _add_topmenu_item(array $app_data,$alt_label=null) |
113 | 113 | { |
114 | 114 | unset($app_data, $alt_label); |
115 | 115 | } |
116 | 116 | |
117 | 117 | /** |
118 | - * Add info items to the topmenu template class to be displayed |
|
119 | - * |
|
120 | - * @param string $content html of item |
|
121 | - * @param string $id =null |
|
122 | - * @access protected |
|
123 | - * @return void |
|
124 | - */ |
|
118 | + * Add info items to the topmenu template class to be displayed |
|
119 | + * |
|
120 | + * @param string $content html of item |
|
121 | + * @param string $id =null |
|
122 | + * @access protected |
|
123 | + * @return void |
|
124 | + */ |
|
125 | 125 | function _add_topmenu_info_item($content, $id=null) |
126 | 126 | { |
127 | 127 | unset($content, $id); |
128 | 128 | } |
129 | 129 | |
130 | 130 | /** |
131 | - * Returns the html from the closing div of the main application area to the closing html-tag |
|
132 | - * |
|
133 | - * @return string html or null if no footer needed/wanted |
|
134 | - */ |
|
131 | + * Returns the html from the closing div of the main application area to the closing html-tag |
|
132 | + * |
|
133 | + * @return string html or null if no footer needed/wanted |
|
134 | + */ |
|
135 | 135 | function footer() |
136 | 136 | { |
137 | 137 | static $footer_done=0; |
@@ -141,29 +141,29 @@ discard block |
||
141 | 141 | } |
142 | 142 | |
143 | 143 | /** |
144 | - * Parses one sidebox menu and add's the html to $this->sidebox_content for later use by $this->navbar |
|
145 | - * |
|
146 | - * @param string $appname |
|
147 | - * @param string $menu_title |
|
148 | - * @param array $file |
|
149 | - * @param string $type =null 'admin', 'preferences', 'favorites', ... |
|
150 | - */ |
|
144 | + * Parses one sidebox menu and add's the html to $this->sidebox_content for later use by $this->navbar |
|
145 | + * |
|
146 | + * @param string $appname |
|
147 | + * @param string $menu_title |
|
148 | + * @param array $file |
|
149 | + * @param string $type =null 'admin', 'preferences', 'favorites', ... |
|
150 | + */ |
|
151 | 151 | function sidebox($appname,$menu_title,$file,$type=null) |
152 | 152 | { |
153 | 153 | unset($appname, $menu_title, $file, $type); |
154 | 154 | } |
155 | 155 | |
156 | 156 | /** |
157 | - * called by hooks to add an icon in the topmenu info location |
|
158 | - * |
|
159 | - * @param string $id unique element id |
|
160 | - * @param string $icon_src src of the icon image. Make sure this nog height then 18pixels |
|
161 | - * @param string $iconlink where the icon links to |
|
162 | - * @param booleon $blink set true to make the icon blink |
|
163 | - * @param mixed $tooltip string containing the tooltip html, or null of no tooltip |
|
164 | - * @access public |
|
165 | - * @return void |
|
166 | - */ |
|
157 | + * called by hooks to add an icon in the topmenu info location |
|
158 | + * |
|
159 | + * @param string $id unique element id |
|
160 | + * @param string $icon_src src of the icon image. Make sure this nog height then 18pixels |
|
161 | + * @param string $iconlink where the icon links to |
|
162 | + * @param booleon $blink set true to make the icon blink |
|
163 | + * @param mixed $tooltip string containing the tooltip html, or null of no tooltip |
|
164 | + * @access public |
|
165 | + * @return void |
|
166 | + */ |
|
167 | 167 | function topmenu_info_icon($id,$icon_src,$iconlink,$blink=false,$tooltip=null) |
168 | 168 | { |
169 | 169 | unset($id, $icon_src, $iconlink, $blink, $tooltip); |
@@ -32,33 +32,33 @@ discard block |
||
32 | 32 | const SAMBA4 = 2; |
33 | 33 | |
34 | 34 | /** |
35 | - * @var array $namingContext holds the supported namingcontexts |
|
36 | - */ |
|
35 | + * @var array $namingContext holds the supported namingcontexts |
|
36 | + */ |
|
37 | 37 | var $namingContext = array(); |
38 | 38 | |
39 | 39 | /** |
40 | - * @var string $version holds the LDAP server version |
|
41 | - */ |
|
40 | + * @var string $version holds the LDAP server version |
|
41 | + */ |
|
42 | 42 | var $version = 2; |
43 | 43 | |
44 | 44 | /** |
45 | - * @var integer $serverType holds the type of LDAP server(OpenLDAP, ADS, NDS, ...) |
|
46 | - */ |
|
45 | + * @var integer $serverType holds the type of LDAP server(OpenLDAP, ADS, NDS, ...) |
|
46 | + */ |
|
47 | 47 | var $serverType = 0; |
48 | 48 | |
49 | 49 | /** |
50 | - * @var string $_subSchemaEntry the subschema entry DN |
|
51 | - */ |
|
50 | + * @var string $_subSchemaEntry the subschema entry DN |
|
51 | + */ |
|
52 | 52 | var $subSchemaEntry = ''; |
53 | 53 | |
54 | 54 | /** |
55 | - * @var array $supportedObjectClasses the supported objectclasses |
|
56 | - */ |
|
55 | + * @var array $supportedObjectClasses the supported objectclasses |
|
56 | + */ |
|
57 | 57 | var $supportedObjectClasses = array(); |
58 | 58 | |
59 | 59 | /** |
60 | - * @var array $supportedOIDs the supported OIDs |
|
61 | - */ |
|
60 | + * @var array $supportedOIDs the supported OIDs |
|
61 | + */ |
|
62 | 62 | var $supportedOIDs = array(); |
63 | 63 | |
64 | 64 | /** |
@@ -79,50 +79,50 @@ discard block |
||
79 | 79 | } |
80 | 80 | |
81 | 81 | /** |
82 | - * gets the version |
|
83 | - * |
|
84 | - * @return integer the supported ldap version |
|
85 | - */ |
|
82 | + * gets the version |
|
83 | + * |
|
84 | + * @return integer the supported ldap version |
|
85 | + */ |
|
86 | 86 | function getVersion() |
87 | 87 | { |
88 | 88 | return $this->version; |
89 | 89 | } |
90 | 90 | |
91 | 91 | /** |
92 | - * sets the namingcontexts |
|
93 | - * |
|
94 | - * @param array $_namingContext the supported namingcontexts |
|
95 | - */ |
|
92 | + * sets the namingcontexts |
|
93 | + * |
|
94 | + * @param array $_namingContext the supported namingcontexts |
|
95 | + */ |
|
96 | 96 | function setNamingContexts($_namingContext) |
97 | 97 | { |
98 | 98 | $this->namingContext = $_namingContext; |
99 | 99 | } |
100 | 100 | |
101 | 101 | /** |
102 | - * sets the type of the ldap server(OpenLDAP, ADS, NDS, ...) |
|
103 | - * |
|
104 | - * @param integer $_serverType the type of ldap server |
|
105 | - */ |
|
102 | + * sets the type of the ldap server(OpenLDAP, ADS, NDS, ...) |
|
103 | + * |
|
104 | + * @param integer $_serverType the type of ldap server |
|
105 | + */ |
|
106 | 106 | function setServerType($_serverType) |
107 | 107 | { |
108 | 108 | $this->serverType = $_serverType; |
109 | 109 | } |
110 | 110 | |
111 | 111 | /** |
112 | - * sets the DN for the subschema entry |
|
113 | - * |
|
114 | - * @param string $_subSchemaEntry the subschema entry DN |
|
115 | - */ |
|
112 | + * sets the DN for the subschema entry |
|
113 | + * |
|
114 | + * @param string $_subSchemaEntry the subschema entry DN |
|
115 | + */ |
|
116 | 116 | function setSubSchemaEntry($_subSchemaEntry) |
117 | 117 | { |
118 | 118 | $this->subSchemaEntry = $_subSchemaEntry; |
119 | 119 | } |
120 | 120 | |
121 | 121 | /** |
122 | - * sets the supported objectclasses |
|
123 | - * |
|
124 | - * @param array $_supportedObjectClasses the supported objectclasses |
|
125 | - */ |
|
122 | + * sets the supported objectclasses |
|
123 | + * |
|
124 | + * @param array $_supportedObjectClasses the supported objectclasses |
|
125 | + */ |
|
126 | 126 | function setSupportedObjectClasses($_supportedObjectClasses) |
127 | 127 | { |
128 | 128 | $this->supportedOIDs = $_supportedObjectClasses; |
@@ -130,20 +130,20 @@ discard block |
||
130 | 130 | } |
131 | 131 | |
132 | 132 | /** |
133 | - * sets the version |
|
134 | - * |
|
135 | - * @param integer $_version the supported ldap version |
|
136 | - */ |
|
133 | + * sets the version |
|
134 | + * |
|
135 | + * @param integer $_version the supported ldap version |
|
136 | + */ |
|
137 | 137 | function setVersion($_version) |
138 | 138 | { |
139 | 139 | $this->version = $_version; |
140 | 140 | } |
141 | 141 | |
142 | 142 | /** |
143 | - * checks for supported objectclasses |
|
144 | - * |
|
145 | - * @return bool returns true if the ldap server supports this objectclass |
|
146 | - */ |
|
143 | + * checks for supported objectclasses |
|
144 | + * |
|
145 | + * @return bool returns true if the ldap server supports this objectclass |
|
146 | + */ |
|
147 | 147 | function supportsObjectClass($_objectClass) |
148 | 148 | { |
149 | 149 | if($this->supportedObjectClasses[strtolower($_objectClass)]) |
@@ -242,13 +242,13 @@ |
||
242 | 242 | if ($ret === false && ($err = json_last_error())) |
243 | 243 | { |
244 | 244 | static $json_err2str = array( |
245 | - JSON_ERROR_NONE => 'No errors', |
|
246 | - JSON_ERROR_DEPTH => 'Maximum stack depth exceeded', |
|
247 | - JSON_ERROR_STATE_MISMATCH => 'Underflow or the modes mismatch', |
|
248 | - JSON_ERROR_CTRL_CHAR => 'Unexpected control character found', |
|
249 | - JSON_ERROR_SYNTAX => 'Syntax error, malformed JSON', |
|
250 | - JSON_ERROR_UTF8 => 'Malformed UTF-8 characters, possibly incorrectly encoded', |
|
251 | - ); |
|
245 | + JSON_ERROR_NONE => 'No errors', |
|
246 | + JSON_ERROR_DEPTH => 'Maximum stack depth exceeded', |
|
247 | + JSON_ERROR_STATE_MISMATCH => 'Underflow or the modes mismatch', |
|
248 | + JSON_ERROR_CTRL_CHAR => 'Unexpected control character found', |
|
249 | + JSON_ERROR_SYNTAX => 'Syntax error, malformed JSON', |
|
250 | + JSON_ERROR_UTF8 => 'Malformed UTF-8 characters, possibly incorrectly encoded', |
|
251 | + ); |
|
252 | 252 | error_log(__METHOD__.'('.array2string($var).') json_last_error()='.$err.'='.$json_err2str[$err]); |
253 | 253 | |
254 | 254 | if (($var = self::fix_content($var))) |
@@ -249,12 +249,12 @@ |
||
249 | 249 | |
250 | 250 | $this->component = Horde_Icalendar::newComponent($type, $this); |
251 | 251 | //error_log(__METHOD__."() this->component = Horde_Icalendar::newComponent('$type', \$this) = ".array2string($this->component)); |
252 | - if ($this->component === false) |
|
253 | - { |
|
254 | - error_log(__METHOD__."() Horde_Icalendar::newComponent('$type', \$this) returned FALSE"); |
|
255 | - return; |
|
256 | - //return PEAR::raiseError("Unable to create object for type $type"); |
|
257 | - } |
|
252 | + if ($this->component === false) |
|
253 | + { |
|
254 | + error_log(__METHOD__."() Horde_Icalendar::newComponent('$type', \$this) returned FALSE"); |
|
255 | + return; |
|
256 | + //return PEAR::raiseError("Unable to create object for type $type"); |
|
257 | + } |
|
258 | 258 | if ($this->charset && $this->charset != 'utf-8') |
259 | 259 | { |
260 | 260 | $data = Api\Translation::convert($data, $this->charset, 'utf-8'); |
@@ -738,12 +738,12 @@ discard block |
||
738 | 738 | } |
739 | 739 | |
740 | 740 | /** |
741 | - * provides centralization and compatibility to locate the lang files |
|
742 | - * |
|
743 | - * @param string $app application name |
|
744 | - * @param string $lang language code |
|
745 | - * @return the full path of the filename for the requested app and language |
|
746 | - */ |
|
741 | + * provides centralization and compatibility to locate the lang files |
|
742 | + * |
|
743 | + * @param string $app application name |
|
744 | + * @param string $lang language code |
|
745 | + * @return the full path of the filename for the requested app and language |
|
746 | + */ |
|
747 | 747 | static function get_lang_file($app,$lang) |
748 | 748 | { |
749 | 749 | if ($app == 'common') $app = 'phpgwapi'; |
@@ -1074,13 +1074,13 @@ discard block |
||
1074 | 1074 | } |
1075 | 1075 | |
1076 | 1076 | /** |
1077 | - * detect_encoding - try to detect the encoding |
|
1078 | - * only to be used if the string in question has no structure that determines his encoding |
|
1079 | - * |
|
1080 | - * @param string - to be evaluated |
|
1081 | - * @param string $verify =null encoding to verify, get checked first and have a match for only ascii or no detection available |
|
1082 | - * @return string - encoding |
|
1083 | - */ |
|
1077 | + * detect_encoding - try to detect the encoding |
|
1078 | + * only to be used if the string in question has no structure that determines his encoding |
|
1079 | + * |
|
1080 | + * @param string - to be evaluated |
|
1081 | + * @param string $verify =null encoding to verify, get checked first and have a match for only ascii or no detection available |
|
1082 | + * @return string - encoding |
|
1083 | + */ |
|
1084 | 1084 | static function detect_encoding($string, $verify=null) |
1085 | 1085 | { |
1086 | 1086 | if (function_exists('iconv')) |