# HG changeset patch # User Dan # Date 1205699422 14400 # Node ID 3b5b78182ce5bae81459b4dd97d8fd5b2d7a2d49 # Parent bc8e0e9ee01d66625a42fdce533defbb1e926089 Added icons for the administration panel diff -r bc8e0e9ee01d -r 3b5b78182ce5 images/icons/applets/adminlogout.png Binary file images/icons/applets/adminlogout.png has changed diff -r bc8e0e9ee01d -r 3b5b78182ce5 images/icons/applets/bancontrol.png Binary file images/icons/applets/bancontrol.png has changed diff -r bc8e0e9ee01d -r 3b5b78182ce5 images/icons/applets/coppa.png Binary file images/icons/applets/coppa.png has changed diff -r bc8e0e9ee01d -r 3b5b78182ce5 images/icons/applets/dbbackup.png Binary file images/icons/applets/dbbackup.png has changed diff -r bc8e0e9ee01d -r 3b5b78182ce5 images/icons/applets/generalconfig.png Binary file images/icons/applets/generalconfig.png has changed diff -r bc8e0e9ee01d -r 3b5b78182ce5 images/icons/applets/groupmanager.png Binary file images/icons/applets/groupmanager.png has changed diff -r bc8e0e9ee01d -r 3b5b78182ce5 images/icons/applets/home.png Binary file images/icons/applets/home.png has changed diff -r bc8e0e9ee01d -r 3b5b78182ce5 images/icons/applets/langmanager.png Binary file images/icons/applets/langmanager.png has changed diff -r bc8e0e9ee01d -r 3b5b78182ce5 images/icons/applets/massemail.png Binary file images/icons/applets/massemail.png has changed diff -r bc8e0e9ee01d -r 3b5b78182ce5 images/icons/applets/pageeditor.png Binary file images/icons/applets/pageeditor.png has changed diff -r bc8e0e9ee01d -r 3b5b78182ce5 images/icons/applets/pagegroups.png Binary file images/icons/applets/pagegroups.png has changed diff -r bc8e0e9ee01d -r 3b5b78182ce5 images/icons/applets/pagemanager.png Binary file images/icons/applets/pagemanager.png has changed diff -r bc8e0e9ee01d -r 3b5b78182ce5 images/icons/applets/pluginmanager.png Binary file images/icons/applets/pluginmanager.png has changed diff -r bc8e0e9ee01d -r 3b5b78182ce5 images/icons/applets/securitylog.png Binary file images/icons/applets/securitylog.png has changed diff -r bc8e0e9ee01d -r 3b5b78182ce5 images/icons/applets/thememanager.png Binary file images/icons/applets/thememanager.png has changed diff -r bc8e0e9ee01d -r 3b5b78182ce5 images/icons/applets/uploadallowedmimetypes.png Binary file images/icons/applets/uploadallowedmimetypes.png has changed diff -r bc8e0e9ee01d -r 3b5b78182ce5 images/icons/applets/uploadconfig.png Binary file images/icons/applets/uploadconfig.png has changed diff -r bc8e0e9ee01d -r 3b5b78182ce5 images/icons/applets/usermanager.png Binary file images/icons/applets/usermanager.png has changed diff -r bc8e0e9ee01d -r 3b5b78182ce5 includes/paths.php --- a/includes/paths.php Sun Mar 16 16:06:59 2008 -0400 +++ b/includes/paths.php Sun Mar 16 16:30:22 2008 -0400 @@ -78,22 +78,22 @@ $session->register_acl_type('edit_acl', AUTH_DISALLOW, 'perm_edit_acl', Array('read', 'post_comments', 'edit_comments', 'edit_page', 'view_source', 'mod_comments', 'history_view', 'history_rollback', 'history_rollback_extra', 'protect', 'rename', 'clear_logs', 'vote_delete', 'vote_reset', 'delete_page', 'set_wiki_mode', 'password_set', 'password_reset', 'mod_misc', 'edit_cat', 'even_when_protected', 'upload_files', 'upload_new_version', 'create_page', 'php_in_pages')); // DO NOT add new admin pages here! Use a plugin to call $paths->addAdminNode(); - $this->addAdminNode('adm_cat_general', 'adm_page_general_config', 'GeneralConfig'); - $this->addAdminNode('adm_cat_general', 'adm_page_file_uploads', 'UploadConfig'); - $this->addAdminNode('adm_cat_general', 'adm_page_file_types', 'UploadAllowedMimeTypes'); - $this->addAdminNode('adm_cat_general', 'adm_page_plugins', 'PluginManager'); - $this->addAdminNode('adm_cat_general', 'adm_page_db_backup', 'DBBackup'); - $this->addAdminNode('adm_cat_general', 'adm_page_lang_manager', 'LangManager'); - $this->addAdminNode('adm_cat_content', 'adm_page_manager', 'PageManager'); - $this->addAdminNode('adm_cat_content', 'adm_page_editor', 'PageEditor'); - $this->addAdminNode('adm_cat_content', 'adm_page_pg_groups', 'PageGroups'); - $this->addAdminNode('adm_cat_appearance', 'adm_page_themes', 'ThemeManager'); - $this->addAdminNode('adm_cat_users', 'adm_page_users', 'UserManager'); - $this->addAdminNode('adm_cat_users', 'adm_page_user_groups', 'GroupManager'); - $this->addAdminNode('adm_cat_users', 'adm_page_coppa', 'COPPA'); - $this->addAdminNode('adm_cat_users', 'adm_page_mass_email', 'MassEmail'); - $this->addAdminNode('adm_cat_security', 'adm_page_security_log', 'SecurityLog'); - $this->addAdminNode('adm_cat_security', 'adm_page_ban_control', 'BanControl'); + $this->addAdminNode('adm_cat_general', 'adm_page_general_config', 'GeneralConfig', scriptPath . '/images/icons/applets/generalconfig.png'); + $this->addAdminNode('adm_cat_general', 'adm_page_file_uploads', 'UploadConfig', scriptPath . '/images/icons/applets/uploadconfig.png'); + $this->addAdminNode('adm_cat_general', 'adm_page_file_types', 'UploadAllowedMimeTypes', scriptPath . '/images/icons/applets/uploadallowedmimetypes.png'); + $this->addAdminNode('adm_cat_general', 'adm_page_plugins', 'PluginManager', scriptPath . '/images/icons/applets/pluginmanager.png'); + $this->addAdminNode('adm_cat_general', 'adm_page_db_backup', 'DBBackup', scriptPath . '/images/icons/applets/dbbackup.png'); + $this->addAdminNode('adm_cat_general', 'adm_page_lang_manager', 'LangManager', scriptPath . '/images/icons/applets/langmanager.png'); + $this->addAdminNode('adm_cat_content', 'adm_page_manager', 'PageManager', scriptPath . '/images/icons/applets/pagemanager.png'); + $this->addAdminNode('adm_cat_content', 'adm_page_editor', 'PageEditor', scriptPath . '/images/icons/applets/pageeditor.png'); + $this->addAdminNode('adm_cat_content', 'adm_page_pg_groups', 'PageGroups', scriptPath . '/images/icons/applets/pagegroups.png'); + $this->addAdminNode('adm_cat_appearance', 'adm_page_themes', 'ThemeManager', scriptPath . '/images/icons/applets/thememanager.png'); + $this->addAdminNode('adm_cat_users', 'adm_page_users', 'UserManager', scriptPath . '/images/icons/applets/usermanager.png'); + $this->addAdminNode('adm_cat_users', 'adm_page_user_groups', 'GroupManager', scriptPath . '/images/icons/applets/groupmanager.png'); + $this->addAdminNode('adm_cat_users', 'adm_page_coppa', 'COPPA', scriptPath . '/images/icons/applets/coppa.png'); + $this->addAdminNode('adm_cat_users', 'adm_page_mass_email', 'MassEmail', scriptPath . '/images/icons/applets/massemail.png'); + $this->addAdminNode('adm_cat_security', 'adm_page_security_log', 'SecurityLog', scriptPath . '/images/icons/applets/securitylog.png'); + $this->addAdminNode('adm_cat_security', 'adm_page_ban_control', 'BanControl', scriptPath . '/images/icons/applets/bancontrol.png'); $code = $plugins->setHook('acl_rule_init'); foreach ( $code as $cmd ) @@ -457,7 +457,9 @@ $k = array_keys($this->admin_tree); $i = 0; $ret = ''; - $ret .= "var TREE_ITEMS = [\n ['" . $lang->get('adm_btn_home') . "', 'javascript:ajaxPage(\'".$this->nslist['Admin']."Home\');',\n "; + $icon = "\"\" "; + $icon = addslashes($icon); + $ret .= "var TREE_ITEMS = [\n ['$icon" . $lang->get('adm_btn_home') . "', 'javascript:ajaxPage(\'".$this->nslist['Admin']."Home\');',\n "; foreach($k as $key) { $i++; @@ -467,12 +469,22 @@ { $i++; $name = ( preg_match('/^[a-z0-9_]+$/', $key) ) ? $lang->get($c['name']) : $c['name']; - - $ret .= " ['".$name."', 'javascript:ajaxPage(\\'".$this->nslist['Admin'].$c['pageid']."\\');'],\n"; + if ( $c['icon'] && $c['icon'] != scriptPath . '/images/spacer.gif' ) + { + $icon = "\"\" "; + } + else + { + $icon = ''; + } + $icon = addslashes($icon); + $ret .= " ['$icon$name', 'javascript:ajaxPage(\\'".$this->nslist['Admin'].$c['pageid']."\\');'],\n"; } $ret .= " ],\n"; } - $ret .= " ['" . $lang->get('adm_btn_logout') . "', 'javascript:ajaxPage(\\'".$this->nslist['Admin']."AdminLogout\\');'],\n"; + $icon = "\"\" "; + $icon = addslashes($icon); + $ret .= " ['$icon" . $lang->get('adm_btn_logout') . "', 'javascript:ajaxPage(\\'".$this->nslist['Admin']."AdminLogout\\');'],\n"; $ret .= " ['" . $lang->get('adm_btn_keepalive_loading') . "', 'javascript:ajaxToggleKeepalive();', ['" . $lang->get('adm_btn_keepalive_about') . "', 'javascript:aboutKeepAlive();'] ],\n"; @@ -481,15 +493,29 @@ $ret .= "]\n];"; return $ret; } - function addAdminNode($section, $page_title, $url) + + /** + * Creates a new entry in the administration panel's navigation tree. + * @param string Section name - if this is a language string identifier, it will be sent through $lang->get() + * @param string The title of the page, also may be a language string identifier + * @param string The page ID of the admin page, the namespace Admin is assumed + * @param string Optional. The path to a 16x16 image that will be displayed as the icon for this admin page + */ + + function addAdminNode($section, $page_title, $url, $icon = false) { + if ( !$icon ) + { + $icon = scriptPath . '/images/spacer.gif'; + } if(!isset($this->admin_tree[$section])) { $this->admin_tree[$section] = Array(); } $this->admin_tree[$section][] = Array( - 'name'=>$page_title, - 'pageid'=>$url + 'name' => $page_title, + 'pageid' => $url, + 'icon' => $icon ); } function getParam($id = 0) diff -r bc8e0e9ee01d -r 3b5b78182ce5 licenses/cc-by-2.5.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/licenses/cc-by-2.5.html Sun Mar 16 16:30:22 2008 -0400 @@ -0,0 +1,228 @@ + + + +Creative Commons Attribution 2.5 license + + + + + +
+ +

