diff --git a/CHANGELOG b/CHANGELOG index cfccabc..87cb57f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,12 @@ Ralf Hertsch, Stockholmer Str. 31, 13359 Berlin (Germany) http://phpManufaktur.de - ralf.hertsch@phpManufaktur.de +Release 0.55 - 2013-11-24 + +* general program maintenance +* fixed a problem recognizing the correct output filter +* added icon.png (BlackCat CMS) and tool_icon.png (WebsiteBaker 2.8.4) + Release 0.54 - 2013-10-29 * Fixed precheck.php for use with BlackCat CMS v1.0 diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 35aab7d..0000000 --- a/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2012 by Ralf Hertsch - -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. \ No newline at end of file diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..88dd23e --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,8 @@ +**Copyright (c) 2013 by Ralf Hertsch** + +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.** \ No newline at end of file diff --git a/backend.css b/backend.css index 8727758..57a60c9 100644 --- a/backend.css +++ b/backend.css @@ -3,7 +3,7 @@ * * @author Ralf Hertsch * @link http://phpmanufaktur.de - * @copyright 2008-2012 + * @copyright 2008-2013 * @license MIT License (MIT) http://www.opensource.org/licenses/MIT */ @@ -110,6 +110,8 @@ textarea color: #000000; background-color: transparent; font-size: 9pt; + margin: 0; + padding: 5px; } .small { @@ -159,4 +161,4 @@ td.copyright_hint { td.tweak_page_id { text-align: right; color: maroon; -} \ No newline at end of file +} diff --git a/class.filter.php b/class.filter.php index 995dd2e..13e07de 100644 --- a/class.filter.php +++ b/class.filter.php @@ -5,7 +5,7 @@ * * @author Ralf Hertsch * @link http://phpmanufaktur.de - * @copyright 2008-2012 + * @copyright 2008-2013 * @license MIT License (MIT) http://www.opensource.org/licenses/MIT */ @@ -40,9 +40,10 @@ require_once (WB_PATH . '/framework/functions.php'); -function tweakImages($content) { +function tweakImages(&$content) { $tweak = new processContent(); - return $tweak->exec($content); + $content = $tweak->exec($content); + return $content; } // tweakImages() @@ -651,4 +652,4 @@ private function checkImage(&$image, &$classes = array()) { } // checkImage() -} // class processContent \ No newline at end of file +} // class processContent diff --git a/class.gallery.php b/class.gallery.php index 6451786..c1c39ee 100644 --- a/class.gallery.php +++ b/class.gallery.php @@ -5,7 +5,7 @@ * * @author Ralf Hertsch * @link http://phpmanufaktur.de - * @copyright 2008-2012 + * @copyright 2008-2013 * @license MIT License (MIT) http://www.opensource.org/licenses/MIT */ diff --git a/class.tweak.php b/class.tweak.php index b585077..de3806f 100644 --- a/class.tweak.php +++ b/class.tweak.php @@ -5,7 +5,7 @@ * * @author Ralf Hertsch * @link http://phpmanufaktur.de - * @copyright 2008-2012 + * @copyright 2008-2013 * @license MIT License (MIT) http://www.opensource.org/licenses/MIT */ diff --git a/droplets/index.php b/droplets/index.php index 72b4d95..5e313c8 100644 --- a/droplets/index.php +++ b/droplets/index.php @@ -5,7 +5,7 @@ * * @author Ralf Hertsch * @link http://phpmanufaktur.de - * @copyright 2008-2012 + * @copyright 2008-2013 * @license MIT License (MIT) http://www.opensource.org/licenses/MIT */ diff --git a/droplets/it_gallery.php b/droplets/it_gallery.php index fc17f95..569773f 100644 --- a/droplets/it_gallery.php +++ b/droplets/it_gallery.php @@ -5,7 +5,7 @@ * * @author Ralf Hertsch * @link http://phpmanufaktur.de - * @copyright 2008-2012 + * @copyright 2008-2013 * @license MIT License (MIT) http://www.opensource.org/licenses/MIT */ // load the image_tweak.jquery preset with LibraryAdmin diff --git a/filter/imageTweak.php b/filter/imageTweak.php index 3b61846..9bdba95 100644 --- a/filter/imageTweak.php +++ b/filter/imageTweak.php @@ -5,7 +5,7 @@ * * @author Ralf Hertsch * @link http://phpmanufaktur.de - * @copyright 2008-2012 + * @copyright 2008-2013 * @license MIT License (MIT) http://www.opensource.org/licenses/MIT */ diff --git a/htt/backend.info.htt b/htt/backend.info.htt index 981e6b1..b54ad98 100644 --- a/htt/backend.info.htt +++ b/htt/backend.info.htt @@ -7,7 +7,7 @@

imageTweak

-

Release {$version} - © 2008 - 2011 by phpManufaktur, Ralf Hertsch (Berlin)

+

Release {$version} - © 2008 - 2013 by phpManufaktur, Ralf Hertsch (Berlin)