Browse Source

rev update

tags/3.2
friendica 6 years ago
parent
commit
ed6ca1d384
4 changed files with 604 additions and 97 deletions
  1. 524
    19
      LICENSE
  2. 1
    1
      boot.php
  3. 3
    1
      index.php
  4. 76
    76
      util/messages.po

+ 524
- 19
LICENSE View File

@@ -1,20 +1,525 @@
1
+Friendica Communications Server
1 2
 Copyright (c) 2010-2013 the Friendica Project
2
-All rights reserved.
3
-
4
-Permission is hereby granted, free of charge, to any person obtaining a copy
5
-of this software and associated documentation files (the "Software"), to deal
6
-in the Software without restriction, including without limitation the rights
7
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8
-copies of the Software, and to permit persons to whom the Software is
9
-furnished to do so, subject to the following conditions:
10
-
11
-The above copyright notice and this permission notice shall be included in
12
-all copies or substantial portions of the Software.
13
-
14
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
20
-THE SOFTWARE.
3
+
4
+	This program is free software: you can redistribute it and/or modify
5
+    it under the terms of the GNU Affero General Public License as published by
6
+    the Free Software Foundation, either version 3 of the License, or
7
+    (at your option) any later version.
8
+
9
+    This program is distributed in the hope that it will be useful,
10
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
11
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
+    GNU Affero General Public License for more details.
13
+
14
+    You should have received a copy of the GNU Affero General Public License
15
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
16
+
17
+                    GNU AFFERO GENERAL PUBLIC LICENSE
18
+                       Version 3, 19 November 2007
19
+
20
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
21
+ Everyone is permitted to copy and distribute verbatim copies
22
+ of this license document, but changing it is not allowed.
23
+
24
+                            Preamble
25
+
26
+  The GNU Affero General Public License is a free, copyleft license for
27
+software and other kinds of works, specifically designed to ensure
28
+cooperation with the community in the case of network server software.
29
+
30
+  The licenses for most software and other practical works are designed
31
+to take away your freedom to share and change the works.  By contrast,
32
+our General Public Licenses are intended to guarantee your freedom to
33
+share and change all versions of a program--to make sure it remains free
34
+software for all its users.
35
+
36
+  When we speak of free software, we are referring to freedom, not
37
+price.  Our General Public Licenses are designed to make sure that you
38
+have the freedom to distribute copies of free software (and charge for
39
+them if you wish), that you receive source code or can get it if you
40
+want it, that you can change the software or use pieces of it in new
41
+free programs, and that you know you can do these things.
42
+
43
+  Developers that use our General Public Licenses protect your rights
44
+with two steps: (1) assert copyright on the software, and (2) offer
45
+you this License which gives you legal permission to copy, distribute
46
+and/or modify the software.
47
+
48
+  A secondary benefit of defending all users' freedom is that
49
+improvements made in alternate versions of the program, if they
50
+receive widespread use, become available for other developers to
51
+incorporate.  Many developers of free software are heartened and
52
+encouraged by the resulting cooperation.  However, in the case of
53
+software used on network servers, this result may fail to come about.
54
+The GNU General Public License permits making a modified version and
55
+letting the public access it on a server without ever releasing its
56
+source code to the public.
57
+
58
+  The GNU Affero General Public License is designed specifically to
59
+ensure that, in such cases, the modified source code becomes available
60
+to the community.  It requires the operator of a network server to
61
+provide the source code of the modified version running there to the
62
+users of that server.  Therefore, public use of a modified version, on
63
+a publicly accessible server, gives the public access to the source
64
+code of the modified version.
65
+
66
+  An older license, called the Affero General Public License and
67
+published by Affero, was designed to accomplish similar goals.  This is
68
+a different license, not a version of the Affero GPL, but Affero has
69
+released a new version of the Affero GPL which permits relicensing under
70
+this license.
71
+
72
+  The precise terms and conditions for copying, distribution and
73
+modification follow.
74
+
75
+                       TERMS AND CONDITIONS
76
+
77
+  0. Definitions.
78
+
79
+  "This License" refers to version 3 of the GNU Affero General Public License.
80
+
81
+  "Copyright" also means copyright-like laws that apply to other kinds of
82
+works, such as semiconductor masks.
83
+
84
+  "The Program" refers to any copyrightable work licensed under this
85
+License.  Each licensee is addressed as "you".  "Licensees" and
86
+"recipients" may be individuals or organizations.
87
+
88
+  To "modify" a work means to copy from or adapt all or part of the work
89
+in a fashion requiring copyright permission, other than the making of an
90
+exact copy.  The resulting work is called a "modified version" of the
91
+earlier work or a work "based on" the earlier work.
92
+
93
+  A "covered work" means either the unmodified Program or a work based
94
+on the Program.
95
+
96
+  To "propagate" a work means to do anything with it that, without
97
+permission, would make you directly or secondarily liable for
98
+infringement under applicable copyright law, except executing it on a
99
+computer or modifying a private copy.  Propagation includes copying,
100
+distribution (with or without modification), making available to the
101
+public, and in some countries other activities as well.
102
+
103
+  To "convey" a wok means any kind of propagation that enables other
104
+parties to make or receive copies.  Mere interaction with a user through
105
+a computer network, with no transfer of a copy, is not conveying.
106
+
107
+  An interactive user interface displays "Appropriate Legal Notices"
108
+to the extent that it includes a convenient and prominently visible
109
+feature that (1) displays an appropriate copyright notice, and (2)
110
+tells the user that there is no warranty for the work (except to the
111
+extent that warranties are provided), that licensees may convey the
112
+work under this License, and how to view a copy of this License.  If
113
+the interface presents a list of user commands or options, such as a
114
+menu, a prominent item in the list meets this criterion.
115
+
116
+  1. Source Code.
117
+
118
+  The "source code" for a work means the preferred form of the work
119
+for making modifications to it.  "Object code" means any non-source
120
+form of a work.
121
+
122
+  A "Standard Interface" means an interface that either is an official
123
+standard defined by a recognized standards body, or, in the case of
124
+interfaces specified for a particular programming language, one that
125
+is widely used among developers working in that language.
126
+
127
+  The "System Libraries" of an executable work include anything, other
128
+than the work as a whole, that (a) is included in the normal form of
129
+packaging a Major Component, but which is not part of that Major
130
+Component, and (b) serves only to enable use of the work with that
131
+Major Component, or to implement a Standard Interface for which an
132
+implementation is available to the public in source code form.  A
133
+"Major Component", in this context, means a major essential component
134
+(kernel, window system, and so on) of the specific operating system
135
+(if any) on which the executable work runs, or a compiler used to
136
+produce the work, or an object code interpreter used to run it.
137
+
138
+  The "Corresponding Source" for a work in object code form means all
139
+the source code needed to generate, install, and (for an executable
140
+work) run the object code and to modify the work, including scripts to
141
+control those activities.  However, it does not include the work's
142
+System Libraries, or general-purpose tools or generally available free
143
+programs which are used unmodified in performing those activities but
144
+which are not part of the work.  For example, Corresponding Source
145
+includes interface definition files associated with source files for
146
+the work, and the source code for shared libraries and dynamically
147
+linked subprograms that the work is specifically designed to require,
148
+such as by intimate data communication or control flow between those
149
+subprograms and other parts of the work.
150
+
151
+  The Corresponding Source need not include anything that users
152
+can regenerate automatically from other parts of the Corresponding
153
+Source.
154
+
155
+  The Corresponding Source for a work in source code form is that
156
+same work.
157
+
158
+  2. Basic Permissions.
159
+
160
+  All rights granted under this License are granted for the term of
161
+copyright on the Program, and are irrevocable provided the stated
162
+conditions are met.  This License explicitly affirms your unlimited
163
+permission to run the unmodified Program.  The output from running a
164
+covered work is covered by this License only if the output, given its
165
+content, constitutes a covered work.  This License acknowledges your
166
+rights of fair use or other equivalent, as provided by copyright law.
167
+
168
+  You may make, run and propagate covered works that you do not
169
+convey, without conditions so long as your license otherwise remains
170
+in force.  You may convey covered works to others for the sole purpose
171
+of having them make modifications exclusively for you, or provide you
172
+with facilities for running those works, provided that you comply with
173
+the terms of this License in conveying all material for which you do
174
+not control copyright.  Those thus making or running the covered works
175
+for you must do so exclusively on your behalf, under your direction
176
+and control, on terms that prohibit them from making any copies of
177
+your copyrighted material outside their relationship with you.
178
+
179
+  Conveying under any other circumstances is permitted solely under
180
+the conditions stated below.  Sublicensing is not allowed; section 10
181
+makes it unnecessary.
182
+
183
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
184
+
185
+  No covered work shall be deemed part of an effective technological
186
+measure under any applicable law fulfilling obligations under article
187
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
188
+similar laws prohibiting or restricting circumvention of such
189
+measures.
190
+
191
+  When you convey a covered work, you waive any legal power to forbid
192
+circumvention of technological measures to the extent such circumvention
193
+is effected by exercising rights under this License with respect to
194
+the covered work, and you disclaim any intention to limit operation or
195
+modification of the work as a means of enforcing, against the work's
196
+users, your or third parties' legal rights to forbid circumvention of
197
+technological measures.
198
+
199
+  4. Conveying Verbatim Copies.
200
+
201
+  You may convey verbatim copies of the Program's source code as you
202
+receive it, in any medium, provided that you conspicuously and
203
+appropriately publish on each copy an appropriate copyright notice;
204
+keep intact all notices stating that this License and any
205
+non-permissive terms added in accord with section 7 apply to the code;
206
+keep intact all notices of the absence of any warranty; and give all
207
+recipients a copy of this License along with t
208
+    long as you offer spare parts or customer support for that product
209
+    model, to give anyone who possesses the object code either (1) a
210
+    copy of the Corresponding Source for all the software in the
211
+    product that is covered by this License, on a durable physical
212
+    medium customarily used for software interchange, for a price no
213
+    more than your reasonable cost of physically performing this
214
+    conveying of source, or (2) access to copy the
215
+    Corresponding Source from a network server at no charge.
216
+
217
+    c) Convey individual copies of the object code with a copy of the
218
+    written offer to provide the Corresponding Source.  This
219
+    alternative is allowed only occasionally and noncommercially, and
220
+    only if you received the object code with such an offer, in accord
221
+    with subsection 6b.
222
+
223
+    d) Convey the object code by offering access from a designated
224
+    place (gratis or for a charge), and offer equivalent access to the
225
+    Corresponding Source in the same way through the same place at no
226
+    further charge.  You need not require recipients to copy the
227
+    Corresponding Source along with the object code.  If the place to
228
+    copy the object code is a network server, the Corresponding Source
229
+    may be on a different server (operated by you or a third party)
230
+    that supports equivalent copying facilities, provided you maintain
231
+    clear directions next to the object code saying where to find the
232
+    Corresponding Source.  Regardless of what server hosts the
233
+    Corresponding Source, you remain obligated to ensure that it is
234
+    available for as long as needed to satisfy these requirements.
235
+
236
+    e) Convey the object code using peer-to-peer transmission, provided
237
+    you inform other peers where the object code and Corresponding
238
+    Source of the work are being offered to the general public at no
239
+    charge under subsection 6d.
240
+
241
+  A separable portion of the object code, whose source code is excluded
242
+from the Corresponding Source as a System Library, need not be
243
+included in conveying the object code work.
244
+
245
+  A "User Product" is either (1) a "consumer product", which means any
246
+tangible personal property which is normally used for personal, family,
247
+or household purposes, or (2) anything designed or sold for incorporation
248
+into a dwelling.  In determining whether a product is a consumer product,
249
+doubtful cases shall be resolved in favor of coverage.  For a particular
250
+product received by a particular user, "normally used" refers to a
251
+typical or common use of that class of product, regardless of the status
252
+of the particular user or of the way in which the particular user
253
+actually uses, or expects or is expected to use, the product.  A product
254
+is a consumer product regardless of whether the product has substantial
255
+commercial, industrial or non-consumer uses, unless such uses represent
256
+the only significant mode of use of the product.
257
+
258
+  "Installation Information" for a User Product means any methods,
259
+procedures, authorization keys, or other information required to install
260
+and execute modified versions of a covered work in that User Product from
261
+a modified version of its Corresponding Source.  The information must
262
+suffice to ensure that the continued functioning of the modified object
263
+code is in no case prevented or interfered with solely because
264
+modification has been made.
265
+
266
+  If you convey an object code work under this section in, or with, or
267
+specifically for use in, a User Product, and the conveying occurs as
268
+part of a transaction in which the right of possession and use of the
269
+User Product is transferred to the recipient in perpetuity or for a
270
+fixed term (regardless of how the transaction is characterized), the
271
+Corresponding Source conveyed under this section must be accompanied
272
+by the Installation Information.  But this requirement does not apply
273
+if neither you nor any third party retains the ability to install
274
+modified object code on the User Product (for example, the work has
275
+been installed in ROM).
276
+
277
+  The requirement to provide Installation Information does not include a
278
+requirement to continue to provide support service, warranty, or updates
279
+for a work that has been modified or installed by the recipient, or for
280
+the User Product in which it has been modified or installed.  Access to a
281
+network may be denied when the modification itself materially and
282
+adversely affects the operation of the network or violates the rules and
283
+protocols for communication across the network.
284
+
285
+  Corresponding Source conveyed, and Installation Information provided,
286
+in accord with this section must be in a format that is publicly
287
+documented (and with an implementation available to the public in
288
+source code form), and must require no special password or key for
289
+unpacking, reading or copying.
290
+
291
+  7. Additional Terms.
292
+
293
+  "Additional permissions" are terms that supplement the terms of this
294
+License by making exceptions from one or more of its conditions.
295
+Additional permissions that are applicable to the entire Program shall
296
+be treated as though they were included in this License, to the extent
297
+that they are valid under applicable law.  If additional permissions
298
+apply only to part of the Program, that part may be used separately
299
+under those permissions, but the entire Program remains governed by
300
+this License without regard to the additional permissions.
301
+
302
+  When you convey a copy of a covered work, you may at your option
303
+remove any additional permissions from that copy, or from any part of
304
+it.  (Additional permissions may be written to require their own
305
+removal in certain cases when you modify the work.)  You may place
306
+additional permissions on material, added by you to a covered work,
307
+for which you have or can give appropriate copyright permission.
308
+
309
+  Notwithstanding any other provision of this License, for material you
310
+add to a covered work, you may (if authorized by the copyright holders of
311
+that material) supplement the terms of this License with terms:
312
+
313
+    a) Disclaiming warranty or limiting liability differently from the
314
+    terms of sections 15 and 16 of this License; or
315
+
316
+    b) Requiring preservation of specified reasonable legal notices or
317
+    author attributions in that material or in the Appropriate Legal
318
+    Notices displayed by works containing it; or
319
+
320
+    c) Prohibiting misrepresentation of the origin of that material, or
321
+    requiring that modified versions of such material be marked in
322
+    reasonable ways as different from the original version; or
323
+
324
+    d) Limiting the use for publicity purposes of names of licensors or
325
+    authors of the material; or
326
+
327
+    e) Declining to grant rights under trademark law for use of some
328
+    trade names, trademarks, or service marks; or
329
+
330
+    f) Requiring indemnification of licensors and authors of that
331
+    material by anyone who conveys the material (or modified versions of
332
+    it) with contractual assumptions of liability to the recipient, for
333
+    any liability that these contractual assumptions directly impose on
334
+    those licensors and authors.
335
+
336
+  All other non-permissive additional terms are considered "further
337
+restrictions" within the meaning of section 10.  If the Program as you
338
+received it, or any part of it, contains a notice stating that it is
339
+governed by this License along with a term that is a further
340
+restriction, you may remove that term.  If a license document contains
341
+a further restriction but permits relicensing or conveying under this
342
+License, you may add to a covered work material governed by the terms
343
+of that license document, provided that the further restriction does
344
+not survive such relicensing or conveying.
345
+
346
+  If you add terms to a covered work in accord with this section, you
347
+must place, in the relevant source files, a statement of the
348
+additional terms that apply to those files, or a notice indicating
349
+where to find the applicable terms.
350
+
351
+  Additional terms, permissive or non-permissive, may be stated in the
352
+form of a separately written license, or stated as exceptions;
353
+the above requirements apply either way.
354
+
355
+  8. Termination.
356
+
357
+  You may not propagate or modify a covered work except as expressly
358
+provided under this License.  Any attempt otherwise to propagate or
359
+modify it is void, and will automatically terminate your rights under
360
+this License (including any patent licenses granted under the third
361
+paragraph of section 11).
362
+
363
+  However, if you cease all violation of this License, then your
364
+license from a particular copyright holder is reinstated (a)
365
+provisionally, unless and until the copyright holder explicitly and
366
+finally terminates your license, and (b) permanently, if the copyright
367
+holder fails to notify you of the violation by some reasonable means
368
+prior to 60 days after the cessation.
369
+
370
+  Moreover, your license from a particular copyright holder is
371
+reinstated permanently if the copyright holder notifies you of the
372
+violation by some reasonable means, this is the first time you have
373
+received notice of violation of this License (for any work) from that
374
+copyright holder, and you cure the violation prior to 30 days after
375
+your receipt of the notice.
376
+
377
+  Termination of your rights under this section does not terminate the
378
+licenses of parties who have received copies or rights from you under
379
+this License.  If your rights have been terminated and not permanently
380
+reinstated, you do not qualify to receive new licenses for the same
381
+material under section 10.
382
+
383
+  9. Acceptance Not Required for Having Copies.
384
+
385
+  You are not required to accept this License in order to receive or
386
+run a copy of the Program.  Ancillary propagation of a covered work
387
+occurring solely as a consequence of using peer-to-peer transmission
388
+to receive a copy likewise does not require acceptance.  However,
389
+nothing other than this License grants you permission to propagate or
390
+modify any covered work.  These actions infringe copyright if you do
391
+not accept this License.  Therefore, by modifying or propagating a
392
+covered work, you indicate your acceptance of this License to do so.
393
+
394
+  10. Automatic Licensing of Downstream Recipients.
395
+
396
+  E to
397
+make, use, sell, offer for sale, import and otherwise run, modify and
398
+propagate the contents of its contributor version.
399
+
400
+  In the following three paragraphs, a "patent license" is any express
401
+agreement or commitment, however denominated, not to enforce a patent
402
+(such as an express permission to practice a patent or covenant not to
403
+sue for patent infringement).  To "grant" such a patent license to a
404
+party means to make such an agreement or commitment not to enforce a
405
+patent against the party.
406
+
407
+  If you convey a covered work, knowingly relying on a patent license,
408
+and the Corresponding Source of the work is not available for anyone
409
+to copy, free of charge and under the terms of this License, through a
410
+publicly available network server or other readily accessible means,
411
+then you must either (1) cause the Corresponding Source to be so
412
+available, or (2) arrange to deprive yourself of the benefit of the
413
+patent license for this particular work, or (3) arrange, in a manner
414
+consistent with the requirements of this License, to extend the patent
415
+license to downstream recipients.  "Knowingly relying" means you have
416
+actual knowledge that, but for the patent license, your conveying the
417
+covered work in a country, or your recipient's use of the covered work
418
+in a country, would infringe one or more identifiable patents in that
419
+country that you have reason to believe are valid.
420
+
421
+  If, pursuant to or in connection with a single transaction or
422
+arrangement, you convey, or propagate by procuring conveyance of, a
423
+covered work, and grant a patent license to some of the parties
424
+receiving the covered work authorizing them to use, propagate, modify
425
+or convey a specific copy of the covered work, then the patent license
426
+you grant is automatically extended to all recipients of the covered
427
+work and works based on it.
428
+
429
+  A patent license is "discriminatory" if it does not include within
430
+the scope of its coverage, prohibits the exercise of, or is
431
+conditioned on the non-exercise of one or more of the rights that are
432
+specifically granted under this License.  You may not convey a covered
433
+work if you are a party to an arrangement with a third party that is
434
+in the business of distributing software, under which you make payment
435
+to the third party based on the extent of your activity of conveying
436
+the work, and under which the third party grants, to any of the
437
+parties who would receive the covered work from you, a discriminatory
438
+patent license (a) in connection with copies of the covered work
439
+conveyed by you (or copies made from those copies), or (b) primarily
440
+for and in connection with specific products or compilations that
441
+contain the covered work, unless you entered into that arrangement,
442
+or that patent license was granted, prior to 28 March 2007.
443
+
444
+  Nothing in this License shall be construed as excluding or limiting
445
+any implied license or other defenses to infringement that may
446
+otherwise be available to you under applicable patent law.
447
+
448
+  12. No Surrender of Others' Freedom.
449
+
450
+  If conditions are imposed on you (whether by court order, agreement or
451
+otherwise) that contradict the conditions of this License, they do not
452
+excuse you from the conditions of this License.  If you cannot convey a
453
+covered work so as to satisfy simultaneously your obligations under this
454
+License and any other pertinent obligations, then as a consequence you may
455
+not convey it at all.  For example, if you agree to terms that obligate you
456
+to collect a royalty for further conveying from those to whom you convey
457
+the Program, the only way you could satisfy both those terms and this
458
+License would be to refrain entirely from conveying the Program.
459
+
460
+  13. Remote Network Interaction; Use with the GNU General Public License.
461
+
462
+  Notwithstanding any other provision of this License, if you modify the
463
+Program, your modified version must prominently offer all users
464
+interacting with it remotely through a computer network (if your version
465
+supports such interaction) an opportunity to receive the Corresponding
466
+Source of your version by providing access to the Corresponding Source
467
+from a network server at no charge, through some standard or customary
468
+means of facilitating copying of software.  This Corresponding Source
469
+shall include the Corresponding Source for any work covered by version 3
470
+of the GNU General Public License that is incorporated pursuant to the
471
+following paragraph.
472
+
473
+  Notwithstanding any other provision of this License, you have
474
+permission to link or combine any covered work with a work licensed
475
+under version 3 of the GNU General Public License into a single
476
+combined work, and to convey the resulting work.  The terms of this
477
+License will continue to apply to the part which is the covered work,
478
+but the work with which it is combined will remain governed by version
479
+3 of the GNU General Public License.
480
+
481
+  14. Revised Versions of this License.
482
+
483
+  The Free Software Foundation may publish revised and/or new versions of
484
+the GNU Affero General Public License from time to time.  Such new versions
485
+will be similar in spirit to the present version, but may differ in detail to
486
+address new problems or concerns.
487
+
488
+  Each version is given a distinguishing version number.  If the
489
+Program specifies that a certain numbered version of the GNU Affero General
490
+Public License "or any later version" applies to it, you have the
491
+option of following the terms and conditions either of that numbered
492
+version orch source file to most effectively
493
+state the exclusion of warranty; and each file should have at least
494
+the "copyright" line and a pointer to where the full notice is found.
495
+
496
+    <one line to give the program's name and a brief idea of what it does.>
497
+    Copyright (C) <year>  <name of author>
498
+
499
+    This program is free software: you can redistribute it and/or modify
500
+    it under the terms of the GNU Affero General Public License as published by
501
+    the Free Software Foundation, either version 3 of the License, or
502
+    (at your option) any later version.
503
+
504
+    This program is distributed in the hope that it will be useful,
505
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
506
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
507
+    GNU Affero General Public License for more details.
508
+
509
+    You should have received a copy of the GNU Affero General Public License
510
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
511
+
512
+Also add information on how to contact you by electronic and paper mail.
513
+
514
+  If your software can interact with users remotely through a computer
515
+network, you should also make sure that it provides a way for users to
516
+get its source.  For example, if your program is a web application, its
517
+interface could display a "Source" link that leads users to an archive
518
+of the code.  There are many ways you could offer source, and different
519
+solutions will be better for different programs; see section 13 for the
520
+specific requirements.
521
+
522
+  You should also get your employer (if you work as a programmer) or school,
523
+if any, to sign a "copyright disclaimer" for the program, if necessary.
524
+For more information on this, and how to apply and follow the GNU AGPL, see
525
+<http://www.gnu.org/licenses/>.