Creative Commons Attribution 2.5 license

+ + + +

THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.

+ +

BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.

+ + +

1. Definitions

+ +
    + +
  1. +"Collective Work" means a work, such as a periodical issue, anthology or encyclopedia, in which the Work in its entirety in unmodified form, along with a number of other contributions, constituting separate and independent works in themselves, are assembled into a collective whole. A work that constitutes a Collective Work will not be considered a Derivative Work (as defined below) for the purposes of this License. +
  2. + +
  3. +"Derivative Work" means a work based upon the Work or upon the Work and other pre-existing works, such as a translation, musical arrangement, dramatization, fictionalization, motion picture version, sound recording, art reproduction, abridgment, condensation, or any other form in which the Work may be recast, transformed, or adapted, except that a work that constitutes a Collective Work will not be considered a Derivative Work for the purpose of this License. For the avoidance of doubt, where the Work is a musical composition or sound recording, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered a Derivative Work for the purpose of this License.
  4. + +
  5. +"Licensor" means the individual or entity that offers the Work under the terms of this License. +
  6. + +
  7. +"Original Author" means the individual or entity who created the Work. +
  8. + +
  9. +"Work" means the copyrightable work of authorship offered under the terms of this License. +
  10. + +
  11. +"You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation. + +
  12. +
