diff options
| author | zotlabs <mike@macgirvin.com> | 2018-03-01 16:16:58 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-03-01 16:16:58 -0800 |
| commit | 49bd859136f4aab63878ce5fedfbc541a644e843 (patch) | |
| tree | 56b46062dcb3cf42a0ae8ea8b82ca9cb7e99df6c | |
| parent | 93a11ade045bb6767952f5bfdb278b3e9d463d2c (diff) | |
| parent | d32f583fda07080f0c331618893d5df91050af1d (diff) | |
| download | volse-hubzilla-49bd859136f4aab63878ce5fedfbc541a644e843.tar.gz volse-hubzilla-49bd859136f4aab63878ce5fedfbc541a644e843.tar.bz2 volse-hubzilla-49bd859136f4aab63878ce5fedfbc541a644e843.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
| -rw-r--r-- | Zotlabs/Web/HTTPSig.php | 117 | ||||
| -rwxr-xr-x | boot.php | 2 | ||||
| -rw-r--r-- | include/zot.php | 10 | ||||
| -rw-r--r-- | tests/unit/Web/HttpSigTest.php | 125 | ||||
| -rw-r--r-- | util/hmessages.po | 381 | ||||
| -rw-r--r-- | vendor/composer/ClassLoader.php | 15 | ||||
| -rw-r--r-- | vendor/composer/autoload_classmap.php | 221 | ||||
| -rw-r--r-- | vendor/composer/autoload_static.php | 268 | ||||
| -rw-r--r-- | view/php/theme_init.php | 2 | ||||
| -rw-r--r-- | view/tpl/generic_addon_settings.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/settings.tpl | 16 | ||||
| -rwxr-xr-x | view/tpl/settings_addons.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/settings_display.tpl | 12 | ||||
| -rwxr-xr-x | view/tpl/settings_features.tpl | 4 |
14 files changed, 943 insertions, 236 deletions
diff --git a/Zotlabs/Web/HTTPSig.php b/Zotlabs/Web/HTTPSig.php index a27edb73d..9bcc2e5ec 100644 --- a/Zotlabs/Web/HTTPSig.php +++ b/Zotlabs/Web/HTTPSig.php @@ -3,16 +3,24 @@ namespace Zotlabs\Web; /** - * Implements HTTP Signatures per draft-cavage-http-signatures-07 + * @brief Implements HTTP Signatures per draft-cavage-http-signatures-07. + * + * @see https://tools.ietf.org/html/draft-cavage-http-signatures-07 */ - - class HTTPSig { - // See RFC5843 - - static function generate_digest($body,$set = true) { - $digest = base64_encode(hash('sha256',$body,true)); + /** + * @brief RFC5843 + * + * @see https://tools.ietf.org/html/rfc5843 + * + * @param string $body The value to create the digest for + * @param boolean $set (optional, default true) + * If set send a Digest HTTP header + * @return string The generated digest of $body + */ + static function generate_digest($body, $set = true) { + $digest = base64_encode(hash('sha256', $body, true)); if($set) { header('Digest: SHA-256=' . $digest); @@ -40,6 +48,7 @@ class HTTPSig { if(is_array($data) && $data['header']) { if(! $data['success']) return $result; + $h = new \Zotlabs\Web\HTTPHeaders($data['header']); $headers = $h->fetcharr(); $body = $data['body']; @@ -47,7 +56,7 @@ class HTTPSig { else { $headers = []; - $headers['(request-target)'] = + $headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI']; foreach($_SERVER as $k => $v) { @@ -78,7 +87,7 @@ class HTTPSig { $result['header_signed'] = true; $signed_headers = $sig_block['headers']; - if(! $signed_headers) + if(! $signed_headers) $signed_headers = [ 'date' ]; $signed_data = ''; @@ -131,7 +140,7 @@ class HTTPSig { if($digest[0] === 'SHA-512') $hashalg = 'sha512'; - // The explode operation will have stripped the '=' padding, so compare against unpadded base64 + // The explode operation will have stripped the '=' padding, so compare against unpadded base64 if(rtrim(base64_encode(hash($hashalg,$body,true)),'=') === $digest[1]) { $result['content_valid'] = true; } @@ -146,7 +155,7 @@ class HTTPSig { if($digest[0] === 'SHA-512') $hashalg = 'sha512'; - // The explode operation will have stripped the '=' padding, so compare against unpadded base64 + // The explode operation will have stripped the '=' padding, so compare against unpadded base64 if(rtrim(base64_encode(hash($hashalg,$_POST['data'],true)),'=') === $digest[1]) { $result['content_valid'] = true; } @@ -155,9 +164,15 @@ class HTTPSig { logger('Content_Valid: ' . (($result['content_valid']) ? 'true' : 'false')); return $result; - } + /** + * @brief + * + * @param string $id + * @return boolean|string + * false if no pub key found, otherwise return the pub key + */ function get_activitypub_key($id) { if(strpos($id,'acct:') === 0) { @@ -180,19 +195,33 @@ class HTTPSig { $j = json_decode($r,true); if($j['id'] !== $id) - return false; + return false; + if(array_key_exists('publicKey',$j) && array_key_exists('publicKeyPem',$j['publicKey'])) { return($j['publicKey']['publicKeyPem']); } } + return false; } - - - - static function create_sig($request,$head,$prvkey,$keyid = 'Key',$send_headers = false,$auth = false,$alg = 'sha256', - $crypt_key = null, $crypt_algo = 'aes256ctr') { + /** + * @brief + * + * @param string $request + * @param array $head + * @param string $prvkey + * @param string $keyid (optional, default 'Key') + * @param boolean $send_headers (optional, default false) + * If set send a HTTP header + * @param boolean $auth (optional, default false) + * @param string $alg (optional, default 'sha256') + * @param string $crypt_key (optional, default null) + * @param string $crypt_algo (optional, default 'aes256ctr') + * @return array + */ + static function create_sig($request, $head, $prvkey, $keyid = 'Key', $send_headers = false, $auth = false, + $alg = 'sha256', $crypt_key = null, $crypt_algo = 'aes256ctr') { $return_headers = []; @@ -212,7 +241,7 @@ class HTTPSig { $x = crypto_encapsulate($headerval,$crypt_key,$crypt_algo); $headerval = 'iv="' . $x['iv'] . '",key="' . $x['key'] . '",alg="' . $x['alg'] . '",data="' . $x['data'] . '"'; } - + if($auth) { $sighead = 'Authorization: Signature ' . $headerval; } @@ -236,12 +265,20 @@ class HTTPSig { else { $return_headers[] = $sighead; } + return $return_headers; } - - - static function sign($request,$head,$prvkey,$alg = 'sha256') { + /** + * @brief + * + * @param string $request + * @param array $head + * @param string $prvkey + * @param string $alg (optional) default 'sha256' + * @return array + */ + static function sign($request, $head, $prvkey, $alg = 'sha256') { $ret = []; @@ -250,27 +287,38 @@ class HTTPSig { if($request) { $headers = '(request-target)' . ': ' . trim($request) . "\n"; $fields = '(request-target)'; - } + } if($head) { foreach($head as $k => $v) { $headers .= strtolower($k) . ': ' . trim($v) . "\n"; if($fields) $fields .= ' '; + $fields .= strtolower($k); } // strip the trailing linefeed $headers = rtrim($headers,"\n"); } - $sig = base64_encode(rsa_sign($headers,$prvkey,$alg)); + $sig = base64_encode(rsa_sign($headers,$prvkey,$alg)); $ret['headers'] = $fields; $ret['signature'] = $sig; - + return $ret; } + /** + * @brief + * + * @param string $header + * @return array associate array with + * - \e string \b keyID + * - \e string \b algorithm + * - \e array \b headers + * - \e string \b signature + */ static function parse_sigheader($header) { $ret = []; @@ -297,12 +345,23 @@ class HTTPSig { } - static function decrypt_sigheader($header,$prvkey = null) { + /** + * @brief + * + * @param string $header + * @param string $prvkey (optional), if not set use site private key + * @return array|string associative array, empty string if failue + * - \e string \b iv + * - \e string \b key + * - \e string \b alg + * - \e string \b data + */ + static function decrypt_sigheader($header, $prvkey = null) { $iv = $key = $alg = $data = null; if(! $prvkey) { - $prvkey = get_config('system','prvkey'); + $prvkey = get_config('system', 'prvkey'); } $matches = []; @@ -319,10 +378,8 @@ class HTTPSig { if($iv && $key && $alg && $data) { return crypto_unencapsulate([ 'iv' => $iv, 'key' => $key, 'alg' => $alg, 'data' => $data ] , $prvkey); } - return ''; + return ''; } } - - @@ -50,7 +50,7 @@ require_once('include/attach.php'); require_once('include/bbcode.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '3.3' ); +define ( 'STD_VERSION', '3.3.1' ); define ( 'ZOT_REVISION', '1.3' ); define ( 'DB_UPDATE_VERSION', 1206 ); diff --git a/include/zot.php b/include/zot.php index 0cfc370a2..25e30ccbc 100644 --- a/include/zot.php +++ b/include/zot.php @@ -171,6 +171,8 @@ function zot_build_packet($channel, $type = 'notify', $recipients = null, $remot * packet type: one of 'ping', 'pickup', 'purge', 'refresh', 'keychange', 'force_refresh', 'notify', 'auth_check' * @param array $recipients * envelope information, array ( 'guid' => string, 'guid_sig' => string ); empty for public posts + * @param string msg + * optional message * @param string $remote_key * optional public site key of target hub used to encrypt entire packet * NOTE: remote_key and encrypted packets are required for 'auth_check' packets, optional for all others @@ -299,7 +301,7 @@ function zot_zot($url, $data, $channel = null,$crypto = null) { if($channel) { $headers['X-Zot-Token'] = random_string(); $hash = \Zotlabs\Web\HTTPSig::generate_digest($data,false); - $headers['X-Zot-Digest'] = 'SHA-256=' . $hash; + $headers['X-Zot-Digest'] = 'SHA-256=' . $hash; $h = \Zotlabs\Web\HTTPSig::create_sig('',$headers,$channel['channel_prvkey'],'acct:' . $channel['channel_address'] . '@' . \App::get_hostname(),false,false,'sha512',(($crypto) ? $crypto['hubloc_sitekey'] : ''), (($crypto) ? zot_best_algorithm($crypto['site_crypto']) : '')); } @@ -393,7 +395,7 @@ function zot_refresh($them, $channel = null, $force = false) { if($s && intval($s[0]['site_dead']) && (! $force)) { logger('zot_refresh: site ' . $url . ' is marked dead and force flag is not set. Cancelling operation.'); return false; - } + } $token = random_string(); @@ -1156,7 +1158,7 @@ function zot_process_response($hub, $arr, $outq) { * and also that the signer and the sender match. * If that happens, we do not need to fetch/pickup the message - we have it already and it is verified. * Translate it into the form we need for zot_import() and import it. - * + * * Otherwise send back a pickup message, using our message tracking ID ($arr['secret']), which we will sign with our site * private key. * The entire pickup message is encrypted with the remote site's public key. @@ -5090,7 +5092,7 @@ function zot_reply_refresh($sender, $recipients) { function zot6_check_sig() { $ret = [ 'success' => false ]; - + logger('server: ' . print_r($_SERVER,true), LOGGER_DATA); if(array_key_exists('HTTP_SIGNATURE',$_SERVER)) { diff --git a/tests/unit/Web/HttpSigTest.php b/tests/unit/Web/HttpSigTest.php new file mode 100644 index 000000000..18f2ce92b --- /dev/null +++ b/tests/unit/Web/HttpSigTest.php @@ -0,0 +1,125 @@ +<?php +/* + * Copyright (c) 2018 Hubzilla + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +namespace Zotlabs\Tests\Unit\Web; + +use phpmock\phpunit\PHPMock; +use Zotlabs\Tests\Unit\UnitTestCase; + +use Zotlabs\Web\HTTPSig; + +/** + * @brief Unit Test case for HTTPSig class. + * + * @covers Zotlabs\Web\HTTPSig + */ +class PermissionDescriptionTest extends UnitTestCase { + + use PHPMock; + + /** + * @dataProvider generate_digestProvider + */ + function testGenerate_digest($text, $digest) { + $this->assertSame( + $digest, + HTTPSig::generate_digest($text, false) + ); + } + public function generate_digestProvider() { + return [ + 'empty body text' => [ + '', + '47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=' + ], + 'sample body text' => [ + 'body text', + '2fu8kUkvuzuo5XyhWwORNOcJgDColXgxWkw1T5EXzPI=' + ], + 'NULL body text' => [ + null, + '47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=' + ], + ]; + } + + function testGeneratedDigestsOfDifferentTextShouldNotBeEqual() { + $this->assertNotSame( + HTTPSig::generate_digest('text1', false), + HTTPSig::generate_digest('text2', false) + ); + } + + /** + * Process separation needed for header() check. + * @runInSeparateProcess + */ + function testGenerate_digestSendsHttpHeader() { + $ret = HTTPSig::generate_digest('body text', true); + + $this->assertSame('2fu8kUkvuzuo5XyhWwORNOcJgDColXgxWkw1T5EXzPI=', $ret); + $this->assertContains( + 'Digest: SHA-256=2fu8kUkvuzuo5XyhWwORNOcJgDColXgxWkw1T5EXzPI=', + xdebug_get_headers(), + 'HTTP header Digest does not match' + ); + } + + /** + * @uses ::crypto_unencapsulate + */ + function testDecrypt_sigheader() { + $header = 'Header: iv="value_iv" key="value_key" alg="value_alg" data="value_data"'; + $result = [ + 'iv' => 'value_iv', + 'key' => 'value_key', + 'alg' => 'value_alg', + 'data' => 'value_data' + ]; + + $this->assertSame($result, HTTPSig::decrypt_sigheader($header, 'site private key')); + } + /** + * @uses ::crypto_unencapsulate + */ + function testDecrypt_sigheaderUseSitePrivateKey() { + // Create a stub for global function get_config() with expectation + $t = $this->getFunctionMock('Zotlabs\Web', 'get_config'); + $t->expects($this->once())->willReturn('system.prvkey'); + + $header = 'Header: iv="value_iv" key="value_key" alg="value_alg" data="value_data"'; + $result = [ + 'iv' => 'value_iv', + 'key' => 'value_key', + 'alg' => 'value_alg', + 'data' => 'value_data' + ]; + + $this->assertSame($result, HTTPSig::decrypt_sigheader($header)); + } + function testDecrypt_sigheaderIncompleteHeaderShouldReturnEmptyString() { + $header = 'Header: iv="value_iv" key="value_key"'; + + $this->assertEmpty(HTTPSig::decrypt_sigheader($header, 'site private key')); + } +} diff --git a/util/hmessages.po b/util/hmessages.po index 98091a368..ee7266010 100644 --- a/util/hmessages.po +++ b/util/hmessages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.3\n" +"Project-Id-Version: 3.3.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-28 08:31+0100\n" +"POT-Creation-Date: 2018-03-01 08:51+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -149,7 +149,7 @@ msgstr "" #: ../../Zotlabs/Module/Cdav.php:1182 ../../Zotlabs/Module/New_channel.php:130 #: ../../Zotlabs/Module/Settings/Channel.php:473 #: ../../Zotlabs/Module/Connedit.php:918 ../../Zotlabs/Module/Profiles.php:798 -#: ../../Zotlabs/Module/Register.php:226 ../../include/selectors.php:49 +#: ../../Zotlabs/Module/Register.php:224 ../../include/selectors.php:49 #: ../../include/selectors.php:66 ../../include/selectors.php:104 #: ../../include/selectors.php:140 ../../include/event.php:1315 #: ../../include/event.php:1322 ../../include/connections.php:689 @@ -216,7 +216,7 @@ msgstr "" #: ../../Zotlabs/Module/Register.php:77 #: ../../Zotlabs/Module/Cover_photo.php:281 #: ../../Zotlabs/Module/Cover_photo.php:294 -#: ../../Zotlabs/Module/Display.php:405 ../../Zotlabs/Module/Network.php:15 +#: ../../Zotlabs/Module/Display.php:406 ../../Zotlabs/Module/Network.php:15 #: ../../Zotlabs/Module/Filestorage.php:15 #: ../../Zotlabs/Module/Filestorage.php:70 #: ../../Zotlabs/Module/Filestorage.php:85 @@ -426,7 +426,7 @@ msgstr "" #: ../../Zotlabs/Module/Wiki.php:206 ../../Zotlabs/Module/Pdledit.php:98 #: ../../Zotlabs/Module/Poke.php:200 ../../Zotlabs/Module/Connedit.php:887 #: ../../Zotlabs/Module/Chat.php:196 ../../Zotlabs/Module/Chat.php:242 -#: ../../Zotlabs/Module/Email_validation.php:39 +#: ../../Zotlabs/Module/Email_validation.php:40 #: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Defperms.php:249 #: ../../Zotlabs/Module/Group.php:87 ../../Zotlabs/Module/Profiles.php:726 #: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149 @@ -454,7 +454,7 @@ msgstr "" #: ../../addon/rtof/rtof.php:101 ../../addon/jappixmini/jappixmini.php:371 #: ../../addon/superblock/superblock.php:120 ../../addon/nofed/nofed.php:80 #: ../../addon/redred/redred.php:119 ../../addon/logrot/logrot.php:35 -#: ../../addon/frphotos/frphotos.php:96 ../../addon/pubcrawl/pubcrawl.php:1054 +#: ../../addon/frphotos/frphotos.php:96 ../../addon/pubcrawl/pubcrawl.php:1053 #: ../../addon/chords/Mod_Chords.php:60 ../../addon/libertree/libertree.php:85 #: ../../addon/flattrwidget/flattrwidget.php:124 #: ../../addon/statusnet/statusnet.php:322 @@ -471,7 +471,7 @@ msgid "Submit" msgstr "" #: ../../Zotlabs/Module/Articles.php:38 ../../Zotlabs/Module/Articles.php:179 -#: ../../Zotlabs/Lib/Apps.php:229 ../../include/features.php:132 +#: ../../Zotlabs/Lib/Apps.php:229 ../../include/features.php:124 #: ../../include/nav.php:469 msgid "Articles" msgstr "" @@ -1523,24 +1523,24 @@ msgid "You have created %1$.0f of %2$.0f allowed channels." msgstr "" #: ../../Zotlabs/Module/New_channel.php:132 -#: ../../Zotlabs/Module/Register.php:256 +#: ../../Zotlabs/Module/Register.php:254 msgid "Name or caption" msgstr "" #: ../../Zotlabs/Module/New_channel.php:132 -#: ../../Zotlabs/Module/Register.php:256 +#: ../../Zotlabs/Module/Register.php:254 msgid "" "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation " "Group\"" msgstr "" #: ../../Zotlabs/Module/New_channel.php:134 -#: ../../Zotlabs/Module/Register.php:258 +#: ../../Zotlabs/Module/Register.php:256 msgid "Choose a short nickname" msgstr "" #: ../../Zotlabs/Module/New_channel.php:134 -#: ../../Zotlabs/Module/Register.php:258 +#: ../../Zotlabs/Module/Register.php:256 #, php-format msgid "" "Your nickname will be used to create an easy to remember channel address e." @@ -1548,17 +1548,17 @@ msgid "" msgstr "" #: ../../Zotlabs/Module/New_channel.php:135 -#: ../../Zotlabs/Module/Register.php:259 +#: ../../Zotlabs/Module/Register.php:257 msgid "Channel role and privacy" msgstr "" #: ../../Zotlabs/Module/New_channel.php:135 -#: ../../Zotlabs/Module/Register.php:259 +#: ../../Zotlabs/Module/Register.php:257 msgid "Select a channel role with your privacy requirements." msgstr "" #: ../../Zotlabs/Module/New_channel.php:135 -#: ../../Zotlabs/Module/Register.php:259 +#: ../../Zotlabs/Module/Register.php:257 msgid "Read more about roles" msgstr "" @@ -2228,7 +2228,7 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Plugins.php:259 #: ../../Zotlabs/Module/Admin/Themes.php:72 ../../Zotlabs/Module/Thing.php:89 #: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:46 -#: ../../Zotlabs/Module/Display.php:409 ../../Zotlabs/Module/Filestorage.php:24 +#: ../../Zotlabs/Module/Display.php:410 ../../Zotlabs/Module/Filestorage.php:24 #: ../../Zotlabs/Module/Admin.php:62 ../../include/items.php:3569 msgid "Item not found." msgstr "" @@ -2278,6 +2278,7 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Plugins.php:344 #: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:242 +#: ../../Zotlabs/Widget/Newmember.php:55 #: ../../Zotlabs/Widget/Settings_menu.php:133 ../../include/nav.php:105 #: ../../include/nav.php:192 msgid "Settings" @@ -2704,7 +2705,7 @@ msgid "Site" msgstr "" #: ../../Zotlabs/Module/Admin/Site.php:290 -#: ../../Zotlabs/Module/Register.php:271 +#: ../../Zotlabs/Module/Register.php:269 msgid "Registration" msgstr "" @@ -3964,7 +3965,11 @@ msgid "Affinity Slider Settings" msgstr "" #: ../../Zotlabs/Module/Settings/Featured.php:64 -msgid "Feature/Addon Settings" +msgid "Addon Settings" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Featured.php:65 +msgid "Please save/submit changes to any panel before opening another." msgstr "" #: ../../Zotlabs/Module/Settings/Display.php:139 @@ -5844,11 +5849,16 @@ msgstr "" msgid "Unknown error" msgstr "" -#: ../../Zotlabs/Module/Email_validation.php:35 -msgid "Email Verification Required" +#: ../../Zotlabs/Module/Email_validation.php:24 +#: ../../Zotlabs/Module/Email_resend.php:12 +msgid "Token verification failed." msgstr "" #: ../../Zotlabs/Module/Email_validation.php:36 +msgid "Email Verification Required" +msgstr "" + +#: ../../Zotlabs/Module/Email_validation.php:37 #, php-format msgid "" "A verification token was sent to your email address [%s]. Enter that token " @@ -5856,11 +5866,11 @@ msgid "" "for delivery, and check your spam folder if you do not see the message." msgstr "" -#: ../../Zotlabs/Module/Email_validation.php:37 +#: ../../Zotlabs/Module/Email_validation.php:38 msgid "Resend Email" msgstr "" -#: ../../Zotlabs/Module/Email_validation.php:40 +#: ../../Zotlabs/Module/Email_validation.php:41 msgid "Validation token" msgstr "" @@ -6097,7 +6107,8 @@ msgstr "" msgid "Relation" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:739 ../../include/datetime.php:58 +#: ../../Zotlabs/Module/Profiles.php:739 ../../Zotlabs/Widget/Newmember.php:53 +#: ../../include/datetime.php:58 msgid "Miscellaneous" msgstr "" @@ -6272,12 +6283,12 @@ msgstr "" msgid "Edit your default profile" msgstr "" -#: ../../Zotlabs/Module/Go.php:38 +#: ../../Zotlabs/Module/Go.php:38 ../../Zotlabs/Widget/Newmember.php:43 msgid "View friend suggestions" msgstr "" -#: ../../Zotlabs/Module/Go.php:39 -msgid "View the directory to find other interesting channels" +#: ../../Zotlabs/Module/Go.php:39 ../../Zotlabs/Widget/Newmember.php:42 +msgid "View the channel directory" msgstr "" #: ../../Zotlabs/Module/Go.php:40 @@ -6355,7 +6366,7 @@ msgstr "" #: ../../Zotlabs/Module/Cards.php:42 ../../Zotlabs/Module/Cards.php:181 #: ../../Zotlabs/Lib/Apps.php:230 ../../include/conversation.php:1890 -#: ../../include/features.php:122 ../../include/nav.php:458 +#: ../../include/features.php:114 ../../include/nav.php:458 msgid "Cards" msgstr "" @@ -6379,7 +6390,7 @@ msgstr "" msgid "Administrator" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:25 ../../Zotlabs/Module/Register.php:234 +#: ../../Zotlabs/Module/Siteinfo.php:25 ../../Zotlabs/Module/Register.php:232 msgid "Terms of Service" msgstr "" @@ -6607,7 +6618,7 @@ msgid "*" msgstr "" #: ../../Zotlabs/Module/Sources.php:96 -#: ../../Zotlabs/Widget/Settings_menu.php:125 ../../include/features.php:238 +#: ../../Zotlabs/Widget/Settings_menu.php:125 ../../include/features.php:274 msgid "Channel Sources" msgstr "" @@ -7096,85 +7107,85 @@ msgstr "" msgid "Passwords do not match." msgstr "" -#: ../../Zotlabs/Module/Register.php:127 ../../Zotlabs/Module/Register.php:137 -msgid "" -"Registration successful. Please check your email for validation instructions." +#: ../../Zotlabs/Module/Register.php:132 +msgid "Registration successful. Continue to create your first channel..." msgstr "" #: ../../Zotlabs/Module/Register.php:135 -msgid "Registration successful. Continue to create your first channel..." +msgid "" +"Registration successful. Please check your email for validation instructions." msgstr "" -#: ../../Zotlabs/Module/Register.php:144 +#: ../../Zotlabs/Module/Register.php:142 msgid "Your registration is pending approval by the site owner." msgstr "" -#: ../../Zotlabs/Module/Register.php:147 +#: ../../Zotlabs/Module/Register.php:145 msgid "Your registration can not be processed." msgstr "" -#: ../../Zotlabs/Module/Register.php:194 +#: ../../Zotlabs/Module/Register.php:192 msgid "Registration on this hub is disabled." msgstr "" -#: ../../Zotlabs/Module/Register.php:203 +#: ../../Zotlabs/Module/Register.php:201 msgid "Registration on this hub is by approval only." msgstr "" -#: ../../Zotlabs/Module/Register.php:204 +#: ../../Zotlabs/Module/Register.php:202 msgid "<a href=\"pubsites\">Register at another affiliated hub.</a>" msgstr "" -#: ../../Zotlabs/Module/Register.php:214 +#: ../../Zotlabs/Module/Register.php:212 msgid "" "This site has exceeded the number of allowed daily account registrations. " "Please try again tomorrow." msgstr "" -#: ../../Zotlabs/Module/Register.php:240 +#: ../../Zotlabs/Module/Register.php:238 #, php-format msgid "I accept the %s for this website" msgstr "" -#: ../../Zotlabs/Module/Register.php:247 +#: ../../Zotlabs/Module/Register.php:245 #, php-format msgid "I am over %s years of age and accept the %s for this website" msgstr "" -#: ../../Zotlabs/Module/Register.php:252 +#: ../../Zotlabs/Module/Register.php:250 msgid "Your email address" msgstr "" -#: ../../Zotlabs/Module/Register.php:253 +#: ../../Zotlabs/Module/Register.php:251 msgid "Choose a password" msgstr "" -#: ../../Zotlabs/Module/Register.php:254 +#: ../../Zotlabs/Module/Register.php:252 msgid "Please re-enter your password" msgstr "" -#: ../../Zotlabs/Module/Register.php:255 +#: ../../Zotlabs/Module/Register.php:253 msgid "Please enter your invitation code" msgstr "" -#: ../../Zotlabs/Module/Register.php:260 +#: ../../Zotlabs/Module/Register.php:258 msgid "no" msgstr "" -#: ../../Zotlabs/Module/Register.php:260 +#: ../../Zotlabs/Module/Register.php:258 msgid "yes" msgstr "" -#: ../../Zotlabs/Module/Register.php:276 +#: ../../Zotlabs/Module/Register.php:274 msgid "Membership on this site is by invitation only." msgstr "" -#: ../../Zotlabs/Module/Register.php:288 ../../boot.php:1563 +#: ../../Zotlabs/Module/Register.php:286 ../../boot.php:1563 #: ../../include/nav.php:164 msgid "Register" msgstr "" -#: ../../Zotlabs/Module/Register.php:289 +#: ../../Zotlabs/Module/Register.php:287 msgid "" "This site requires email verification. After completing this form, please " "check your email for further instructions." @@ -7245,11 +7256,11 @@ msgstr "" msgid "Contents" msgstr "" -#: ../../Zotlabs/Module/Display.php:350 +#: ../../Zotlabs/Module/Display.php:351 msgid "Article" msgstr "" -#: ../../Zotlabs/Module/Display.php:402 +#: ../../Zotlabs/Module/Display.php:403 msgid "Item has been removed." msgstr "" @@ -7368,10 +7379,6 @@ msgstr "" msgid "View Common Connections" msgstr "" -#: ../../Zotlabs/Module/Email_resend.php:12 -msgid "Token verification failed." -msgstr "" - #: ../../Zotlabs/Module/Email_resend.php:30 msgid "Email verification resent" msgstr "" @@ -7596,7 +7603,7 @@ msgstr "" msgid "Remote Diagnostics" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:238 ../../include/features.php:362 +#: ../../Zotlabs/Lib/Apps.php:238 ../../include/features.php:390 msgid "Suggest Channels" msgstr "" @@ -7610,7 +7617,7 @@ msgid "Activity" msgstr "" #: ../../Zotlabs/Lib/Apps.php:245 ../../include/conversation.php:1928 -#: ../../include/features.php:95 ../../include/nav.php:497 +#: ../../include/features.php:87 ../../include/nav.php:497 msgid "Wiki" msgstr "" @@ -8654,7 +8661,7 @@ msgstr "" msgid "Remove term" msgstr "" -#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:326 +#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:354 msgid "Saved Searches" msgstr "" @@ -8696,7 +8703,7 @@ msgid "See more..." msgstr "" #: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53 -#: ../../include/features.php:415 +#: ../../include/features.php:443 msgid "Saved Folders" msgstr "" @@ -8704,6 +8711,54 @@ msgstr "" msgid "Click to show more" msgstr "" +#: ../../Zotlabs/Widget/Newmember.php:33 +msgid "Profile Creation" +msgstr "" + +#: ../../Zotlabs/Widget/Newmember.php:35 +msgid "Upload profile photo" +msgstr "" + +#: ../../Zotlabs/Widget/Newmember.php:36 +msgid "Upload cover photo" +msgstr "" + +#: ../../Zotlabs/Widget/Newmember.php:37 ../../include/nav.php:119 +msgid "Edit your profile" +msgstr "" + +#: ../../Zotlabs/Widget/Newmember.php:40 +msgid "Find and Connect with others" +msgstr "" + +#: ../../Zotlabs/Widget/Newmember.php:44 +msgid "Manage your connections" +msgstr "" + +#: ../../Zotlabs/Widget/Newmember.php:47 +msgid "Communicate" +msgstr "" + +#: ../../Zotlabs/Widget/Newmember.php:49 +msgid "View your channel homepage" +msgstr "" + +#: ../../Zotlabs/Widget/Newmember.php:50 +msgid "View your network stream" +msgstr "" + +#: ../../Zotlabs/Widget/Newmember.php:56 +msgid "Documentation" +msgstr "" + +#: ../../Zotlabs/Widget/Newmember.php:67 +msgid "View public stream. Warning: not moderated" +msgstr "" + +#: ../../Zotlabs/Widget/Newmember.php:71 +msgid "New Member Links" +msgstr "" + #: ../../Zotlabs/Widget/Admin.php:23 ../../Zotlabs/Widget/Admin.php:60 msgid "Member registrations waiting for confirmation" msgstr "" @@ -8737,7 +8792,7 @@ msgid "Additional features" msgstr "" #: ../../Zotlabs/Widget/Settings_menu.php:57 -msgid "Feature/Addon settings" +msgid "Addon settings" msgstr "" #: ../../Zotlabs/Widget/Settings_menu.php:63 @@ -8756,7 +8811,7 @@ msgstr "" msgid "Connected apps" msgstr "" -#: ../../Zotlabs/Widget/Settings_menu.php:100 ../../include/features.php:168 +#: ../../Zotlabs/Widget/Settings_menu.php:100 ../../include/features.php:231 msgid "Permission Groups" msgstr "" @@ -10457,7 +10512,7 @@ msgstr "" msgid "Not supported by some microblog services such as Mastodon" msgstr "" -#: ../../addon/pubcrawl/pubcrawl.php:1054 +#: ../../addon/pubcrawl/pubcrawl.php:1053 msgid "ActivityPub Protocol Settings" msgstr "" @@ -13281,312 +13336,332 @@ msgstr "" msgid "General Features" msgstr "" -#: ../../include/features.php:59 -msgid "Multiple Profiles" -msgstr "" - #: ../../include/features.php:60 -msgid "Ability to create multiple profiles" -msgstr "" - -#: ../../include/features.php:68 msgid "Advanced Profiles" msgstr "" -#: ../../include/features.php:69 +#: ../../include/features.php:61 msgid "Additional profile sections and selections" msgstr "" -#: ../../include/features.php:77 +#: ../../include/features.php:69 msgid "Profile Import/Export" msgstr "" -#: ../../include/features.php:78 +#: ../../include/features.php:70 msgid "Save and load profile details across sites/channels" msgstr "" -#: ../../include/features.php:86 +#: ../../include/features.php:78 msgid "Web Pages" msgstr "" -#: ../../include/features.php:87 +#: ../../include/features.php:79 msgid "Provide managed web pages on your channel" msgstr "" -#: ../../include/features.php:96 +#: ../../include/features.php:88 msgid "Provide a wiki for your channel" msgstr "" -#: ../../include/features.php:113 +#: ../../include/features.php:105 msgid "Private Notes" msgstr "" -#: ../../include/features.php:114 +#: ../../include/features.php:106 msgid "Enables a tool to store notes and reminders (note: not encrypted)" msgstr "" -#: ../../include/features.php:123 +#: ../../include/features.php:115 msgid "Create personal planning cards" msgstr "" -#: ../../include/features.php:133 +#: ../../include/features.php:125 msgid "Create interactive articles" msgstr "" -#: ../../include/features.php:141 +#: ../../include/features.php:133 msgid "Navigation Channel Select" msgstr "" -#: ../../include/features.php:142 +#: ../../include/features.php:134 msgid "Change channels directly from within the navigation dropdown menu" msgstr "" -#: ../../include/features.php:150 +#: ../../include/features.php:142 msgid "Photo Location" msgstr "" -#: ../../include/features.php:151 +#: ../../include/features.php:143 msgid "If location data is available on uploaded photos, link this to a map." msgstr "" -#: ../../include/features.php:159 +#: ../../include/features.php:151 msgid "Access Controlled Chatrooms" msgstr "" -#: ../../include/features.php:160 +#: ../../include/features.php:152 msgid "Provide chatrooms and chat services with access control." msgstr "" -#: ../../include/features.php:169 -msgid "Provide alternate connection permission roles." -msgstr "" - -#: ../../include/features.php:177 +#: ../../include/features.php:161 msgid "Smart Birthdays" msgstr "" -#: ../../include/features.php:178 +#: ../../include/features.php:162 msgid "" "Make birthday events timezone aware in case your friends are scattered " "across the planet." msgstr "" -#: ../../include/features.php:186 +#: ../../include/features.php:170 msgid "Event Timezone Selection" msgstr "" -#: ../../include/features.php:187 +#: ../../include/features.php:171 msgid "Allow event creation in timezones other than your own." msgstr "" -#: ../../include/features.php:196 +#: ../../include/features.php:180 msgid "Premium Channel" msgstr "" -#: ../../include/features.php:197 +#: ../../include/features.php:181 msgid "" "Allows you to set restrictions and terms on those that connect with your " "channel" msgstr "" -#: ../../include/features.php:205 +#: ../../include/features.php:189 msgid "Advanced Directory Search" msgstr "" -#: ../../include/features.php:206 +#: ../../include/features.php:190 msgid "Allows creation of complex directory search queries" msgstr "" -#: ../../include/features.php:214 +#: ../../include/features.php:198 msgid "Advanced Theme and Layout Settings" msgstr "" -#: ../../include/features.php:215 +#: ../../include/features.php:199 msgid "Allows fine tuning of themes and page layouts" msgstr "" -#: ../../include/features.php:225 +#: ../../include/features.php:208 +msgid "Access Control and Permissions" +msgstr "" + +#: ../../include/features.php:212 ../../include/group.php:328 +msgid "Privacy Groups" +msgstr "" + +#: ../../include/features.php:213 +msgid "Enable management and selection of privacy groups" +msgstr "" + +#: ../../include/features.php:221 +msgid "Multiple Profiles" +msgstr "" + +#: ../../include/features.php:222 +msgid "Ability to create multiple profiles" +msgstr "" + +#: ../../include/features.php:232 +msgid "Provide alternate connection permission roles." +msgstr "" + +#: ../../include/features.php:240 +msgid "OAuth Clients" +msgstr "" + +#: ../../include/features.php:241 +msgid "Manage authenticatication tokens for mobile and remote apps." +msgstr "" + +#: ../../include/features.php:249 +msgid "Access Tokens" +msgstr "" + +#: ../../include/features.php:250 +msgid "Create access tokens so that non-members can access private content." +msgstr "" + +#: ../../include/features.php:261 msgid "Post Composition Features" msgstr "" -#: ../../include/features.php:229 +#: ../../include/features.php:265 msgid "Large Photos" msgstr "" -#: ../../include/features.php:230 +#: ../../include/features.php:266 msgid "" "Include large (1024px) photo thumbnails in posts. If not enabled, use small " "(640px) photo thumbnails" msgstr "" -#: ../../include/features.php:239 +#: ../../include/features.php:275 msgid "Automatically import channel content from other channels or feeds" msgstr "" -#: ../../include/features.php:247 +#: ../../include/features.php:283 msgid "Even More Encryption" msgstr "" -#: ../../include/features.php:248 +#: ../../include/features.php:284 msgid "" "Allow optional encryption of content end-to-end with a shared secret key" msgstr "" -#: ../../include/features.php:256 +#: ../../include/features.php:292 msgid "Enable Voting Tools" msgstr "" -#: ../../include/features.php:257 +#: ../../include/features.php:293 msgid "Provide a class of post which others can vote on" msgstr "" -#: ../../include/features.php:265 +#: ../../include/features.php:301 msgid "Disable Comments" msgstr "" -#: ../../include/features.php:266 +#: ../../include/features.php:302 msgid "Provide the option to disable comments for a post" msgstr "" -#: ../../include/features.php:274 +#: ../../include/features.php:310 msgid "Delayed Posting" msgstr "" -#: ../../include/features.php:275 +#: ../../include/features.php:311 msgid "Allow posts to be published at a later date" msgstr "" -#: ../../include/features.php:283 +#: ../../include/features.php:319 msgid "Content Expiration" msgstr "" -#: ../../include/features.php:284 +#: ../../include/features.php:320 msgid "Remove posts/comments and/or private messages at a future time" msgstr "" -#: ../../include/features.php:292 +#: ../../include/features.php:328 msgid "Suppress Duplicate Posts/Comments" msgstr "" -#: ../../include/features.php:293 +#: ../../include/features.php:329 msgid "" "Prevent posts with identical content to be published with less than two " "minutes in between submissions." msgstr "" -#: ../../include/features.php:304 +#: ../../include/features.php:340 msgid "Network and Stream Filtering" msgstr "" -#: ../../include/features.php:308 +#: ../../include/features.php:344 msgid "Search by Date" msgstr "" -#: ../../include/features.php:309 +#: ../../include/features.php:345 msgid "Ability to select posts by date ranges" msgstr "" -#: ../../include/features.php:317 ../../include/group.php:328 -msgid "Privacy Groups" -msgstr "" - -#: ../../include/features.php:318 -msgid "Enable management and selection of privacy groups" -msgstr "" - -#: ../../include/features.php:327 +#: ../../include/features.php:355 msgid "Save search terms for re-use" msgstr "" -#: ../../include/features.php:335 +#: ../../include/features.php:363 msgid "Network Personal Tab" msgstr "" -#: ../../include/features.php:336 +#: ../../include/features.php:364 msgid "Enable tab to display only Network posts that you've interacted on" msgstr "" -#: ../../include/features.php:344 +#: ../../include/features.php:372 msgid "Network New Tab" msgstr "" -#: ../../include/features.php:345 +#: ../../include/features.php:373 msgid "Enable tab to display all new Network activity" msgstr "" -#: ../../include/features.php:353 +#: ../../include/features.php:381 msgid "Affinity Tool" msgstr "" -#: ../../include/features.php:354 +#: ../../include/features.php:382 msgid "Filter stream activity by depth of relationships" msgstr "" -#: ../../include/features.php:363 +#: ../../include/features.php:391 msgid "Show friend and connection suggestions" msgstr "" -#: ../../include/features.php:371 +#: ../../include/features.php:399 msgid "Connection Filtering" msgstr "" -#: ../../include/features.php:372 +#: ../../include/features.php:400 msgid "Filter incoming posts from connections based on keywords/content" msgstr "" -#: ../../include/features.php:384 +#: ../../include/features.php:412 msgid "Post/Comment Tools" msgstr "" -#: ../../include/features.php:388 +#: ../../include/features.php:416 msgid "Community Tagging" msgstr "" -#: ../../include/features.php:389 +#: ../../include/features.php:417 msgid "Ability to tag existing posts" msgstr "" -#: ../../include/features.php:397 +#: ../../include/features.php:425 msgid "Post Categories" msgstr "" -#: ../../include/features.php:398 +#: ../../include/features.php:426 msgid "Add categories to your posts" msgstr "" -#: ../../include/features.php:406 +#: ../../include/features.php:434 msgid "Emoji Reactions" msgstr "" -#: ../../include/features.php:407 +#: ../../include/features.php:435 msgid "Add emoji reaction ability to posts" msgstr "" -#: ../../include/features.php:416 +#: ../../include/features.php:444 msgid "Ability to file posts under folders" msgstr "" -#: ../../include/features.php:424 +#: ../../include/features.php:452 msgid "Dislike Posts" msgstr "" -#: ../../include/features.php:425 +#: ../../include/features.php:453 msgid "Ability to dislike posts/comments" msgstr "" -#: ../../include/features.php:433 +#: ../../include/features.php:461 msgid "Star Posts" msgstr "" -#: ../../include/features.php:434 +#: ../../include/features.php:462 msgid "Ability to mark special posts with a star indicator" msgstr "" -#: ../../include/features.php:442 +#: ../../include/features.php:470 msgid "Tag Cloud" msgstr "" -#: ../../include/features.php:443 +#: ../../include/features.php:471 msgid "Provide a personal tag cloud on your channel page" msgstr "" @@ -13799,10 +13874,6 @@ msgstr "" msgid "Manage/Edit profiles" msgstr "" -#: ../../include/nav.php:119 -msgid "Edit your profile" -msgstr "" - #: ../../include/nav.php:126 ../../include/nav.php:130 msgid "Sign in" msgstr "" diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php index c6f6d2322..dc02dfb11 100644 --- a/vendor/composer/ClassLoader.php +++ b/vendor/composer/ClassLoader.php @@ -43,8 +43,7 @@ namespace Composer\Autoload; class ClassLoader { // PSR-4 - private $firstCharsPsr4 = array(); - private $prefixLengthsPsr4 = array(); // For BC with legacy static maps + private $prefixLengthsPsr4 = array(); private $prefixDirsPsr4 = array(); private $fallbackDirsPsr4 = array(); @@ -171,10 +170,11 @@ class ClassLoader } } elseif (!isset($this->prefixDirsPsr4[$prefix])) { // Register directories for a new namespace. - if ('\\' !== substr($prefix, -1)) { + $length = strlen($prefix); + if ('\\' !== $prefix[$length - 1]) { throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator."); } - $this->firstCharsPsr4[$prefix[0]] = true; + $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length; $this->prefixDirsPsr4[$prefix] = (array) $paths; } elseif ($prepend) { // Prepend directories for an already registered namespace. @@ -221,10 +221,11 @@ class ClassLoader if (!$prefix) { $this->fallbackDirsPsr4 = (array) $paths; } else { - if ('\\' !== substr($prefix, -1)) { + $length = strlen($prefix); + if ('\\' !== $prefix[$length - 1]) { throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator."); } - $this->firstCharsPsr4[$prefix[0]] = true; + $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length; $this->prefixDirsPsr4[$prefix] = (array) $paths; } } @@ -372,7 +373,7 @@ class ClassLoader $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext; $first = $class[0]; - if (isset($this->firstCharsPsr4[$first]) || isset($this->prefixLengthsPsr4[$first])) { + if (isset($this->prefixLengthsPsr4[$first])) { $subPath = $class; while (false !== $lastPos = strrpos($subPath, '\\')) { $subPath = substr($subPath, 0, $lastPos); diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 3c3031de8..f3b48cd69 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -270,7 +270,6 @@ return array( 'HTMLPurifier_VarParser_Flexible' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php', 'HTMLPurifier_VarParser_Native' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Native.php', 'HTMLPurifier_Zipper' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Zipper.php', - 'Hubzilla\\Import\\Import' => $baseDir . '/include/Import/Importer.php', 'ID3Parser\\ID3Parser' => $vendorDir . '/lukasreschke/id3parser/src/ID3Parser.php', 'ID3Parser\\getID3\\Tags\\getid3_id3v1' => $vendorDir . '/lukasreschke/id3parser/src/getID3/Tags/getid3_id3v1.php', 'ID3Parser\\getID3\\Tags\\getid3_id3v2' => $vendorDir . '/lukasreschke/id3parser/src/getID3/Tags/getid3_id3v2.php', @@ -788,6 +787,8 @@ return array( 'Zotlabs\\Daemon\\Thumbnail' => $baseDir . '/Zotlabs/Daemon/Thumbnail.php', 'Zotlabs\\Extend\\Hook' => $baseDir . '/Zotlabs/Extend/Hook.php', 'Zotlabs\\Identity\\BasicId\\BasicId' => $baseDir . '/Zotlabs/Identity/BasicId.php', + 'Zotlabs\\Identity\\OAuth2Server' => $baseDir . '/Zotlabs/Identity/OAuth2Server.php', + 'Zotlabs\\Identity\\OAuth2Storage' => $baseDir . '/Zotlabs/Identity/OAuth2Storage.php', 'Zotlabs\\Identity\\ProfilePhoto\\ProfilePhoto' => $baseDir . '/Zotlabs/Identity/ProfilePhoto.php', 'Zotlabs\\Lib\\AConfig' => $baseDir . '/Zotlabs/Lib/AConfig.php', 'Zotlabs\\Lib\\AbConfig' => $baseDir . '/Zotlabs/Lib/AbConfig.php', @@ -798,6 +799,7 @@ return array( 'Zotlabs\\Lib\\Chatroom' => $baseDir . '/Zotlabs/Lib/Chatroom.php', 'Zotlabs\\Lib\\Config' => $baseDir . '/Zotlabs/Lib/Config.php', 'Zotlabs\\Lib\\DB_Upgrade' => $baseDir . '/Zotlabs/Lib/DB_Upgrade.php', + 'Zotlabs\\Lib\\DReport' => $baseDir . '/Zotlabs/Lib/DReport.php', 'Zotlabs\\Lib\\Enotify' => $baseDir . '/Zotlabs/Lib/Enotify.php', 'Zotlabs\\Lib\\ExtendedZip' => $baseDir . '/Zotlabs/Lib/ExtendedZip.php', 'Zotlabs\\Lib\\IConfig' => $baseDir . '/Zotlabs/Lib/IConfig.php', @@ -810,15 +812,15 @@ return array( 'Zotlabs\\Lib\\PConfig' => $baseDir . '/Zotlabs/Lib/PConfig.php', 'Zotlabs\\Lib\\Permcat' => $baseDir . '/Zotlabs/Lib/Permcat.php', 'Zotlabs\\Lib\\PermissionDescription' => $baseDir . '/Zotlabs/Lib/PermissionDescription.php', - 'Zotlabs\\Lib\\ProtoDriver' => $baseDir . '/Zotlabs/Lib/ProtoDriver.php', 'Zotlabs\\Lib\\SConfig' => $baseDir . '/Zotlabs/Lib/SConfig.php', + 'Zotlabs\\Lib\\Share' => $baseDir . '/Zotlabs/Lib/Share.php', 'Zotlabs\\Lib\\SuperCurl' => $baseDir . '/Zotlabs/Lib/SuperCurl.php', 'Zotlabs\\Lib\\System' => $baseDir . '/Zotlabs/Lib/System.php', 'Zotlabs\\Lib\\Techlevels' => $baseDir . '/Zotlabs/Lib/Techlevels.php', 'Zotlabs\\Lib\\ThreadItem' => $baseDir . '/Zotlabs/Lib/ThreadItem.php', 'Zotlabs\\Lib\\ThreadStream' => $baseDir . '/Zotlabs/Lib/ThreadStream.php', + 'Zotlabs\\Lib\\Verify' => $baseDir . '/Zotlabs/Lib/Verify.php', 'Zotlabs\\Lib\\XConfig' => $baseDir . '/Zotlabs/Lib/XConfig.php', - 'Zotlabs\\Lib\\ZotDriver' => $baseDir . '/Zotlabs/Lib/ZotDriver.php', 'Zotlabs\\Module\\Achievements' => $baseDir . '/Zotlabs/Module/Achievements.php', 'Zotlabs\\Module\\Acl' => $baseDir . '/Zotlabs/Module/Acl.php', 'Zotlabs\\Module\\Admin' => $baseDir . '/Zotlabs/Module/Admin.php', @@ -874,6 +876,8 @@ return array( 'Zotlabs\\Module\\Editlayout' => $baseDir . '/Zotlabs/Module/Editlayout.php', 'Zotlabs\\Module\\Editpost' => $baseDir . '/Zotlabs/Module/Editpost.php', 'Zotlabs\\Module\\Editwebpage' => $baseDir . '/Zotlabs/Module/Editwebpage.php', + 'Zotlabs\\Module\\Email_resend' => $baseDir . '/Zotlabs/Module/Email_resend.php', + 'Zotlabs\\Module\\Email_validation' => $baseDir . '/Zotlabs/Module/Email_validation.php', 'Zotlabs\\Module\\Embedphotos' => $baseDir . '/Zotlabs/Module/Embedphotos.php', 'Zotlabs\\Module\\Events' => $baseDir . '/Zotlabs/Module/Events.php', 'Zotlabs\\Module\\Fbrowser' => $baseDir . '/Zotlabs/Module/Fbrowser.php', @@ -885,6 +889,7 @@ return array( 'Zotlabs\\Module\\Filestorage' => $baseDir . '/Zotlabs/Module/Filestorage.php', 'Zotlabs\\Module\\Follow' => $baseDir . '/Zotlabs/Module/Follow.php', 'Zotlabs\\Module\\Getfile' => $baseDir . '/Zotlabs/Module/Getfile.php', + 'Zotlabs\\Module\\Go' => $baseDir . '/Zotlabs/Module/Go.php', 'Zotlabs\\Module\\Group' => $baseDir . '/Zotlabs/Module/Group.php', 'Zotlabs\\Module\\Hcard' => $baseDir . '/Zotlabs/Module/Hcard.php', 'Zotlabs\\Module\\Help' => $baseDir . '/Zotlabs/Module/Help.php', @@ -1027,6 +1032,213 @@ return array( 'Zotlabs\\Thumbs\\Pdf' => $baseDir . '/Zotlabs/Thumbs/Pdf.php', 'Zotlabs\\Thumbs\\Text' => $baseDir . '/Zotlabs/Thumbs/Text.php', 'Zotlabs\\Thumbs\\Video' => $baseDir . '/Zotlabs/Thumbs/Video.php', + 'Zotlabs\\Update\\_1000' => $baseDir . '/Zotlabs/Update/_1000.php', + 'Zotlabs\\Update\\_1001' => $baseDir . '/Zotlabs/Update/_1001.php', + 'Zotlabs\\Update\\_1002' => $baseDir . '/Zotlabs/Update/_1002.php', + 'Zotlabs\\Update\\_1003' => $baseDir . '/Zotlabs/Update/_1003.php', + 'Zotlabs\\Update\\_1004' => $baseDir . '/Zotlabs/Update/_1004.php', + 'Zotlabs\\Update\\_1005' => $baseDir . '/Zotlabs/Update/_1005.php', + 'Zotlabs\\Update\\_1006' => $baseDir . '/Zotlabs/Update/_1006.php', + 'Zotlabs\\Update\\_1007' => $baseDir . '/Zotlabs/Update/_1007.php', + 'Zotlabs\\Update\\_1008' => $baseDir . '/Zotlabs/Update/_1008.php', + 'Zotlabs\\Update\\_1009' => $baseDir . '/Zotlabs/Update/_1009.php', + 'Zotlabs\\Update\\_1010' => $baseDir . '/Zotlabs/Update/_1010.php', + 'Zotlabs\\Update\\_1011' => $baseDir . '/Zotlabs/Update/_1011.php', + 'Zotlabs\\Update\\_1012' => $baseDir . '/Zotlabs/Update/_1012.php', + 'Zotlabs\\Update\\_1013' => $baseDir . '/Zotlabs/Update/_1013.php', + 'Zotlabs\\Update\\_1014' => $baseDir . '/Zotlabs/Update/_1014.php', + 'Zotlabs\\Update\\_1015' => $baseDir . '/Zotlabs/Update/_1015.php', + 'Zotlabs\\Update\\_1016' => $baseDir . '/Zotlabs/Update/_1016.php', + 'Zotlabs\\Update\\_1017' => $baseDir . '/Zotlabs/Update/_1017.php', + 'Zotlabs\\Update\\_1018' => $baseDir . '/Zotlabs/Update/_1018.php', + 'Zotlabs\\Update\\_1019' => $baseDir . '/Zotlabs/Update/_1019.php', + 'Zotlabs\\Update\\_1020' => $baseDir . '/Zotlabs/Update/_1020.php', + 'Zotlabs\\Update\\_1021' => $baseDir . '/Zotlabs/Update/_1021.php', + 'Zotlabs\\Update\\_1022' => $baseDir . '/Zotlabs/Update/_1022.php', + 'Zotlabs\\Update\\_1023' => $baseDir . '/Zotlabs/Update/_1023.php', + 'Zotlabs\\Update\\_1024' => $baseDir . '/Zotlabs/Update/_1024.php', + 'Zotlabs\\Update\\_1025' => $baseDir . '/Zotlabs/Update/_1025.php', + 'Zotlabs\\Update\\_1026' => $baseDir . '/Zotlabs/Update/_1026.php', + 'Zotlabs\\Update\\_1027' => $baseDir . '/Zotlabs/Update/_1027.php', + 'Zotlabs\\Update\\_1028' => $baseDir . '/Zotlabs/Update/_1028.php', + 'Zotlabs\\Update\\_1029' => $baseDir . '/Zotlabs/Update/_1029.php', + 'Zotlabs\\Update\\_1030' => $baseDir . '/Zotlabs/Update/_1030.php', + 'Zotlabs\\Update\\_1031' => $baseDir . '/Zotlabs/Update/_1031.php', + 'Zotlabs\\Update\\_1032' => $baseDir . '/Zotlabs/Update/_1032.php', + 'Zotlabs\\Update\\_1033' => $baseDir . '/Zotlabs/Update/_1033.php', + 'Zotlabs\\Update\\_1034' => $baseDir . '/Zotlabs/Update/_1034.php', + 'Zotlabs\\Update\\_1035' => $baseDir . '/Zotlabs/Update/_1035.php', + 'Zotlabs\\Update\\_1036' => $baseDir . '/Zotlabs/Update/_1036.php', + 'Zotlabs\\Update\\_1037' => $baseDir . '/Zotlabs/Update/_1037.php', + 'Zotlabs\\Update\\_1038' => $baseDir . '/Zotlabs/Update/_1038.php', + 'Zotlabs\\Update\\_1039' => $baseDir . '/Zotlabs/Update/_1039.php', + 'Zotlabs\\Update\\_1040' => $baseDir . '/Zotlabs/Update/_1040.php', + 'Zotlabs\\Update\\_1041' => $baseDir . '/Zotlabs/Update/_1041.php', + 'Zotlabs\\Update\\_1042' => $baseDir . '/Zotlabs/Update/_1042.php', + 'Zotlabs\\Update\\_1043' => $baseDir . '/Zotlabs/Update/_1043.php', + 'Zotlabs\\Update\\_1044' => $baseDir . '/Zotlabs/Update/_1044.php', + 'Zotlabs\\Update\\_1045' => $baseDir . '/Zotlabs/Update/_1045.php', + 'Zotlabs\\Update\\_1046' => $baseDir . '/Zotlabs/Update/_1046.php', + 'Zotlabs\\Update\\_1047' => $baseDir . '/Zotlabs/Update/_1047.php', + 'Zotlabs\\Update\\_1048' => $baseDir . '/Zotlabs/Update/_1048.php', + 'Zotlabs\\Update\\_1049' => $baseDir . '/Zotlabs/Update/_1049.php', + 'Zotlabs\\Update\\_1050' => $baseDir . '/Zotlabs/Update/_1050.php', + 'Zotlabs\\Update\\_1051' => $baseDir . '/Zotlabs/Update/_1051.php', + 'Zotlabs\\Update\\_1052' => $baseDir . '/Zotlabs/Update/_1052.php', + 'Zotlabs\\Update\\_1053' => $baseDir . '/Zotlabs/Update/_1053.php', + 'Zotlabs\\Update\\_1054' => $baseDir . '/Zotlabs/Update/_1054.php', + 'Zotlabs\\Update\\_1055' => $baseDir . '/Zotlabs/Update/_1055.php', + 'Zotlabs\\Update\\_1056' => $baseDir . '/Zotlabs/Update/_1056.php', + 'Zotlabs\\Update\\_1057' => $baseDir . '/Zotlabs/Update/_1057.php', + 'Zotlabs\\Update\\_1058' => $baseDir . '/Zotlabs/Update/_1058.php', + 'Zotlabs\\Update\\_1059' => $baseDir . '/Zotlabs/Update/_1059.php', + 'Zotlabs\\Update\\_1060' => $baseDir . '/Zotlabs/Update/_1060.php', + 'Zotlabs\\Update\\_1061' => $baseDir . '/Zotlabs/Update/_1061.php', + 'Zotlabs\\Update\\_1062' => $baseDir . '/Zotlabs/Update/_1062.php', + 'Zotlabs\\Update\\_1063' => $baseDir . '/Zotlabs/Update/_1063.php', + 'Zotlabs\\Update\\_1064' => $baseDir . '/Zotlabs/Update/_1064.php', + 'Zotlabs\\Update\\_1065' => $baseDir . '/Zotlabs/Update/_1065.php', + 'Zotlabs\\Update\\_1066' => $baseDir . '/Zotlabs/Update/_1066.php', + 'Zotlabs\\Update\\_1067' => $baseDir . '/Zotlabs/Update/_1067.php', + 'Zotlabs\\Update\\_1068' => $baseDir . '/Zotlabs/Update/_1068.php', + 'Zotlabs\\Update\\_1069' => $baseDir . '/Zotlabs/Update/_1069.php', + 'Zotlabs\\Update\\_1070' => $baseDir . '/Zotlabs/Update/_1070.php', + 'Zotlabs\\Update\\_1071' => $baseDir . '/Zotlabs/Update/_1071.php', + 'Zotlabs\\Update\\_1072' => $baseDir . '/Zotlabs/Update/_1072.php', + 'Zotlabs\\Update\\_1073' => $baseDir . '/Zotlabs/Update/_1073.php', + 'Zotlabs\\Update\\_1074' => $baseDir . '/Zotlabs/Update/_1074.php', + 'Zotlabs\\Update\\_1075' => $baseDir . '/Zotlabs/Update/_1075.php', + 'Zotlabs\\Update\\_1076' => $baseDir . '/Zotlabs/Update/_1076.php', + 'Zotlabs\\Update\\_1077' => $baseDir . '/Zotlabs/Update/_1077.php', + 'Zotlabs\\Update\\_1078' => $baseDir . '/Zotlabs/Update/_1078.php', + 'Zotlabs\\Update\\_1079' => $baseDir . '/Zotlabs/Update/_1079.php', + 'Zotlabs\\Update\\_1080' => $baseDir . '/Zotlabs/Update/_1080.php', + 'Zotlabs\\Update\\_1081' => $baseDir . '/Zotlabs/Update/_1081.php', + 'Zotlabs\\Update\\_1082' => $baseDir . '/Zotlabs/Update/_1082.php', + 'Zotlabs\\Update\\_1083' => $baseDir . '/Zotlabs/Update/_1083.php', + 'Zotlabs\\Update\\_1084' => $baseDir . '/Zotlabs/Update/_1084.php', + 'Zotlabs\\Update\\_1085' => $baseDir . '/Zotlabs/Update/_1085.php', + 'Zotlabs\\Update\\_1086' => $baseDir . '/Zotlabs/Update/_1086.php', + 'Zotlabs\\Update\\_1087' => $baseDir . '/Zotlabs/Update/_1087.php', + 'Zotlabs\\Update\\_1088' => $baseDir . '/Zotlabs/Update/_1088.php', + 'Zotlabs\\Update\\_1089' => $baseDir . '/Zotlabs/Update/_1089.php', + 'Zotlabs\\Update\\_1090' => $baseDir . '/Zotlabs/Update/_1090.php', + 'Zotlabs\\Update\\_1091' => $baseDir . '/Zotlabs/Update/_1091.php', + 'Zotlabs\\Update\\_1092' => $baseDir . '/Zotlabs/Update/_1092.php', + 'Zotlabs\\Update\\_1093' => $baseDir . '/Zotlabs/Update/_1093.php', + 'Zotlabs\\Update\\_1094' => $baseDir . '/Zotlabs/Update/_1094.php', + 'Zotlabs\\Update\\_1095' => $baseDir . '/Zotlabs/Update/_1095.php', + 'Zotlabs\\Update\\_1096' => $baseDir . '/Zotlabs/Update/_1096.php', + 'Zotlabs\\Update\\_1097' => $baseDir . '/Zotlabs/Update/_1097.php', + 'Zotlabs\\Update\\_1098' => $baseDir . '/Zotlabs/Update/_1098.php', + 'Zotlabs\\Update\\_1099' => $baseDir . '/Zotlabs/Update/_1099.php', + 'Zotlabs\\Update\\_1100' => $baseDir . '/Zotlabs/Update/_1100.php', + 'Zotlabs\\Update\\_1101' => $baseDir . '/Zotlabs/Update/_1101.php', + 'Zotlabs\\Update\\_1102' => $baseDir . '/Zotlabs/Update/_1102.php', + 'Zotlabs\\Update\\_1103' => $baseDir . '/Zotlabs/Update/_1103.php', + 'Zotlabs\\Update\\_1104' => $baseDir . '/Zotlabs/Update/_1104.php', + 'Zotlabs\\Update\\_1105' => $baseDir . '/Zotlabs/Update/_1105.php', + 'Zotlabs\\Update\\_1106' => $baseDir . '/Zotlabs/Update/_1106.php', + 'Zotlabs\\Update\\_1107' => $baseDir . '/Zotlabs/Update/_1107.php', + 'Zotlabs\\Update\\_1108' => $baseDir . '/Zotlabs/Update/_1108.php', + 'Zotlabs\\Update\\_1109' => $baseDir . '/Zotlabs/Update/_1109.php', + 'Zotlabs\\Update\\_1110' => $baseDir . '/Zotlabs/Update/_1110.php', + 'Zotlabs\\Update\\_1111' => $baseDir . '/Zotlabs/Update/_1111.php', + 'Zotlabs\\Update\\_1112' => $baseDir . '/Zotlabs/Update/_1112.php', + 'Zotlabs\\Update\\_1113' => $baseDir . '/Zotlabs/Update/_1113.php', + 'Zotlabs\\Update\\_1114' => $baseDir . '/Zotlabs/Update/_1114.php', + 'Zotlabs\\Update\\_1115' => $baseDir . '/Zotlabs/Update/_1115.php', + 'Zotlabs\\Update\\_1116' => $baseDir . '/Zotlabs/Update/_1116.php', + 'Zotlabs\\Update\\_1117' => $baseDir . '/Zotlabs/Update/_1117.php', + 'Zotlabs\\Update\\_1118' => $baseDir . '/Zotlabs/Update/_1118.php', + 'Zotlabs\\Update\\_1119' => $baseDir . '/Zotlabs/Update/_1119.php', + 'Zotlabs\\Update\\_1120' => $baseDir . '/Zotlabs/Update/_1120.php', + 'Zotlabs\\Update\\_1121' => $baseDir . '/Zotlabs/Update/_1121.php', + 'Zotlabs\\Update\\_1122' => $baseDir . '/Zotlabs/Update/_1122.php', + 'Zotlabs\\Update\\_1123' => $baseDir . '/Zotlabs/Update/_1123.php', + 'Zotlabs\\Update\\_1124' => $baseDir . '/Zotlabs/Update/_1124.php', + 'Zotlabs\\Update\\_1125' => $baseDir . '/Zotlabs/Update/_1125.php', + 'Zotlabs\\Update\\_1126' => $baseDir . '/Zotlabs/Update/_1126.php', + 'Zotlabs\\Update\\_1127' => $baseDir . '/Zotlabs/Update/_1127.php', + 'Zotlabs\\Update\\_1128' => $baseDir . '/Zotlabs/Update/_1128.php', + 'Zotlabs\\Update\\_1129' => $baseDir . '/Zotlabs/Update/_1129.php', + 'Zotlabs\\Update\\_1130' => $baseDir . '/Zotlabs/Update/_1130.php', + 'Zotlabs\\Update\\_1131' => $baseDir . '/Zotlabs/Update/_1131.php', + 'Zotlabs\\Update\\_1132' => $baseDir . '/Zotlabs/Update/_1132.php', + 'Zotlabs\\Update\\_1133' => $baseDir . '/Zotlabs/Update/_1133.php', + 'Zotlabs\\Update\\_1134' => $baseDir . '/Zotlabs/Update/_1134.php', + 'Zotlabs\\Update\\_1135' => $baseDir . '/Zotlabs/Update/_1135.php', + 'Zotlabs\\Update\\_1136' => $baseDir . '/Zotlabs/Update/_1136.php', + 'Zotlabs\\Update\\_1137' => $baseDir . '/Zotlabs/Update/_1137.php', + 'Zotlabs\\Update\\_1138' => $baseDir . '/Zotlabs/Update/_1138.php', + 'Zotlabs\\Update\\_1139' => $baseDir . '/Zotlabs/Update/_1139.php', + 'Zotlabs\\Update\\_1140' => $baseDir . '/Zotlabs/Update/_1140.php', + 'Zotlabs\\Update\\_1141' => $baseDir . '/Zotlabs/Update/_1141.php', + 'Zotlabs\\Update\\_1142' => $baseDir . '/Zotlabs/Update/_1142.php', + 'Zotlabs\\Update\\_1143' => $baseDir . '/Zotlabs/Update/_1143.php', + 'Zotlabs\\Update\\_1144' => $baseDir . '/Zotlabs/Update/_1144.php', + 'Zotlabs\\Update\\_1145' => $baseDir . '/Zotlabs/Update/_1145.php', + 'Zotlabs\\Update\\_1146' => $baseDir . '/Zotlabs/Update/_1146.php', + 'Zotlabs\\Update\\_1147' => $baseDir . '/Zotlabs/Update/_1147.php', + 'Zotlabs\\Update\\_1148' => $baseDir . '/Zotlabs/Update/_1148.php', + 'Zotlabs\\Update\\_1149' => $baseDir . '/Zotlabs/Update/_1149.php', + 'Zotlabs\\Update\\_1150' => $baseDir . '/Zotlabs/Update/_1150.php', + 'Zotlabs\\Update\\_1151' => $baseDir . '/Zotlabs/Update/_1151.php', + 'Zotlabs\\Update\\_1152' => $baseDir . '/Zotlabs/Update/_1152.php', + 'Zotlabs\\Update\\_1153' => $baseDir . '/Zotlabs/Update/_1153.php', + 'Zotlabs\\Update\\_1154' => $baseDir . '/Zotlabs/Update/_1154.php', + 'Zotlabs\\Update\\_1155' => $baseDir . '/Zotlabs/Update/_1155.php', + 'Zotlabs\\Update\\_1156' => $baseDir . '/Zotlabs/Update/_1156.php', + 'Zotlabs\\Update\\_1157' => $baseDir . '/Zotlabs/Update/_1157.php', + 'Zotlabs\\Update\\_1158' => $baseDir . '/Zotlabs/Update/_1158.php', + 'Zotlabs\\Update\\_1159' => $baseDir . '/Zotlabs/Update/_1159.php', + 'Zotlabs\\Update\\_1160' => $baseDir . '/Zotlabs/Update/_1160.php', + 'Zotlabs\\Update\\_1161' => $baseDir . '/Zotlabs/Update/_1161.php', + 'Zotlabs\\Update\\_1162' => $baseDir . '/Zotlabs/Update/_1162.php', + 'Zotlabs\\Update\\_1163' => $baseDir . '/Zotlabs/Update/_1163.php', + 'Zotlabs\\Update\\_1164' => $baseDir . '/Zotlabs/Update/_1164.php', + 'Zotlabs\\Update\\_1165' => $baseDir . '/Zotlabs/Update/_1165.php', + 'Zotlabs\\Update\\_1166' => $baseDir . '/Zotlabs/Update/_1166.php', + 'Zotlabs\\Update\\_1167' => $baseDir . '/Zotlabs/Update/_1167.php', + 'Zotlabs\\Update\\_1168' => $baseDir . '/Zotlabs/Update/_1168.php', + 'Zotlabs\\Update\\_1169' => $baseDir . '/Zotlabs/Update/_1169.php', + 'Zotlabs\\Update\\_1170' => $baseDir . '/Zotlabs/Update/_1170.php', + 'Zotlabs\\Update\\_1171' => $baseDir . '/Zotlabs/Update/_1171.php', + 'Zotlabs\\Update\\_1172' => $baseDir . '/Zotlabs/Update/_1172.php', + 'Zotlabs\\Update\\_1173' => $baseDir . '/Zotlabs/Update/_1173.php', + 'Zotlabs\\Update\\_1174' => $baseDir . '/Zotlabs/Update/_1174.php', + 'Zotlabs\\Update\\_1175' => $baseDir . '/Zotlabs/Update/_1175.php', + 'Zotlabs\\Update\\_1176' => $baseDir . '/Zotlabs/Update/_1176.php', + 'Zotlabs\\Update\\_1177' => $baseDir . '/Zotlabs/Update/_1177.php', + 'Zotlabs\\Update\\_1178' => $baseDir . '/Zotlabs/Update/_1178.php', + 'Zotlabs\\Update\\_1179' => $baseDir . '/Zotlabs/Update/_1179.php', + 'Zotlabs\\Update\\_1180' => $baseDir . '/Zotlabs/Update/_1180.php', + 'Zotlabs\\Update\\_1181' => $baseDir . '/Zotlabs/Update/_1181.php', + 'Zotlabs\\Update\\_1182' => $baseDir . '/Zotlabs/Update/_1182.php', + 'Zotlabs\\Update\\_1183' => $baseDir . '/Zotlabs/Update/_1183.php', + 'Zotlabs\\Update\\_1184' => $baseDir . '/Zotlabs/Update/_1184.php', + 'Zotlabs\\Update\\_1185' => $baseDir . '/Zotlabs/Update/_1185.php', + 'Zotlabs\\Update\\_1186' => $baseDir . '/Zotlabs/Update/_1186.php', + 'Zotlabs\\Update\\_1187' => $baseDir . '/Zotlabs/Update/_1187.php', + 'Zotlabs\\Update\\_1188' => $baseDir . '/Zotlabs/Update/_1188.php', + 'Zotlabs\\Update\\_1189' => $baseDir . '/Zotlabs/Update/_1189.php', + 'Zotlabs\\Update\\_1190' => $baseDir . '/Zotlabs/Update/_1190.php', + 'Zotlabs\\Update\\_1191' => $baseDir . '/Zotlabs/Update/_1191.php', + 'Zotlabs\\Update\\_1192' => $baseDir . '/Zotlabs/Update/_1192.php', + 'Zotlabs\\Update\\_1193' => $baseDir . '/Zotlabs/Update/_1193.php', + 'Zotlabs\\Update\\_1194' => $baseDir . '/Zotlabs/Update/_1194.php', + 'Zotlabs\\Update\\_1195' => $baseDir . '/Zotlabs/Update/_1195.php', + 'Zotlabs\\Update\\_1196' => $baseDir . '/Zotlabs/Update/_1196.php', + 'Zotlabs\\Update\\_1197' => $baseDir . '/Zotlabs/Update/_1197.php', + 'Zotlabs\\Update\\_1198' => $baseDir . '/Zotlabs/Update/_1198.php', + 'Zotlabs\\Update\\_1199' => $baseDir . '/Zotlabs/Update/_1199.php', + 'Zotlabs\\Update\\_1200' => $baseDir . '/Zotlabs/Update/_1200.php', + 'Zotlabs\\Update\\_1201' => $baseDir . '/Zotlabs/Update/_1201.php', + 'Zotlabs\\Update\\_1202' => $baseDir . '/Zotlabs/Update/_1202.php', + 'Zotlabs\\Update\\_1203' => $baseDir . '/Zotlabs/Update/_1203.php', + 'Zotlabs\\Update\\_1204' => $baseDir . '/Zotlabs/Update/_1204.php', + 'Zotlabs\\Update\\_1205' => $baseDir . '/Zotlabs/Update/_1205.php', + 'Zotlabs\\Update\\_1206' => $baseDir . '/Zotlabs/Update/_1206.php', 'Zotlabs\\Web\\CheckJS' => $baseDir . '/Zotlabs/Web/CheckJS.php', 'Zotlabs\\Web\\Controller' => $baseDir . '/Zotlabs/Web/Controller.php', 'Zotlabs\\Web\\HTTPHeaders' => $baseDir . '/Zotlabs/Web/HTTPHeaders.php', @@ -1069,6 +1281,7 @@ return array( 'Zotlabs\\Widget\\Item' => $baseDir . '/Zotlabs/Widget/Item.php', 'Zotlabs\\Widget\\Mailmenu' => $baseDir . '/Zotlabs/Widget/Mailmenu.php', 'Zotlabs\\Widget\\Menu_preview' => $baseDir . '/Zotlabs/Widget/Menu_preview.php', + 'Zotlabs\\Widget\\Newmember' => $baseDir . '/Zotlabs/Widget/Newmember.php', 'Zotlabs\\Widget\\Notes' => $baseDir . '/Zotlabs/Widget/Notes.php', 'Zotlabs\\Widget\\Notifications' => $baseDir . '/Zotlabs/Widget/Notifications.php', 'Zotlabs\\Widget\\Photo' => $baseDir . '/Zotlabs/Widget/Photo.php', @@ -1095,10 +1308,8 @@ return array( 'Zotlabs\\Widget\\Wiki_pages' => $baseDir . '/Zotlabs/Widget/Wiki_pages.php', 'Zotlabs\\Widget\\Zcard' => $baseDir . '/Zotlabs/Widget/Zcard.php', 'Zotlabs\\Zot\\Auth' => $baseDir . '/Zotlabs/Zot/Auth.php', - 'Zotlabs\\Zot\\DReport' => $baseDir . '/Zotlabs/Zot/DReport.php', 'Zotlabs\\Zot\\Finger' => $baseDir . '/Zotlabs/Zot/Finger.php', 'Zotlabs\\Zot\\IHandler' => $baseDir . '/Zotlabs/Zot/IHandler.php', 'Zotlabs\\Zot\\Receiver' => $baseDir . '/Zotlabs/Zot/Receiver.php', - 'Zotlabs\\Zot\\Verify' => $baseDir . '/Zotlabs/Zot/Verify.php', 'Zotlabs\\Zot\\ZotHandler' => $baseDir . '/Zotlabs/Zot/ZotHandler.php', ); diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index b0fb922de..aa6a8bce4 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -18,14 +18,43 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'f084d01b0a599f67676cffef638aa95b' => __DIR__ . '/..' . '/smarty/smarty/libs/bootstrap.php', ); - public static $firstCharsPsr4 = array ( - 'Z' => true, - 'S' => true, - 'P' => true, - 'L' => true, - 'I' => true, - 'H' => true, - 'C' => true, + public static $prefixLengthsPsr4 = array ( + 'Z' => + array ( + 'Zotlabs\\' => 8, + ), + 'S' => + array ( + 'Sabre\\Xml\\' => 10, + 'Sabre\\VObject\\' => 14, + 'Sabre\\Uri\\' => 10, + 'Sabre\\HTTP\\' => 11, + 'Sabre\\Event\\' => 12, + 'Sabre\\DAV\\' => 10, + 'Sabre\\DAVACL\\' => 13, + 'Sabre\\CardDAV\\' => 14, + 'Sabre\\CalDAV\\' => 13, + ), + 'P' => + array ( + 'Psr\\Log\\' => 8, + ), + 'L' => + array ( + 'League\\HTMLToMarkdown\\' => 22, + ), + 'I' => + array ( + 'ID3Parser\\' => 10, + ), + 'H' => + array ( + 'Hubzilla\\' => 9, + ), + 'C' => + array ( + 'CommerceGuys\\Intl\\' => 18, + ), ); public static $prefixDirsPsr4 = array ( @@ -394,7 +423,6 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'HTMLPurifier_VarParser_Flexible' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php', 'HTMLPurifier_VarParser_Native' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Native.php', 'HTMLPurifier_Zipper' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Zipper.php', - 'Hubzilla\\Import\\Import' => __DIR__ . '/../..' . '/include/Import/Importer.php', 'ID3Parser\\ID3Parser' => __DIR__ . '/..' . '/lukasreschke/id3parser/src/ID3Parser.php', 'ID3Parser\\getID3\\Tags\\getid3_id3v1' => __DIR__ . '/..' . '/lukasreschke/id3parser/src/getID3/Tags/getid3_id3v1.php', 'ID3Parser\\getID3\\Tags\\getid3_id3v2' => __DIR__ . '/..' . '/lukasreschke/id3parser/src/getID3/Tags/getid3_id3v2.php', @@ -912,6 +940,8 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Daemon\\Thumbnail' => __DIR__ . '/../..' . '/Zotlabs/Daemon/Thumbnail.php', 'Zotlabs\\Extend\\Hook' => __DIR__ . '/../..' . '/Zotlabs/Extend/Hook.php', 'Zotlabs\\Identity\\BasicId\\BasicId' => __DIR__ . '/../..' . '/Zotlabs/Identity/BasicId.php', + 'Zotlabs\\Identity\\OAuth2Server' => __DIR__ . '/../..' . '/Zotlabs/Identity/OAuth2Server.php', + 'Zotlabs\\Identity\\OAuth2Storage' => __DIR__ . '/../..' . '/Zotlabs/Identity/OAuth2Storage.php', 'Zotlabs\\Identity\\ProfilePhoto\\ProfilePhoto' => __DIR__ . '/../..' . '/Zotlabs/Identity/ProfilePhoto.php', 'Zotlabs\\Lib\\AConfig' => __DIR__ . '/../..' . '/Zotlabs/Lib/AConfig.php', 'Zotlabs\\Lib\\AbConfig' => __DIR__ . '/../..' . '/Zotlabs/Lib/AbConfig.php', @@ -922,6 +952,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Lib\\Chatroom' => __DIR__ . '/../..' . '/Zotlabs/Lib/Chatroom.php', 'Zotlabs\\Lib\\Config' => __DIR__ . '/../..' . '/Zotlabs/Lib/Config.php', 'Zotlabs\\Lib\\DB_Upgrade' => __DIR__ . '/../..' . '/Zotlabs/Lib/DB_Upgrade.php', + 'Zotlabs\\Lib\\DReport' => __DIR__ . '/../..' . '/Zotlabs/Lib/DReport.php', 'Zotlabs\\Lib\\Enotify' => __DIR__ . '/../..' . '/Zotlabs/Lib/Enotify.php', 'Zotlabs\\Lib\\ExtendedZip' => __DIR__ . '/../..' . '/Zotlabs/Lib/ExtendedZip.php', 'Zotlabs\\Lib\\IConfig' => __DIR__ . '/../..' . '/Zotlabs/Lib/IConfig.php', @@ -934,15 +965,15 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Lib\\PConfig' => __DIR__ . '/../..' . '/Zotlabs/Lib/PConfig.php', 'Zotlabs\\Lib\\Permcat' => __DIR__ . '/../..' . '/Zotlabs/Lib/Permcat.php', 'Zotlabs\\Lib\\PermissionDescription' => __DIR__ . '/../..' . '/Zotlabs/Lib/PermissionDescription.php', - 'Zotlabs\\Lib\\ProtoDriver' => __DIR__ . '/../..' . '/Zotlabs/Lib/ProtoDriver.php', 'Zotlabs\\Lib\\SConfig' => __DIR__ . '/../..' . '/Zotlabs/Lib/SConfig.php', + 'Zotlabs\\Lib\\Share' => __DIR__ . '/../..' . '/Zotlabs/Lib/Share.php', 'Zotlabs\\Lib\\SuperCurl' => __DIR__ . '/../..' . '/Zotlabs/Lib/SuperCurl.php', 'Zotlabs\\Lib\\System' => __DIR__ . '/../..' . '/Zotlabs/Lib/System.php', 'Zotlabs\\Lib\\Techlevels' => __DIR__ . '/../..' . '/Zotlabs/Lib/Techlevels.php', 'Zotlabs\\Lib\\ThreadItem' => __DIR__ . '/../..' . '/Zotlabs/Lib/ThreadItem.php', 'Zotlabs\\Lib\\ThreadStream' => __DIR__ . '/../..' . '/Zotlabs/Lib/ThreadStream.php', + 'Zotlabs\\Lib\\Verify' => __DIR__ . '/../..' . '/Zotlabs/Lib/Verify.php', 'Zotlabs\\Lib\\XConfig' => __DIR__ . '/../..' . '/Zotlabs/Lib/XConfig.php', - 'Zotlabs\\Lib\\ZotDriver' => __DIR__ . '/../..' . '/Zotlabs/Lib/ZotDriver.php', 'Zotlabs\\Module\\Achievements' => __DIR__ . '/../..' . '/Zotlabs/Module/Achievements.php', 'Zotlabs\\Module\\Acl' => __DIR__ . '/../..' . '/Zotlabs/Module/Acl.php', 'Zotlabs\\Module\\Admin' => __DIR__ . '/../..' . '/Zotlabs/Module/Admin.php', @@ -998,6 +1029,8 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Module\\Editlayout' => __DIR__ . '/../..' . '/Zotlabs/Module/Editlayout.php', 'Zotlabs\\Module\\Editpost' => __DIR__ . '/../..' . '/Zotlabs/Module/Editpost.php', 'Zotlabs\\Module\\Editwebpage' => __DIR__ . '/../..' . '/Zotlabs/Module/Editwebpage.php', + 'Zotlabs\\Module\\Email_resend' => __DIR__ . '/../..' . '/Zotlabs/Module/Email_resend.php', + 'Zotlabs\\Module\\Email_validation' => __DIR__ . '/../..' . '/Zotlabs/Module/Email_validation.php', 'Zotlabs\\Module\\Embedphotos' => __DIR__ . '/../..' . '/Zotlabs/Module/Embedphotos.php', 'Zotlabs\\Module\\Events' => __DIR__ . '/../..' . '/Zotlabs/Module/Events.php', 'Zotlabs\\Module\\Fbrowser' => __DIR__ . '/../..' . '/Zotlabs/Module/Fbrowser.php', @@ -1009,6 +1042,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Module\\Filestorage' => __DIR__ . '/../..' . '/Zotlabs/Module/Filestorage.php', 'Zotlabs\\Module\\Follow' => __DIR__ . '/../..' . '/Zotlabs/Module/Follow.php', 'Zotlabs\\Module\\Getfile' => __DIR__ . '/../..' . '/Zotlabs/Module/Getfile.php', + 'Zotlabs\\Module\\Go' => __DIR__ . '/../..' . '/Zotlabs/Module/Go.php', 'Zotlabs\\Module\\Group' => __DIR__ . '/../..' . '/Zotlabs/Module/Group.php', 'Zotlabs\\Module\\Hcard' => __DIR__ . '/../..' . '/Zotlabs/Module/Hcard.php', 'Zotlabs\\Module\\Help' => __DIR__ . '/../..' . '/Zotlabs/Module/Help.php', @@ -1151,6 +1185,213 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Thumbs\\Pdf' => __DIR__ . '/../..' . '/Zotlabs/Thumbs/Pdf.php', 'Zotlabs\\Thumbs\\Text' => __DIR__ . '/../..' . '/Zotlabs/Thumbs/Text.php', 'Zotlabs\\Thumbs\\Video' => __DIR__ . '/../..' . '/Zotlabs/Thumbs/Video.php', + 'Zotlabs\\Update\\_1000' => __DIR__ . '/../..' . '/Zotlabs/Update/_1000.php', + 'Zotlabs\\Update\\_1001' => __DIR__ . '/../..' . '/Zotlabs/Update/_1001.php', + 'Zotlabs\\Update\\_1002' => __DIR__ . '/../..' . '/Zotlabs/Update/_1002.php', + 'Zotlabs\\Update\\_1003' => __DIR__ . '/../..' . '/Zotlabs/Update/_1003.php', + 'Zotlabs\\Update\\_1004' => __DIR__ . '/../..' . '/Zotlabs/Update/_1004.php', + 'Zotlabs\\Update\\_1005' => __DIR__ . '/../..' . '/Zotlabs/Update/_1005.php', + 'Zotlabs\\Update\\_1006' => __DIR__ . '/../..' . '/Zotlabs/Update/_1006.php', + 'Zotlabs\\Update\\_1007' => __DIR__ . '/../..' . '/Zotlabs/Update/_1007.php', + 'Zotlabs\\Update\\_1008' => __DIR__ . '/../..' . '/Zotlabs/Update/_1008.php', + 'Zotlabs\\Update\\_1009' => __DIR__ . '/../..' . '/Zotlabs/Update/_1009.php', + 'Zotlabs\\Update\\_1010' => __DIR__ . '/../..' . '/Zotlabs/Update/_1010.php', + 'Zotlabs\\Update\\_1011' => __DIR__ . '/../..' . '/Zotlabs/Update/_1011.php', + 'Zotlabs\\Update\\_1012' => __DIR__ . '/../..' . '/Zotlabs/Update/_1012.php', + 'Zotlabs\\Update\\_1013' => __DIR__ . '/../..' . '/Zotlabs/Update/_1013.php', + 'Zotlabs\\Update\\_1014' => __DIR__ . '/../..' . '/Zotlabs/Update/_1014.php', + 'Zotlabs\\Update\\_1015' => __DIR__ . '/../..' . '/Zotlabs/Update/_1015.php', + 'Zotlabs\\Update\\_1016' => __DIR__ . '/../..' . '/Zotlabs/Update/_1016.php', + 'Zotlabs\\Update\\_1017' => __DIR__ . '/../..' . '/Zotlabs/Update/_1017.php', + 'Zotlabs\\Update\\_1018' => __DIR__ . '/../..' . '/Zotlabs/Update/_1018.php', + 'Zotlabs\\Update\\_1019' => __DIR__ . '/../..' . '/Zotlabs/Update/_1019.php', + 'Zotlabs\\Update\\_1020' => __DIR__ . '/../..' . '/Zotlabs/Update/_1020.php', + 'Zotlabs\\Update\\_1021' => __DIR__ . '/../..' . '/Zotlabs/Update/_1021.php', + 'Zotlabs\\Update\\_1022' => __DIR__ . '/../..' . '/Zotlabs/Update/_1022.php', + 'Zotlabs\\Update\\_1023' => __DIR__ . '/../..' . '/Zotlabs/Update/_1023.php', + 'Zotlabs\\Update\\_1024' => __DIR__ . '/../..' . '/Zotlabs/Update/_1024.php', + 'Zotlabs\\Update\\_1025' => __DIR__ . '/../..' . '/Zotlabs/Update/_1025.php', + 'Zotlabs\\Update\\_1026' => __DIR__ . '/../..' . '/Zotlabs/Update/_1026.php', + 'Zotlabs\\Update\\_1027' => __DIR__ . '/../..' . '/Zotlabs/Update/_1027.php', + 'Zotlabs\\Update\\_1028' => __DIR__ . '/../..' . '/Zotlabs/Update/_1028.php', + 'Zotlabs\\Update\\_1029' => __DIR__ . '/../..' . '/Zotlabs/Update/_1029.php', + 'Zotlabs\\Update\\_1030' => __DIR__ . '/../..' . '/Zotlabs/Update/_1030.php', + 'Zotlabs\\Update\\_1031' => __DIR__ . '/../..' . '/Zotlabs/Update/_1031.php', + 'Zotlabs\\Update\\_1032' => __DIR__ . '/../..' . '/Zotlabs/Update/_1032.php', + 'Zotlabs\\Update\\_1033' => __DIR__ . '/../..' . '/Zotlabs/Update/_1033.php', + 'Zotlabs\\Update\\_1034' => __DIR__ . '/../..' . '/Zotlabs/Update/_1034.php', + 'Zotlabs\\Update\\_1035' => __DIR__ . '/../..' . '/Zotlabs/Update/_1035.php', + 'Zotlabs\\Update\\_1036' => __DIR__ . '/../..' . '/Zotlabs/Update/_1036.php', + 'Zotlabs\\Update\\_1037' => __DIR__ . '/../..' . '/Zotlabs/Update/_1037.php', + 'Zotlabs\\Update\\_1038' => __DIR__ . '/../..' . '/Zotlabs/Update/_1038.php', + 'Zotlabs\\Update\\_1039' => __DIR__ . '/../..' . '/Zotlabs/Update/_1039.php', + 'Zotlabs\\Update\\_1040' => __DIR__ . '/../..' . '/Zotlabs/Update/_1040.php', + 'Zotlabs\\Update\\_1041' => __DIR__ . '/../..' . '/Zotlabs/Update/_1041.php', + 'Zotlabs\\Update\\_1042' => __DIR__ . '/../..' . '/Zotlabs/Update/_1042.php', + 'Zotlabs\\Update\\_1043' => __DIR__ . '/../..' . '/Zotlabs/Update/_1043.php', + 'Zotlabs\\Update\\_1044' => __DIR__ . '/../..' . '/Zotlabs/Update/_1044.php', + 'Zotlabs\\Update\\_1045' => __DIR__ . '/../..' . '/Zotlabs/Update/_1045.php', + 'Zotlabs\\Update\\_1046' => __DIR__ . '/../..' . '/Zotlabs/Update/_1046.php', + 'Zotlabs\\Update\\_1047' => __DIR__ . '/../..' . '/Zotlabs/Update/_1047.php', + 'Zotlabs\\Update\\_1048' => __DIR__ . '/../..' . '/Zotlabs/Update/_1048.php', + 'Zotlabs\\Update\\_1049' => __DIR__ . '/../..' . '/Zotlabs/Update/_1049.php', + 'Zotlabs\\Update\\_1050' => __DIR__ . '/../..' . '/Zotlabs/Update/_1050.php', + 'Zotlabs\\Update\\_1051' => __DIR__ . '/../..' . '/Zotlabs/Update/_1051.php', + 'Zotlabs\\Update\\_1052' => __DIR__ . '/../..' . '/Zotlabs/Update/_1052.php', + 'Zotlabs\\Update\\_1053' => __DIR__ . '/../..' . '/Zotlabs/Update/_1053.php', + 'Zotlabs\\Update\\_1054' => __DIR__ . '/../..' . '/Zotlabs/Update/_1054.php', + 'Zotlabs\\Update\\_1055' => __DIR__ . '/../..' . '/Zotlabs/Update/_1055.php', + 'Zotlabs\\Update\\_1056' => __DIR__ . '/../..' . '/Zotlabs/Update/_1056.php', + 'Zotlabs\\Update\\_1057' => __DIR__ . '/../..' . '/Zotlabs/Update/_1057.php', + 'Zotlabs\\Update\\_1058' => __DIR__ . '/../..' . '/Zotlabs/Update/_1058.php', + 'Zotlabs\\Update\\_1059' => __DIR__ . '/../..' . '/Zotlabs/Update/_1059.php', + 'Zotlabs\\Update\\_1060' => __DIR__ . '/../..' . '/Zotlabs/Update/_1060.php', + 'Zotlabs\\Update\\_1061' => __DIR__ . '/../..' . '/Zotlabs/Update/_1061.php', + 'Zotlabs\\Update\\_1062' => __DIR__ . '/../..' . '/Zotlabs/Update/_1062.php', + 'Zotlabs\\Update\\_1063' => __DIR__ . '/../..' . '/Zotlabs/Update/_1063.php', + 'Zotlabs\\Update\\_1064' => __DIR__ . '/../..' . '/Zotlabs/Update/_1064.php', + 'Zotlabs\\Update\\_1065' => __DIR__ . '/../..' . '/Zotlabs/Update/_1065.php', + 'Zotlabs\\Update\\_1066' => __DIR__ . '/../..' . '/Zotlabs/Update/_1066.php', + 'Zotlabs\\Update\\_1067' => __DIR__ . '/../..' . '/Zotlabs/Update/_1067.php', + 'Zotlabs\\Update\\_1068' => __DIR__ . '/../..' . '/Zotlabs/Update/_1068.php', + 'Zotlabs\\Update\\_1069' => __DIR__ . '/../..' . '/Zotlabs/Update/_1069.php', + 'Zotlabs\\Update\\_1070' => __DIR__ . '/../..' . '/Zotlabs/Update/_1070.php', + 'Zotlabs\\Update\\_1071' => __DIR__ . '/../..' . '/Zotlabs/Update/_1071.php', + 'Zotlabs\\Update\\_1072' => __DIR__ . '/../..' . '/Zotlabs/Update/_1072.php', + 'Zotlabs\\Update\\_1073' => __DIR__ . '/../..' . '/Zotlabs/Update/_1073.php', + 'Zotlabs\\Update\\_1074' => __DIR__ . '/../..' . '/Zotlabs/Update/_1074.php', + 'Zotlabs\\Update\\_1075' => __DIR__ . '/../..' . '/Zotlabs/Update/_1075.php', + 'Zotlabs\\Update\\_1076' => __DIR__ . '/../..' . '/Zotlabs/Update/_1076.php', + 'Zotlabs\\Update\\_1077' => __DIR__ . '/../..' . '/Zotlabs/Update/_1077.php', + 'Zotlabs\\Update\\_1078' => __DIR__ . '/../..' . '/Zotlabs/Update/_1078.php', + 'Zotlabs\\Update\\_1079' => __DIR__ . '/../..' . '/Zotlabs/Update/_1079.php', + 'Zotlabs\\Update\\_1080' => __DIR__ . '/../..' . '/Zotlabs/Update/_1080.php', + 'Zotlabs\\Update\\_1081' => __DIR__ . '/../..' . '/Zotlabs/Update/_1081.php', + 'Zotlabs\\Update\\_1082' => __DIR__ . '/../..' . '/Zotlabs/Update/_1082.php', + 'Zotlabs\\Update\\_1083' => __DIR__ . '/../..' . '/Zotlabs/Update/_1083.php', + 'Zotlabs\\Update\\_1084' => __DIR__ . '/../..' . '/Zotlabs/Update/_1084.php', + 'Zotlabs\\Update\\_1085' => __DIR__ . '/../..' . '/Zotlabs/Update/_1085.php', + 'Zotlabs\\Update\\_1086' => __DIR__ . '/../..' . '/Zotlabs/Update/_1086.php', + 'Zotlabs\\Update\\_1087' => __DIR__ . '/../..' . '/Zotlabs/Update/_1087.php', + 'Zotlabs\\Update\\_1088' => __DIR__ . '/../..' . '/Zotlabs/Update/_1088.php', + 'Zotlabs\\Update\\_1089' => __DIR__ . '/../..' . '/Zotlabs/Update/_1089.php', + 'Zotlabs\\Update\\_1090' => __DIR__ . '/../..' . '/Zotlabs/Update/_1090.php', + 'Zotlabs\\Update\\_1091' => __DIR__ . '/../..' . '/Zotlabs/Update/_1091.php', + 'Zotlabs\\Update\\_1092' => __DIR__ . '/../..' . '/Zotlabs/Update/_1092.php', + 'Zotlabs\\Update\\_1093' => __DIR__ . '/../..' . '/Zotlabs/Update/_1093.php', + 'Zotlabs\\Update\\_1094' => __DIR__ . '/../..' . '/Zotlabs/Update/_1094.php', + 'Zotlabs\\Update\\_1095' => __DIR__ . '/../..' . '/Zotlabs/Update/_1095.php', + 'Zotlabs\\Update\\_1096' => __DIR__ . '/../..' . '/Zotlabs/Update/_1096.php', + 'Zotlabs\\Update\\_1097' => __DIR__ . '/../..' . '/Zotlabs/Update/_1097.php', + 'Zotlabs\\Update\\_1098' => __DIR__ . '/../..' . '/Zotlabs/Update/_1098.php', + 'Zotlabs\\Update\\_1099' => __DIR__ . '/../..' . '/Zotlabs/Update/_1099.php', + 'Zotlabs\\Update\\_1100' => __DIR__ . '/../..' . '/Zotlabs/Update/_1100.php', + 'Zotlabs\\Update\\_1101' => __DIR__ . '/../..' . '/Zotlabs/Update/_1101.php', + 'Zotlabs\\Update\\_1102' => __DIR__ . '/../..' . '/Zotlabs/Update/_1102.php', + 'Zotlabs\\Update\\_1103' => __DIR__ . '/../..' . '/Zotlabs/Update/_1103.php', + 'Zotlabs\\Update\\_1104' => __DIR__ . '/../..' . '/Zotlabs/Update/_1104.php', + 'Zotlabs\\Update\\_1105' => __DIR__ . '/../..' . '/Zotlabs/Update/_1105.php', + 'Zotlabs\\Update\\_1106' => __DIR__ . '/../..' . '/Zotlabs/Update/_1106.php', + 'Zotlabs\\Update\\_1107' => __DIR__ . '/../..' . '/Zotlabs/Update/_1107.php', + 'Zotlabs\\Update\\_1108' => __DIR__ . '/../..' . '/Zotlabs/Update/_1108.php', + 'Zotlabs\\Update\\_1109' => __DIR__ . '/../..' . '/Zotlabs/Update/_1109.php', + 'Zotlabs\\Update\\_1110' => __DIR__ . '/../..' . '/Zotlabs/Update/_1110.php', + 'Zotlabs\\Update\\_1111' => __DIR__ . '/../..' . '/Zotlabs/Update/_1111.php', + 'Zotlabs\\Update\\_1112' => __DIR__ . '/../..' . '/Zotlabs/Update/_1112.php', + 'Zotlabs\\Update\\_1113' => __DIR__ . '/../..' . '/Zotlabs/Update/_1113.php', + 'Zotlabs\\Update\\_1114' => __DIR__ . '/../..' . '/Zotlabs/Update/_1114.php', + 'Zotlabs\\Update\\_1115' => __DIR__ . '/../..' . '/Zotlabs/Update/_1115.php', + 'Zotlabs\\Update\\_1116' => __DIR__ . '/../..' . '/Zotlabs/Update/_1116.php', + 'Zotlabs\\Update\\_1117' => __DIR__ . '/../..' . '/Zotlabs/Update/_1117.php', + 'Zotlabs\\Update\\_1118' => __DIR__ . '/../..' . '/Zotlabs/Update/_1118.php', + 'Zotlabs\\Update\\_1119' => __DIR__ . '/../..' . '/Zotlabs/Update/_1119.php', + 'Zotlabs\\Update\\_1120' => __DIR__ . '/../..' . '/Zotlabs/Update/_1120.php', + 'Zotlabs\\Update\\_1121' => __DIR__ . '/../..' . '/Zotlabs/Update/_1121.php', + 'Zotlabs\\Update\\_1122' => __DIR__ . '/../..' . '/Zotlabs/Update/_1122.php', + 'Zotlabs\\Update\\_1123' => __DIR__ . '/../..' . '/Zotlabs/Update/_1123.php', + 'Zotlabs\\Update\\_1124' => __DIR__ . '/../..' . '/Zotlabs/Update/_1124.php', + 'Zotlabs\\Update\\_1125' => __DIR__ . '/../..' . '/Zotlabs/Update/_1125.php', + 'Zotlabs\\Update\\_1126' => __DIR__ . '/../..' . '/Zotlabs/Update/_1126.php', + 'Zotlabs\\Update\\_1127' => __DIR__ . '/../..' . '/Zotlabs/Update/_1127.php', + 'Zotlabs\\Update\\_1128' => __DIR__ . '/../..' . '/Zotlabs/Update/_1128.php', + 'Zotlabs\\Update\\_1129' => __DIR__ . '/../..' . '/Zotlabs/Update/_1129.php', + 'Zotlabs\\Update\\_1130' => __DIR__ . '/../..' . '/Zotlabs/Update/_1130.php', + 'Zotlabs\\Update\\_1131' => __DIR__ . '/../..' . '/Zotlabs/Update/_1131.php', + 'Zotlabs\\Update\\_1132' => __DIR__ . '/../..' . '/Zotlabs/Update/_1132.php', + 'Zotlabs\\Update\\_1133' => __DIR__ . '/../..' . '/Zotlabs/Update/_1133.php', + 'Zotlabs\\Update\\_1134' => __DIR__ . '/../..' . '/Zotlabs/Update/_1134.php', + 'Zotlabs\\Update\\_1135' => __DIR__ . '/../..' . '/Zotlabs/Update/_1135.php', + 'Zotlabs\\Update\\_1136' => __DIR__ . '/../..' . '/Zotlabs/Update/_1136.php', + 'Zotlabs\\Update\\_1137' => __DIR__ . '/../..' . '/Zotlabs/Update/_1137.php', + 'Zotlabs\\Update\\_1138' => __DIR__ . '/../..' . '/Zotlabs/Update/_1138.php', + 'Zotlabs\\Update\\_1139' => __DIR__ . '/../..' . '/Zotlabs/Update/_1139.php', + 'Zotlabs\\Update\\_1140' => __DIR__ . '/../..' . '/Zotlabs/Update/_1140.php', + 'Zotlabs\\Update\\_1141' => __DIR__ . '/../..' . '/Zotlabs/Update/_1141.php', + 'Zotlabs\\Update\\_1142' => __DIR__ . '/../..' . '/Zotlabs/Update/_1142.php', + 'Zotlabs\\Update\\_1143' => __DIR__ . '/../..' . '/Zotlabs/Update/_1143.php', + 'Zotlabs\\Update\\_1144' => __DIR__ . '/../..' . '/Zotlabs/Update/_1144.php', + 'Zotlabs\\Update\\_1145' => __DIR__ . '/../..' . '/Zotlabs/Update/_1145.php', + 'Zotlabs\\Update\\_1146' => __DIR__ . '/../..' . '/Zotlabs/Update/_1146.php', + 'Zotlabs\\Update\\_1147' => __DIR__ . '/../..' . '/Zotlabs/Update/_1147.php', + 'Zotlabs\\Update\\_1148' => __DIR__ . '/../..' . '/Zotlabs/Update/_1148.php', + 'Zotlabs\\Update\\_1149' => __DIR__ . '/../..' . '/Zotlabs/Update/_1149.php', + 'Zotlabs\\Update\\_1150' => __DIR__ . '/../..' . '/Zotlabs/Update/_1150.php', + 'Zotlabs\\Update\\_1151' => __DIR__ . '/../..' . '/Zotlabs/Update/_1151.php', + 'Zotlabs\\Update\\_1152' => __DIR__ . '/../..' . '/Zotlabs/Update/_1152.php', + 'Zotlabs\\Update\\_1153' => __DIR__ . '/../..' . '/Zotlabs/Update/_1153.php', + 'Zotlabs\\Update\\_1154' => __DIR__ . '/../..' . '/Zotlabs/Update/_1154.php', + 'Zotlabs\\Update\\_1155' => __DIR__ . '/../..' . '/Zotlabs/Update/_1155.php', + 'Zotlabs\\Update\\_1156' => __DIR__ . '/../..' . '/Zotlabs/Update/_1156.php', + 'Zotlabs\\Update\\_1157' => __DIR__ . '/../..' . '/Zotlabs/Update/_1157.php', + 'Zotlabs\\Update\\_1158' => __DIR__ . '/../..' . '/Zotlabs/Update/_1158.php', + 'Zotlabs\\Update\\_1159' => __DIR__ . '/../..' . '/Zotlabs/Update/_1159.php', + 'Zotlabs\\Update\\_1160' => __DIR__ . '/../..' . '/Zotlabs/Update/_1160.php', + 'Zotlabs\\Update\\_1161' => __DIR__ . '/../..' . '/Zotlabs/Update/_1161.php', + 'Zotlabs\\Update\\_1162' => __DIR__ . '/../..' . '/Zotlabs/Update/_1162.php', + 'Zotlabs\\Update\\_1163' => __DIR__ . '/../..' . '/Zotlabs/Update/_1163.php', + 'Zotlabs\\Update\\_1164' => __DIR__ . '/../..' . '/Zotlabs/Update/_1164.php', + 'Zotlabs\\Update\\_1165' => __DIR__ . '/../..' . '/Zotlabs/Update/_1165.php', + 'Zotlabs\\Update\\_1166' => __DIR__ . '/../..' . '/Zotlabs/Update/_1166.php', + 'Zotlabs\\Update\\_1167' => __DIR__ . '/../..' . '/Zotlabs/Update/_1167.php', + 'Zotlabs\\Update\\_1168' => __DIR__ . '/../..' . '/Zotlabs/Update/_1168.php', + 'Zotlabs\\Update\\_1169' => __DIR__ . '/../..' . '/Zotlabs/Update/_1169.php', + 'Zotlabs\\Update\\_1170' => __DIR__ . '/../..' . '/Zotlabs/Update/_1170.php', + 'Zotlabs\\Update\\_1171' => __DIR__ . '/../..' . '/Zotlabs/Update/_1171.php', + 'Zotlabs\\Update\\_1172' => __DIR__ . '/../..' . '/Zotlabs/Update/_1172.php', + 'Zotlabs\\Update\\_1173' => __DIR__ . '/../..' . '/Zotlabs/Update/_1173.php', + 'Zotlabs\\Update\\_1174' => __DIR__ . '/../..' . '/Zotlabs/Update/_1174.php', + 'Zotlabs\\Update\\_1175' => __DIR__ . '/../..' . '/Zotlabs/Update/_1175.php', + 'Zotlabs\\Update\\_1176' => __DIR__ . '/../..' . '/Zotlabs/Update/_1176.php', + 'Zotlabs\\Update\\_1177' => __DIR__ . '/../..' . '/Zotlabs/Update/_1177.php', + 'Zotlabs\\Update\\_1178' => __DIR__ . '/../..' . '/Zotlabs/Update/_1178.php', + 'Zotlabs\\Update\\_1179' => __DIR__ . '/../..' . '/Zotlabs/Update/_1179.php', + 'Zotlabs\\Update\\_1180' => __DIR__ . '/../..' . '/Zotlabs/Update/_1180.php', + 'Zotlabs\\Update\\_1181' => __DIR__ . '/../..' . '/Zotlabs/Update/_1181.php', + 'Zotlabs\\Update\\_1182' => __DIR__ . '/../..' . '/Zotlabs/Update/_1182.php', + 'Zotlabs\\Update\\_1183' => __DIR__ . '/../..' . '/Zotlabs/Update/_1183.php', + 'Zotlabs\\Update\\_1184' => __DIR__ . '/../..' . '/Zotlabs/Update/_1184.php', + 'Zotlabs\\Update\\_1185' => __DIR__ . '/../..' . '/Zotlabs/Update/_1185.php', + 'Zotlabs\\Update\\_1186' => __DIR__ . '/../..' . '/Zotlabs/Update/_1186.php', + 'Zotlabs\\Update\\_1187' => __DIR__ . '/../..' . '/Zotlabs/Update/_1187.php', + 'Zotlabs\\Update\\_1188' => __DIR__ . '/../..' . '/Zotlabs/Update/_1188.php', + 'Zotlabs\\Update\\_1189' => __DIR__ . '/../..' . '/Zotlabs/Update/_1189.php', + 'Zotlabs\\Update\\_1190' => __DIR__ . '/../..' . '/Zotlabs/Update/_1190.php', + 'Zotlabs\\Update\\_1191' => __DIR__ . '/../..' . '/Zotlabs/Update/_1191.php', + 'Zotlabs\\Update\\_1192' => __DIR__ . '/../..' . '/Zotlabs/Update/_1192.php', + 'Zotlabs\\Update\\_1193' => __DIR__ . '/../..' . '/Zotlabs/Update/_1193.php', + 'Zotlabs\\Update\\_1194' => __DIR__ . '/../..' . '/Zotlabs/Update/_1194.php', + 'Zotlabs\\Update\\_1195' => __DIR__ . '/../..' . '/Zotlabs/Update/_1195.php', + 'Zotlabs\\Update\\_1196' => __DIR__ . '/../..' . '/Zotlabs/Update/_1196.php', + 'Zotlabs\\Update\\_1197' => __DIR__ . '/../..' . '/Zotlabs/Update/_1197.php', + 'Zotlabs\\Update\\_1198' => __DIR__ . '/../..' . '/Zotlabs/Update/_1198.php', + 'Zotlabs\\Update\\_1199' => __DIR__ . '/../..' . '/Zotlabs/Update/_1199.php', + 'Zotlabs\\Update\\_1200' => __DIR__ . '/../..' . '/Zotlabs/Update/_1200.php', + 'Zotlabs\\Update\\_1201' => __DIR__ . '/../..' . '/Zotlabs/Update/_1201.php', + 'Zotlabs\\Update\\_1202' => __DIR__ . '/../..' . '/Zotlabs/Update/_1202.php', + 'Zotlabs\\Update\\_1203' => __DIR__ . '/../..' . '/Zotlabs/Update/_1203.php', + 'Zotlabs\\Update\\_1204' => __DIR__ . '/../..' . '/Zotlabs/Update/_1204.php', + 'Zotlabs\\Update\\_1205' => __DIR__ . '/../..' . '/Zotlabs/Update/_1205.php', + 'Zotlabs\\Update\\_1206' => __DIR__ . '/../..' . '/Zotlabs/Update/_1206.php', 'Zotlabs\\Web\\CheckJS' => __DIR__ . '/../..' . '/Zotlabs/Web/CheckJS.php', 'Zotlabs\\Web\\Controller' => __DIR__ . '/../..' . '/Zotlabs/Web/Controller.php', 'Zotlabs\\Web\\HTTPHeaders' => __DIR__ . '/../..' . '/Zotlabs/Web/HTTPHeaders.php', @@ -1193,6 +1434,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Widget\\Item' => __DIR__ . '/../..' . '/Zotlabs/Widget/Item.php', 'Zotlabs\\Widget\\Mailmenu' => __DIR__ . '/../..' . '/Zotlabs/Widget/Mailmenu.php', 'Zotlabs\\Widget\\Menu_preview' => __DIR__ . '/../..' . '/Zotlabs/Widget/Menu_preview.php', + 'Zotlabs\\Widget\\Newmember' => __DIR__ . '/../..' . '/Zotlabs/Widget/Newmember.php', 'Zotlabs\\Widget\\Notes' => __DIR__ . '/../..' . '/Zotlabs/Widget/Notes.php', 'Zotlabs\\Widget\\Notifications' => __DIR__ . '/../..' . '/Zotlabs/Widget/Notifications.php', 'Zotlabs\\Widget\\Photo' => __DIR__ . '/../..' . '/Zotlabs/Widget/Photo.php', @@ -1219,18 +1461,16 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Widget\\Wiki_pages' => __DIR__ . '/../..' . '/Zotlabs/Widget/Wiki_pages.php', 'Zotlabs\\Widget\\Zcard' => __DIR__ . '/../..' . '/Zotlabs/Widget/Zcard.php', 'Zotlabs\\Zot\\Auth' => __DIR__ . '/../..' . '/Zotlabs/Zot/Auth.php', - 'Zotlabs\\Zot\\DReport' => __DIR__ . '/../..' . '/Zotlabs/Zot/DReport.php', 'Zotlabs\\Zot\\Finger' => __DIR__ . '/../..' . '/Zotlabs/Zot/Finger.php', 'Zotlabs\\Zot\\IHandler' => __DIR__ . '/../..' . '/Zotlabs/Zot/IHandler.php', 'Zotlabs\\Zot\\Receiver' => __DIR__ . '/../..' . '/Zotlabs/Zot/Receiver.php', - 'Zotlabs\\Zot\\Verify' => __DIR__ . '/../..' . '/Zotlabs/Zot/Verify.php', 'Zotlabs\\Zot\\ZotHandler' => __DIR__ . '/../..' . '/Zotlabs/Zot/ZotHandler.php', ); public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->firstCharsPsr4 = ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d::$firstCharsPsr4; + $loader->prefixLengthsPsr4 = ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d::$prefixLengthsPsr4; $loader->prefixDirsPsr4 = ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d::$prefixDirsPsr4; $loader->prefixesPsr0 = ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d::$prefixesPsr0; $loader->classMap = ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d::$classMap; diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 1e066c570..f2c46da28 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -15,7 +15,7 @@ head_add_js('jquery.js'); head_add_js('/library/justifiedGallery/jquery.justifiedGallery.min.js'); head_add_js('/library/sprintf.js/dist/sprintf.min.js'); -head_add_js('jquery.textinputs.js'); +//head_add_js('jquery.textinputs.js'); head_add_js('autocomplete.js'); head_add_js('/library/jquery-textcomplete/jquery.textcomplete.js'); diff --git a/view/tpl/generic_addon_settings.tpl b/view/tpl/generic_addon_settings.tpl index bf39b2aea..57028237a 100644 --- a/view/tpl/generic_addon_settings.tpl +++ b/view/tpl/generic_addon_settings.tpl @@ -1,12 +1,12 @@ <div class="panel"> <div class="section-subtitle-wrapper" role="tab" id="{{$addon.0}}-settings"> <h3> - <a title="{{$addon.2}}" data-toggle="collapse" data-parent="#settings" href="#{{$addon.0}}-settings-content" aria-controls="{{$addon.0}}-settings-content"> + <a title="{{$addon.2}}" data-toggle="collapse" data-target="#{{$addon.0}}-settings-content" href="#" aria-controls="{{$addon.0}}-settings-content"> {{$addon.1}} </a> </h3> </div> - <div id="{{$addon.0}}-settings-content" class="panel-collapse collapse" role="tabpanel" aria-labelledby="{{$addon.0}}-settings"> + <div id="{{$addon.0}}-settings-content" class="panel-collapse collapse" role="tabpanel" aria-labelledby="{{$addon.0}}-settings" data-parent="#settings"> <div class="section-content-tools-wrapper"> {{$content}} {{if $addon.0}} diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 0f42a6e8a..130dc6918 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -11,12 +11,12 @@ <div class="panel"> <div class="section-subtitle-wrapper" role="tab" id="basic-settings"> <h3> - <a data-toggle="collapse" data-parent="#settings" href="#basic-settings-collapse"> + <a data-toggle="collapse" data-target="#basic-settings-collapse" href="#"> {{$h_basic}} </a> </h3> </div> - <div id="basic-settings-collapse" class="collapse show" role="tabpanel" aria-labelledby="basic-settings"> + <div id="basic-settings-collapse" class="collapse show" role="tabpanel" aria-labelledby="basic-settings" data-parent="#settings"> <div class="section-content-tools-wrapper"> {{include file="field_input.tpl" field=$username}} {{include file="field_select_grouped.tpl" field=$timezone}} @@ -37,12 +37,12 @@ <div class="panel"> <div class="section-subtitle-wrapper" role="tab" id="privacy-settings"> <h3> - <a data-toggle="collapse" data-parent="#settings" href="#privacy-settings-collapse"> + <a data-toggle="collapse" data-target="#privacy-settings-collapse" href="#"> {{$h_prv}} </a> </h3> </div> - <div id="privacy-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="privacy-settings"> + <div id="privacy-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="privacy-settings" data-parent="#settings"> <div class="section-content-tools-wrapper"> {{include file="field_select_grouped.tpl" field=$role}} <div id="advanced-perm" style="display:{{if $permissions_set}}none{{else}}block{{/if}};"> @@ -96,12 +96,12 @@ <div class="panel"> <div class="section-subtitle-wrapper" role="tab" id="notification-settings"> <h3> - <a data-toggle="collapse" data-parent="#settings" href="#notification-settings-collapse"> + <a data-toggle="collapse" data-target="#notification-settings-collapse" href="#"> {{$h_not}} </a> </h3> </div> - <div id="notification-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="notification-settings"> + <div id="notification-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="notification-settings" data-parent="#settings"> <div class="section-content-tools-wrapper"> <div id="settings-notifications"> @@ -160,12 +160,12 @@ <div class="panel"> <div class="section-subtitle-wrapper" role="tab" id="miscellaneous-settings"> <h3> - <a data-toggle="collapse" data-parent="#settings" href="#miscellaneous-settings-collapse" aria-expanded="true" aria-controls="miscellaneous-settings-collapse"> + <a data-toggle="collapse" data-target="#miscellaneous-settings-collapse" href="#" aria-expanded="true" aria-controls="miscellaneous-settings-collapse"> {{$lbl_misc}} </a> </h3> </div> - <div id="miscellaneous-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="miscellaneous-settings"> + <div id="miscellaneous-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="miscellaneous-settings" data-parent="#settings" > <div class="section-content-tools-wrapper"> {{if $profselect}} <label for="contact-profile-selector">{{$profseltxt}}</label> diff --git a/view/tpl/settings_addons.tpl b/view/tpl/settings_addons.tpl index 2a925f1f7..27cfa238a 100755 --- a/view/tpl/settings_addons.tpl +++ b/view/tpl/settings_addons.tpl @@ -1,8 +1,8 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> - <div class="descriptive-text pull-right">{{$descrip}}</div> <h2>{{$title}}</h2> </div> + <div class="section-content-info-wrapper">{{$descrip}}</div> <form action="settings/featured" method="post" autocomplete="off"> <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <div class="panel-group" id="settings" role="tablist"> diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index b0751eb5f..7600038ea 100755 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -10,12 +10,12 @@ <div class="panel"> <div class="section-subtitle-wrapper" role="tab" id="theme-settings-title"> <h3> - <a data-toggle="collapse" data-parent="#settings" href="#theme-settings-content" aria-expanded="true" aria-controls="theme-settings-content"> + <a data-toggle="collapse" data-target="#theme-settings-content" href="#" aria-expanded="true" aria-controls="theme-settings-content"> {{$d_tset}} </a> </h3> </div> - <div id="theme-settings-content" class="collapse show" role="tabpanel" aria-labelledby="theme-settings"> + <div id="theme-settings-content" class="collapse show" role="tabpanel" aria-labelledby="theme-settings" data-parent="#settings" > <div class="section-content-tools-wrapper"> {{if $theme}} {{include file="field_themeselect.tpl" field=$theme}} @@ -33,12 +33,12 @@ <div class="panel"> <div class="section-subtitle-wrapper" role="tab" id="custom-settings-title"> <h3> - <a data-toggle="collapse" data-parent="#settings" href="#custom-settings-content" aria-expanded="true" aria-controls="custom-settings-content"> + <a data-toggle="collapse" data-target="#custom-settings-content" href="" aria-expanded="true" aria-controls="custom-settings-content"> {{$d_ctset}} </a> </h3> </div> - <div id="custom-settings-content" class="collapse{{if !$theme}} in{{/if}}" role="tabpanel" aria-labelledby="custom-settings"> + <div id="custom-settings-content" class="collapse{{if !$theme}} in{{/if}}" role="tabpanel" aria-labelledby="custom-settings" data-parent="#settings" > <div class="section-content-tools-wrapper"> {{if $theme_config}} {{$theme_config}} @@ -49,12 +49,12 @@ <div class="panel"> <div class="section-subtitle-wrapper" role="tab" id="content-settings-title"> <h3> - <a data-toggle="collapse" data-parent="#settings" href="#content-settings-content" aria-expanded="true" aria-controls="content-settings-content"> + <a data-toggle="collapse" data-target="#content-settings-content" href="" aria-expanded="true" aria-controls="content-settings-content"> {{$d_cset}} </a> </h3> </div> - <div id="content-settings-content" class="collapse{{if !$theme && !$theme_config}} in{{/if}}" role="tabpanel" aria-labelledby="content-settings"> + <div id="content-settings-content" class="collapse{{if !$theme && !$theme_config}} in{{/if}}" role="tabpanel" aria-labelledby="content-settings" data-parent="#settings"> <div class="section-content-wrapper"> {{include file="field_input.tpl" field=$ajaxint}} {{include file="field_input.tpl" field=$itemspage}} diff --git a/view/tpl/settings_features.tpl b/view/tpl/settings_features.tpl index dfe049a7a..f8c162e17 100755 --- a/view/tpl/settings_features.tpl +++ b/view/tpl/settings_features.tpl @@ -9,12 +9,12 @@ <div class="panel"> <div class="section-subtitle-wrapper" role="tab" id="{{$g}}-settings-title"> <h3> - <a data-toggle="collapse" data-parent="#settings" href="#{{$g}}-settings-content" aria-expanded="true" aria-controls="{{$g}}-settings-collapse"> + <a data-toggle="collapse" data-target="#{{$g}}-settings-content" href="#" aria-expanded="true" aria-controls="{{$g}}-settings-collapse"> {{$f.0}} </a> </h3> </div> - <div id="{{$g}}-settings-content" class="collapse{{if $g == 'general'}} show{{/if}}" role="tabpanel" aria-labelledby="{{$g}}-settings-title"> + <div id="{{$g}}-settings-content" class="collapse{{if $g == 'general'}} show{{/if}}" role="tabpanel" aria-labelledby="{{$g}}-settings-title" data-parent="#settings"> <div class="section-content-tools-wrapper"> {{foreach $f.1 as $fcat}} {{include file="field_checkbox.tpl" field=$fcat}} |