+ 1
- 1
boot.php View File

@@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
12 12
 require_once('include/features.php');
13 13
 
14 14
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
15
-define ( 'FRIENDICA_VERSION',      '3.1.1706' );
15
+define ( 'FRIENDICA_VERSION',      '3.1.1707' );
16 16
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
17 17
 define ( 'DB_UPDATE_VERSION',      1163      );
18 18
 define ( 'EOL',                    "<br />\r\n"     );

+ 3
- 1
index.php View File

@@ -414,7 +414,9 @@ if(!$a->theme['stylesheet'])
414 414
 	$stylesheet = current_theme_url();
415 415
 else
416 416
 	$stylesheet = $a->theme['stylesheet'];
417
-$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => $stylesheet));
417
+
418
+$a->page['htmlhead'] = str_replace('{{$stylesheet}}',$stylesheet,$a->page['htmlhead']);
419
+//$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => $stylesheet));
418 420
 
419 421
 $page    = $a->page;
420 422
 $profile = $a->profile;

+ 76
- 76
util/messages.po View File

@@ -6,9 +6,9 @@
6 6
 #, fuzzy
7 7
 msgid ""
8 8
 msgstr ""
9
-"Project-Id-Version: 3.1.1706\n"
9
+"Project-Id-Version: 3.1.1707\n"
10 10
 "Report-Msgid-Bugs-To: \n"