+ +

2. Fair Use Rights. Nothing in this license is intended to reduce, limit, or restrict any rights arising from fair use, first sale or other limitations on the exclusive rights of the copyright owner under copyright law or other applicable laws.

+ + +

3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:

+ + +
    +
  1. + +to reproduce the Work, to incorporate the Work into one or more Collective Works, and to reproduce the Work as incorporated in the Collective Works; +
  2. + +
  3. +to create and reproduce Derivative Works; +
  4. + +
  5. +to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission the Work including as incorporated in Collective Works; + +
  6. + +
  7. +to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission Derivative Works. +
  8. + +
  9. For the avoidance of doubt, where the work is a musical composition:

    + +
      +
    1. Performance Royalties Under Blanket Licenses. Licensor waives the exclusive right to collect, whether individually or via a performance rights society (e.g. ASCAP, BMI, SESAC), royalties for the public performance or public digital performance (e.g. webcast) of the Work.
    2. + +
    3. Mechanical Rights and Statutory Royalties. Licensor waives the exclusive right to collect, whether individually or via a music rights agency or designated agent (e.g. Harry Fox Agency), royalties for any phonorecord You create from the Work ("cover version") and distribute, subject to the compulsory license created by 17 USC Section 115 of the US Copyright Act (or the equivalent in other jurisdictions).
  10. + +
  11. Webcasting Rights and Statutory Royalties. For the avoidance of doubt, where the Work is a sound recording, Licensor waives the exclusive right to collect, whether individually or via a performance-rights society (e.g. SoundExchange), royalties for the public digital performance (e.g. webcast) of the Work, subject to the compulsory license created by 17 USC Section 114 of the US Copyright Act (or the equivalent in other jurisdictions).
  12. + +
