Index: CHANGELOG.txt =================================================================== RCS file: CHANGELOG.txt diff -N CHANGELOG.txt --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ CHANGELOG.txt 17 Dec 2008 02:05:23 -0000 1.1.2.1.2.7 @@ -0,0 +1,47 @@ +// $Id: CHANGELOG.txt,v 1.1.2.1.2.7 2008/12/17 02:05:23 hswong3i Exp $ + +AdSense Injector 5.x-2.x-dev, xxxx-xx-xx (development version) +---------------------- + +AdSense Injector 5.x-2.6, 2008-12-16 +---------------------- +- sync with 6.x-2.x-dev. + +AdSense Injector 5.x-2.5-1, 2007-4-7 +---------------------- +- minor tweaks. adding donor button in admin settings form. +- donations support ongoing development :D + +AdSense Injector 5.x-2.5, 2007-3-18 +---------------------- +- new template scheme for ads insertion. + +AdSense Injector 5.x-2.2, 2007-3-18 +---------------------- +- fix issue http://drupal.org/node/121034 + +AdSense Injector 5.x-2.1, 2007-2-11 +---------------------- +- fixes a problem in list injection: was always using ad group 1 settings. + +AdSense Injector 5.x-2.0, 2007-2-11 +---------------------- +- first Drupal 5 version with frontpage/taxonomy list ad insertion feature. + +AdSense Injector 4.7.x-2.5-1, 2007-4-7 +---------------------- +- minor tweaks. adding donor button in admin settings form. +- donations support ongoing development :D + +AdSense Injector 4.7.x-2.5, 2007-3-18 +---------------------- +- new template scheme for ads insertion. + +AdSense Injector 4.7.x-2.1, 2007-2-11 +---------------------- +- fixes a problem in list injection: was always using ad group 1 settings. + +AdSense Injector 4.7.x-2.0, 2007-2-11 +---------------------- +- second Drupal 4.7 version. +- includes ability to insert ads after teaser in frontpage/taxonomy pages. Index: LICENSE.txt =================================================================== RCS file: LICENSE.txt diff -N LICENSE.txt --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ LICENSE.txt 16 Dec 2008 08:16:56 -0000 1.1.2.1 @@ -0,0 +1,342 @@ +// $Id: LICENSE.txt,v 1.1.2.1 2008/12/16 08:16:56 hswong3i Exp $ + + 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. Index: README.txt =================================================================== RCS file: README.txt diff -N README.txt --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ README.txt 16 Dec 2008 08:50:57 -0000 1.1.2.1.2.2 @@ -0,0 +1,36 @@ +// $Id: README.txt,v 1.1.2.1.2.2 2008/12/16 08:50:57 hswong3i Exp $ + +ABOUT ADSENSE INJECTOR +---------------------- + +The purpose of this module is to provide a simple method of automatically +placing 'inline' adsense module content into a full-page view of selected +node types. It does this by intercepting node rendering using hook_nodeapi +during 'page' rendering, and injecting selected text into the $node->body +field. + +It uses a very simple scheme at present (just string concatenation) and +could be enhanced greatly by using regular expressions, templates, or other +techniques in a later revision. + +Official Adsense Injector project page: + http://exodusdev.com/drupal/4.7/modules/adsense_injector.module + +Drupal Adsense Injector project page: + http://drupal.org/project/adsense_injector + +Sponsored by: + http://exodusdev.com/ + +LIST OF MAINTAINERS +---------------------- + +PROJECT OWNER +M: Michael Curry +S: maintained +W: http://exodusdev.com/ + +CO-MAINTAINER +M: Edison Wong +S: maintained +W: http://edin.no-ip.com/ Index: adsense_injector.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/adsense_injector/adsense_injector.info,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.4.2.1 diff -u -p -w -b -B -r1.1.2.2 -r1.1.2.4.2.1 --- adsense_injector.info 9 Feb 2007 05:38:19 -0000 1.1.2.2 +++ adsense_injector.info 16 Dec 2008 16:08:49 -0000 1.1.2.4.2.1 @@ -1,10 +1,6 @@ -; $Id: adsense_injector.info,v 1.1.2.2 2007/02/09 05:38:19 inactivist Exp $ +; $Id: adsense_injector.info,v 1.1.2.4.2.1 2008/12/16 16:08:49 hswong3i Exp $ + name = AdSense Injector description = Insert adsense ads into full-page node view, and front page or other list views automatically. dependencies = adsense -package = "Site Advertising" - -; Information added by drupal.org packaging script on 2006-12-14 -version = "5.0" -project = "adsense_injector" - +package = Adsense Index: adsense_injector.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/adsense_injector/adsense_injector.module,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.8.2.7 diff -u -p -w -b -B -r1.1.2.6 -r1.1.2.8.2.7 --- adsense_injector.module 6 Apr 2007 16:05:55 -0000 1.1.2.6 +++ adsense_injector.module 17 Dec 2008 01:43:13 -0000 1.1.2.8.2.7 @@ -1,37 +1,14 @@ body field. - * - * It uses a very simple scheme at present (just string concatenation) - * and could be enhanced greatly by using regular expressions, templates, - * or other techniques in a later revision. */ -define('ADSENSE_INJECTOR_MODULE_VERSION', '$Id: adsense_injector.module,v 1.1.2.6 2007/04/06 16:05:55 inactivist Exp $' ); define('ADSENSE_INJECTOR_INSERT_BODY_AD_DEFAULT', TRUE); - define('ADSENSE_INJECTOR_BODY_INSERTION_TEMPLATE_DEFAULT', '
[adsense:120x240:1:1]
%body
[adsense:468x60:1:1]'); define('ADSENSE_INJECTOR_BODY_MINWORDS_DEFAULT', 75); - define('ADSENSE_INJECTOR_APPEND_IN_LISTVIEW_DEFAULT', FALSE); define('ADSENSE_INJECTOR_LISTVIEW_INSERTION_TEMPLATE_DEFAULT', '%teaser
[adsense:468x60:1:1]
'); @@ -37,9 +14,8 @@ define('ADSENSE_INJECTOR_LISTVIEW_INSERT /** * Prefix for variable table entries - append node type name, store as boolean - * value, nonzero means insert ad content + * value, nonzero means insert ad content. */ - define('ADSENSE_INJECTOR_INSERT_AD_NODETYPE', 'adsense_injector_nodetype_'); /** @@ -43,63 +19,44 @@ define('ADSENSE_INJECTOR_LISTVIEW_INSERT define('ADSENSE_INJECTOR_INSERT_AD_NODETYPE', 'adsense_injector_nodetype_'); /** - * Count words in a string. - * @param $str ref to a string (ref so no copy) - * @param $max max # of words we care about. Return value will never exceed this. - * @return the count of words, where delimiter is one or more spaces - * @todo Efficiency, find better way to do this - */ -function _adsense_injector_count_words(&$str, $max) { - return count(explode(' ', $str, $max)); // lifted from node.module node_validate() function. -} - -/** - * Get the minimum node body wordcount for insertion. - * May be content-type specific, but at present, it's - * global to all node types. - * @param $nodetype the node type - * @param $defval the default value - * @return The minimum insertion wordcount - */ -function _adsense_injector_minwords_cfg($nodetype, $defval=75) { - return variable_get('adsense_injector_body_minwords', $defval); -} - -/** - * Implementation of hook_nodeapi. + * Implementation of hook_nodeapi(). + * * If rendering a full page, and the node type one of the configured types, * inject configured adsense content using simple string concatenation. + * * @todo: Evaluate efficiency of string concat vs. sprintf, other methods. */ function adsense_injector_nodeapi(&$node, $op, $teaser, $page) { // insert an ad into the body. - if (module_exists('adsense') && _adsense_page_match() && variable_get(ADSENSE_INJECTOR_INSERT_AD_NODETYPE . $node->type, FALSE)) { if ($op == 'view') { + if (module_exists('adsense') && _adsense_page_match() && variable_get(ADSENSE_INJECTOR_INSERT_AD_NODETYPE . $node->type, FALSE)) { if ($page) { if (variable_get('adsense_injector_insert_body_ad', ADSENSE_INJECTOR_INSERT_BODY_AD_DEFAULT)) { - $minwords = _adsense_injector_minwords_cfg($node->type); - $oldBody = $node->content['body']['#value']; - $wordcount = _adsense_injector_count_words($oldBody, $minwords); + $body = $node->content['body']['#value']; + // Get the minimum node body wordcount for insertion. + $minwords = variable_get('adsense_injector_body_minwords', ADSENSE_INJECTOR_BODY_MINWORDS_DEFAULT); + // Count words in a string. + // lifted from node.module node_validate() function. + $wordcount = count(explode(' ', $body, $minwords)); if ($wordcount >= $minwords) { $template = variable_get('adsense_injector_body_template', ADSENSE_INJECTOR_BODY_INSERTION_TEMPLATE_DEFAULT); - // Process adsense module tags in the template text, if enabled and possible + // Process adsense module tags in the template text, if enabled and possible. if (function_exists('_adsense_process_tags')) { $template = _adsense_process_tags($template); } else { watchdog('adsense_injector', t('adsense module function _adsense_process_tags() not found'), WATCHDOG_ERROR); } - $node->body = - $node->content['body']['#value'] = strtr($template, array('%body' => $oldBody)); - } else { - $node->content['body']['#value'] = "" . $oldBody; + $node->content['body']['#value'] = strtr($template, array('%body' => $body)); + } + else { + $node->content['body']['#value'] = "". $body; } } } - else if ($teaser - && variable_get('adsense_injector_append_in_listview', ADSENSE_INJECTOR_APPEND_IN_LISTVIEW_DEFAULT)) { + elseif ($teaser && variable_get('adsense_injector_append_in_listview', ADSENSE_INJECTOR_APPEND_IN_LISTVIEW_DEFAULT)) { $template = variable_get('adsense_injector_listview_insertion_template', ADSENSE_INJECTOR_LISTVIEW_INSERTION_TEMPLATE_DEFAULT); - // Process adsense module tags in the template text, if enabled and possible + // Process adsense module tags in the template text, if enabled and possible. if (function_exists('_adsense_process_tags')) { $template = _adsense_process_tags($template); } @@ -113,12 +70,12 @@ function adsense_injector_nodeapi(&$node } /** - * Implementation of hook_menu + * Implementation of hook_menu(). */ function adsense_injector_menu() { $items[] = array( 'path' => 'admin/settings/adsense_injector', - 'title' => t('Google AdSense Injector'), + 'title' => t('AdSense Injector'), 'description' => t('Insert Google AdSense ads into full node views automatically.'), 'callback' => 'drupal_get_form', 'callback arguments' => array('adsense_injector_admin_settings'), @@ -130,11 +87,10 @@ function adsense_injector_menu() { /** - * Implementation of hook_settings + * Implementation of hook_settings(). */ function adsense_injector_admin_settings() { $form=array(); - _adsense_injector_get_banner($form); $form['node_ad_body_insertion'] = array( '#type' => 'fieldset', @@ -145,109 +101,96 @@ function adsense_injector_admin_settings ); if (module_exists('adsense')) { - $form['node_ad_body_insertion']['adsense_injector_insert_body_ad'] = - array('#type' => 'checkbox', + $form['node_ad_body_insertion']['adsense_injector_insert_body_ad'] = array( + '#type' => 'checkbox', '#title'=> t('Insert inline ad in node body on page views'), '#default_value' => variable_get('adsense_injector_insert_body_ad', ADSENSE_INJECTOR_INSERT_BODY_AD_DEFAULT), '#description' => t('Description'), - '#required'=>FALSE); - - - - $form['node_ad_body_insertion']['adsense_injector_body_minwords'] = - array('#type' => 'textfield', + '#required' => FALSE, + ); + $form['node_ad_body_insertion']['adsense_injector_body_minwords'] = array( + '#type' => 'textfield', '#title'=> t('Minimum node body word count'), '#default_value' => variable_get('adsense_injector_body_minwords', ADSENSE_INJECTOR_BODY_MINWORDS_DEFAULT), - '#description' => t('The minimum node body word count threshold - only inject if node body has at least this many words.')); - - $form['node_ad_body_insertion']['adsense_injector_body_template'] = - array('#type' => 'textarea', + '#description' => t('The minimum node body word count threshold - only inject if node body has at least this many words.'), + ); + $form['node_ad_body_insertion']['adsense_injector_body_template'] = array( + '#type' => 'textarea', '#title'=> t('Node body ad insertion template'), '#rows' => 5, '#cols' => 40, '#default_value' => variable_get('adsense_injector_body_template', ADSENSE_INJECTOR_BODY_INSERTION_TEMPLATE_DEFAULT), '#description' => t('Ad insertion template. Substitution variables: %body = full node body text. Insert adsense module filter tags. See the adsense.module settings page for a list of supported formats and help with filter tags.'), - '#required' => TRUE); + '#required' => TRUE, + ); /** - * 'list' insertion (frontpage, taxonomy, etc. + * 'list' insertion (frontpage, taxonomy, etc). */ - $form['node_ad_list_insertion'] = - array('#type' => 'fieldset', + $form['node_ad_list_insertion'] = array( + '#type' => 'fieldset', '#collapsible' => TRUE, '#collapsed' => FALSE, '#title' => t('Node list ad insertion'), '#description' => t('Ad insertion in node lists or other non-page view, like front page, taxonomy views.'), ); - - $form['node_ad_list_insertion']['adsense_injector_append_in_listview'] = - array('#type' => 'checkbox', + $form['node_ad_list_insertion']['adsense_injector_append_in_listview'] = array( + '#type' => 'checkbox', '#title'=> t('Append an ad after teaser on frontpage and taxonomy lists'), '#default_value' => variable_get('adsense_injector_append_in_listview', ADSENSE_INJECTOR_APPEND_IN_LISTVIEW_DEFAULT), '#description' => t('Note: this does not currently support Views module based lists.'), - '#required'=>FALSE); - - $form['node_ad_list_insertion']['adsense_injector_listview_insertion_template'] = - array('#type' => 'textarea', + '#required' => FALSE, + ); + $form['node_ad_list_insertion']['adsense_injector_listview_insertion_template'] = array( + '#type' => 'textarea', '#title'=> t('List ad insertion template'), '#rows' => 3, '#cols' => 40, '#default_value' => variable_get('adsense_injector_listview_insertion_template', ADSENSE_INJECTOR_LISTVIEW_INSERTION_TEMPLATE_DEFAULT), '#description' => t('Template to use when inserting adsense ad. "%teaser" will be replaced with the node teaser. Insert adsense filter tags. See the adsense.module settings page for a list of supported formats and help with filter tags.'), - '#required' => TRUE); + '#required' => TRUE, + ); /** * What kinds of nodes do we want to insert on...? */ - - $form['injection_control'] = - array('#type' => 'fieldset', + $form['injection_control'] = array( + '#type' => 'fieldset', '#collapsible' => TRUE, - '#collapsed' => TRUE, + '#collapsed' => FALSE, '#title' => t('Select Node Types for Insertion'), '#description' => t('Nodes types to display inline ads - ads are inserted only in the selected node types.'), ); /** - * Enumerate node types, and set up form fields for each + * Enumerate node types, and set up form fields for each. */ $enabled_count = 0; $nodetypes = array(); - foreach (node_get_types() as $type => $typeObj) { - $nodetypes[$type] = $typeObj->name; + foreach (node_get_types() as $type => $obj) { + $nodetypes[$type] = $obj->name; $enabled = variable_get(ADSENSE_INJECTOR_INSERT_AD_NODETYPE . $type, FALSE); if ($enabled) $enabled_count++; - $form['injection_control']['node_types'][ADSENSE_INJECTOR_INSERT_AD_NODETYPE . $type] = - array('#type' => 'checkbox', - '#title'=> $typeObj->name, + $form['injection_control']['node_types'][ADSENSE_INJECTOR_INSERT_AD_NODETYPE . $type] = array( + '#type' => 'checkbox', + '#title' => $obj->name, '#default_value' => $enabled, - '#description' => t('Display inline ads on %nodetype nodes', array('%nodetype' => $typeObj->name)), - '#required'=>FALSE); - + '#description' => t('Display inline ads on %nodetype nodes', array('%nodetype' => $obj->name)), + '#required' => FALSE, + ); } - // do some sanity checking + // Do some sanity checking. if ($enabled_count == 0) { $msg = t('No node types selected (no ads will be inserted because you haven\'t selected any node types for automatic ad insertion.)'); - // form_set_error('injection_control][node_types', $msg); $form['injection_control']['#collapsed'] = FALSE; - $form['injection_control']['no_nodes_enabled'] - = array('#type' => 'markup', + $form['injection_control']['no_nodes_enabled'] = array( + '#type' => 'markup', '#weight' => -1, - '#value' => '
' . $msg . '
'); - } - + '#value' => '
'. $msg .'
', + ); } - return system_settings_form($form); } -/** - * Get settings 'banner' - */ -function _adsense_injector_get_banner(&$form) { - $name = 'adsense_injector-d5'; - $d = 'Your donations support ongoing development'; - $form['module_banner'] = array('#type' => 'markup', - '#value' => '
' . $d . '
Module development sponsored by Exodus Development
'); - $form['module_id'] = array('#type' => 'markup', '#value' => ADSENSE_INJECTOR_MODULE_VERSION . '
'); + return system_settings_form($form); }