11
-"POT-Creation-Date: 2013-05-20 00:03-0700\n"
11
+"POT-Creation-Date: 2013-05-21 00:03-0700\n"
12 12
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,7 +21,7 @@ msgstr ""
21 21
 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:84
22 22
 #: ../../include/nav.php:77 ../../mod/profperm.php:103
23 23
 #: ../../mod/newmember.php:32 ../../view/theme/diabook/theme.php:88
24
-#: ../../boot.php:1946
24
+#: ../../boot.php:1947
25 25
 msgid "Profile"
26 26
 msgstr ""
27 27
 
@@ -30,7 +30,7 @@ msgid "Full Name:"
30 30
 msgstr ""
31 31
 
32 32
 #: ../../include/profile_advanced.php:17 ../../mod/directory.php:136
33
-#: ../../boot.php:1486
33
+#: ../../boot.php:1487
34 34
 msgid "Gender:"
35 35
 msgstr ""
36 36
 
@@ -51,7 +51,7 @@ msgid "Age:"
51 51
 msgstr ""
52 52
 
53 53
 #: ../../include/profile_advanced.php:37 ../../mod/directory.php:138
54
-#: ../../boot.php:1489
54
+#: ../../boot.php:1490
55 55
 msgid "Status:"
56 56
 msgstr ""
