Menu
▾
▴
Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[31434] trunk
|
From: Jonny B. <jon...@gm...> - 2011-03-05 18:59:31
|
start scrolling... On 5 Mar 2011, at 13:43, Filipus Klutiero wrote: > On 2011-03-04 14:43, Jonny Bradley wrote: >> On 4 Mar 2011, at 13:45, Filipus Klutiero wrote: >> >>> Hi Jonny, >>> >>> On 2010-12-15 10:31, jon...@us... wrote: >>>> Revision: 31434 >>>> http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31434&view=rev >>>> Author: jonnybradley >>>> Date: 2010-12-15 15:31:39 +0000 (Wed, 15 Dec 2010) >>>> >>>> Log Message: >>>> ----------- >>>> [bp/r31354& 31355] From xajax_removal branch. >>>> [KIL] xajax removal: First pass of removing Xajax. >>>> 3rd party library link disconnected and support files removed. >>>> "loadComponent" functionality removed. >>>> Remaining dependant features' (gmap, webmail, shoutbox) ajax operation disabled and marked with AJAX_TODO comments. >>>> [KIL] xajax removal: Part 2 - feature_wiki_save_draft >>>> Table tiki_page_drafts not removed to preserve existing data but removed from tiki.sql for new installs. >>>> Script in devtools started for manual removal. >>>> >>>> Modified Paths: >>>> -------------- >>>> trunk/db/tiki-db.php >>>> trunk/db/tiki.sql >>>> trunk/lib/init/smarty.php >>>> trunk/lib/prefs/ajax.php >>>> trunk/lib/prefs/feature.php >>>> trunk/lib/setup/js_detect.php >>>> trunk/lib/setup/prefs.php >>>> trunk/lib/smarty_tiki/block.ajax_href.php >>>> trunk/lib/smarty_tiki/block.pagination_links.php >>>> trunk/lib/smarty_tiki/block.self_link.php >>>> trunk/lib/tikiaccesslib.php >>>> trunk/lib/tikilib.php >>>> trunk/lib/userslib.php >>>> trunk/lib/wiki/wikilib.php >>>> trunk/messu-mailbox.php >>>> trunk/modules/mod-func-shoutbox.php >>>> trunk/modules/mod-func-webmail_inbox.php >>>> trunk/templates/confirm.tpl >>>> trunk/templates/modules/mod-shoutbox.tpl >>>> trunk/templates/modules/mod-webmail_inbox.tpl >>>> trunk/templates/register-email.tpl >>>> trunk/templates/register-login.tpl >>>> trunk/templates/register-pass.tpl >>>> trunk/templates/register-pass2.tpl >>>> trunk/templates/tiki-admin_include_anchors.tpl >>>> trunk/templates/tiki-admin_include_features.tpl >>>> trunk/templates/tiki-admin_include_wiki.tpl >>>> trunk/templates/tiki-ajax_header.tpl >>>> trunk/templates/tiki-change_password.tpl >>>> trunk/templates/tiki-gmap_locator.tpl >>>> trunk/templates/tiki-register.tpl >>>> trunk/templates/tiki-user_preferences.tpl >>>> trunk/templates/wiki_edit_actions.tpl >>>> trunk/tiki-admin_actionlog.php >>>> trunk/tiki-calendar_edit_item.php >>>> trunk/tiki-calendar_params_ical.php >>>> trunk/tiki-editpage.php >>>> trunk/tiki-index.php >>>> trunk/tiki-index_p.php >>>> trunk/tiki-minical.php >>>> trunk/tiki-my_tiki.php >>>> trunk/tiki-notepad_list.php >>>> trunk/tiki-register.php >>>> trunk/tiki-setup.php >>>> trunk/tiki-shoutbox.php >>>> trunk/tiki-socialnetworks_firstlogin.php >>>> trunk/tiki-user_assigned_modules.php >>>> trunk/tiki-user_bookmarks.php >>>> trunk/tiki-user_information.php >>>> trunk/tiki-user_preferences.php >>>> trunk/tiki-user_tasks.php >>>> trunk/tiki-user_watches.php >>>> trunk/tiki-userfiles.php >>>> trunk/tiki-view_tracker_item.php >>>> trunk/tiki-webmail.php >>>> trunk/tiki-webmail_ajax.php >>>> >>>> Added Paths: >>>> ----------- >>>> trunk/doc/devtools/upto_7_drop_unused_6.x_tables.sql >>>> >>>> Removed Paths: >>>> ------------- >>>> trunk/lib/ajax/LICENSE.txt >>>> trunk/lib/ajax/README.txt >>>> trunk/lib/ajax/ajaxlib.php >>>> trunk/lib/ajax/tiki-ajax.js >>>> trunk/lib/wiki/wiki-ajax.js >>>> trunk/lib/wiki/wiki-ajax.php >>>> >>>> Property Changed: >>>> ---------------- >>>> trunk/lib/ajax/ >>>> >>>> Modified: trunk/db/tiki-db.php >>>> =================================================================== >>>> --- trunk/db/tiki-db.php 2010-12-15 14:39:38 UTC (rev 31433) >>>> +++ trunk/db/tiki-db.php 2010-12-15 15:31:39 UTC (rev 31434) >>>> @@ -123,7 +123,7 @@ >>>> { >>>> function handle( TikiDb $db, $query, $values, $result ) // {{{ >>>> { >>>> - global $smarty, $prefs, $ajaxlib; >>>> + global $smarty, $prefs; >>>> >>>> $msg = $db->getErrorMessage(); >>>> $q=$query; >>>> @@ -170,22 +170,6 @@ >>>> >>>> header("Cache-Control: no-cache, pre-check=0, post-check=0"); >>>> >>>> - if ($prefs['ajax_xajax'] === 'y') { >>>> - global $ajaxlib; >>>> - include_once('lib/ajax/xajax/xajax_core/xajaxAIO.inc.php'); >>>> - if ($ajaxlib&& $ajaxlib->canProcessRequest()) { >>>> - // this was a xajax request -> return a xajax answer >>>> - $page = $smarty->fetch( 'database-connection-error.tpl' ); >>>> - $objResponse = new xajaxResponse(); >>>> - $page=addslashes(str_replace(array("\n", "\r"), array(' ', ' '), $page)); >>>> - $objResponse->script("bugwin=window.open('', 'tikierror', 'width=760,height=500,scrollbars=1,resizable=1');". >>>> - "bugwin.document.write('$page');"); >>>> - echo $objResponse->getOutput(); >>>> - $this->log($msg.' - '.$q); >>>> - die(); >>>> - } >>>> - } >>>> - >>>> $smarty->display('database-connection-error.tpl'); >>>> unset($_SESSION['fatal_error']); >>>> $this->log($msg.' - '.$q); >>>> >>>> Modified: trunk/db/tiki.sql >>>> =================================================================== >>>> --- trunk/db/tiki.sql 2010-12-15 14:39:38 UTC (rev 31433) >>>> +++ trunk/db/tiki.sql 2010-12-15 15:31:39 UTC (rev 31434) >>>> @@ -1632,17 +1632,6 @@ >>>> KEY `lastModif`(`lastModif`) >>>> ) ENGINE=MyISAM AUTO_INCREMENT=1; >>>> >>>> -DROP TABLE IF EXISTS `tiki_page_drafts`; >>>> -CREATE TABLE `tiki_page_drafts` ( >>>> - `user` varchar(200) default '', >>>> - `pageName` varchar(255) NOT NULL, >>>> - `data` mediumtext, >>>> - `description` varchar(200) default NULL, >>>> - `comment` varchar(200) default NULL, >>>> - `lastModif` int(14) default NULL, >>>> - PRIMARY KEY (`pageName`(120), `user`(120)) >>>> -) ENGINE=MyISAM; >>>> - >>>> DROP TABLE IF EXISTS `tiki_pageviews`; >>>> CREATE TABLE `tiki_pageviews` ( >>>> `day` int(14) NOT NULL default '0', >>>> >>>> Added: trunk/doc/devtools/upto_7_drop_unused_6.x_tables.sql >>>> =================================================================== >>>> --- trunk/doc/devtools/upto_7_drop_unused_6.x_tables.sql (rev 0) >>>> +++ trunk/doc/devtools/upto_7_drop_unused_6.x_tables.sql 2010-12-15 15:31:39 UTC (rev 31434) >>>> @@ -0,0 +1,2 @@ >>>> +-- jonnyb: remove tables no longer used in tiki 7 >>>> +DROP TABLE `tiki_page_drafts`; >>>> >>>> >>>> Property changes on: trunk/lib/ajax >>>> ___________________________________________________________________ >>>> Deleted: svn:externals >>>> - xajax -r18815 https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki/third_party/xajax >>>> >>>> >>>> Deleted: trunk/lib/ajax/LICENSE.txt >>>> =================================================================== >>>> --- trunk/lib/ajax/LICENSE.txt 2010-12-15 14:39:38 UTC (rev 31433) >>>> +++ trunk/lib/ajax/LICENSE.txt 2010-12-15 15:31:39 UTC (rev 31434) >>>> @@ -1,504 +0,0 @@ >>>> - GNU LESSER GENERAL PUBLIC LICENSE >>>> - Version 2.1, February 1999 >>>> - >>>> - Copyright (C) 1991, 1999 Free Software Foundation, Inc. >>>> - 51 Franklin St, 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. >>>> - >>>> -[This is the first released version of the Lesser GPL. It also counts >>>> - as the successor of the GNU Library Public License, version 2, hence >>>> - the version number 2.1.] >>>> - >>>> - Preamble >>>> - >>>> - The licenses for most software are designed to take away your >>>> -freedom to share and change it. By contrast, the GNU General Public >>>> -Licenses are intended to guarantee your freedom to share and change >>>> -free software--to make sure the software is free for all its users. >>>> - >>>> - This license, the Lesser General Public License, applies to some >>>> -specially designated software packages--typically libraries--of the >>>> -Free Software Foundation and other authors who decide to use it. You >>>> -can use it too, but we suggest you first think carefully about whether >>>> -this license or the ordinary General Public License is the better >>>> -strategy to use in any particular case, based on the explanations below. >>>> - >>>> - When we speak of free software, we are referring to freedom of use, >>>> -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 and use pieces of >>>> -it in new free programs; and that you are informed that you can do >>>> -these things. >>>> - >>>> - To protect your rights, we need to make restrictions that forbid >>>> -distributors to deny you these rights or to ask you to surrender these >>>> -rights. These restrictions translate to certain responsibilities for >>>> -you if you distribute copies of the library or if you modify it. >>>> - >>>> - For example, if you distribute copies of the library, whether gratis >>>> -or for a fee, you must give the recipients all the rights that we gave >>>> -you. You must make sure that they, too, receive or can get the source >>>> -code. If you link other code with the library, you must provide >>>> -complete object files to the recipients, so that they can relink them >>>> -with the library after making changes to the library and recompiling >>>> -it. And you must show them these terms so they know their rights. >>>> - >>>> - We protect your rights with a two-step method: (1) we copyright the >>>> -library, and (2) we offer you this license, which gives you legal >>>> -permission to copy, distribute and/or modify the library. >>>> - >>>> - To protect each distributor, we want to make it very clear that >>>> -there is no warranty for the free library. Also, if the library is >>>> -modified by someone else and passed on, the recipients should know >>>> -that what they have is not the original version, so that the original >>>> -author's reputation will not be affected by problems that might be >>>> -introduced by others. >>>> - >>>> - Finally, software patents pose a constant threat to the existence of >>>> -any free program. We wish to make sure that a company cannot >>>> -effectively restrict the users of a free program by obtaining a >>>> -restrictive license from a patent holder. Therefore, we insist that >>>> -any patent license obtained for a version of the library must be >>>> -consistent with the full freedom of use specified in this license. >>>> - >>>> - Most GNU software, including some libraries, is covered by the >>>> -ordinary GNU General Public License. This license, the GNU Lesser >>>> -General Public License, applies to certain designated libraries, and >>>> -is quite different from the ordinary General Public License. We use >>>> -this license for certain libraries in order to permit linking those >>>> -libraries into non-free programs. >>>> - >>>> - When a program is linked with a library, whether statically or using >>>> -a shared library, the combination of the two is legally speaking a >>>> -combined work, a derivative of the original library. The ordinary >>>> -General Public License therefore permits such linking only if the >>>> -entire combination fits its criteria of freedom. The Lesser General >>>> -Public License permits more lax criteria for linking other code with >>>> -the library. >>>> - >>>> - We call this license the "Lesser" General Public License because it >>>> -does Less to protect the user's freedom than the ordinary General >>>> -Public License. It also provides other free software developers Less >>>> -of an advantage over competing non-free programs. These disadvantages >>>> -are the reason we use the ordinary General Public License for many >>>> -libraries. However, the Lesser license provides advantages in certain >>>> -special circumstances. >>>> - >>>> - For example, on rare occasions, there may be a special need to >>>> -encourage the widest possible use of a certain library, so that it becomes >>>> -a de-facto standard. To achieve this, non-free programs must be >>>> -allowed to use the library. A more frequent case is that a free >>>> -library does the same job as widely used non-free libraries. In this >>>> -case, there is little to gain by limiting the free library to free >>>> -software only, so we use the Lesser General Public License. >>>> - >>>> - In other cases, permission to use a particular library in non-free >>>> -programs enables a greater number of people to use a large body of >>>> -free software. For example, permission to use the GNU C Library in >>>> -non-free programs enables many more people to use the whole GNU >>>> -operating system, as well as its variant, the GNU/Linux operating >>>> -system. >>>> - >>>> - Although the Lesser General Public License is Less protective of the >>>> -users' freedom, it does ensure that the user of a program that is >>>> -linked with the Library has the freedom and the wherewithal to run >>>> -that program using a modified version of the Library. >>>> - >>>> - The precise terms and conditions for copying, distribution and >>>> -modification follow. Pay close attention to the difference between a >>>> -"work based on the library" and a "work that uses the library". The >>>> -former contains code derived from the library, whereas the latter must >>>> -be combined with the library in order to run. >>>> - >>>> - GNU LESSER GENERAL PUBLIC LICENSE >>>> - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION >>>> - >>>> - 0. This License Agreement applies to any software library or other >>>> -program which contains a notice placed by the copyright holder or >>>> -other authorized party saying it may be distributed under the terms of >>>> -this Lesser General Public License (also called "this License"). >>>> -Each licensee is addressed as "you". >>>> - >>>> - A "library" means a collection of software functions and/or data >>>> -prepared so as to be conveniently linked with application programs >>>> -(which use some of those functions and data) to form executables. >>>> - >>>> - The "Library", below, refers to any such software library or work >>>> -which has been distributed under these terms. A "work based on the >>>> -Library" means either the Library or any derivative work under >>>> -copyright law: that is to say, a work containing the Library or a >>>> -portion of it, either verbatim or with modifications and/or translated >>>> -straightforwardly into another language. (Hereinafter, translation is >>>> -included without limitation in the term "modification".) >>>> - >>>> - "Source code" for a work means the preferred form of the work for >>>> -making modifications to it. For a library, 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 library. >>>> - >>>> - Activities other than copying, distribution and modification are not >>>> -covered by this License; they are outside its scope. The act of >>>> -running a program using the Library is not restricted, and output from >>>> -such a program is covered only if its contents constitute a work based >>>> -on the Library (independent of the use of the Library in a tool for >>>> -writing it). Whether that is true depends on what the Library does >>>> -and what the program that uses the Library does. >>>> - >>>> - 1. You may copy and distribute verbatim copies of the Library's >>>> -complete 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 distribute a copy of this License along with the >>>> -Library. >>>> - >>>> - 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 Library or any portion >>>> -of it, thus forming a work based on the Library, 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) The modified work must itself be a software library. >>>> - >>>> - b) You must cause the files modified to carry prominent notices >>>> - stating that you changed the files and the date of any change. >>>> - >>>> - c) You must cause the whole of the work to be licensed at no >>>> - charge to all third parties under the terms of this License. >>>> - >>>> - d) If a facility in the modified Library refers to a function or a >>>> - table of data to be supplied by an application program that uses >>>> - the facility, other than as an argument passed when the facility >>>> - is invoked, then you must make a good faith effort to ensure that, >>>> - in the event an application does not supply such function or >>>> - table, the facility still operates, and performs whatever part of >>>> - its purpose remains meaningful. >>>> - >>>> - (For example, a function in a library to compute square roots has >>>> - a purpose that is entirely well-defined independent of the >>>> - application. Therefore, Subsection 2d requires that any >>>> - application-supplied function or table used by this function must >>>> - be optional: if the application does not supply it, the square >>>> - root function must still compute square roots.) >>>> - >>>> -These requirements apply to the modified work as a whole. If >>>> -identifiable sections of that work are not derived from the Library, >>>> -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 Library, 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 Library. >>>> - >>>> -In addition, mere aggregation of another work not based on the Library >>>> -with the Library (or with a work based on the Library) on a volume of >>>> -a storage or distribution medium does not bring the other work under >>>> -the scope of this License. >>>> - >>>> - 3. You may opt to apply the terms of the ordinary GNU General Public >>>> -License instead of this License to a given copy of the Library. To do >>>> -this, you must alter all the notices that refer to this License, so >>>> -that they refer to the ordinary GNU General Public License, version 2, >>>> -instead of to this License. (If a newer version than version 2 of the >>>> -ordinary GNU General Public License has appeared, then you can specify >>>> -that version instead if you wish.) Do not make any other change in >>>> -these notices. >>>> - >>>> - Once this change is made in a given copy, it is irreversible for >>>> -that copy, so the ordinary GNU General Public License applies to all >>>> -subsequent copies and derivative works made from that copy. >>>> - >>>> - This option is useful when you wish to copy part of the code of >>>> -the Library into a program that is not a library. >>>> - >>>> - 4. You may copy and distribute the Library (or a portion or >>>> -derivative of it, under Section 2) in object code or executable form >>>> -under the terms of Sections 1 and 2 above provided that you 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. >>>> - >>>> - If distribution of 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 satisfies the requirement to >>>> -distribute the source code, even though third parties are not >>>> -compelled to copy the source along with the object code. >>>> - >>>> - 5. A program that contains no derivative of any portion of the >>>> -Library, but is designed to work with the Library by being compiled or >>>> -linked with it, is called a "work that uses the Library". Such a >>>> -work, in isolation, is not a derivative work of the Library, and >>>> -therefore falls outside the scope of this License. >>>> - >>>> - However, linking a "work that uses the Library" with the Library >>>> -creates an executable that is a derivative of the Library (because it >>>> -contains portions of the Library), rather than a "work that uses the >>>> -library". The executable is therefore covered by this License. >>>> -Section 6 states terms for distribution of such executables. >>>> - >>>> - When a "work that uses the Library" uses material from a header file >>>> -that is part of the Library, the object code for the work may be a >>>> -derivative work of the Library even though the source code is not. >>>> -Whether this is true is especially significant if the work can be >>>> -linked without the Library, or if the work is itself a library. The >>>> -threshold for this to be true is not precisely defined by law. >>>> - >>>> - If such an object file uses only numerical parameters, data >>>> -structure layouts and accessors, and small macros and small inline >>>> -functions (ten lines or less in length), then the use of the object >>>> -file is unrestricted, regardless of whether it is legally a derivative >>>> -work. (Executables containing this object code plus portions of the >>>> -Library will still fall under Section 6.) >>>> - >>>> - Otherwise, if the work is a derivative of the Library, you may >>>> -distribute the object code for the work under the terms of Section 6. >>>> -Any executables containing that work also fall under Section 6, >>>> -whether or not they are linked directly with the Library itself. >>>> - >>>> - 6. As an exception to the Sections above, you may also combine or >>>> -link a "work that uses the Library" with the Library to produce a >>>> -work containing portions of the Library, and distribute that work >>>> -under terms of your choice, provided that the terms permit >>>> -modification of the work for the customer's own use and reverse >>>> -engineering for debugging such modifications. >>>> - >>>> - You must give prominent notice with each copy of the work that the >>>> -Library is used in it and that the Library and its use are covered by >>>> -this License. You must supply a copy of this License. If the work >>>> -during execution displays copyright notices, you must include the >>>> -copyright notice for the Library among them, as well as a reference >>>> -directing the user to the copy of this License. Also, you must do one >>>> -of these things: >>>> - >>>> - a) Accompany the work with the complete corresponding >>>> - machine-readable source code for the Library including whatever >>>> - changes were used in the work (which must be distributed under >>>> - Sections 1 and 2 above); and, if the work is an executable linked >>>> - with the Library, with the complete machine-readable "work that >>>> - uses the Library", as object code and/or source code, so that the >>>> - user can modify the Library and then relink to produce a modified >>>> - executable containing the modified Library. (It is understood >>>> - that the user who changes the contents of definitions files in the >>>> - Library will not necessarily be able to recompile the application >>>> - to use the modified definitions.) >>>> - >>>> - b) Use a suitable shared library mechanism for linking with the >>>> - Library. A suitable mechanism is one that (1) uses at run time a >>>> - copy of the library already present on the user's computer system, >>>> - rather than copying library functions into the executable, and (2) >>>> - will operate properly with a modified version of the library, if >>>> - the user installs one, as long as the modified version is >>>> - interface-compatible with the version that the work was made with. >>>> - >>>> - c) Accompany the work with a written offer, valid for at >>>> - least three years, to give the same user the materials >>>> - specified in Subsection 6a, above, for a charge no more >>>> - than the cost of performing this distribution. >>>> - >>>> - d) If distribution of the work is made by offering access to copy >>>> - from a designated place, offer equivalent access to copy the above >>>> - specified materials from the same place. >>>> - >>>> - e) Verify that the user has already received a copy of these >>>> - materials or that you have already sent this user a copy. >>>> - >>>> - For an executable, the required form of the "work that uses the >>>> -Library" must include any data and utility programs needed for >>>> -reproducing the executable from it. However, as a special exception, >>>> -the materials to be 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. >>>> - >>>> - It may happen that this requirement contradicts the license >>>> -restrictions of other proprietary libraries that do not normally >>>> -accompany the operating system. Such a contradiction means you cannot >>>> -use both them and the Library together in an executable that you >>>> -distribute. >>>> - >>>> - 7. You may place library facilities that are a work based on the >>>> -Library side-by-side in a single library together with other library >>>> -facilities not covered by this License, and distribute such a combined >>>> -library, provided that the separate distribution of the work based on >>>> -the Library and of the other library facilities is otherwise >>>> -permitted, and provided that you do these two things: >>>> - >>>> - a) Accompany the combined library with a copy of the same work >>>> - based on the Library, uncombined with any other library >>>> - facilities. This must be distributed under the terms of the >>>> - Sections above. >>>> - >>>> - b) Give prominent notice with the combined library of the fact >>>> - that part of it is a work based on the Library, and explaining >>>> - where to find the accompanying uncombined form of the same work. >>>> - >>>> - 8. You may not copy, modify, sublicense, link with, or distribute >>>> -the Library except as expressly provided under this License. Any >>>> -attempt otherwise to copy, modify, sublicense, link with, or >>>> -distribute the Library 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. >>>> - >>>> - 9. 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 Library or its derivative works. These actions are >>>> -prohibited by law if you do not accept this License. Therefore, by >>>> -modifying or distributing the Library (or any work based on the >>>> -Library), you indicate your acceptance of this License to do so, and >>>> -all its terms and conditions for copying, distributing or modifying >>>> -the Library or works based on it. >>>> - >>>> - 10. Each time you redistribute the Library (or any work based on the >>>> -Library), the recipient automatically receives a license from the >>>> -original licensor to copy, distribute, link with or modify the Library >>>> -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 with >>>> -this License. >>>> - >>>> - 11. 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 Library at all. For example, if a patent >>>> -license would not permit royalty-free redistribution of the Library 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 Library. >>>> - >>>> -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. >>>> - >>>> - 12. If the distribution and/or use of the Library is restricted in >>>> -certain countries either by patents or by copyrighted interfaces, the >>>> -original copyright holder who places the Library 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. >>>> - >>>> - 13. The Free Software Foundation may publish revised and/or new >>>> -versions of the Lesser 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 Library >>>> -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 Library does not specify a >>>> -license version number, you may choose any version ever published by >>>> -the Free Software Foundation. >>>> - >>>> - 14. If you wish to incorporate parts of the Library into other free >>>> -programs whose distribution conditions are incompatible with these, >>>> -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 >>>> - >>>> - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO >>>> -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. >>>> -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR >>>> -OTHER PARTIES PROVIDE THE LIBRARY "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 >>>> -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME >>>> -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. >>>> - >>>> - 16. 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 LIBRARY 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 >>>> -LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), 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 Libraries >>>> - >>>> - If you develop a new library, and you want it to be of the greatest >>>> -possible use to the public, we recommend making it free software that >>>> -everyone can redistribute and change. You can do so by permitting >>>> -redistribution under these terms (or, alternatively, under the terms of the >>>> -ordinary General Public License). >>>> - >>>> - To apply these terms, attach the following notices to the library. 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. >>>> - >>>> -<one line to give the library's name and a brief idea of what it does.> >>>> - Copyright (C)<year> <name of author> >>>> - >>>> - This library is free software; you can redistribute it and/or >>>> - modify it under the terms of the GNU Lesser General Public >>>> - License as published by the Free Software Foundation; either >>>> - version 2.1 of the License, or (at your option) any later version. >>>> - >>>> - This library 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 >>>> - Lesser General Public License for more details. >>>> - >>>> - You should have received a copy of the GNU Lesser General Public >>>> - License along with this library; if not, write to the Free Software >>>> - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA >>>> - >>>> -Also add information on how to contact you by electronic and paper mail. >>>> - >>>> -You should also get your employer (if you work as a programmer) or your >>>> -school, if any, to sign a "copyright disclaimer" for the library, if >>>> -necessary. Here is a sample; alter the names: >>>> - >>>> - Yoyodyne, Inc., hereby disclaims all copyright interest in the >>>> - library `Frob' (a library for tweaking knobs) written by James Random Hacker. >>>> - >>>> -<signature of Ty Coon>, 1 April 1990 >>>> - Ty Coon, President of Vice >>>> - >>>> -That's all there is to it! >>>> - >>>> - >>>> >>>> Deleted: trunk/lib/ajax/README.txt >>>> =================================================================== >>>> --- trunk/lib/ajax/README.txt 2010-12-15 14:39:38 UTC (rev 31433) >>>> +++ trunk/lib/ajax/README.txt 2010-12-15 15:31:39 UTC (rev 31434) >>>> @@ -1,106 +0,0 @@ >>>> -==================================================================== >>>> - xajax PHP Class Library >>>> - The easiest way to develop asynchronous Ajax applications with PHP >>>> - >>>> - Version 0.2.5 (stable release) >>>> - README Text File >>>> - >>>> - ------------------------------------------------------ >>>> - | Release Notes: | >>>> - | http://wiki.xajaxproject.org/0.2.5_Release_Notes | >>>> - | | >>>> - | Lead Developers: | >>>> - | Jared White (ja...@in...) | >>>> - | J. Max Wilson (jma...@us...) | >>>> - | Eion Robb (ei...@bi...) | >>>> - ------------------------------------------------------ >>>> -==================================================================== >>>> - >>>> - :: To find out what's changed since the 0.2.4 release of xajax, :: >>>> - :: view the Release Notes in the link above. :: >>>> - >>>> -1. Introduction >>>> - >>>> -xajax is a PHP library that you can include in your PHP scripts >>>> -to provide an easy way for Web pages to call PHP functions or >>>> -object methods using Ajax (Asynchronous Javascript And XML). Simply >>>> -register one or more functions/methods with the xajax object that >>>> -return a proper XML response using the supplied response class, add >>>> -a statement in your HTML header to print the Javascript include, >>>> -and run a request processor prior to outputting any HTML. Then add >>>> -some simple Javascript function calls to your HTML, and xajax takes >>>> -care of the rest! >>>> - >>>> -xajax includes a Javascript object to facilitate the communication >>>> -between the browser and the server, and it can also be used as a >>>> -Javascript library directly to simplify certain DOM and event >>>> -manipulations. However, you can definitely choose to use a >>>> -dedicated Javascript "engine" of your liking and integrate it with >>>> -xajax's client/server communication features in a number of ways. >>>> -More tightly-coupled integration will be forthcoming in a future >>>> -version of xajax. >>>> - >>>> -2. For More Information >>>> - >>>> -The official xajax Web site is located at: >>>> -http://www.xajaxproject.org >>>> - >>>> -Visit the xajax Forums at: >>>> -http://community.xajaxproject.org >>>> -to keep track of the latest news and participate in the community >>>> -discussion. >>>> - >>>> -There is also a wiki with documentation, tips& tricks, and other >>>> -information located at: >>>> -http://wiki.xajaxproject.org >>>> - >>>> -3. Installation >>>> - >>>> -To run xajax, you need: >>>> -* Apache Web Server or IIS for Windows XP/2003 Server >>>> - (other servers may or may not work and are not supported at this >>>> - time) >>>> -* PHP 4.3.x or PHP 5.x >>>> -* Minimum supported browsers: Internet Explorer 5.5, Firefox 1.0 (or >>>> - equivalent Gecko-based browser), Safari 1.3, Opera 8.5 (older >>>> - versions only work with GET requests) >>>> - >>>> -To install xajax: >>>> -Unpack the contents of this archive and copy them to your main Web >>>> -site folder. Or if you wish, you can put all of the files in a >>>> -dedicated "xajax" folder on your Web server (make sure that you >>>> -know what that URL is relative your site pages so you can provide >>>> -xajax with the correct installed folder URL). Note that the >>>> - >>>> -"thewall" folder in the "examples" folder needs to be writable by >>>> - >>>> -the Web server for that example to function. >>>> - >>>> -Within the main xajax folder there are two folders: "examples" >>>> -and "tests". You should be able to view these PHP pages from your >>>> -Web browser and see xajax working in action. If you can view the >>>> -pages but the AJAX calls are not working, there may be something >>>> -wrong with your server setup or perhaps your browser is not >>>> -supported or configured correctly. If worst comes to worst, post >>>> -a message in our forums and someone may be able to help you. >>>> - >>>> -4. Documentation >>>> - >>>> -Detailed documentation for the xajax PHP classes is available on >>>> -our wiki (URL listed above in section 2), and more is on the way >>>> -(particularly in regards to the Javascript component of xajax). >>>> -Another good way of learning xajax is to look at the code for the >>>> -examples and tests. If you need any help, pop in the forums and >>>> -ask for assistance (and the more specific your questions are, >>>> -the better the answers will be). >>>> - >>>> -5. Contributing to xajax >>>> - >>>> -xajax is released under the LGPL open source license. If you wish >>>> -to contribute to the project or suggest new features, introduce >>>> -yourself on the forums or you can e-mail the lead developers at >>>> -the addresses listed at the top of this README. >>>> - >>>> -6. Good luck and enjoy! >>>> - >>>> -==================================================================== >>>> >>>> Deleted: trunk/lib/ajax/ajaxlib.php >>>> =================================================================== >>>> --- trunk/lib/ajax/ajaxlib.php 2010-12-15 14:39:38 UTC (rev 31433) >>>> +++ trunk/lib/ajax/ajaxlib.php 2010-12-15 15:31:39 UTC (rev 31434) >>>> @@ -1,305 +0,0 @@ >>>> -<?php >>>> -// (c) Copyright 2002-2010 by authors of the Tiki Wiki/CMS/Groupware Project >>>> -// >>>> -// All Rights Reserved. See copyright.txt for details and a complete list of authors. >>>> -// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. >>>> -// $Id$ >>>> - >>>> -// This script may only be included - so it's better to die if called directly. >>>> -if (strpos($_SERVER["SCRIPT_NAME"],basename(__FILE__)) !== false) { >>>> - header("location: index.php"); >>>> - die; >>>> -} >>>> - >>>> -global $prefs; >>>> -if ($prefs['ajax_xajax'] === 'y') { >>>> - require_once("lib/ajax/xajax/xajax_core/xajaxAIO.inc.php"); >>>> - if (!defined ('XAJAX_GET')) define ('XAJAX_GET', 0); >>>> - >>>> -class TikiAjax extends xajax >>>> -{ >>>> - >>>> - /** >>>> - * Array of templates that are allowed to be served >>>> - * >>>> - * @access private >>>> - * @var array $aTemplates >>>> - */ >>>> - var $aTemplates; >>>> - var $deniedFunctions; >>>> - >>>> - >>>> - /** >>>> - * PHP 5 constructor. >>>> - * >>>> - * @access public >>>> - * @return void >>>> - */ >>>> - function __construct() { >>>> - parent::__construct(); >>>> - >>>> - $this->aTemplates = array( 'confirm.tpl' => 1, 'error.tpl' => 1); >>>> - $this->deniedFunctions = array(); >>>> - >>>> - $this->configure('waitCursor',true); >>>> - } >>>> - >>>> - /** >>>> - * Tells ajax engine that a given template can be retrieved with >>>> - * this page >>>> - * >>>> - * @access public >>>> - * @param string $name >>>> - * @return void >>>> - */ >>>> - function registerTemplate($template) { >>>> - $this->aTemplates[$template] = 1; >>>> - } >>>> - >>>> - /** >>>> - * Sets access permission for a given function. >>>> - * Permission MUST be set before registering the function. >>>> - * >>>> - * @access public >>>> - * @param string $functionName >>>> - * @param boolean $hasPermission >>>> - * @return void >>>> - */ >>>> - function setPermission($functionName, $hasPermission) { >>>> - if (!$hasPermission) { >>>> - $this->deniedFunctions[$functionName] = 1; >>>> - } >>>> - } >>>> - >>>> - /** >>>> - * Checks if a given template is registered >>>> - * >>>> - * @access public >>>> - * @param string $template >>>> - * @return boolean >>>> - */ >>>> - function templateIsRegistered($template) { >>>> - return array_key_exists($template, $this->aTemplates); >>>> - } >>>> - >>>> - /** >>>> - * Register a JavaScript function >>>> - * >>>> - * @access public >>>> - * @param string|array $mFunction - JS function name OR array e.g. array('myFunctionName', array('callback' => 'myCallbackVarName') >>>> - * @param int $sRequestType {XAJAX_GET = 0} >>>> - * @return void >>>> - */ >>>> - function registerFunction($mFunction, $sRequestType=XAJAX_GET) { >>>> - $functionName = is_array($mFunction) ? $mFunction[0] : $mFunction; >>>> - $this->setDefaultMethod($sRequestType); >>>> - if (isset($this->deniedFunctions[$functionName])) { >>>> - if (is_array($mFunction)) { >>>> - if (method_exists($mFunction[1], $mFunction[2] . 'Error')) { >>>> - $mFunction[2] .= 'Error'; >>>> - } else { >>>> - $mFunction[1]&= $this; >>>> - $mFunction[2] = 'accessDenied'; >>>> - } >>>> - } else { >>>> - if (function_exists($mFunction . 'Error')) { >>>> - $mFunction .= 'Error'; >>>> - } else { >>>> - $mFunction = array($mFunction,&$this, 'accessDenied'); >>>> - } >>>> - } >>>> - } >>>> - if (is_array($mFunction)&& count($mFunction)> 1) { >>>> - xajax::register(XAJAX_FUNCTION,$functionName, $mFunction[1]); >>>> - } else { >>>> - xajax::register(XAJAX_FUNCTION,$mFunction); >>>> - } >>>> - } >>>> - >>>> - /* >>>> - * Returns default access denied error >>>> - * >>>> - * @access public >>>> - * @return xajaxResponse object >>>> - */ >>>> - function accessDenied() { >>>> - $objResponse = new xajaxResponse(); >>>> - $objResponse->Alert(tra("Permission denied")); >>>> - return $objResponse; >>>> - } >>>> - >>>> - /** >>>> - * Assigns xajax javascript to smarty just before processing requests. >>>> - * this way developer can register functions in php code and don't have >>>> - * to manually assign xajax_js. >>>> - * >>>> - * @access public >>>> - * @return void >>>> - */ >>>> - function processRequests() { >>>> - global $smarty; >>>> - if (isset($smarty)) { >>>> - $smarty->assign("xajax_js",$this->getJavascript('lib/ajax/xajax/')); >>>> - } >>>> - >>>> - xajax::processRequest(); >>>> - } >>>> - >>>> - } >>>> -} else { >>>> - // dumb TikiAjax class >>>> - class TikiAjax >>>> -{ >>>> - function TikiAjax() {} >>>> -# function __construct() {} // commented out because it causes PHP notice "constructor already defined for class TikiAjax" (no idea, where and why it even goes through this file when ajax feature is not enabled) >>>> - function registerFunction() {} >>>> - function registerTemplate() {} >>>> - function templateIsRegistered() { return false; } >>>> - function processRequests() {} >>>> - function getJavascript() { return ''; } >>>> - } >>>> -} >>>> - >>>> -global $ajaxlib; >>>> -$ajaxlib = new TikiAjax(); >>>> -$ajaxlib->registerFunction("loadComponent"); >>>> - >>>> -function loadComponent($template, $htmlElementId, $max_tikitabs = 0, $last_user = '') { >>>> - global $smarty, $ajaxlib, $prefs, $user, $headerlib; >>>> - global $js_script; >>>> - $objResponse = new xajaxResponse(); >>>> - $objResponse->setCharacterEncoding('UTF-8'); >>>> - $confirmation_text = $smarty->get_template_vars('confirmation_text'); >>>> - >>>> - if ( $last_user != $user ) { >>>> - >>>> - // If the user session timed out, completely reload the page to refresh right/left modules >>>> - $objResponse->Redirect($_SERVER['REQUEST_URI'], 0); >>>> - >>>> - } elseif ( $ajaxlib->templateIsRegistered($template) ) { >>>> - >>>> - $content = ''; >>>> - if ($smarty->get_template_vars('mid') == $template) { >>>> - $content = $smarty->get_template_vars('mid_data'); >>>> - } >>>> - if (empty($content)) { >>>> - $content = $smarty->fetch($template); >>>> - } >>>> - // Help >>>> - require_once $smarty->_get_plugin_filepath('function', 'show_help'); >>>> - $content .= smarty_function_show_help(null,$smarty); >>>> - // Handle TikiTabs in order to display only the current tab in the XAJAX response >>>> - // This has to be done here, since it is tikitabs() is usually called when loading the<body> tag >>>> - // which is not done again when replacing content by the XAJAX response >>>> - // >>>> - >>>> - // take out javascript from the html response because it needs to be sent specifically as javascript >>>> - // using $objResponse->script($s) below >>>> - >>>> - $js_script = $headerlib->getJsFromHTML( $content, true ); >>>> - >>>> - // do included files too... >>>> - $js_files = array(); >>>> - preg_match_all('/<script[^>]*src=[\'"]??(.*)[\'"]??>\s*<\/script>/Umis', $content, $jsarr); >>>> - if (count($jsarr)> 1&& is_array($jsarr[1])) { >>>> - $js = $jsarr[1]; >>>> - $js_files = array_merge($js_files, $js); >>>> - } >>>> - >>>> - // now remove all the js from the source >>>> - $content = preg_replace('/\s*<script.*javascript.*>.*\/script>\s*/Umis', '', $content); >>>> - // attach the cleaned xhtml to the response >>>> - $objResponse->Assign($htmlElementId, "innerHTML", $content); >>>> - >>>> - } elseif ( $ajaxlib->templateIsRegistered('confirm.tpl')&& !empty($confirmation_text) ) { >>>> - >>>> - $params = array( >>>> - '_tag' => 'n', >>>> - '_keepall' => 'y' >>>> - ); >>>> - >>>> - if ( $prefs['feature_ticketlib2'] == 'y' ) { >>>> - $objResponse->confirmCommands(1, $confirmation_text); >>>> - $params['daconfirm'] = 'y'; >>>> - $params['ticket'] = $smarty->get_template_vars('ticket'); >>>> - } >>>> - >>>> - require_once('lib/smarty_tiki/block.self_link.php'); >>>> - require_once('lib/smarty_tiki/modifier.escape.php'); >>>> - >>>> - $uri = smarty_modifier_escape(smarty_block_self_link($params, '', $smarty), 'javascript'); >>>> - $objResponse->call("loadComponent('$uri','$template','$htmlElementId',".((int)$max_tikitabs).",'$last_user')"); >>>> - >>>> - } elseif ( $ajaxlib->templateIsRegistered('error.tpl') ) { >>>> - >>>> - $content = $smarty->fetch('error.tpl'); >>>> - $objResponse->Assign($htmlElementId, "innerHTML", $content); >>>> - >>>> - } else { >>>> - $objResponse->alert(sprintf(tra("Template %s not registered"),$template)); >>>> - } >>>> - >>>> - $js_files[] = array(); >>>> - >>>> - if (count($js_files)) { >>>> - foreach($js_files as $f) { >>>> - if (trim($f) != '') { >>>> - $objResponse->includeScript($f); >>>> - } >>>> - } >>>> - } >>>> - >>>> - if( $prefs['tiki_minify_javascript'] == 'y' ) { >>>> - ksort($headerlib->jsfiles); >>>> - $hjsfiles = $headerlib->getMinifiedJs(); >>>> - if( isset($prefs['javascript_cdn'])&& $prefs['javascript_cdn'] == 'google' ) { >>>> - $hjsfiles[] = 'http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js'; >>>> - if( $prefs['feature_jquery_ui'] == 'y' ) { >>>> - $hjsfiles[] = 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.5/jquery-ui.min.js'; >>>> - } >>>> - } >>>> - } else { >>>> - $hjsfiles = $headerlib->getJsFilesList(); >>>> - } >>>> - foreach($hjsfiles as $f) { >>>> - foreach ($f as $jsf) { >>>> - if (trim($jsf) != '') { >>>> - $objResponse->includeScriptOnce($jsf); >>>> - } >>>> - } >>>> - } >>>> - >>>> - if (strpos($content, '<input type="hidden" name="wysiwyg" value="y" />') !== false) { >>>> - $ck_reset = "window.CKEDITOR = null;$.getScript('lib/ckeditor/ckeditor.js');"; >>>> - } else { >>>> - $ck_reset = ''; >>>> - } >>>> - $objResponse->script('xajax.config.requestURI="'.$ajaxlib->getRequestURI().'";' . $ck_reset); >>>> - >>>> - $max_tikitabs = (int)$max_tikitabs; >>>> - if ( $max_tikitabs> 0&& $prefs['feature_tabs'] == 'y' ) { >>>> - global $cookietab; >>>> - $tab = ( $cookietab != '' ) ? (int)$cookietab : 1; >>>> - $headerlib->add_jq_onready("tikitabs($tab,$max_tikitabs);"); >>>> - } >>>> - // collect js from headerlib >>>> - $jscontent = $headerlib->output_js(false); >>>> - global $tikidomainslash; >>>> - $tmp_jsfile = 'temp/public/'.$tikidomainslash.md5($jscontent).'.js'; >>>> - if ( ! file_exists( $tmp_jsfile) ) { >>>> - file_put_contents( $tmp_jsfile, $jscontent ); >>>> - chmod($tmp_jsfile, 0644); >>>> - } >>>> - $objResponse->includeScript($tmp_jsfile); >>>> - >>>> - if ($prefs['ajax_autosave'] == 'y') { >>>> - $objResponse->call("auto_save"); >>>> - } >>>> - >>>> - return $objResponse; >>>> -} >>>> - >>>> -if ($prefs['ajax_autosave'] === 'y') { >>>> - require_once("lib/ajax/autosave.php"); >>>> -} >>>> - >>>> >>>> Deleted: trunk/lib/ajax/tiki-ajax.js >>>> =================================================================== >>>> --- trunk/lib/ajax/tiki-ajax.js 2010-12-15 14:39:38 UTC (rev 31433) >>>> +++ trunk/lib/ajax/tiki-ajax.js 2010-12-15 15:31:39 UTC (rev 31434) >>>> @@ -1,15 +0,0 @@ >>>> -function loadComponent(url, template, htmlelement, max_tikitabs, last_user) { >>>> - ajaxLoadingShow(htmlelement); >>>> - >>>> - xajax.config.requestURI = url; >>>> - xajax_loadComponent(template, htmlelement, max_tikitabs, last_user); >>>> -} >>>> - >>>> -if (typeof xajax !== 'undefined') { >>>> - xajax.callback.global.onRequest = function () { >>>> - show('ajaxLoading'); >>>> - }; >>>> - >>>> - xajax.callback.global.beforeResponseProcessing = ajaxLoadingHide; >>>> - >>>> -} >>>> >>>> Modified: trunk/lib/init/smarty.php >>>> =================================================================== >>>> --- trunk/lib/init/smarty.php 2010-12-15 14:39:38 UTC (rev 31433) >>>> +++ trunk/lib/init/smarty.php 2010-12-15 15:31:39 UTC (rev 31434) >>>> @@ -134,13 +134,6 @@ >>>> } >>>> } >>>> >>>> - // Enable AJAX >>>> - if ( $prefs['ajax_xajax'] === 'y'&& $_smarty_display ) { >>>> - global $ajaxlib; require_once('lib/ajax/ajaxlib.php'); >>>> - $ajaxlib->registerTemplate('tiki-site_header_login.tpl'); >>>> - $ajaxlib->registerTemplate($tpl); >>>> - } >>>> - >>>> if ( $_smarty_tpl_file == 'tiki-print.tpl' ) { >>>> $this->assign('print_page', 'y'); >>>> } >>>> @@ -148,22 +141,9 @@ >>>> $this->assign('mid_data', $data); >>>> if ($prefs['feature_fullscreen'] != 'y' || empty($_SESSION['fullscreen']) || $_SESSION['fullscreen'] != 'y') >>>> include_once('tiki-modules.php'); >>>> - if ( $prefs['ajax_xajax'] === 'y'&& $_smarty_display ) { >>>> - $ajaxlib->processRequests(); >>>> - } >>>> } elseif ($_smarty_tpl_file == 'confirm.tpl' || $_smarty_tpl_file == 'error.tpl' || $_smarty_tpl_file == 'error_ticket.tpl' || $_smarty_tpl_file == 'error_simple.tpl') { >>>> include_once('tiki-modules.php'); >>>> - >>>> - // Enable AJAX >>>> - if ( $prefs['ajax_xajax'] === 'y'&& $_smarty_display ) { >>>> - $_POST['xajaxargs'][0] = $_smarty_tpl_file; >>>> - global $ajaxlib; require_once('lib/ajax/ajaxlib.php'); >>>> - $ajaxlib->registerTemplate('tiki-site_header_login.tpl'); >>>> - $ajaxlib->registerTemplate($_smarty_tpl_file); >>>> - $ajaxlib->processRequests(); >>>> - } >>>> } >>>> - >>>> if (isset($style_base)) { >>>> if ($tikidomain and file_exists("templates/$tikidomain/styles/$style_base/$_smarty_tpl_file")) { >>>> $_smarty_tpl_file = "$tikidomain/styles/$style_base/$_smarty_tpl_file"; >>>> >>>> Modified: trunk/lib/prefs/ajax.php >>>> =================================================================== >>>> --- trunk/lib/prefs/ajax.php 2010-12-15 14:39:38 UTC (rev 31433) >>>> +++ trunk/lib/prefs/ajax.php 2010-12-15 15:31:39 UTC (rev 31434) >>>> @@ -9,15 +9,6 @@ >>>> >>>> return array( >>>> >>>> - 'ajax_xajax' => array( >>>> - 'name' => tra('Ajax Xajax'), >>>> - 'description' => tra('Use "xajax" library to "ajaxify" most Tiki pages.'), >>>> - 'help' => 'Ajax', >>>> - 'type' => 'flag', >>>> - 'dependencies' => array( >>>> - 'feature_ajax', >>>> - ), >>>> - ), >>>> 'ajax_autosave' => array( >>>> 'name' => tra('Ajax auto-save'), >>>> 'description' => tra('Saves your edits as you go along enabling you to recover your work after an "interruption". Also enables "Live" preview and is required for wysiwyg plugin processing.'), >>>> >>>> Modified: trunk/lib/prefs/feature.php >>>> =================================================================== >>>> --- trunk/lib/prefs/feature.php 2010-12-15 14:39:38 UTC (rev 31433) >>>> +++ trunk/lib/prefs/feature.php 2010-12-15 15:31:39 UTC (rev 31434) >>>> @@ -412,18 +412,6 @@ >>>> 'help' => 'Wysiwyg', >>>> 'type' => 'flag', >>>> ), >>>> - 'feature_wiki_save_draft' => array( >>>> - 'name' => tra('Save draft'), >>>> - 'warning' => tra('Experimental (Requires AJAX)'), >>>> - 'dependencies' => array( >>>> - 'feature_ajax', >>>> - ), >>>> - 'type' => 'flag', >>>> - 'dependencies' => array( >>>> - 'feature_ajax', >>>> - 'ajax_xajax', >>>> - ), >>>> - ), >>>> 'feature_kaltura' => array( >>>> 'name' => tra('Kaltura'), >>>> 'description' => tra('Collaborative video editing'), >>>> >>>> Modified: trunk/lib/setup/js_detect.php >>>> =================================================================== >>>> --- trunk/lib/setup/js_detect.php 2010-12-15 14:39:38 UTC (rev 31433) >>>> +++ trunk/lib/setup/js_detect.php 2010-12-15 15:31:39 UTC (rev 31434) >>>> @@ -126,5 +126,4 @@ >>>> >>>> if ($prefs['feature_ajax'] != 'y') { >>>> $prefs['ajax_autosave'] = 'n'; >>>> - $prefs['ajax_xajax'] = 'n'; >>>> } >>>> >>>> Modified: trunk/lib/setup/prefs.php >>>> =================================================================== >>>> --- trunk/lib/setup/prefs.php 2010-12-15 14:39:38 UTC (rev 31433) >>>> +++ trunk/lib/setup/prefs.php 2010-12-15 15:31:39 UTC (rev 31434) >>>> @@ -103,7 +103,6 @@ >>>> 'feature_wiki_userpage_prefix' => 'User:', >>>> 'feature_wiki_usrlock' => 'n', >>>> 'feature_wiki_feedback_polls' => array(), >>>> - 'feature_wiki_save_draft' => 'n', >>>> 'feature_wikiwords' => 'n', >>>> 'feature_wikiwords_usedash' => 'y', >>>> 'feature_wiki_pagealias' => 'y', >>>> @@ -1519,7 +1518,6 @@ >>>> 'feature_htmlpurifier_output' => 'n', >>>> 'feature_ajax' => 'y', >>>> 'ajax_autosave' => 'y', >>>> - 'ajax_xajax' => 'n', >>>> 'feature_antibot' => 'y', >>>> 'feature_banners' => 'n', >>>> 'feature_banning' => 'n', >>>> >>>> Modified: trunk/lib/smarty_tiki/block.ajax_href.php >>>> =================================================================== >>>> --- trunk/lib/smarty_tiki/block.ajax_href.php 2010-12-15 14:39:38 UTC (rev 31433) >>>> +++ trunk/lib/smarty_tiki/block.ajax_href.php 2010-12-15 15:31:39 UTC (rev 31434) >>>> @@ -47,17 +47,5 @@ >>>> $func = isset($params['function']) ? $params['function']: $def_func; // preserve previous behaviour >>>> $last_user = htmlspecialchars($user); >>>> >>>> - // temporary switch to not do ajax for ckeditor button - not reliable in tiki 6 >>>> -// Actually in tiki 6 even when not ckeditor if you edit while in tiki-index vs editpage the plugin help breaks as well, you get blank help >>>> - if ( $prefs['ajax_xajax'] !== 'y' || $prefs['javascript_enabled'] == 'n' || $template === 'tiki-editpage.tpl' ) { >>>> - return " href=\"$url\" "; >>>> - } else { >>>> - $max_tikitabs = 50; // Same value as in header.tpl,<body> tag onload's param >>>> - if (empty($params['_anchor'])) { >>>> - $anchor = "#main"; >>>> - } else { >>>> - $anchor = '#'.$params['_anchor']; >>>> - } >>>> - return " href=\"$anchor\" onclick=\"$onclick $func('$url','$template','$htmlelement',$max_tikitabs,'$last_user'); return false\" "; >>>> - } >>>> + return " href=\"$url\" "; >>>> } >>>> >>>> Modified: trunk/lib/smarty_tiki/block.pagination_links.php >>>> =================================================================== >>>> --- trunk/lib/smarty_tiki/block.pagination_links.php 2010-12-15 14:39:38 UTC (rev 31433) >>>> +++ trunk/lib/smarty_tiki/block.pagination_links.php 2010-12-15 15:31:39 UTC (rev 31434) >>>> @@ -40,7 +40,7 @@ >>>> * - zero_based_offset: Items addressed as zero-based (defaults to 'y'). If 'n' then "one based" offset used (1 to cant + 1) >>>> * (jb tiki5: only fully tested without reloffset and step=1) >>>> * - show_numbers: Show/hide direct_pagination links, current and total numbers (Defaults to 'y') >>>> - * - _ajax : if set t... [truncated message content] |