@@ -437,7 +437,7 @@ |
||
| 437 | 437 | // Setup for share to load |
| 438 | 438 | $_SERVER['REQUEST_URI'] = $link; |
| 439 | 439 | preg_match('|^https?://[^/]+(/.*)share.php/'.$share['share_token'].'$|', $path_info=$_SERVER['REQUEST_URI'], $matches); |
| 440 | - $_SERVER['SCRIPT_NAME'] = $matches[1]; |
|
| 440 | + $_SERVER['SCRIPT_NAME'] = $matches[1]; |
|
| 441 | 441 | $is_dir = Vfs::is_dir($path); |
| 442 | 442 | |
| 443 | 443 | |
@@ -73,14 +73,14 @@ discard block |
||
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | /** |
| 76 | - * get list of cats where current user has given rights |
|
| 77 | - * |
|
| 78 | - * @author Cornelius Weiss <[email protected]> |
|
| 79 | - * @param int $perm_type one of Acl::READ, Acl::ADD, Acl::EDIT, Acl::DELETE, self::DIRECT_BOOKING |
|
| 80 | - * @param int $parent_id=0 cat_id of parent to return only children of that category |
|
| 81 | - * @return array cat_id => cat_name |
|
| 82 | - * TODO mark subcats and so on! |
|
| 83 | - */ |
|
| 76 | + * get list of cats where current user has given rights |
|
| 77 | + * |
|
| 78 | + * @author Cornelius Weiss <[email protected]> |
|
| 79 | + * @param int $perm_type one of Acl::READ, Acl::ADD, Acl::EDIT, Acl::DELETE, self::DIRECT_BOOKING |
|
| 80 | + * @param int $parent_id=0 cat_id of parent to return only children of that category |
|
| 81 | + * @return array cat_id => cat_name |
|
| 82 | + * TODO mark subcats and so on! |
|
| 83 | + */ |
|
| 84 | 84 | function get_cats($perm_type,$parent_id=0) |
| 85 | 85 | { |
| 86 | 86 | $cats = $this->egw_cats->return_sorted_array(0,false,'','','',true,$parent_id); |
@@ -105,24 +105,24 @@ discard block |
||
| 105 | 105 | |
| 106 | 106 | |
| 107 | 107 | /** |
| 108 | - * gets name of category |
|
| 109 | - * |
|
| 110 | - * @author Lukas Weiss <[email protected]> |
|
| 111 | - * @param int $cat_id |
|
| 112 | - * @return mixed name of category |
|
| 113 | - */ |
|
| 108 | + * gets name of category |
|
| 109 | + * |
|
| 110 | + * @author Lukas Weiss <[email protected]> |
|
| 111 | + * @param int $cat_id |
|
| 112 | + * @return mixed name of category |
|
| 113 | + */ |
|
| 114 | 114 | static public function get_cat_name($cat_id) |
| 115 | 115 | { |
| 116 | 116 | return $GLOBALS['egw']->categories->id2name($cat_id); |
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | /** |
| 120 | - * gets userid of admin for given category |
|
| 121 | - * |
|
| 122 | - * @author Cornelius Weiss <[email protected]> |
|
| 123 | - * @param int $cat_id |
|
| 124 | - * @return int|null userid of cat admin or null for none set |
|
| 125 | - */ |
|
| 120 | + * gets userid of admin for given category |
|
| 121 | + * |
|
| 122 | + * @author Cornelius Weiss <[email protected]> |
|
| 123 | + * @param int $cat_id |
|
| 124 | + * @return int|null userid of cat admin or null for none set |
|
| 125 | + */ |
|
| 126 | 126 | static public function get_cat_admin($cat_id) |
| 127 | 127 | { |
| 128 | 128 | $cat_rights = self::get_rights($cat_id); |
@@ -194,11 +194,11 @@ discard block |
||
| 194 | 194 | } |
| 195 | 195 | |
| 196 | 196 | /** |
| 197 | - * gets all rights from all user for given cat |
|
| 198 | - * |
|
| 199 | - * @param int $cat_id |
|
| 200 | - * @return array userid => right |
|
| 201 | - */ |
|
| 197 | + * gets all rights from all user for given cat |
|
| 198 | + * |
|
| 199 | + * @param int $cat_id |
|
| 200 | + * @return array userid => right |
|
| 201 | + */ |
|
| 202 | 202 | static public function get_rights($cat_id) |
| 203 | 203 | { |
| 204 | 204 | return $GLOBALS['egw']->acl->get_all_rights('L'.$cat_id,'resources'); |
@@ -47,10 +47,10 @@ |
||
| 47 | 47 | const WRITABLE = 'share_rw'; |
| 48 | 48 | |
| 49 | 49 | /** |
| 50 | - * Modes for sharing files |
|
| 51 | - * |
|
| 52 | - * @var array |
|
| 53 | - */ |
|
| 50 | + * Modes for sharing files |
|
| 51 | + * |
|
| 52 | + * @var array |
|
| 53 | + */ |
|
| 54 | 54 | static $modes = array( |
| 55 | 55 | self::ATTACH => array( |
| 56 | 56 | 'label' => 'Attachment', |
@@ -63,10 +63,10 @@ discard block |
||
| 63 | 63 | static public $certificate_regexp = '/-----BEGIN CERTIFICATE-----.*-----END CERTIFICATE-----\r?\n?/s'; |
| 64 | 64 | |
| 65 | 65 | /** |
| 66 | - * Encryption type of sign |
|
| 67 | - * |
|
| 68 | - * @var String; |
|
| 69 | - */ |
|
| 66 | + * Encryption type of sign |
|
| 67 | + * |
|
| 68 | + * @var String; |
|
| 69 | + */ |
|
| 70 | 70 | const TYPE_SIGN = 'smime_sign'; |
| 71 | 71 | |
| 72 | 72 | /** |
@@ -99,14 +99,14 @@ discard block |
||
| 99 | 99 | |
| 100 | 100 | |
| 101 | 101 | /** |
| 102 | - * Constructor. |
|
| 103 | - * |
|
| 104 | - * @param Horde_Crypt_Smime $params S/MIME object. |
|
| 105 | - */ |
|
| 106 | - public function __construct($params = array()) |
|
| 107 | - { |
|
| 102 | + * Constructor. |
|
| 103 | + * |
|
| 104 | + * @param Horde_Crypt_Smime $params S/MIME object. |
|
| 105 | + */ |
|
| 106 | + public function __construct($params = array()) |
|
| 107 | + { |
|
| 108 | 108 | parent::__construct($params); |
| 109 | - } |
|
| 109 | + } |
|
| 110 | 110 | |
| 111 | 111 | /** |
| 112 | 112 | * Check if a given mime type is smime type |
@@ -142,8 +142,8 @@ discard block |
||
| 142 | 142 | public static function getSmimeType (Horde_Mime_Part $_mime_part) |
| 143 | 143 | { |
| 144 | 144 | if (($type = $_mime_part->getContentTypeParameter('smime-type'))) { |
| 145 | - return strtolower($type); |
|
| 146 | - } |
|
| 145 | + return strtolower($type); |
|
| 146 | + } |
|
| 147 | 147 | // |
| 148 | 148 | $protocol = $_mime_part->getContentTypeParameter('protocol'); |
| 149 | 149 | switch ($_mime_part->getType()) |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | return self::isSmime($protocol) ? self::SMIME_TYPE_SIGNED_DATA : null; |
| 153 | 153 | } |
| 154 | 154 | |
| 155 | - return null; |
|
| 155 | + return null; |
|
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | /** |
@@ -210,16 +210,16 @@ discard block |
||
| 210 | 210 | } |
| 211 | 211 | |
| 212 | 212 | /** |
| 213 | - * Extract the contents from signed S/MIME data. |
|
| 214 | - * |
|
| 215 | - * @param string $data The signed S/MIME data. |
|
| 216 | - * |
|
| 217 | - * @return Horde_Mime_Part returns content of signed message as mime part object |
|
| 218 | - */ |
|
| 219 | - public function extractSignedContents($data) |
|
| 220 | - { |
|
| 221 | - return Horde_Mime_Part::parseMessage(parent::extractSignedContents($data), array('forcemime' => true)); |
|
| 222 | - } |
|
| 213 | + * Extract the contents from signed S/MIME data. |
|
| 214 | + * |
|
| 215 | + * @param string $data The signed S/MIME data. |
|
| 216 | + * |
|
| 217 | + * @return Horde_Mime_Part returns content of signed message as mime part object |
|
| 218 | + */ |
|
| 219 | + public function extractSignedContents($data) |
|
| 220 | + { |
|
| 221 | + return Horde_Mime_Part::parseMessage(parent::extractSignedContents($data), array('forcemime' => true)); |
|
| 222 | + } |
|
| 223 | 223 | |
| 224 | 224 | /** |
| 225 | 225 | * Verify a signature |
@@ -84,9 +84,9 @@ |
||
| 84 | 84 | $a_label = is_array($a["label"]) ? $a["label"]["label"] : $a["label"]; |
| 85 | 85 | $b_label = is_array($b["label"]) ? $b["label"]["label"] : $b["label"]; |
| 86 | 86 | |
| 87 | - similar_text($query, $a_label, $percent_a); |
|
| 88 | - similar_text($query, $b_label, $percent_b); |
|
| 89 | - return $percent_a === $percent_b ? 0 : ($percent_a > $percent_b ? -1 : 1); |
|
| 87 | + similar_text($query, $a_label, $percent_a); |
|
| 88 | + similar_text($query, $b_label, $percent_b); |
|
| 89 | + return $percent_a === $percent_b ? 0 : ($percent_a > $percent_b ? -1 : 1); |
|
| 90 | 90 | }); |
| 91 | 91 | |
| 92 | 92 | // switch regular JSON response handling off |
@@ -962,14 +962,14 @@ |
||
| 962 | 962 | } |
| 963 | 963 | |
| 964 | 964 | /** |
| 965 | - * Parses a DateTime field and returns a unix timestamp. If the |
|
| 966 | - * field cannot be parsed then the original text is returned |
|
| 967 | - * unmodified. |
|
| 968 | - * |
|
| 969 | - * @param string $text The Icalendar datetime field value. |
|
| 970 | - * @param string $tzid =null A timezone identifier. |
|
| 971 | - * |
|
| 972 | - * @return integer A unix timestamp. |
|
| 965 | + * Parses a DateTime field and returns a unix timestamp. If the |
|
| 966 | + * field cannot be parsed then the original text is returned |
|
| 967 | + * unmodified. |
|
| 968 | + * |
|
| 969 | + * @param string $text The Icalendar datetime field value. |
|
| 970 | + * @param string $tzid =null A timezone identifier. |
|
| 971 | + * |
|
| 972 | + * @return integer A unix timestamp. |
|
| 973 | 973 | */ |
| 974 | 974 | private static function parseIcalDateTime($text, $tzid=null) |
| 975 | 975 | { |
@@ -134,11 +134,11 @@ |
||
| 134 | 134 | } |
| 135 | 135 | |
| 136 | 136 | /** |
| 137 | - * Create the path for an event |
|
| 138 | - * |
|
| 139 | - * @param array|int $event |
|
| 140 | - * @return string |
|
| 141 | - */ |
|
| 137 | + * Create the path for an event |
|
| 138 | + * |
|
| 139 | + * @param array|int $event |
|
| 140 | + * @return string |
|
| 141 | + */ |
|
| 142 | 142 | function get_path($event) |
| 143 | 143 | { |
| 144 | 144 | if (is_numeric($event) && self::$path_attr == 'id') |
@@ -501,7 +501,7 @@ discard block |
||
| 501 | 501 | } |
| 502 | 502 | $ids = Link\Storage::get_links($app, $id, $only_app, $order, $deleted, $limit); |
| 503 | 503 | if (empty($only_app) || $only_app == self::VFS_APPNAME || |
| 504 | - ($only_app[0] == '!' && $only_app != '!'.self::VFS_APPNAME)) |
|
| 504 | + ($only_app[0] == '!' && $only_app != '!'.self::VFS_APPNAME)) |
|
| 505 | 505 | { |
| 506 | 506 | if (($vfs_ids = self::list_attached($app,$id))) |
| 507 | 507 | { |
@@ -557,7 +557,7 @@ discard block |
||
| 557 | 557 | $links = Link\Storage::get_links($app,$ids,$only_app,$order,$deleted); |
| 558 | 558 | |
| 559 | 559 | if (empty($only_app) || $only_app == self::VFS_APPNAME || |
| 560 | - ($only_app[0] == '!' && $only_app != '!'.self::VFS_APPNAME)) |
|
| 560 | + ($only_app[0] == '!' && $only_app != '!'.self::VFS_APPNAME)) |
|
| 561 | 561 | { |
| 562 | 562 | // todo do that in a single query, eg. directory listing, too |
| 563 | 563 | foreach($ids as $id) |
@@ -776,7 +776,7 @@ discard block |
||
| 776 | 776 | |
| 777 | 777 | if (!isset($options['total'])) |
| 778 | 778 | { |
| 779 | - $options['total'] = count($result); |
|
| 779 | + $options['total'] = count($result); |
|
| 780 | 780 | } |
| 781 | 781 | if (isset($options['exclude'])) |
| 782 | 782 | { |
@@ -92,20 +92,20 @@ discard block |
||
| 92 | 92 | */ |
| 93 | 93 | var $clientProperties; |
| 94 | 94 | /** |
| 95 | - * Set Logging |
|
| 96 | - * |
|
| 97 | - * @var string |
|
| 98 | - * off = false; |
|
| 99 | - */ |
|
| 95 | + * Set Logging |
|
| 96 | + * |
|
| 97 | + * @var string |
|
| 98 | + * off = false; |
|
| 99 | + */ |
|
| 100 | 100 | var $log = false; |
| 101 | 101 | var $logfile="/tmp/log-vcard"; |
| 102 | 102 | /** |
| 103 | - * Constructor |
|
| 104 | - * |
|
| 105 | - * @param string $contact_app the current application |
|
| 106 | - * @param string $_contentType the content type (version) |
|
| 107 | - * @param array $_clientProperties client properties |
|
| 108 | - */ |
|
| 103 | + * Constructor |
|
| 104 | + * |
|
| 105 | + * @param string $contact_app the current application |
|
| 106 | + * @param string $_contentType the content type (version) |
|
| 107 | + * @param array $_clientProperties client properties |
|
| 108 | + */ |
|
| 109 | 109 | function __construct($contact_app='addressbook', $_contentType='text/x-vcard', &$_clientProperties = array()) |
| 110 | 110 | { |
| 111 | 111 | parent::__construct($contact_app); |
@@ -128,15 +128,15 @@ discard block |
||
| 128 | 128 | $this->supportedFields = $this->databaseFields; |
| 129 | 129 | } |
| 130 | 130 | /** |
| 131 | - * import a vard into addressbook |
|
| 132 | - * |
|
| 133 | - * @param string $_vcard the vcard |
|
| 134 | - * @param int/string $_abID =null the internal addressbook id or !$_abID for a new enty |
|
| 135 | - * @param boolean $merge =false merge data with existing entry |
|
| 136 | - * @param string $charset The encoding charset for $text. Defaults to |
|
| 137 | - * utf-8 for new format, iso-8859-1 for old format. |
|
| 138 | - * @return int contact id |
|
| 139 | - */ |
|
| 131 | + * import a vard into addressbook |
|
| 132 | + * |
|
| 133 | + * @param string $_vcard the vcard |
|
| 134 | + * @param int/string $_abID =null the internal addressbook id or !$_abID for a new enty |
|
| 135 | + * @param boolean $merge =false merge data with existing entry |
|
| 136 | + * @param string $charset The encoding charset for $text. Defaults to |
|
| 137 | + * utf-8 for new format, iso-8859-1 for old format. |
|
| 138 | + * @return int contact id |
|
| 139 | + */ |
|
| 140 | 140 | function addVCard($_vcard, $_abID=null, $merge=false, $charset=null) |
| 141 | 141 | { |
| 142 | 142 | if (!($contact = $this->vcardtoegw($_vcard, $charset))) return false; |
@@ -177,19 +177,19 @@ discard block |
||
| 177 | 177 | $contact['id'] = $_abID; |
| 178 | 178 | } |
| 179 | 179 | else |
| 180 | - { |
|
| 180 | + { |
|
| 181 | 181 | // If photo is set, we want to update it |
| 182 | 182 | $contact['photo_unchanged'] = false; |
| 183 | - if (is_array($contact['cat_id'])) |
|
| 183 | + if (is_array($contact['cat_id'])) |
|
| 184 | 184 | { |
| 185 | 185 | $contact['cat_id'] = implode(',',$this->find_or_add_categories($contact['cat_id'], -1)); |
| 186 | 186 | } |
| 187 | - } |
|
| 188 | - if (isset($contact['owner']) && $contact['owner'] != $this->user) |
|
| 189 | - { |
|
| 190 | - $contact['private'] = 0; // foreign contacts are never private! |
|
| 191 | - } |
|
| 192 | - if ($this->log) |
|
| 187 | + } |
|
| 188 | + if (isset($contact['owner']) && $contact['owner'] != $this->user) |
|
| 189 | + { |
|
| 190 | + $contact['private'] = 0; // foreign contacts are never private! |
|
| 191 | + } |
|
| 192 | + if ($this->log) |
|
| 193 | 193 | { |
| 194 | 194 | error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" . |
| 195 | 195 | array2string($contact)."\n",3,$this->logfile); |
@@ -198,13 +198,13 @@ discard block |
||
| 198 | 198 | } |
| 199 | 199 | |
| 200 | 200 | /** |
| 201 | - * return a vcard |
|
| 202 | - * |
|
| 203 | - * @param int/string $_id the id of the contact |
|
| 204 | - * @param string $_charset ='UTF-8' encoding of the vcard, default UTF-8 |
|
| 205 | - * @param boolean $extra_charset_attribute =true GroupDAV/CalDAV dont need the charset attribute and some clients have problems with it |
|
| 206 | - * @return string containing the vcard |
|
| 207 | - */ |
|
| 201 | + * return a vcard |
|
| 202 | + * |
|
| 203 | + * @param int/string $_id the id of the contact |
|
| 204 | + * @param string $_charset ='UTF-8' encoding of the vcard, default UTF-8 |
|
| 205 | + * @param boolean $extra_charset_attribute =true GroupDAV/CalDAV dont need the charset attribute and some clients have problems with it |
|
| 206 | + * @return string containing the vcard |
|
| 207 | + */ |
|
| 208 | 208 | function getVCard($_id,$_charset='UTF-8',$extra_charset_attribute=true) |
| 209 | 209 | { |
| 210 | 210 | $vCard = new Horde_Icalendar_Vcard($this->version); |
@@ -554,14 +554,14 @@ discard block |
||
| 554 | 554 | } |
| 555 | 555 | |
| 556 | 556 | /** |
| 557 | - * Parses a string containing vCard data. |
|
| 558 | - * |
|
| 559 | - * @param string $_vcard The data to parse. |
|
| 560 | - * @param string $charset The encoding charset for $text. Defaults to |
|
| 561 | - * utf-8 for new format, iso-8859-1 for old format. |
|
| 562 | - * |
|
| 563 | - * @return array|boolean The contact data or false on errors. |
|
| 564 | - */ |
|
| 557 | + * Parses a string containing vCard data. |
|
| 558 | + * |
|
| 559 | + * @param string $_vcard The data to parse. |
|
| 560 | + * @param string $charset The encoding charset for $text. Defaults to |
|
| 561 | + * utf-8 for new format, iso-8859-1 for old format. |
|
| 562 | + * |
|
| 563 | + * @return array|boolean The contact data or false on errors. |
|
| 564 | + */ |
|
| 565 | 565 | function vcardtoegw($_vcard, $charset=null) |
| 566 | 566 | { |
| 567 | 567 | // the horde class does the charset conversion. DO NOT CONVERT HERE. |
@@ -820,7 +820,7 @@ discard block |
||
| 820 | 820 | } |
| 821 | 821 | break; |
| 822 | 822 | case 'TEL;OTHER;VOICE': |
| 823 | - if (!in_array('TEL;OTHER', $rowNames) |
|
| 823 | + if (!in_array('TEL;OTHER', $rowNames) |
|
| 824 | 824 | && !isset($finalRowNames['TEL;OTHER'])) |
| 825 | 825 | { |
| 826 | 826 | $finalRowNames['TEL;OTHER'] = $vcardKey; |