+ + +

The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. All rights not expressly granted by Licensor are hereby reserved.

+ +

4. Restrictions.The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:

+ + +
    +
  1. +You may distribute, publicly display, publicly perform, or publicly digitally perform the Work only under the terms of this License, and You must include a copy of, or the Uniform Resource Identifier for, this License with every copy or phonorecord of the Work You distribute, publicly display, publicly perform, or publicly digitally perform. You may not offer or impose any terms on the Work that alter or restrict the terms of this License or the recipients' exercise of the rights granted hereunder. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties. You may not distribute, publicly display, publicly perform, or publicly digitally perform the Work with any technological measures that control access or use of the Work in a manner inconsistent with the terms of this License Agreement. The above applies to the Work as incorporated in a Collective Work, but this does not require the Collective Work apart from the Work itself to be made subject to the terms of this License. If You create a Collective Work, upon notice from any Licensor You must, to the extent practicable, remove from the Collective Work any credit as required by clause 4(b), as requested. If You create a Derivative Work, upon notice from any Licensor You must, to the extent practicable, remove from the Derivative Work any credit as required by clause 4(b), as requested. +
  2. + + +
  3. +If you distribute, publicly display, publicly perform, or publicly digitally perform the Work or any Derivative Works or Collective Works, You must keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or (ii) if the Original Author and/or Licensor designate another party or parties (e.g. a sponsor institute, publishing entity, journal) for attribution in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; the title of the Work if supplied; to the extent reasonably practicable, the Uniform Resource Identifier, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and in the case of a Derivative Work, a credit identifying the use of the Work in the Derivative Work (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). Such credit may be implemented in any reasonable manner; provided, however, that in the case of a Derivative Work or Collective Work, at a minimum such credit will appear where any other comparable authorship credit appears and in a manner at least as prominent as such other comparable authorship credit. +
  4. + +
+ + + + + + +

5. Representations, Warranties and Disclaimer

+ +

UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.

+ + +

6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

+ +

7. Termination

+ +
    + +
  1. +This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Derivative Works or Collective Works from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License. +
  2. + +
  3. +Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above. +
  4. +
+ +

8. Miscellaneous

+ +
    + +
  1. +Each time You distribute or publicly digitally perform the Work or a Collective Work, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License. +
  2. + +
  3. +Each time You distribute or publicly digitally perform a Derivative Work, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License. +
  4. + +
  5. +If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. +
  6. + +
  7. +No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent. + +
  8. + +
  9. +This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You. +
  10. +
+ + + + + + +
+ + + diff -r bc8e0e9ee01d -r 3b5b78182ce5 licenses/index.html --- a/licenses/index.html Sun Mar 16 16:06:59 2008 -0400 +++ b/licenses/index.html Sun Mar 16 16:30:22 2008 -0400 @@ -93,6 +93,7 @@

The PHP License

@@ -115,6 +116,12 @@
  • FastJSON - a JSON encoder/decoder. Only used when PHP4 compatibility is a must (early in the installer). Copyright © 2006 - 2007 Andrea Giammarchi.
  • +

    Creative Commons licenses

    +

    View the Attribution 2.5 license

    + +

    Unknown license

    For the following libraries, the license was either not formally stated or could not be found.