57 57
 
@@ -65,7 +65,7 @@ msgid "Sexual Preference:"
65 65
 msgstr ""
66 66
 
67 67
 #: ../../include/profile_advanced.php:48 ../../mod/directory.php:140
68
-#: ../../boot.php:1491
68
+#: ../../boot.php:1492
69 69
 msgid "Homepage:"
70 70
 msgstr ""
71 71
 
@@ -401,6 +401,25 @@ msgstr ""
401 401
 msgid "Send PM"
402 402
 msgstr ""
403 403
 
404
+#: ../../include/bbcode.php:210 ../../include/bbcode.php:549
405
+msgid "Image/photo"
406
+msgstr ""
407
+
408
+#: ../../include/bbcode.php:272
409
+#, php-format
410
+msgid ""
411
+"<span><a href=\"%s\" target=\"external-link\">%s</a> wrote the following <a "
412
+"href=\"%s\" target=\"external-link\">post</a>"
413
+msgstr ""
414
+
415
+#: ../../include/bbcode.php:514 ../../include/bbcode.php:534
416
+msgid "$1 wrote:"
417
+msgstr ""
418
+
419
+#: ../../include/bbcode.php:557 ../../include/bbcode.php:558
420
+msgid "Encrypted content"
421
+msgstr ""
422
+
404 423
 #: ../../include/acl_selectors.php:325
