From 62eab117db5701a79ee7da3d6fe76f85502f1dc0 Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Mon, 12 Jun 2017 12:17:20 +0200 Subject: [PATCH] Added PHP-ICO library See #2257 --- .../system/api/chrisjean/php-ico/README.md | 96 +++++ .../system/api/chrisjean/php-ico/changelog | 11 + .../api/chrisjean/php-ico/class-php-ico.php | 264 +++++++++++++ .../api/chrisjean/php-ico/composer.json | 28 ++ .../system/api/chrisjean/php-ico/license.txt | 359 ++++++++++++++++++ .../files/lib/system/api/composer.json | 3 +- .../files/lib/system/api/composer.lock | 45 ++- .../system/api/composer/autoload_classmap.php | 1 + .../system/api/composer/autoload_static.php | 5 + .../lib/system/api/composer/installed.json | 45 +++ 10 files changed, 855 insertions(+), 2 deletions(-) create mode 100644 wcfsetup/install/files/lib/system/api/chrisjean/php-ico/README.md create mode 100644 wcfsetup/install/files/lib/system/api/chrisjean/php-ico/changelog create mode 100644 wcfsetup/install/files/lib/system/api/chrisjean/php-ico/class-php-ico.php create mode 100644 wcfsetup/install/files/lib/system/api/chrisjean/php-ico/composer.json create mode 100644 wcfsetup/install/files/lib/system/api/chrisjean/php-ico/license.txt diff --git a/wcfsetup/install/files/lib/system/api/chrisjean/php-ico/README.md b/wcfsetup/install/files/lib/system/api/chrisjean/php-ico/README.md new file mode 100644 index 0000000000..da0be7552d --- /dev/null +++ b/wcfsetup/install/files/lib/system/api/chrisjean/php-ico/README.md @@ -0,0 +1,96 @@ +PHP ICO - The PHP ICO Generator +=============================== + +PHP ICO provides an easy-to-use PHP class that generates valid [ICO files](http://en.wikipedia.org/wiki/ICO_%28file_format%29). Note that these are not simply BMP, GIF, or PNG formatted images with an extension of ico, the images generated by this class are fully valid ICO-formatted image files. + +The class uses the GD library for reading an image from the source file and uses pure PHP for generating the ICO file format. In theory, any image format that GD can read can be used as a source image to generate the ICO file. I tested this library with JPEG, GIF, and PNG images with great results. If an animated GIF is supplied, the first frame will be used to generate the ICO image. + +The PHP ICO library is available on Composer via Packagist at `chrisjean/php-ico`. + +ICO Format Details +------------------ + +The primary goal of creating this class was to have a simple-to-use and reliable method of generating ICO files for use as [favicons](http://en.wikipedia.org/wiki/Favicon) in websites. This goal drove much of the development and is the reason for some of the limitations in the resulting functionality. + +ICO files support two different ways of encoding the actual image data: the [Windows BMP](http://en.wikipedia.org/wiki/BMP_file_format) format and the [PNG](http://en.wikipedia.org/wiki/Portable_Network_Graphics) format. Since support for the PNG format was introduced in Windows Vista and both older and newer versions of Windows support the BMP enocoding, the BMP encoding method was used. + +Images are encoded using 32 bits per pixel. This allows for alpha channel information in the resulting images. Support for 32 bit images was added in Windows XP. This means that older versions of Windows are not likely to display the ICO images properly, if at all. The generated images have not been tested on versions of Windows predating XP. + +Usage +----- + +The following is a very basic example of using the PHP ICO library: + +```php +require( dirname( __FILE__ ) . '/class-php-ico.php' ); + +$source = dirname( __FILE__ ) . '/example.gif'; +$destination = dirname( __FILE__ ) . '/example.ico'; + +$ico_lib = new PHP_ICO( $source ); +$ico_lib->save_ico( $destination ); +```` + +It takes a source file named `example.gif` and produce an output ICO file named `example.ico`. `example.ico` will contain a single image that is the same size as the source image. + +The ICO file format is capable of holding multiple images, each of a different size. The PHP ICO library opens up this feature of the ICO format as shown in the following example: + +```php +require( dirname( __FILE__ ) . '/class-php-ico.php' ); + +$source = dirname( __FILE__ ) . '/example.gif'; +$destination = dirname( __FILE__ ) . '/example.ico'; + +$ico_lib = new PHP_ICO( $source, array( array( 32, 32 ), array( 64, 64 ) ) ); +$ico_lib->save_ico( $destination ); +``` + +As with the previous example, this example produces `example.ico` from the `example.gif` source file. In this example, sizes were passed to the constructor that result in the `example.ico` file containing two images: one that is 32x32 and one that is 64x64. Since the same source image is used for each of the contained images, each contained image is simply the source image scaled to the new dimensions. + +Using different source images for the different sizes contained inside an ICO file can create much better results. For instance, you can use a high-quality image for higher-resolution images and use smaller images that are tailored for their specific dimensions for the smaller sizes. The following example shows how the PHP ICO library can be used to create such ICO files: + +```php +require( dirname( __FILE__ ) . '/class-php-ico.php' ); + +$destination = dirname( __FILE__ ) . '/example.ico'; + +$ico_lib = new PHP_ICO(); + +$ico_lib->add_image( dirname( __FILE__ ) . '/example-small.gif', array( array( 16, 16 ), array( 24, 24 ), array( 32, 32 ) ) ); +$ico_lib->add_image( dirname( __FILE__ ) . '/example-medium.gif', array( array( 48, 48 ), array( 96, 96 ) ) ); +$ico_lib->add_image( dirname( __FILE__ ) . '/example-large.gif', array( array( 128, 128 ) ) ); + +$ico_lib->save_ico( $destination ); +``` + +This example creates a single ICO file named `example.ico` just as the previous examples. The difference is that this example used multiple source images to generate the final ICO images. The final ICO image contains a total of six images: 16x16, 24x24, and 32x32 images from `example-small.gif`; 48x48 and 96x96 images from `example-medium.gif`; and a 128x128 image from `example-large.gif`. + +By using this feature of supplying multiple source images with specific sizes for each, you can generate ICO files that have very high-quality images at each supplied resolution. + +Since the PHP ICO library was created to generate favicon files, the following example shows how to generate a favicon ICO file with all the needed dimensions from a single source image: + +```php +require( dirname( __FILE__ ) . '/class-php-ico.php' ); + +$source = dirname( __FILE__ ) . '/example.gif'; +$destination = dirname( __FILE__ ) . '/example.ico'; + +$sizes = array( + array( 16, 16 ), + array( 24, 24 ), + array( 32, 32 ), + array( 48, 48 ), +); + +$ico_lib = new PHP_ICO( $source, $sizes ); +$ico_lib->save_ico( $destination ); +``` + +I've found that the 16x16, 24x24, 32x32, and 48x48 image sizes cover all the sizes that browsers and Windows will try to use a favicon image for. The different sizes come from using the favicon for various browser icons, bookmarks, and various other places. + +Thanks +------ + +I'd like to thank [iThemes](http://ithemes.com) for making this project possible. This code was originally developed to add easy-to-use favicon support to the [Builder theme](http://ithemes.com/purchase/builder-theme/). I asked [Cory](http://corymiller.tv/), owner of iThemes and my boss, if I could share the final code. He gave me the green light. Win for everyone. :) + +Thanks iThemes. Thanks Cory. diff --git a/wcfsetup/install/files/lib/system/api/chrisjean/php-ico/changelog b/wcfsetup/install/files/lib/system/api/chrisjean/php-ico/changelog new file mode 100644 index 0000000000..b29202ed17 --- /dev/null +++ b/wcfsetup/install/files/lib/system/api/chrisjean/php-ico/changelog @@ -0,0 +1,11 @@ +1.0.0 - 2011-08-04 + Initial version. +1.0.1 - 2012-10-01 + Added requirements checks. +1.0.2 - 2013-01-07 + Added bug fix that caused source images with transparency to have artifacts when output at the same dimensions as the source. +1.0.3 - 2016-07-22 + Updated class constructor to __construct() as PHP4-style constructors are now deprecated. Props @nuxodin. + Removed trailing whitespace from blank lines. +1.0.4 - 2016-09-27 + Updated version to get composer to track properly. diff --git a/wcfsetup/install/files/lib/system/api/chrisjean/php-ico/class-php-ico.php b/wcfsetup/install/files/lib/system/api/chrisjean/php-ico/class-php-ico.php new file mode 100644 index 0000000000..2e9983e7b2 --- /dev/null +++ b/wcfsetup/install/files/lib/system/api/chrisjean/php-ico/class-php-ico.php @@ -0,0 +1,264 @@ +_has_requirements = true; + + + if ( false != $file ) + $this->add_image( $file, $sizes ); + } + + /** + * Add an image to the generator. + * + * This function adds a source image to the generator. It serves two main purposes: add a source image if one was + * not supplied to the constructor and to add additional source images so that different images can be supplied for + * different sized images in the resulting ICO file. For instance, a small source image can be used for the small + * resolutions while a larger source image can be used for large resolutions. + * + * @param string $file Path to the source image file. + * @param array $sizes Optional. An array of sizes (each size is an array with a width and height) that the source image should be rendered at in the generated ICO file. If sizes are not supplied, the size of the source image will be used. + * @return boolean true on success and false on failure. + */ + function add_image( $file, $sizes = array() ) { + if ( ! $this->_has_requirements ) + return false; + + if ( false === ( $im = $this->_load_image_file( $file ) ) ) + return false; + + + if ( empty( $sizes ) ) + $sizes = array( imagesx( $im ), imagesy( $im ) ); + + // If just a single size was passed, put it in array. + if ( ! is_array( $sizes[0] ) ) + $sizes = array( $sizes ); + + foreach ( (array) $sizes as $size ) { + list( $width, $height ) = $size; + + $new_im = imagecreatetruecolor( $width, $height ); + + imagecolortransparent( $new_im, imagecolorallocatealpha( $new_im, 0, 0, 0, 127 ) ); + imagealphablending( $new_im, false ); + imagesavealpha( $new_im, true ); + + $source_width = imagesx( $im ); + $source_height = imagesy( $im ); + + if ( false === imagecopyresampled( $new_im, $im, 0, 0, 0, 0, $width, $height, $source_width, $source_height ) ) + continue; + + $this->_add_image_data( $new_im ); + } + + return true; + } + + /** + * Write the ICO file data to a file path. + * + * @param string $file Path to save the ICO file data into. + * @return boolean true on success and false on failure. + */ + function save_ico( $file ) { + if ( ! $this->_has_requirements ) + return false; + + if ( false === ( $data = $this->_get_ico_data() ) ) + return false; + + if ( false === ( $fh = fopen( $file, 'w' ) ) ) + return false; + + if ( false === ( fwrite( $fh, $data ) ) ) { + fclose( $fh ); + return false; + } + + fclose( $fh ); + + return true; + } + + /** + * Generate the final ICO data by creating a file header and adding the image data. + * + * @access private + */ + function _get_ico_data() { + if ( ! is_array( $this->_images ) || empty( $this->_images ) ) + return false; + + + $data = pack( 'vvv', 0, 1, count( $this->_images ) ); + $pixel_data = ''; + + $icon_dir_entry_size = 16; + + $offset = 6 + ( $icon_dir_entry_size * count( $this->_images ) ); + + foreach ( $this->_images as $image ) { + $data .= pack( 'CCCCvvVV', $image['width'], $image['height'], $image['color_palette_colors'], 0, 1, $image['bits_per_pixel'], $image['size'], $offset ); + $pixel_data .= $image['data']; + + $offset += $image['size']; + } + + $data .= $pixel_data; + unset( $pixel_data ); + + + return $data; + } + + /** + * Take a GD image resource and change it into a raw BMP format. + * + * @access private + */ + function _add_image_data( $im ) { + $width = imagesx( $im ); + $height = imagesy( $im ); + + + $pixel_data = array(); + + $opacity_data = array(); + $current_opacity_val = 0; + + for ( $y = $height - 1; $y >= 0; $y-- ) { + for ( $x = 0; $x < $width; $x++ ) { + $color = imagecolorat( $im, $x, $y ); + + $alpha = ( $color & 0x7F000000 ) >> 24; + $alpha = ( 1 - ( $alpha / 127 ) ) * 255; + + $color &= 0xFFFFFF; + $color |= 0xFF000000 & ( $alpha << 24 ); + + $pixel_data[] = $color; + + + $opacity = ( $alpha <= 127 ) ? 1 : 0; + + $current_opacity_val = ( $current_opacity_val << 1 ) | $opacity; + + if ( ( ( $x + 1 ) % 32 ) == 0 ) { + $opacity_data[] = $current_opacity_val; + $current_opacity_val = 0; + } + } + + if ( ( $x % 32 ) > 0 ) { + while ( ( $x++ % 32 ) > 0 ) + $current_opacity_val = $current_opacity_val << 1; + + $opacity_data[] = $current_opacity_val; + $current_opacity_val = 0; + } + } + + $image_header_size = 40; + $color_mask_size = $width * $height * 4; + $opacity_mask_size = ( ceil( $width / 32 ) * 4 ) * $height; + + + $data = pack( 'VVVvvVVVVVV', 40, $width, ( $height * 2 ), 1, 32, 0, 0, 0, 0, 0, 0 ); + + foreach ( $pixel_data as $color ) + $data .= pack( 'V', $color ); + + foreach ( $opacity_data as $opacity ) + $data .= pack( 'N', $opacity ); + + + $image = array( + 'width' => $width, + 'height' => $height, + 'color_palette_colors' => 0, + 'bits_per_pixel' => 32, + 'size' => $image_header_size + $color_mask_size + $opacity_mask_size, + 'data' => $data, + ); + + $this->_images[] = $image; + } + + /** + * Read in the source image file and convert it into a GD image resource. + * + * @access private + */ + function _load_image_file( $file ) { + // Run a cheap check to verify that it is an image file. + if ( false === ( $size = getimagesize( $file ) ) ) + return false; + + if ( false === ( $file_data = file_get_contents( $file ) ) ) + return false; + + if ( false === ( $im = imagecreatefromstring( $file_data ) ) ) + return false; + + unset( $file_data ); + + + return $im; + } +} diff --git a/wcfsetup/install/files/lib/system/api/chrisjean/php-ico/composer.json b/wcfsetup/install/files/lib/system/api/chrisjean/php-ico/composer.json new file mode 100644 index 0000000000..71d4a93f97 --- /dev/null +++ b/wcfsetup/install/files/lib/system/api/chrisjean/php-ico/composer.json @@ -0,0 +1,28 @@ +{ + "name": "chrisjean/php-ico", + "description": "An easy-to-use library to generate valid ICO files.", + "version": "1.0.4", + "keywords": ["ico", "favicon"], + "homepage": "https://github.com/chrisbliss18/php-ico", + "license": "GPL-2.0+", + "authors": [ + { + "name": "Chris Jean", + "homepage": "https://chrisjean.com", + "role": "Developer" + } + ], + "support": { + "issues": "https://github.com/chrisbliss18/php-ico/issues", + "source": "https://github.com/chrisbliss18/php-ico" + }, + "require": { + "php": ">=5.2.4", + "ext-gd": "*" + }, + "autoload": { + "classmap": [ + "class-php-ico.php" + ] + } +} diff --git a/wcfsetup/install/files/lib/system/api/chrisjean/php-ico/license.txt b/wcfsetup/install/files/lib/system/api/chrisjean/php-ico/license.txt new file mode 100644 index 0000000000..f1171d35c8 --- /dev/null +++ b/wcfsetup/install/files/lib/system/api/chrisjean/php-ico/license.txt @@ -0,0 +1,359 @@ +PHP ICO - The PHP ICO Generator + +Copyright 2011-2016 Chris Jean + +PHP ICO 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. + +PHP ICO 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 PHP ICO; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +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. + + + Copyright (C) + + 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. + + , 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. diff --git a/wcfsetup/install/files/lib/system/api/composer.json b/wcfsetup/install/files/lib/system/api/composer.json index c668a0251b..342512a3a0 100644 --- a/wcfsetup/install/files/lib/system/api/composer.json +++ b/wcfsetup/install/files/lib/system/api/composer.json @@ -6,6 +6,7 @@ "require": { "ezyang/htmlpurifier": "4.9.*", "erusev/parsedown": "1.6.*", - "pelago/emogrifier": "1.1.*" + "pelago/emogrifier": "1.1.*", + "chrisjean/php-ico": "1.0.*" } } diff --git a/wcfsetup/install/files/lib/system/api/composer.lock b/wcfsetup/install/files/lib/system/api/composer.lock index 748271b683..2c3f20707a 100644 --- a/wcfsetup/install/files/lib/system/api/composer.lock +++ b/wcfsetup/install/files/lib/system/api/composer.lock @@ -4,8 +4,51 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "a16ac53b137b152868cb4414ceb081a4", + "content-hash": "c29f6d996a437cf2a7050610f2b32378", "packages": [ + { + "name": "chrisjean/php-ico", + "version": "1.0.4", + "source": { + "type": "git", + "url": "https://github.com/chrisbliss18/php-ico.git", + "reference": "ccd5c0d56554f3ddcd7a823e695be83e0d1e43b6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/chrisbliss18/php-ico/zipball/ccd5c0d56554f3ddcd7a823e695be83e0d1e43b6", + "reference": "ccd5c0d56554f3ddcd7a823e695be83e0d1e43b6", + "shasum": "" + }, + "require": { + "ext-gd": "*", + "php": ">=5.2.4" + }, + "type": "library", + "autoload": { + "classmap": [ + "class-php-ico.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "Chris Jean", + "homepage": "https://chrisjean.com", + "role": "Developer" + } + ], + "description": "An easy-to-use library to generate valid ICO files.", + "homepage": "https://github.com/chrisbliss18/php-ico", + "keywords": [ + "favicon", + "ico" + ], + "time": "2016-09-27T22:00:56+00:00" + }, { "name": "erusev/parsedown", "version": "1.6.2", diff --git a/wcfsetup/install/files/lib/system/api/composer/autoload_classmap.php b/wcfsetup/install/files/lib/system/api/composer/autoload_classmap.php index 1bd6482f9e..063ce1fa71 100644 --- a/wcfsetup/install/files/lib/system/api/composer/autoload_classmap.php +++ b/wcfsetup/install/files/lib/system/api/composer/autoload_classmap.php @@ -6,4 +6,5 @@ $vendorDir = dirname(dirname(__FILE__)); $baseDir = $vendorDir; return array( + 'PHP_ICO' => $vendorDir . '/chrisjean/php-ico/class-php-ico.php', ); diff --git a/wcfsetup/install/files/lib/system/api/composer/autoload_static.php b/wcfsetup/install/files/lib/system/api/composer/autoload_static.php index 22ce1f3aa8..c6bc48aff0 100644 --- a/wcfsetup/install/files/lib/system/api/composer/autoload_static.php +++ b/wcfsetup/install/files/lib/system/api/composer/autoload_static.php @@ -41,12 +41,17 @@ class ComposerStaticInit4a4e0e985ef68770d710dc260edc44ab ), ); + public static $classMap = array ( + 'PHP_ICO' => __DIR__ . '/..' . '/chrisjean/php-ico/class-php-ico.php', + ); + public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { $loader->prefixLengthsPsr4 = ComposerStaticInit4a4e0e985ef68770d710dc260edc44ab::$prefixLengthsPsr4; $loader->prefixDirsPsr4 = ComposerStaticInit4a4e0e985ef68770d710dc260edc44ab::$prefixDirsPsr4; $loader->prefixesPsr0 = ComposerStaticInit4a4e0e985ef68770d710dc260edc44ab::$prefixesPsr0; + $loader->classMap = ComposerStaticInit4a4e0e985ef68770d710dc260edc44ab::$classMap; }, null, ClassLoader::class); } diff --git a/wcfsetup/install/files/lib/system/api/composer/installed.json b/wcfsetup/install/files/lib/system/api/composer/installed.json index e7ce5a6b12..55d14397ad 100644 --- a/wcfsetup/install/files/lib/system/api/composer/installed.json +++ b/wcfsetup/install/files/lib/system/api/composer/installed.json @@ -153,5 +153,50 @@ "markdown", "parser" ] + }, + { + "name": "chrisjean/php-ico", + "version": "1.0.4", + "version_normalized": "1.0.4.0", + "source": { + "type": "git", + "url": "https://github.com/chrisbliss18/php-ico.git", + "reference": "ccd5c0d56554f3ddcd7a823e695be83e0d1e43b6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/chrisbliss18/php-ico/zipball/ccd5c0d56554f3ddcd7a823e695be83e0d1e43b6", + "reference": "ccd5c0d56554f3ddcd7a823e695be83e0d1e43b6", + "shasum": "" + }, + "require": { + "ext-gd": "*", + "php": ">=5.2.4" + }, + "time": "2016-09-27T22:00:56+00:00", + "type": "library", + "installation-source": "dist", + "autoload": { + "classmap": [ + "class-php-ico.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "Chris Jean", + "homepage": "https://chrisjean.com", + "role": "Developer" + } + ], + "description": "An easy-to-use library to generate valid ICO files.", + "homepage": "https://github.com/chrisbliss18/php-ico", + "keywords": [ + "favicon", + "ico" + ] } ] -- 2.20.1