Merge branch 'dev'

LICENSE

@@ -276,64 +276,3 @@ TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
 YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
-How to Apply These Terms to Your New Programs
-
-If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-{description}
-Copyright (C) {year}  {fullname}
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-Gnomovision version 69, Copyright (C) year name of author
-Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-This is free software, and you are welcome to redistribute it
-under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-`Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-{signature of Ty Coon}, 1 April 1989
-Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.

README.textile

@@ -1,6 +1,6 @@
-h1. rah_flat
+h1. oui_flat
 
-"Download":https://github.com/NicolasGraph/rah_flat/releases | "Donate to the original author":http://rahforum.biz/donate/rah_flat
+"Download":https://github.com/NicolasGraph/oui_flat/releases
 
 This plugin makes your "Textpattern CMS":http://www.textpattern.com database more flat, manageable and editable. Edit templates, forms, pages, preferences, variables and sections as flat files. Use any editor, work in teams and store your website's source under your favorite "version control system":http://en.wikipedia.org/wiki/Revision_control.
 
@@ -24,7 +24,7 @@ h2. Table of contents
 
 h2(#requirements). Plugin requirements
 
-rah_flat’s minimum requirements:
+oui_flat’s minimum requirements:
 
 * Textpattern 4.5+
 
@@ -39,7 +39,7 @@ h2(#prefs). Preferences / options
 * *Security key for the public callback* - Security key for the public callback hook URL. Importing is done when the URL is accessed. The URL follows the format of:
 * *Production status for the systematic upload* - The site production status for which you want to activate the systematic templates upload (see "Basics":#basics).
 
-bc. http://example.com/?rah_flat_key={yourKey}
+bc. http://example.com/?oui_flat_key={yourKey}
 
 Where @http://example.com/@ is your site's URL, and @{yourKey}@ is the security key you specified.
 
@@ -52,7 +52,7 @@ Your flat files are imported to the database:
 
 1. Variables are imported only once to avoid the override of user strings. To update them, remove or rename .json files and refresh.
 
-If you want to exclude a certain content type from importing, just don't create a directory for it. No directory, and rah_flat will leave the database alone when it comes to that content type.
+If you want to exclude a certain content type from importing, just don't create a directory for it. No directory, and oui_flat will leave the database alone when it comes to that content type.
 
 h3. About variables
 
@@ -135,7 +135,7 @@ Here is an example of content for a @menu_sections.json@ file.
 bc.. {
     "value": "articles, about, contact",
     "type": "PREF_HIDDEN",
-    "event": "rah_flat_var",
+    "event": "oui_flat_var",
     "html": "text_input",
     "position": "10",
     "is_private": true
@@ -145,20 +145,20 @@ p. where each data is optional and the default values are the following:
 
 * @"value": "…"@ - _default: '' (empty)_ - The default value of the preference.
 * @"type": "…"@ - _default: PREF_PLUGIN (for Txp 4.6, else PREF_ADVANCED)_ - To hide a pref in the _Preferences_ tab, use _PREF_HIDDEN_, you should probably not use _PREF_CORE_.
-* "event": "…" - _default: 'rah_flat_var'_ - The prefs group name where you want to display your custom pref.
+* "event": "…" - _default: 'oui_flat_var'_ - The prefs group name where you want to display your custom pref.
 * @"html": "…"@ - _default: 'text_input'_ - To display radio buttons, use _onoffradio_ or _yesnoradio_.
 * @"position": "…"@ - _default: 0_ - Use position to sort your prefs.
 * @"is_private": "…"@ - _default: false_ - If _true_, the pref will be user related.
 
-p. While you can call your custom preference as a Txp variable like so: @<txp:variable name="menu_sections" />@; they will be prefixed with @rah_flat_var_@ under the preferences tab and you will need to use the textpack as below to add user friendly titles.
+p. While you can call your custom preference as a Txp variable like so: @<txp:variable name="menu_sections" />@; they will be prefixed with @oui_flat_var_@ under the preferences tab and you will need to use the textpack as below to add user friendly titles.
 
 h3(#textpacks). Textpacks
 
 Here is an example of content for a @en-gb.json@ file.
 
 bc.. {
     "admin": {
-        "rah_flat_var_menu_sections": "Sections used in the menu"
+        "oui_flat_var_menu_sections": "Sections used in the menu"
     },
     "common": {
     },
@@ -172,7 +172,7 @@ p. Text strings are only updated if they already exist, otherwise, they can be i
 
 h2(#author). Author
 
-"Jukka Svahn":http://rahforum.biz/, forked by "Nicolas Morand":https://github.com/ from v0.3.0.
+"Nicolas Morand":https://github.com/, from "rah_flat":https://github.com/gocom/rah_flat by "Jukka Svahn":http://rahforum.biz/.
 
 h2(#licence). Licence
 
@@ -182,16 +182,21 @@ h2(#Changelog). Changelog
 
 * To do: Fix the _Options_ link.
 
-h3. Version 0.5.0- 2016/08/26
+h3. Version 0.6.0 - 2017/03/14
+
+* Changed: Back to @oui_@ plugin author prefix.
+* Changed: Lighten compiled code by removing duplicated license infos.
+
+h3. Version 0.5.0 (rah_flat) - 2016/08/26
 
 * Changed: Forms are stored by types in subfolders and don't need prefixes anymore.
 * Added: Custom form types are changed to 'misc' when the plugin is disable to avoid an error in the Forms tab.
 * Changed: Preferences update affects values only.
 * Added: Prefs are hidden in the admin if set via flat files and get back to visible when the plugin is disabled.
 * Added: Custom prefs (in the variables folder) accept more paramters in .json files.
-* Changed: Custom prefs (in the variables folder) now have a rah_flat_var_ prefix added to their name.
+* Changed: Custom prefs (in the variables folder) now have a oui_flat_var_ prefix added to their name.
 
-h3. Version 0.4.0 (oui_flat) - 2015/11/29
+h3. Version 0.4.0 - 2015/11/29
 
 * Changed: Forked by Nicolas Morand.
 * Added: Custom preferences can be created and use as Txp variables.
@@ -200,12 +205,12 @@ h3. Version 0.4.0 (oui_flat) - 2015/11/29
 h3. Version 0.3.0 - 2014/03/28
 
 * Added: Drop access to a admin-side panel only if the specific content-type is active and has a directory set up.
-* Added: Invokable @rah_flat.import@ callback event.
+* Added: Invokable @oui_flat.import@ callback event.
 * Added: Sections and preferences get their names from the filename.
 * Added: Preferences are always just updated, no strands are created.
 * Added: Preference fields that are not specified in a file are kept as-is in the database.
 * Added: French translation by "Patrick Lefevre":https://github.com/cara-tm.
-* Changed: Renamed confusing @rah_flat_Import_Template@ interface to @rah_flat_Import_ImportInterface@.
+* Changed: Renamed confusing @oui_flat_Import_Template@ interface to @oui_flat_Import_ImportInterface@.
 
 h3. Version 0.2.0 - 2014/03/19
 

composer.json

@@ -1,24 +1,24 @@
 {
-    "name": "rah/rah_flat",
+    "name": "nicolasgraph/oui_flat",
     "description": "Textpattern CMS templates as flat files",
     "keywords": ["textpattern", "plugin", "flat", "template"],
-    "homepage": "https://github.com/gocom/rah_flat",
+    "homepage": "https://github.com/nicolasgraph/oui_flat",
     "license": "GPL-2.0",
     "type": "textpattern-plugin",
     "authors": [
         {
-            "name": "Jukka Svahn",
-            "homepage": "http://rahforum.biz",
+            "name": "Nicolas Morand, Jukka Svahn",
+            "homepage": "https://github.com/nicolasgraph",
             "role": "Developer"
         }
     ],
     "support": {
-        "issues": "https://github.com/gocom/rah_flat/issues",
-        "source": "https://github.com/gocom/rah_flat"
+        "issues": "https://github.com/nicolasgraph/oui_flat/issues",
+        "source": "https://github.com/nicolasgraph/oui_flat"
     },
     "require": {
         "php": ">=5.2.0",
-        "textpattern/lock": ">=4.4.1",
+        "textpattern/lock": ">=4.6",
         "textpattern/installer": "*"
     },
     "require-dev": {

manifest.json

@@ -1,9 +1,9 @@
 {
-    "name"        : "rah_flat",
+    "name"        : "oui_flat",
     "description" : "Edit Textpattern's database prefs, contents and page templates as flat files",
-    "version"     : "0.5.0",
+    "version"     : "0.6.0",
     "type"        : 1,
-    "author"      : "Jukka Svahn (forked by Nicolas Morand)",
+    "author"      : "Nicolas Morand, Jukka Svahn",
     "author_uri"  : "http://github.com/NicolasGraph",
     "order"       : 5,
     "flags"       : 3,