405 424
 msgid "Visible to everybody"
406 425
 msgstr ""
@@ -448,7 +467,7 @@ msgid "Finishes:"
448 467
 msgstr ""
449 468
 
450 469
 #: ../../include/bb2diaspora.php:415 ../../include/event.php:40
451
-#: ../../mod/directory.php:134 ../../mod/events.php:471 ../../boot.php:1484
470
+#: ../../mod/directory.php:134 ../../mod/events.php:471 ../../boot.php:1485
452 471
 msgid "Location:"
453 472
 msgstr ""
454 473
 
@@ -702,7 +721,7 @@ msgid "Example: bob@example.com, http://example.com/barbara"
702 721
 msgstr ""
703 722
 
704 723
 #: ../../include/contact_widgets.php:9 ../../mod/suggest.php:88
705
-#: ../../mod/match.php:58 ../../boot.php:1416
724
+#: ../../mod/match.php:58 ../../boot.php:1417
706 725
 msgid "Connect"
707 726
 msgstr ""
708 727
 
@@ -779,7 +798,7 @@ msgstr[0] ""
779 798
 msgstr[1] ""
780 799
 
781 800
 #: ../../include/contact_widgets.php:204 ../../mod/content.php:629
782
-#: ../../object/Item.php:365 ../../boot.php:670
801
+#: ../../object/Item.php:365 ../../boot.php:671
783 802
 msgid "show more"
784 803
 msgstr ""
785 804
 
@@ -787,25 +806,6 @@ msgstr ""
787 806
 msgid " on Last.fm"
788 807
 msgstr ""
789 808
 
790
-#: ../../include/bbcode.php:210 ../../include/bbcode.php:549
791
-msgid "Image/photo"
792
-msgstr ""
793
-
794
-#: ../../include/bbcode.php:272
795
-#, php-format
796
-msgid ""
797
-"<span><a href=\"%s\" target=\"external-link\">%s</a> wrote the following <a "
798
-"href=\"%s\" target=\"external-link\">post</a>"
799
-msgstr ""
800
-
801
-#: ../../include/bbcode.php:514 ../../include/bbcode.php:534
802
-msgid "$1 wrote:"
803
-msgstr ""
804
-
805
-#: ../../include/bbcode.php:557 ../../include/bbcode.php:558
806
-msgid "Encrypted content"
807
-msgstr ""
808
-
809 809
 #: ../../include/network.php:877
810 810
 msgid "view full size"
811 811
 msgstr ""
@@ -1996,7 +1996,7 @@ msgstr ""
1996 1996
 msgid "Clear notifications"
1997 1997
 msgstr ""
1998 1998
 
1999
-#: ../../include/nav.php:73 ../../boot.php:1135
1999
+#: ../../include/nav.php:73 ../../boot.php:1136
2000 2000
 msgid "Logout"
2001 2001
 msgstr ""
2002 2002
 
@@ -2004,7 +2004,7 @@ msgstr ""
2004 2004
 msgid "End this session"
2005 2005
 msgstr ""
2006 2006
 
2007
-#: ../../include/nav.php:76 ../../boot.php:1939
2007
+#: ../../include/nav.php:76 ../../boot.php:1940
2008 2008
 msgid "Status"
2009 2009
 msgstr ""
2010 2010
 
@@ -2018,7 +2018,7 @@ msgid "Your profile page"
2018 2018
 msgstr ""
2019 2019
 
2020 2020
 #: ../../include/nav.php:78 ../../mod/fbrowser.php:25
2021
-#: ../../view/theme/diabook/theme.php:90 ../../boot.php:1953
2021
+#: ../../view/theme/diabook/theme.php:90 ../../boot.php:1954
2022 2022
 msgid "Photos"
2023 2023
 msgstr ""
2024 2024
 
@@ -2027,7 +2027,7 @@ msgid "Your photos"
2027 2027
 msgstr ""
2028 2028
 
2029 2029
 #: ../../include/nav.php:79 ../../mod/events.php:370
2030
-#: ../../view/theme/diabook/theme.php:91 ../../boot.php:1970
2030
+#: ../../view/theme/diabook/theme.php:91 ../../boot.php:1971
2031 2031
 msgid "Events"
2032 2032
 msgstr ""
2033 2033
 
@@ -2043,7 +2043,7 @@ msgstr ""
2043 2043
 msgid "Your personal photos"
2044 2044
 msgstr ""
2045 2045
 
2046
-#: ../../include/nav.php:91 ../../boot.php:1136
2046
+#: ../../include/nav.php:91 ../../boot.php:1137
2047 2047
 msgid "Login"
2048 2048
 msgstr ""
2049 2049
 
@@ -2060,7 +2060,7 @@ msgstr ""
2060 2060
 msgid "Home Page"
2061 2061
 msgstr ""
2062 2062
 
2063
-#: ../../include/nav.php:108 ../../mod/register.php:275 ../../boot.php:1111
2063
+#: ../../include/nav.php:108 ../../mod/register.php:275 ../../boot.php:1112
2064 2064
 msgid "Register"
2065 2065
 msgstr ""
2066 2066
 
@@ -2189,7 +2189,7 @@ msgstr ""
2189 2189
 msgid "Account settings"
2190 2190
 msgstr ""
2191 2191
 
2192
-#: ../../include/nav.php:169 ../../boot.php:1438
2192
+#: ../../include/nav.php:169 ../../boot.php:1439
2193 2193
 msgid "Profiles"
2194 2194
 msgstr ""
2195 2195
 
@@ -2588,23 +2588,23 @@ msgstr ""
2588 2588
 msgid "Edit/Manage Profiles"
2589 2589
 msgstr ""
2590 2590
 
2591
-#: ../../mod/profiles.php:726 ../../boot.php:1444 ../../boot.php:1470
2591
+#: ../../mod/profiles.php:726 ../../boot.php:1445 ../../boot.php:1471
2592 2592
 msgid "Change profile photo"
2593 2593
 msgstr ""
2594 2594
 
2595
-#: ../../mod/profiles.php:727 ../../boot.php:1445
2595
+#: ../../mod/profiles.php:727 ../../boot.php:1446
2596 2596
 msgid "Create New Profile"
2597 2597
 msgstr ""
2598 2598
 
2599
-#: ../../mod/profiles.php:738 ../../boot.php:1455
2599
+#: ../../mod/profiles.php:738 ../../boot.php:1456
2600 2600
 msgid "Profile Image"
2601 2601
 msgstr ""
2602 2602
 
2603
-#: ../../mod/profiles.php:740 ../../boot.php:1458
2603
+#: ../../mod/profiles.php:740 ../../boot.php:1459
2604 2604
 msgid "visible to everybody"
2605 2605
 msgstr ""
2606 2606
 
2607
-#: ../../mod/profiles.php:741 ../../boot.php:1459
2607
+#: ../../mod/profiles.php:741 ../../boot.php:1460
2608 2608
 msgid "Edit visibility"
2609 2609
 msgstr ""
2610 2610
 
@@ -2632,7 +2632,7 @@ msgstr ""
2632 2632
 msgid "All Contacts (with secure profile access)"
2633 2633
 msgstr ""
2634 2634
 
2635
-#: ../../mod/notes.php:44 ../../boot.php:1977
2635
+#: ../../mod/notes.php:44 ../../boot.php:1978
2636 2636
 msgid "Personal Notes"
2637 2637
 msgstr ""
2638 2638
 
@@ -5571,7 +5571,7 @@ msgid ""
5571 5571
 "Password reset failed."
5572 5572
 msgstr ""
5573 5573
 
5574
-#: ../../mod/lostpass.php:84 ../../boot.php:1150
5574
+#: ../../mod/lostpass.php:84 ../../boot.php:1151
5575 5575
 msgid "Password Reset"
5576 5576
 msgstr ""
5577 5577
 
@@ -5957,7 +5957,7 @@ msgstr ""
5957 5957
 msgid "Home Notifications"
5958 5958
 msgstr ""
5959 5959
 
5960
-#: ../../mod/photos.php:51 ../../boot.php:1956
5960
+#: ../../mod/photos.php:51 ../../boot.php:1957
5961 5961
 msgid "Photo Albums"
5962 5962
 msgstr ""
5963 5963
 
@@ -6153,7 +6153,7 @@ msgstr ""
6153 6153
 
6154 6154
 #: ../../mod/photos.php:1551 ../../mod/photos.php:1595
6155 6155
 #: ../../mod/photos.php:1678 ../../mod/content.php:732
6156
-#: ../../object/Item.php:338 ../../object/Item.php:652 ../../boot.php:669
6156
+#: ../../object/Item.php:338 ../../object/Item.php:652 ../../boot.php:670
6157 6157
 msgid "Comment"
6158 6158
 msgstr ""
6159 6159
 
@@ -6342,7 +6342,7 @@ msgid ""
6342 6342
 "features and resources."
6343 6343
 msgstr ""
6344 6344
 
6345
-#: ../../mod/profile.php:21 ../../boot.php:1324
6345
+#: ../../mod/profile.php:21 ../../boot.php:1325
6346 6346
 msgid "Requested profile is not available."
6347 6347
 msgstr ""
6348 6348
 
@@ -6981,128 +6981,128 @@ msgstr ""
6981 6981
 msgid "toggle mobile"
6982 6982
 msgstr ""
6983 6983
 
6984
-#: ../../boot.php:668
6984
+#: ../../boot.php:669
6985 6985
 msgid "Delete this item?"
6986 6986
 msgstr ""
6987 6987
 
6988
-#: ../../boot.php:671
6988
+#: ../../boot.php:672
6989 6989
 msgid "show fewer"
6990 6990
 msgstr ""
6991 6991
 
6992
-#: ../../boot.php:998
6992
+#: ../../boot.php:999
6993 6993
 #, php-format
6994 6994
 msgid "Update %s failed. See error logs."
6995 6995
 msgstr ""
6996 6996
 
6997
-#: ../../boot.php:1000
6997
+#: ../../boot.php:1001
6998 6998
 #, php-format
6999 6999
 msgid "Update Error at %s"
7000 7000
 msgstr ""
7001 7001
 
7002
-#: ../../boot.php:1110
7002
+#: ../../boot.php:1111
7003 7003
 msgid "Create a New Account"
7004 7004
 msgstr ""
7005 7005
 
7006
-#: ../../boot.php:1138
7006
+#: ../../boot.php:1139
7007 7007
 msgid "Nickname or Email address: "
7008 7008
 msgstr ""
7009 7009
 
7010
-#: ../../boot.php:1139
7010
+#: ../../boot.php:1140
7011 7011
 msgid "Password: "
7012 7012
 msgstr ""
7013 7013
 
7014
-#: ../../boot.php:1140
7014
+#: ../../boot.php:1141
7015 7015
 msgid "Remember me"
7016 7016
 msgstr ""
7017 7017
 
7018
-#: ../../boot.php:1143
7018
+#: ../../boot.php:1144
7019 7019
 msgid "Or login using OpenID: "
7020 7020
 msgstr ""
7021 7021
 
7022
-#: ../../boot.php:1149
7022
+#: ../../boot.php:1150
7023 7023
 msgid "Forgot your password?"
7024 7024
 msgstr ""
7025 7025
 
7026
-#: ../../boot.php:1152
7026
+#: ../../boot.php:1153
7027 7027
 msgid "Website Terms of Service"
7028 7028
 msgstr ""
7029 7029
 
7030
-#: ../../boot.php:1153
7030
+#: ../../boot.php:1154
7031 7031
 msgid "terms of service"
7032 7032
 msgstr ""
7033 7033
 
7034
-#: ../../boot.php:1155
7034
+#: ../../boot.php:1156
7035 7035
 msgid "Website Privacy Policy"
7036 7036
 msgstr ""
7037 7037
 
7038
-#: ../../boot.php:1156
7038
+#: ../../boot.php:1157
7039 7039
 msgid "privacy policy"
7040 7040
 msgstr ""
7041 7041
 
7042
-#: ../../boot.php:1285
7042
+#: ../../boot.php:1286
7043 7043
 msgid "Requested account is not available."
7044 7044
 msgstr ""
7045 7045
 
7046
-#: ../../boot.php:1364 ../../boot.php:1468
7046
+#: ../../boot.php:1365 ../../boot.php:1469
7047 7047
 msgid "Edit profile"
7048 7048
 msgstr ""
7049 7049
 
7050
-#: ../../boot.php:1430
7050
+#: ../../boot.php:1431
7051 7051
 msgid "Message"
7052 7052
 msgstr ""
7053 7053
 
7054
-#: ../../boot.php:1438
7054
+#: ../../boot.php:1439
7055 7055
 msgid "Manage/edit profiles"
7056 7056
 msgstr ""
7057 7057
 
7058
-#: ../../boot.php:1567 ../../boot.php:1653
7058
+#: ../../boot.php:1568 ../../boot.php:1654
7059 7059
 msgid "g A l F d"
7060 7060
 msgstr ""
7061 7061
 
7062
-#: ../../boot.php:1568 ../../boot.php:1654
7062
+#: ../../boot.php:1569 ../../boot.php:1655
7063 7063
 msgid "F d"
7064 7064
 msgstr ""
7065 7065
 
7066
-#: ../../boot.php:1613 ../../boot.php:1694
7066
+#: ../../boot.php:1614 ../../boot.php:1695
7067 7067
 msgid "[today]"
7068 7068
 msgstr ""
7069 7069
 
7070
-#: ../../boot.php:1625
7070
+#: ../../boot.php:1626
7071 7071
 msgid "Birthday Reminders"
7072 7072
 msgstr ""
7073 7073
 
7074
-#: ../../boot.php:1626
7074
+#: ../../boot.php:1627
7075 7075
 msgid "Birthdays this week:"
7076 7076
 msgstr ""
7077 7077
 
7078
-#: ../../boot.php:1687
7078
+#: ../../boot.php:1688
7079 7079
 msgid "[No description]"
7080 7080
 msgstr ""
7081 7081
 
7082
-#: ../../boot.php:1705
7082
+#: ../../boot.php:1706
7083 7083
 msgid "Event Reminders"
7084 7084
 msgstr ""
7085 7085
 
7086
-#: ../../boot.php:1706
7086
+#: ../../boot.php:1707
7087 7087
 msgid "Events this week:"
7088 7088
 msgstr ""
7089 7089
 
7090
-#: ../../boot.php:1942
7090
+#: ../../boot.php:1943
7091 7091
 msgid "Status Messages and Posts"
7092 7092
 msgstr ""
7093 7093
 
7094
-#: ../../boot.php:1949
7094
+#: ../../boot.php:1950
7095 7095
 msgid "Profile Details"
7096 7096
 msgstr ""
7097 7097
 
7098
-#: ../../boot.php:1960 ../../boot.php:1963
7098
+#: ../../boot.php:1961 ../../boot.php:1964
7099 7099
 msgid "Videos"
7100 7100
 msgstr ""
7101 7101
 
7102
-#: ../../boot.php:1973
7102
+#: ../../boot.php:1974
7103 7103
 msgid "Events and Calendar"
7104 7104
 msgstr ""
7105 7105
 
7106
-#: ../../boot.php:1980
7106
+#: ../../boot.php:1981
7107 7107
 msgid "Only You Can See This"
7108 7108
 msgstr ""

Loading…
Cancel
Save