[Affelio-cvs 700] CVS update: affelio_farm/admin/skelton/affelio

Back to archive index

Tadashi Okoshi slash****@users*****
2005年 10月 25日 (火) 04:20:42 JST


Index: affelio_farm/admin/skelton/affelio/CHANGES
diff -u affelio_farm/admin/skelton/affelio/CHANGES:1.1.1.1 affelio_farm/admin/skelton/affelio/CHANGES:removed
--- affelio_farm/admin/skelton/affelio/CHANGES:1.1.1.1	Tue Oct 25 04:14:39 2005
+++ affelio_farm/admin/skelton/affelio/CHANGES	Tue Oct 25 04:20:42 2005
@@ -1,218 +0,0 @@
-1.0.1 (July 12, 2005)
-	Debug: Setup Wizard
-		Error-handling has been revised.
-		Probably we don't have just "500 error" any more.
-		(We can have more detailed error messages)
-
-
-1.0.0 (July 4, 2005)
-
-1.0RC2 (July 4, 2005)
-
-	Debug: Handshaking error
-		RID:0000047
-		Handshake reply back to Affelio with MySQL did not
-		finish correctly due to MySQL error.
-
-
-	Debug: Affelio's Session forwarding
-		-Symptom: Access from the owner was sometimes recognized as
-		"friend of friend" access, when the owner goes from own
-		page, to friend's page and go back to own page.	
-
-		-Symptom: Large number of tmp files was created in
-		session/ directory.
-
-	Debug: Link to other Affelio's
-		Change hyperlink URL to link through outgoing.cgi
-			Messaging
-			AccessLog
-			App: Diary
-
-	Debug: Profile editting
-		Profile value did not appear on the page after user
-		upload profile image to the server.
-
-	Brushup
-		Core/public/friendlist
-		Only for owner, show [edit] and [mail]
-
-1.0RC1.1 (July 2, 2005)
-	Debug:
-		AccessLog did not work well with mySQL
-
-1.0RC1 (July 1, 2005)
-
-	Feature:
-		-Messaging among Affelio
-			-notification to email
-		-Removal of friend
-		-Affelio News
-		-You can set the "top page" to application, not to Affelio 
-		-Free-format message in friend link request.
-		-Access log (a.k.a. ASHIATO in Japanese)
-		-Show number of friends, and friends of friends (roughly)
-
-	Brush-up
-		Page design
-
-	Setup Wizard
-		Note: install wizard is only for "new setup"
-		Note: only one DB modules is needed out of two.
-
-	Debug: MacOSX
-		Template system now works fine on MacOSX
-
-	Feature: Mixi App 
-		If the owner accesses the Mixi app, show actual
-		image files from Mixi.
-
-	Feature: Diary
-		RSS import functionality.
-		(This will be available only if the web server 
-		 has XML::Parser module installed.)
-
-0.9.5.4 (June 22, 2005)
-	Feature: Photo Album application
-		Now we have Phot Album Application!!!
-
-	Debug: Setup Wizard
-		-JavaScript for checking nickname input value
-		 was not working correctly.
-		-New scheme on checking file permission
-		 in order to install smoothly on several hosting web site.
-
-0.9.5.3 (June 22, 2005)
-	Misc: CGI::Session
-		Added auto/CGI/Session to extlib/
-
-0.9.5.2 (June 22, 2005)
-	Debug: setup.cgi
-		Without DBD::SQLite, setup did not proceed further...
-
-0.9.5.1 (June 22, 2005)
-	Misc: CGI::Session
-		Added CGI::Session to extlib/
-
-0.9.5 (June 22, 2005)
-	Feature: MySQL support
-		RID:0000026
-		Now we experimentally support MySQL.
-	         
-	Feature: Built-in Crypt::DH
-		RID:0000023
-		We don't need Crypt::DH and Math::Pari any more as install
-		requirement. Everything is in extlib
-
-	Feature: Skin System 1.1
-		- Skin System 1.1
-		- Skins: "Standard", "Aqua", and "XwinClassic"
-
-	Debug: Mixi application
-		- Login failure
-		- Error message
-		- some style thing
-
-	Debug: Skin uploading
-		RID:0000013
-		We had a problem in uploading skin zip file.
-	
-	Debug: Typo
-		RID:0000022
-		Typo in ManageGroup.pm 
-
-	Debug: Setup.cgi
-		Now setup.cgi works fine on MacOS X.
-
-
-0.9.4.2 (May 15, 2005)
-	RID:0000018
-	Debug: Added I18N::LangTags module in extlib/
-
-	RID:0000016
-	Debug: Affelio did not work correctly if it was installed at
-	       http://localhost:8000/
-
-	RID:0000017
-	Debug: Typo in setup.cgi
-
-
-
-
-0.9.4.1 (May 13, 2005)
-	Debug: Session, Cookie, Login problem 
-	       Fixed a problem that user cannot logon from Internet
-	       Explorer.
-
-
-0.9.4 (May 12, 2005)
-	Feature: Affelio API 1.0
-
-	Feature: "Simple Diary" application now works!
-
-	Feature: Access control for Affelio applications
-
-	Structure:  Now using CGI::Session as session/cookie management
-
-	Misc: skins: new default images 
-	Misc: templates: new default image size
-
-	RID:0000014
-	Debug: Moji-bake in "Given name" field. (in Edit Profile)
-
-	Debug: Session: 
-	       Session module has been replaced by CGI::Session
-	       
-	Debug: Affelio Session forwarding
-	       get_content.cgi: a program to get remote content with
-	       Affelio session forwarding had a big bug. now fixed.
-
-
-0.9.3 (May 7, 2005)
-	Feature: New skin editting menu
-
-	Feature: Warn user when she is accessing from a private IP address
-	         and when she tries to fowward session to another Affelio.
-
-	RID:0000004
-	Debug: Modify FriendManager:add() so that, when two already-friends 
-	       Affelio exhange another friend link communication, the 
-               FriendManager update their newly-generated passwords
-	       respectively.
-
-	RID:0000009
-	Debug: An error screen appears when login fails.
-	       (A bug introduced in 0.9.2)
-
-	RID:0000008
-	Debug: An error screen appears when link request is sent.
-	       (A bug introduced in 0.9.2)
-
-	RID:0000008
-	Debug: An error screen appears when link approval is sent.
-	       (A bug introduced in 0.9.2)
-
-	RID:0000010
-	Debug: CGI goes into infinite loop in friend edit mode.
-
-	RID:0000011
-	Debug: Permission table in "Edit Friend" was somewhat broken.
-
-
-0.9.2 (May 6, 2005)
-	Feature: Added Japanese and American English support.
-
-	Structure: Localization (with Locale::Maketext)
-
-	Debug: Affelio could not be installed without DBD::CSV.
-
-
-0.9.1 (May 1, 2005)
-        Include "Error" module in extlib/
-        Include "Config::IniFiles" module in extlib/
-	Renew the version of "Config::Tiny" module from 2.00 to 2.01
-	
-	Added Perl module checking in setup.cgi setup wizard.
-
-0.9 (April 27, 2005)
-        Initial release
Index: affelio_farm/admin/skelton/affelio/COPYING
diff -u affelio_farm/admin/skelton/affelio/COPYING:1.1.1.1 affelio_farm/admin/skelton/affelio/COPYING:removed
--- affelio_farm/admin/skelton/affelio/COPYING:1.1.1.1	Tue Oct 25 04:14:39 2005
+++ affelio_farm/admin/skelton/affelio/COPYING	Tue Oct 25 04:20:42 2005
@@ -1,352 +0,0 @@
-                      GNU GENERAL PUBLIC LICENSE
-                         Version 2, June 1991
-
-     Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place - Suite 330, Boston, MA  02111-1307, 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 Library 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.
-
-     ONE LINE TO GIVE THE PROGRAM'S NAME AND A BRIEF IDEA OF WHAT IT DOES.
-     Copyright (C) YYYY  NAME OF AUTHOR
-
-     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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, 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) 19YY 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.
-
-     SIGNATURE OF TY COON, 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 Library General Public License instead of this License.
-
Index: affelio_farm/admin/skelton/affelio/LICENSE-sjis.txt
diff -u affelio_farm/admin/skelton/affelio/LICENSE-sjis.txt:1.1.1.1 affelio_farm/admin/skelton/affelio/LICENSE-sjis.txt:removed
--- affelio_farm/admin/skelton/affelio/LICENSE-sjis.txt:1.1.1.1	Tue Oct 25 04:14:39 2005
+++ affelio_farm/admin/skelton/affelio/LICENSE-sjis.txt	Tue Oct 25 04:20:42 2005
@@ -1,9 +0,0 @@
-Affelioソフトウェアのライセンスについて
-
-本ソフトウェアは、GPLおよびAffelioコマーシャルライセンスのデュアルライセンス
-です。詳しくは、affelio.jp内: http://affelio.jp/modules/tinyd5/ をご参照
-ください。
-
-
-Affelio Project
-April 2005
Index: affelio_farm/admin/skelton/affelio/LICENSE.txt
diff -u affelio_farm/admin/skelton/affelio/LICENSE.txt:1.1.1.1 affelio_farm/admin/skelton/affelio/LICENSE.txt:removed
--- affelio_farm/admin/skelton/affelio/LICENSE.txt:1.1.1.1	Tue Oct 25 04:14:39 2005
+++ affelio_farm/admin/skelton/affelio/LICENSE.txt	Tue Oct 25 04:20:42 2005
@@ -1,11 +0,0 @@
-On the Lisence of the Affelio Software
-
-This software, Affelio, is a software with dual license based on GPL and 
-the Affelio commercial lisence. For more detaile, Please refer the Affelio 
-web page. 
-
-Affelio Project
-April 2005
-
-http://affelio.jp/ (Japan)
-http://affelio.us/ (USA and other countries)
Index: affelio_farm/admin/skelton/affelio/README-sjis.txt
diff -u affelio_farm/admin/skelton/affelio/README-sjis.txt:1.1.1.1 affelio_farm/admin/skelton/affelio/README-sjis.txt:removed
--- affelio_farm/admin/skelton/affelio/README-sjis.txt:1.1.1.1	Tue Oct 25 04:14:39 2005
+++ affelio_farm/admin/skelton/affelio/README-sjis.txt	Tue Oct 25 04:20:42 2005
@@ -1,95 +0,0 @@
-Affelio: The Open Social Network 
-
-	 Version: 1.0.0   July 4, 2005
-
-
-‚±‚̃o[ƒWƒ‡ƒ“‚ɂ‚¢‚Ă̂²’ˆÓ
-
-	‚±‚̃o[ƒWƒ‡ƒ“‚ÍGPL2.0‚ÉŠî‚¢‚ㆁ[ƒU[‚ÌŠF—l‚Ƀ‰ƒCƒZƒ“ƒX‚³‚ê‚é
-	ƒo[ƒWƒ‡ƒ“‚Å‚·B
-
-	–³•ۏ؁A–Ɛӂɂ‚«‚Ü‚µ‚ÄGPL2.0‚Ìð€‚É€‹’‚¢‚½‚µ‚Ü‚·BˆÈ‰º‚É
-	GPL2.0“ú–{Œê–ó‚©‚çˆê•”ˆø—p‚³‚¹‚Ä‚¢‚½‚¾‚«‚Ü‚·B
-	================================================================ 
-	–³•ۏ؂ɂ‚¢‚Ä
-	wƒvƒƒOƒ‰ƒ€x‚͑㉿–³‚µ‚É—˜—p‚ª‹–‰Â‚³‚ê‚é‚̂ŁA“KØ‚È–@‚ª”F‚ß
-	‚éŒÀ‚è‚É‚¨‚¢‚āAwƒvƒƒOƒ‰ƒ€x‚ÉŠÖ‚·‚é‚¢‚©‚È‚é•ÛØ‚à‘¶Ý‚µ‚È‚¢B
-	‘–ʂŕʂɏq‚ׂéê‡‚ðœ‚¢‚āA’˜ìŒ ŽÒA‚Ü‚½‚Í‚»‚Ì‘¼‚Ì’c‘̂́A
-	wƒvƒƒOƒ‰ƒ€x‚ðA•\–¾‚³‚ꂽ‚©Œ¾ŠO‚É‚©‚Í–â‚킸A¤‹Æ“I“K«‚ð•Û
-	Ø‚·‚é‚ق̂߂©‚µ‚â‚ ‚é“Á’è‚Ì–Ú“I‚Ö‚Ì“K‡«(‚ÉŒÀ‚ç‚ê‚È‚¢)‚ðŠÜ‚Þ
-	ˆêØ‚̕ۏؖ³‚µ‚Ɂu‚ ‚邪‚܂܁v‚Å’ñ‹Ÿ‚·‚éBwƒvƒƒOƒ‰ƒ€x‚ÌŽ¿‚Æ
-	«”\‚ÉŠÖ‚·‚郊ƒXƒN‚Ì‚·‚ׂĂ͂ ‚È‚½‚É‹A‘®‚·‚éBwƒvƒƒOƒ‰ƒ€x‚É
-	Œ‡Š×‚ª‚ ‚邯”»–¾‚µ‚½ê‡A‚ ‚È‚½‚Í•K—v‚ȕێç“_ŒŸ‚â•âCAC³‚É
-	—v‚·‚éƒRƒXƒg‚Ì‚·‚×‚Ä‚ðˆø‚«Žó‚¯‚邱‚ƂɂȂéB
-
-	“KØ‚È–@‚©‘–ʂł̓¯ˆÓ‚É‚æ‚Á‚Ä–½‚º‚ç‚ê‚È‚¢ŒÀ‚èA’˜ìŒ ŽÒA‚Ü‚½
-	‚͏ã‹L‚Å‹–‰Â‚³‚ê‚Ä‚¢‚é’Ê‚è‚ɁwƒvƒƒOƒ‰ƒ€x‚ð‰ü•ς܂½‚͍ĔЕz‚µ
-	‚½‚»‚Ì‘¼‚Ì’c‘̂́A‚ ‚È‚½‚ɑ΂µ‚āwƒvƒƒOƒ‰ƒ€x‚Ì—˜—p‚È‚¢‚µ—˜—p
-	•s”\‚Ő¶‚¶‚½’ʏ푹ŠQ‚â“Á•Ê‘¹ŠQA‹ô”­‘¹ŠQAŠÔÚ‘¹ŠQ(ƒf[ƒ^‚̏Á
-	ޏ‚â•s³Šm‚ȏˆ—A‚ ‚È‚½‚©‘æŽOŽÒ‚ª”í‚Á‚½‘¹Ž¸A‚ ‚é‚¢‚́wƒvƒƒO
-	ƒ‰ƒ€x‚ª‘¼‚̃\ƒtƒgƒEƒFƒA‚ƈꏏ‚É“®ì‚µ‚È‚¢‚Æ‚¢‚¤•s‹ï‡‚ȂǂðŠÜ
-	‚Þ‚ª‚»‚ê‚ç‚ÉŒÀ‚ç‚È‚¢)‚ÉˆêØ‚̐ӔC‚𕉂í‚È‚¢B‚»‚̂悤‚È‘¹ŠQ‚ª
-	¶‚¸‚é‰Â”\«‚ɂ‚¢‚Ĕނ炪’‰‚³‚ê‚Ä‚¢‚½‚Æ‚µ‚Ä‚à“¯—l‚Å‚ ‚éB
-	================================================================
-
-
-ƒtƒB[ƒhƒoƒbƒN‚ɂ‚¢‚Ä
-	
-	http://affelio.jp “àuƒ†[ƒU[ƒTƒ|[ƒgvƒR[ƒi[‚ÌŒfަ”‚â
-	ƒ[ƒŠƒ“ƒOƒŠƒXƒg‚܂ŁA‚²ˆÓŒ©E‚²Š´‘zA‚²Ž¿–âE‚²—v–]‚ȂNjCŒy‚É
-	ƒtƒB[ƒhƒoƒbƒN‚ð‚¨Šè‚¢’v‚µ‚Ü‚·B
-
-	‚Ü‚½AƒoƒO•ñ‚àŠ½Œ}‚¢‚½‚µ‚Ü‚·Bhttp://affelio.jp “àuƒoƒO•ñv
-	ƒR[ƒi[‚܂łæ‚낵‚­‚¨Šè‚¢‚¢‚½‚µ‚Ü‚·B
-
-
-ƒCƒ“ƒXƒg[ƒ‹—vŒ
-
-	EUnixŒnWebƒT[ƒo
-	ECGI‚ª“®ì‚·‚éŠÂ‹«
-@	EPerl verion.5.6ˆÈã
-	E•K—v‚ÈPerlƒ‚ƒWƒ…[ƒ‹
-		LWP
-		URI
-		DBI
-
-		ˆÈ‰º‚Ì2‚‚̂¤‚¿‚Ì‚¢‚¸‚ê‚©
-		DBD::mysql (MySQL4.1ˆÈ~‚ðƒf[ƒ^ƒx[ƒX‚Æ‚µ‚ÄŽg—p‚·‚éê‡)
-		DBD::SQLite (SQLite‚ðƒf[ƒ^ƒx[ƒX‚Æ‚µ‚ÄŽg—p‚·‚éê‡)
-
-
-ƒCƒ“ƒXƒg[ƒ‹•û–@
-
-	(1)‘S•”‚̃tƒ@ƒCƒ‹‚ðFTP‚ÅWebƒT[ƒoã‚ɃAƒbƒvƒ[ƒh‚µ‚Ä‚­‚¾‚³‚¢B
-	@E‘S•”‚̃tƒ@ƒCƒ‹‚ÍUTF-8‚ŏ‘‚©‚ê‚Ä‚¢‚Ü‚·B
-	@@FTP‚ł̓oƒCƒiƒŠƒ‚[ƒh‚ł̓]‘—‚ð‚¨Š©‚ß‚µ‚Ü‚·B
-	@E.cgiƒtƒ@ƒCƒ‹‚Í‚·‚ׂĎÀsƒp[ƒ~ƒbƒVƒ‡ƒ“‚ðÝ’肵‚Ä‚­‚¾‚³‚¢B
-
-	(2)ƒuƒ‰ƒEƒU‚©‚çsetup.cgi‚ðŽÀs‚µ‚Ä‚­‚¾‚³‚¢BƒZƒbƒgƒAƒbƒvƒEƒBƒU[ƒh
-	@ ‚ªŠJŽn‚µ‚Ü‚·‚̂ŁAŽwަ‚ɏ]‚Á‚Đi‚ñ‚Å‚­‚¾‚³‚¢B
-
-	Ú‚µ‚­‚͈ȉº‚ÌURL‚ð‚²——‰º‚³‚¢‚Ü‚¹B
-	http://affelio.jp/modules/tinyd9/
-
-
-Žg‚¢•û
-	ƒCƒ“ƒXƒg[ƒ‹Œã‚ÌAffelio‚ÌŽg‚¢•û‚ÉŠÖ‚µ‚ẮAAffelio‰^‰cƒTƒCƒg
-	http://affelio.jp “àA¶‘¤‚̃ƒjƒ…[‚æ‚èuŽg‚¢•ûv‚ðA‚²ŽQÆ
-	‰º‚³‚¢B
-
-
-ƒTƒ|[ƒg
-	ƒTƒ|[ƒg‚́AAffelio‰^‰cƒTƒCƒg‚ɂčs‚Á‚Ä‚¨‚è‚Ü‚·BƒTƒCƒgã‚ÌŒfަ”Â
-	‚܂ŋCŒy‚ɃAƒNƒZƒX‚µ‚Ä‚­‚¾‚³‚¢B
-
-
-ƒ‰ƒCƒZƒ“ƒXE—˜—p‹K–ñ
-	Affelio‚́AGPL‚¨‚æ‚ÑAffelioƒRƒ}[ƒVƒƒƒ‹ƒ‰ƒCƒZƒ“ƒX‚̃fƒ…ƒAƒ‹
-	ƒ‰ƒCƒZƒ“ƒX‚Å‚·B–”A–{ƒo[ƒWƒ‡ƒ“‚ÍGPLƒo[ƒWƒ‡ƒ“‚Å‚·B
-	ƒ‰ƒCƒZƒ“ƒXE—˜—p‹K–ñ‚ÉŠÖ‚µ‚ďڂµ‚­‚́Aaffelio.jp“à
-	http://affelio.jp/modules/tinyd5/ ‚ð‚²ŽQÆ‚­‚¾‚³‚¢B
-
-
-’˜ìŒ E¤•W
-	Affelio‚Ì’˜ìŒ ‚Í—LŒÀ‰ïŽÐƒtƒBƒbƒVƒ…ƒOƒ[ƒ”‚ªŠ—L‚µ‚Ü‚·B
-	Affelio‚Í—LŒÀ‰ïŽÐƒtƒBƒbƒVƒ…ƒOƒ[ƒ”‚̏¤•W‚Å‚·B
Index: affelio_farm/admin/skelton/affelio/README.txt
diff -u affelio_farm/admin/skelton/affelio/README.txt:1.1.1.1 affelio_farm/admin/skelton/affelio/README.txt:removed
--- affelio_farm/admin/skelton/affelio/README.txt:1.1.1.1	Tue Oct 25 04:14:39 2005
+++ affelio_farm/admin/skelton/affelio/README.txt	Tue Oct 25 04:20:42 2005
@@ -1,78 +0,0 @@
-Affelio: The Open Social Network
-
-	 Version: 1.0.0   July 4, 2005
-
-
-Caution!
-	This version is a "RC" (Release Candidate) version of Affelio.
-	Users need to understand following points.
-
-	* You may encounter some problem in install and use of this
-	  software. 
-
-	* NO WARRANTY.
-
-	* This version is "GPL version". Please understand the policy
-	  of GPL, especially the following paragraphs from GPL 2.0.
-	  ----------------------------------------------------------
-	  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.
-	  ----------------------------------------------------------
-
-Install Requirement
-
-	* UNIX/Linux-based web server
-	* CGI environment
-	* Perl 5.6 and later
-	* Following Perl modules
-
-		    -LWP
-		    -URI
-		    -DBI
-		    
-		    (One of the following)
-		    -DBD::mysql		for MySQL use
-		    -DBD::SQLite	for SQLite use
-
-How to Install 
-
-       (1)Upload all files to the web server via FTP
-
-		 - We recommend you use "binary" mode since
-		   some files are written in UTF-8.
-		 - Set executable permission for all .cgi files.
-
-       (2)Access setup.cgi from your browser. 
-
-       That's it! :)
-
-
-Support
-	Please visit our website for more information!
-	http://affelio.us is our web site in USA and other countries.
-	http://affelio.jp is our web site in Japan.
-
-
-Copyright (C)2005 FishGrove Inc.
-
Index: affelio_farm/admin/skelton/affelio/admin.cgi
diff -u affelio_farm/admin/skelton/affelio/admin.cgi:1.1.1.1 affelio_farm/admin/skelton/affelio/admin.cgi:removed
--- affelio_farm/admin/skelton/affelio/admin.cgi:1.1.1.1	Tue Oct 25 04:14:39 2005
+++ affelio_farm/admin/skelton/affelio/admin.cgi	Tue Oct 25 04:20:42 2005
@@ -1,832 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright (C) 2005 FishGrove Inc.
-#
-# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# $Id: admin.cgi,v 1.1.1.1 2005/10/24 19:14:39 slash5234 Exp $
-
-use strict;
-
-use lib("./extlib");
-use CGI qw(-unique_headers);
-$CGI::DISABLE_UPLOADS = 0;
-$CGI::POST_MAX = 1024_000;
-use Error qw(:try);
-use CGI::Session qw(-ip_match);
-use HTML::Template;
-use Fcntl;
-
-use lib("./lib");
-use Affelio;
-use Affelio::misc::CGIError;
-use Affelio::misc::Debug qw( debug_print);
-use Affelio::misc::Time;
-use Affelio::misc::NetMisc;
-use Affelio::misc::WebInput;
-use Affelio::exception::CommunicationException; 
-
-############################################################################
-#Load Affelio
-############################################################################
-debug_print("admin.cgi: start.");
-
-my $cfg_dir = "./config/";
-my $af;
-try{
-    $af = new Affelio(ConfigDir => $cfg_dir);
-}catch Error with{
-    my $e = shift;
-    print "Content-type: text/html; charset=UTF-8\n";
-    print "Pragma: no-cache", "\n\n";
-    print "<HTML><PRE>Affelio load error.<BR>$e<BR><BR>" . $e->stacktrace . "</PRE></HTML>";
-    exit(1);
-};
-debug_print("admin.cgi: AF loaded.");
-my $wi = new Affelio::misc::WebInput();
-
-############################################################################
-#Check session w/ cookie
-############################################################################
-my $TMPL_FILE=""; 
-my $q = new CGI;
-my $sid = $q->cookie("affelio-$af->{user__nickname}");
-debug_print("admin.cgi: sid from cookie = $sid");
-my $session="";
-if($sid){
-    $session = new CGI::Session(undef, 
-				$sid, 
-				{Directory=> $af->{site__session_dir}});
-    debug_print("admin:cgi Existing session: [" . $session->id . "]");
-}
-
-if( (!$session) || ($session->param("type") ne "self")  ){
-    # Is the session alive?
-    # Is the user the admin of this site?
-    # if not....
-    debug_print("admin.cgi: login is needed.");
-
-    print "Content-type: text/html; charset=UTF-8\n";
-    print "Pragma: no-cache", "\n\n";
-    print get_HTML_header();
-
-    $TMPL_FILE = "$af->{site__fs_root}/templates/$af->{site__template}/owner_side/login.tmpl";
-    my $tmpl = new HTML::Template( filename => $TMPL_FILE,
-				   die_on_bad_params => 0);
-    $tmpl->param(reason_msg => "You haven't been authenticated.");
-    $tmpl->param("tmpl_path" => "$af->{site__web_root}/templates/$af->{site__template}/owner_side/");
-    $tmpl->param("style_path" => $af->{site__web_root} . "/skins/" . $af->{userpref__skin});
-    $tmpl->param("forward_URL" => $q->self_url);
-
-    print $af->translate_templateL10N($tmpl->output);
-    print get_HTML_footer();
-    exit(1);
-}
-
-debug_print("admin.cgi: Session as the admin is OK.");
-$session->expire('+12h');
-
-############################################################################
-#Going to the owner mode
-############################################################################
-#Set this Affelio as owner mode.
-$af->set_owner_mode();
-
-
-############################################################################
-#Invoking models
-############################################################################
-use Affelio::App::Admin::Messaging;
-my %output_data = ("tmpl_path", "$af->{site__web_root}/templates/$af->{site__template}/owner_side/",
-		   "style_path", $af->{site__web_root} . "/skins/" . $af->{userpref__skin},
-		   "site_web_root", "$af->{site__web_root}",
-		   "my_nickname", $af->{user__nickname},
-		   "my_currentstatus", $af->{user__currentstatus},
-		   "new_messages", Affelio::App::Admin::Messaging::get_new($af)
-		   );
-
-my $HTTP_forward_flag = 0;
-my $forward_URL = "";
-my $ret_msg="";
-my $err_msg="";
-
-my $admin_mode = $wi->PTN_mode($q->url_param("mode"));
-
-#####################################################################
-#Affelio Configuration
-#####################################################################
-if($admin_mode eq "config_affelio"){
-
-    use Affelio::App::Admin::Configuration;
-
-    my $sub_mode = $wi->PTN_mode($q->url_param("action"));
-    if($sub_mode eq "submit" ){
-	try{
-	    Affelio::App::Admin::Configuration::configure($af, $q);
-	}catch Error with{
-	    my $e = shift;    $err_msg .= $e->stacktrace;
-	};
-    }
-
-    $TMPL_FILE = "$af->{site__fs_root}/templates/" .
-	         "$af->{site__template}/owner_side/admin_affelio_config.tmpl";
-    Affelio::App::Admin::Configuration::show($af,\%output_data);
-
-#####################################################################
-#Access Log
-#####################################################################
-}elsif($admin_mode eq "accesslog"){
-
-    use Affelio::App::Admin::AccessLog;
-
-    $TMPL_FILE = "$af->{site__fs_root}/templates/" .
-	         "$af->{site__template}/owner_side/admin_access_log.tmpl";
-    try{
-	Affelio::App::Admin::AccessLog::show($af,$q,\%output_data);
-    }catch Error with{
-	my $e = shift;    $err_msg .= $e->stacktrace;
-    };
-
-#####################################################################
-#Upload Image
-#####################################################################
-}elsif($admin_mode eq "uploadimage"){
-
-    use Affelio::App::Admin::EditProfile;
-    $TMPL_FILE = "$af->{site__fs_root}/templates/" .
-	         "$af->{site__template}/owner_side/admin_editprofile.tmpl";
-
-    my $sub_mode = $wi->PTN_mode($q->url_param("action"));
-    if($sub_mode eq "submit" ){
-	try{
-	    $q->cgi_error 
-		and error($q, "File transfer failed." . $q->cgi_error);
-
-	    my $uploaded_filename = $wi->PTN_jpg_filename($q->param("file"))
-		|| error($q, "File has not been transfered to server.");
-	    my $fh = $q->upload( "file" );
-	
-	    sysopen(OUT, "$af->{site__user_dir}/profile_face.jpg", 
-		    O_WRONLY|O_TRUNC|O_CREAT, 0755);
-	    binmode $fh;
-	    binmode OUT;
-	    my $buffer="";
-	    while (read ($fh, $buffer, 16384)){
-		print OUT $buffer;
-	    }
-	    close OUT;
-	}catch Error with{
-	    my $e = shift;
-	    $err_msg='<AF_M text="Error in uploading the image"><BR>' . $e;
-	};
-
-	Affelio::App::Admin::EditProfile::show_profileeditor($af, \%output_data);
-    }else{
-    }
-
-#####################################################################
-#Messages
-#####################################################################
-}elsif($admin_mode eq "messages"){
-
-    use Affelio::App::Admin::Messaging;
-
-    if( $q->url_param("action") eq "send_message" ){
-
-	try{
-	    $ret_msg=Affelio::App::Admin::Messaging::send_message($af, $q);
-	    $ret_msg='<AF_M text="You message has been sent successfuly.">';
-	}catch Affelio::exception::CommunicationException with{
-	    my $E = shift;
-	    $err_msg='<AF_M text="Could not send message."><BR>' . $E;
-	};
-
-	$TMPL_FILE = "$af->{site__fs_root}/templates/" .
-	    "$af->{site__template}/owner_side/admin_showmessage_list.tmpl";
-
-	try{
-	    Affelio::App::Admin::Messaging::show_message_list($af, 
-							  \%output_data);
-	}catch Error with{
-	    my $e = shift;    $err_msg .= $e->stacktrace;
-	};
-
-    }elsif( $q->url_param("action") eq "compose" ){
-	$TMPL_FILE = "$af->{site__fs_root}/templates/" .
-	    "$af->{site__template}/owner_side/admin_composemessage.tmpl";
-
-	try{
-	    Affelio::App::Admin::Messaging::compose($af,
-						    $q,
-						    \%output_data);
-	}catch Error with{
-	    my $e = shift;    $err_msg .= $e->stacktrace;
-	};
-
-    }elsif( $q->url_param("action") eq "show" ){
-	$TMPL_FILE = "$af->{site__fs_root}/templates/" .
-	    "$af->{site__template}/owner_side/admin_showmessage.tmpl";
-	try{
-	    Affelio::App::Admin::Messaging::mark_as_read($af,
-						     $q->url_param("mid"));
-
-	    Affelio::App::Admin::Messaging::show_message($af,
-						     $q->url_param("mid"),
-						     \%output_data);
-	}catch Error with{
-	    my $e = shift;    $err_msg .= $e->stacktrace;
-	};
-
-    }else{
-	$TMPL_FILE = "$af->{site__fs_root}/templates/" .
-	    "$af->{site__template}/owner_side/admin_showmessage_list.tmpl";
-	
-	try{
-	    Affelio::App::Admin::Messaging::show_message_list($af, 
-							  \%output_data);
-	}catch Error with{
-	    my $e = shift;    $err_msg .= $e->stacktrace;
-	};
-    }
-
-#####################################################################
-#Edit skin
-#####################################################################
-}elsif($admin_mode eq "edit_skins"){
-
-    use Affelio::App::Admin::EditSkins;
-
-    if( $q->url_param("action") eq "submitcss" ){
-	debug_print("admin.cgi: action=[submitcss]");
-	try{
-	    Affelio::App::Admin::EditSkins::save_css($af, $q);
-	}catch Error with{
-	    my $e = shift;    $err_msg .= $e->stacktrace;
-	};
-
-    }elsif( $q->url_param("action") eq "chooseskin" ){
-	#Choose skin
-	debug_print("admin.cgi: action=[chooseskin]");
-	try{
-	    Affelio::App::Admin::EditSkins::choose_skin($af, $q);
-	}catch Error with{
-	    my $e = shift;    $err_msg .= $e->stacktrace;
-	};
-
-    }elsif( $q->url_param("action") eq "backup" ){
-	#backup skin
-	debug_print("admin.cgi: action=[backup]");
-	try{
-	    Affelio::App::Admin::EditSkins::backup($af,$q);
-	}catch Error with{
-	    my $e = shift;    $err_msg .= $e->stacktrace;
-	};
-
-    }elsif( $q->url_param("action") eq "upload" ){
-	#backup skin
-	debug_print("admin.cgi: action=[upload]");
-	try{
-	    Affelio::App::Admin::EditSkins::upload($af,$q);
-	}catch Error with{
-	    my $e = shift;    $err_msg .= $e->stacktrace;
-	};
-    }
-
-    $TMPL_FILE = "$af->{site__fs_root}/templates/" .
-	         "$af->{site__template}/owner_side/admin_edit_skins.tmpl";
-    try{
-	Affelio::App::Admin::EditSkins::show($af, \%output_data);
-    }catch Error with{
-	my $e = shift;    $err_msg .= $e->stacktrace;
-    };
-#####################################################################
-#Edit templates
-#####################################################################
-}elsif($admin_mode eq "edit_templates"){
-
-    use Affelio::App::Admin::EditTemplates;
-
-    if( $q->url_param("action") eq "submit" ){
-	#Retrieve the latest data from friends' sites.
-	debug_print("admin.cgi: action=[submit]");
-
-	try{
-	    Affelio::App::Admin::EditTemplates::save_templates($af,$q);
-	    Affelio::App::Admin::EditTemplates::rebuild($af);
-	}catch Error with{
-	    my $e = shift;    $err_msg .= $e->stacktrace;
-	};
-    }elsif( $q->url_param("action") eq "rebuild" ){
-
-	#Retrieve the latest data from friends' sites.
-	debug_print("admin.cgi: action=[rebuild]");
-	try{
-	    Affelio::App::Admin::EditTemplates::rebuild($af);
-	}catch Error with{
-	    my $e = shift;    $err_msg .= $e->stacktrace;
-	};
-    }
-
-    $TMPL_FILE = "$af->{site__fs_root}/templates/" .
-	         "$af->{site__template}/owner_side/admin_edit_templates.tmpl";
-
-    try{
-	Affelio::App::Admin::EditTemplates::show_templates($af, \%output_data);
-    }catch Error with{
-	    my $e = shift;    $err_msg .= $e->stacktrace;
-    };
-
-
-#####################################################################
-#Friends graph
-#####################################################################
-}elsif($admin_mode eq "friendsgraph"){
-
-    use Affelio::App::Admin::FriendsGraph;
-
-    if( $q->url_param("action") eq "retrieve" ){
-	#Retrieve the latest data from friends' sites.
-	debug_print("admin.cgi: action=[retrieve]");
-
-	try{
-	    Affelio::App::Admin::FriendsGraph::retrieve($af);
-	}catch Error with{
-	    my $e = shift;    $err_msg .= $e->stacktrace;
-	};
-    }
-
-
-    $TMPL_FILE = "$af->{site__fs_root}/templates/" .
-	         "$af->{site__template}/owner_side/admin_friendsgraph.tmpl";
-    try{
-	Affelio::App::Admin::FriendsGraph::show_friendsgraph($af, \%output_data);
-    }catch Error with{
-	my $e = shift;    $err_msg .= $e->stacktrace;
-    };
-#####################################################################
-#Edit Profile
-#####################################################################
-}elsif($admin_mode eq "editprofile"){
-
-    use Affelio::App::Admin::EditProfile;
-
-    $TMPL_FILE = "$af->{site__fs_root}/templates/" .
-	         "$af->{site__template}/owner_side/admin_editprofile.tmpl";
-
-    if( $q->url_param("mode2") eq "submit" ){
-	#Profile data is being submitted.
-	debug_print("admin.cgi: mode2=[submit]");
-
-	try{
-	    Affelio::App::Admin::EditProfile::save_profile($af,$q);
-	}catch Error with{
-	    my $e = shift;    $err_msg .= $e->stacktrace;
-	};
-    }
-
-    Affelio::App::Admin::EditProfile::show_profileeditor($af, \%output_data);
-
-#####################################################################
-#Group Member Table
-#####################################################################
-}elsif($admin_mode eq "group_member_table"){
-
-    use Affelio::App::Admin::GroupMemberTable;
-
-    debug_print("admin.cgi: mode2=[" . $q->url_param("mode2"));
-    if($q->url_param("mode2") eq "submit"){
-	try{
-	    save_GroupMember_table($af, $q);
-	}catch Error with{
-	    my $e = shift;    $err_msg .= $e->stacktrace;
-	};
-    }
-
-    $TMPL_FILE = "$af->{site__fs_root}/templates/" .
-	"$af->{site__template}/owner_side/admin_groupmember_table.tmpl";
-    try{
-	show_GroupMember_table($af, \%output_data);
-    }catch Error with{
-	my $e = shift;    $err_msg .= $e->stacktrace;
-    };
-#####################################################################
-#Manage Friend
-#####################################################################
-}elsif($admin_mode eq "manage_friends"){
-
-    use Affelio::App::Admin::ManageFriend;
-
-    debug_print("admin.cgi: mode2=[" . $q->url_param("mode2"));
-    if($q->url_param("mode2") eq "delete"){
-	try{
-	    Affelio::App::Admin::ManageFriend::remove_member($af, $q->url_param("uid"), $q);
-	}catch Error with{
-	    my $e = shift;    $err_msg .= $e->stacktrace;
-	};
-
-	$TMPL_FILE = "$af->{site__fs_root}/templates/" .
-	    "$af->{site__template}/owner_side/admin_managefriends_top.tmpl";
-	try{
-	    Affelio::App::Admin::ManageFriend::manage_top($af, \%output_data);
-	}catch Error with{
-	    my $e = shift;    $err_msg .= $e->stacktrace;
-	};
-    }elsif($q->url_param("mode2") eq "show_member"){
-	##Show member#############
-
-        $TMPL_FILE = "$af->{site__fs_root}/templates/" .
-            "$af->{site__template}/owner_side/admin_managefriends_showmember.tmpl";
-	try{
-	    Affelio::App::Admin::ManageFriend::show_member($af, $q->url_param("uid"), \%output_data);
-	}catch Error with{
-	    my $e = shift;    $err_msg .= $e->stacktrace;
-	};
-
-    }elsif($q->url_param("mode2") eq "modify_member"){
-	##Modify member###########
-
-	try{
-	    Affelio::App::Admin::ManageFriend::modify_member($af, $q->url_param("uid"), $q);
-	}catch Error with{
-	    my $e = shift;    $err_msg .= $e->stacktrace;
-	};
-
-	$TMPL_FILE = "$af->{site__fs_root}/templates/" .
-            "$af->{site__template}/owner_side/admin_managefriends_showmember.tmpl";
-	try{
-	    Affelio::App::Admin::ManageFriend::show_member($af, $q->url_param("uid"), \%output_data);
-	}catch Error with{
-	    my $e = shift;    $err_msg .= $e->stacktrace;
-	};
-
-    }elsif($q->url_param("mode2") eq "unsubscribe_group"){
-	##Unsubscribe group#######
-
-	try{
-	    Affelio::App::Admin::ManageFriend::unsubscribe_group($af, $q->url_param("gid"), $q->url_param("uid"));
-	}catch Error with{
-	    my $e = shift;    $err_msg .= $e->stacktrace;
-	};
-
-	$TMPL_FILE = "$af->{site__fs_root}/templates/" .
-            "$af->{site__template}/owner_side/admin_managefriends_showmember.tmpl";
-	
-	try{
-	    Affelio::App::Admin::ManageFriend::show_member($af, $q->url_param("uid"), \%output_data);
-	}catch Error with{
-	    my $e = shift;    $err_msg .= $e->stacktrace;
-	};
-
-    }elsif($q->url_param("mode2") eq "subscribe_group"){
-	##Subscribe group#########
-	my @add_group_inputs = $q->param("add_group");
-	foreach my $i (@add_group_inputs){
-	    try{
-		Affelio::App::Admin::ManageFriend::subscribe_group($af, $i, $q->url_param("uid"));
-	    }catch Error with{
-		my $e = shift;    $err_msg .= $e->stacktrace;
-	    };
-	}
-
-	$TMPL_FILE = "$af->{site__fs_root}/templates/" .
-            "$af->{site__template}/owner_side/admin_managefriends_showmember.tmpl";
-	try{
-	    Affelio::App::Admin::ManageFriend::show_member($af, $q->url_param("uid"), \%output_data);
-	}catch Error with{
-	    my $e = shift;    $err_msg .= $e->stacktrace;
-	};
-
-    }else{
-	##TOP#####################
-
-	$TMPL_FILE = "$af->{site__fs_root}/templates/" .
-	    "$af->{site__template}/owner_side/admin_managefriends_top.tmpl";
-
-	try{
-	    Affelio::App::Admin::ManageFriend::manage_top($af, \%output_data);
-	}catch Error with{
-	    my $e = shift;    $err_msg .= $e->stacktrace;
-	};
-
-    }
-
-#####################################################################
-#Manage Groups
-#####################################################################
-}elsif($admin_mode eq "manage_groups"){
-
-    use Affelio::App::Admin::ManageGroup;
-
-    debug_print("admin.cgi: mode2=[" . $q->url_param("mode2"));
-    if($q->url_param("mode2") eq "show_group"){
-	##Show member#############
-
-        $TMPL_FILE = "$af->{site__fs_root}/templates/" .
-            "$af->{site__template}/owner_side/admin_managegroups_showgroup.tmpl";
-	try{
-	    Affelio::App::Admin::ManageGroup::show_group($af, $q->url_param("gid"), \%output_data);
-      	}catch Error with{
-	    my $e = shift;    $err_msg .= $e->stacktrace;
-	};
-
-    }elsif($q->url_param("mode2") eq "rename"){
-	##Modify member###########
-	try{
-	    Affelio::App::Admin::ManageGroup::rename_group($af, $q->url_param("gid"), $q->param("new_name"));
-      	}catch Error with{
-	    my $e = shift;    $err_msg .= $e->stacktrace;
-	};
-
-	$TMPL_FILE = "$af->{site__fs_root}/templates/" .
-	    "$af->{site__template}/owner_side/admin_managegroups_top.tmpl";
-
-	try{
-	    Affelio::App::Admin::ManageGroup::manage_top($af, \%output_data);
-      	}catch Error with{
-	    my $e = shift;    $err_msg .= $e->stacktrace;
-	};
-
-    }elsif($q->url_param("mode2") eq "add_group"){
-	try{
-	    Affelio::App::Admin::ManageGroup::add_group($af, $q->param("new_group_name"));
-      	}catch Error with{
-	    my $e = shift;    $err_msg .= $e->stacktrace;
-	};
-
-	$TMPL_FILE = "$af->{site__fs_root}/templates/" .
-	    "$af->{site__template}/owner_side/admin_managegroups_top.tmpl";
-
-	try{
-	    Affelio::App::Admin::ManageGroup::manage_top($af, \%output_data);
-      	}catch Error with{
-	    my $e = shift;    $err_msg .= $e->stacktrace;
-	};
-    }elsif($q->url_param("mode2") eq "remove_group"){
-	try{
-	    Affelio::App::Admin::ManageGroup::remove_group($af, $q->url_param("gid"), $q);
-      	}catch Error with{
-	    my $e = shift;    $err_msg .= $e->stacktrace;
-	};
-
-	$TMPL_FILE = "$af->{site__fs_root}/templates/" .
-	    "$af->{site__template}/owner_side/admin_managegroups_top.tmpl";
-	try{
-	    Affelio::App::Admin::ManageGroup::manage_top($af, \%output_data);
-      	}catch Error with{
-	    my $e = shift;    $err_msg .= $e->stacktrace;
-	};
-
-
-    }else{
-	##TOP#####################
-
-	$TMPL_FILE = "$af->{site__fs_root}/templates/" .
-	    "$af->{site__template}/owner_side/admin_managegroups_top.tmpl";
-	try{
-	    Affelio::App::Admin::ManageGroup::manage_top($af, \%output_data);
-      	}catch Error with{
-	    my $e = shift;    $err_msg .= $e->stacktrace;
-	};
-    }
-
-#####################################################################
-#Access Control
-#####################################################################
-}elsif($admin_mode eq "access_control"){
-    
-    use Affelio::App::Admin::AccessControl;
-    
-    if($q->url_param("mode2") eq "submit"){
-	try{
-	    save_GroupAttribute_table($af, $q);
-      	}catch Error with{
-	    my $e = shift;    $err_msg .= $e->stacktrace;
-	};
-    }
-    
-    $TMPL_FILE = "$af->{site__fs_root}/templates/" .
-	"$af->{site__template}/owner_side/admin_accesscontrol.tmpl";
-
-    try{
-	show_GroupAttribute_table($af, \%output_data);
-    }catch Error with{
-	my $e = shift;    $err_msg .= $e->stacktrace;
-    };
-
-#####################################################################
-#Application Access Control
-#####################################################################
-}elsif($admin_mode eq "access_control_apps"){
-
-    use Affelio::App::Admin::ManageApplication;
-
-    if($q->url_param("mode2") eq "modify_app"){
-	##Show app#############
-
-	try{
-	    Affelio::App::Admin::ManageApplication::save_permission($af, $q, $q->url_param("app_name"));
-	}catch Error with{
-	    my $e = shift;    $err_msg .= $e->stacktrace;
-	};
-
-        $TMPL_FILE = "$af->{site__fs_root}/templates/" .
-            "$af->{site__template}/owner_side/admin_accesscontrol_apps_showapp.tmpl";
-	try{
-	    Affelio::App::Admin::ManageApplication::show_app($af, $q->url_param("app_name"), \%output_data);
-	}catch Error with{
-	    my $e = shift;    $err_msg .= $e->stacktrace;
-	};
-
-    }elsif($q->url_param("mode2") eq "show_app"){
-	##Show app#############
-
-        $TMPL_FILE = "$af->{site__fs_root}/templates/" .
-            "$af->{site__template}/owner_side/admin_accesscontrol_apps_showapp.tmpl";
-	try{
-	    Affelio::App::Admin::ManageApplication::show_app($af, $q->url_param("app_name"), \%output_data);
-	}catch Error with{
-	    my $e = shift;    $err_msg .= $e->stacktrace;
-	};
-
-    }else{
-	##TOP#####################
-
-	$TMPL_FILE = "$af->{site__fs_root}/templates/" .
-	    "$af->{site__template}/owner_side/admin_accesscontrol_apps_top.tmpl";
-
-	try{
-	    Affelio::App::Admin::ManageApplication::manage_top($af, \%output_data);
-	}catch Error with{
-	    my $e = shift;    $err_msg .= $e->stacktrace;
-	};
-    }
-
-
-#####################################################################
-#Send Invitation
-#####################################################################
-}elsif($admin_mode eq "send_invitation"){
-
-    use Affelio::App::Admin::SendInvitation;
-    try{
-	send_invitation($af, $q->param("dest_address"), \%output_data);
-    }catch Error with{
-	my $e = shift;    $err_msg .= $e->stacktrace;
-    };
-
-    $TMPL_FILE = "$af->{site__fs_root}/templates/" .
-	         "$af->{site__template}/owner_side/admin_top.tmpl";
-
-
-#####################################################################
-#Send Handshake
-#####################################################################
-}elsif($admin_mode eq "send_handshake"){
-
-    use Affelio::App::Admin::SendHandshake;
-    try{
-	Affelio::App::Admin::SendHandshake::send($af, $q, \%output_data);
-    }catch Error with{
-	my $e = shift;
-	$err_msg='<AF_M text="Error in handshaking"><BR>' . $e;
-    };
-
-    $TMPL_FILE = "$af->{site__fs_root}/templates/" .
-	"$af->{site__template}/owner_side/handshake_sent.tmpl";
-
-#####################################################################
-#MyStatus
-#####################################################################
-}elsif($admin_mode eq "post_mystatus"){
-
-    use Affelio::App::Admin::MyStatus;
-
-    try{
-	Affelio::App::Admin::MyStatus::post($af, $q->param("my_currentstatus"));
-    }catch Error with{
-	my $e = shift;    $err_msg .= $e->stacktrace;
-    };
-
-    $HTTP_forward_flag = 1;
-    $forward_URL = "$af->{site__web_root}/admin.cgi";
-
-
-#####################################################################
-#Top
-#####################################################################
-}else{
-
-    $TMPL_FILE = "$af->{site__fs_root}/templates/" .
-	         "$af->{site__template}/owner_side/admin_top.tmpl";
-
-    use Affelio::App::Admin::AffelioNews;
-    try{
-	Affelio::App::Admin::AffelioNews::getnews($af, \%output_data);
-    }catch Error with{
-	my $e = shift;    $err_msg .= $e->stacktrace;
-    };
-
-}#if
-
-
-############################################################################
-#Output View
-############################################################################
-if( $HTTP_forward_flag==1 ){
-    print "Location: $forward_URL", "\n\n";
-
-}else{
-    print "Content-type: text/html; charset=UTF-8\n";
-    print "Pragma: no-cache", "\n\n";
-    print get_HTML_header();
-
-    my $tmpl = new HTML::Template( filename => $TMPL_FILE,
-				   die_on_bad_params => 0);
-    foreach my $data_key (keys(%output_data)) {
-	$tmpl->param($data_key => $output_data{$data_key});
-	#debug_print("$data_key ... $output_data{$data_key}");
-    } 
-    $tmpl->param("err_msg" => $err_msg);
-    $tmpl->param("ret_msg" => $ret_msg);
-    $tmpl->param("site__locale" => $af->{site__locale});
-
-    print $af->translate_templateL10N($tmpl->output);
-
-    print get_HTML_footer();
-}
-
-
-
-####################
-#Hmmmmmm
-####################
-
-    ######################################################################
-    #Get_HTML_header
-    ######################################################################
-    sub get_HTML_header{
-        my $self = shift;
-        my $app__page_title = shift;
-
-#        my $af = $self->{af};
-
-        #Set template file name
-        my $TMPL_FILE = "$af->{site__fs_root}/templates_dyn/_header.tmpl";
-        #Set data for template
-        my %output_data = ();
-        $output_data{'app__css_path'} = $af->{site__web_root}."/templates/default/owner_side";
-        $output_data{'app__page_title'} = "Affelio Owner's page";
-        $output_data{"site__skin_dir"} = $af->{site__web_root} . "/skins/" . $af->{userpref__skin};
-        $output_data{'site__web_root'} = $af->{site__web_root};
-        $output_data{'site__locale'} = $af->{site__locale};
-
-        $af->get_module_list(\%output_data, $af->{site__web_root},"self");
-        $af->get_guest_owner_list(\%output_data);
-
-        #Initiate Template
-        my $tmpl = new HTML::Template( filename => $TMPL_FILE,
-                                       die_on_bad_params => 0);
-        foreach my $data_key (keys(%output_data)) {
-            debug_print("$data_key = $output_data{$data_key}");
-            $tmpl->param($data_key => $output_data{$data_key});
-        }
-
-        my $final_out = $af->translate_templateL10N($tmpl->output)
-            . '<div class="afMain">' . "\n";
-
-        return($final_out);
-
-    }
-    
-    ######################################################################
-    #get_HTML_footer
-    ######################################################################
-    sub get_HTML_footer{
-        my $self = shift;
-#        my $af = $self->{af};
-
-        #Set template file name
-        my $TMPL_FILE = "$af->{site__fs_root}/templates_dyn/_footer.tmpl";
-        my $tmpl = new HTML::Template(filename => $TMPL_FILE);
-
-        my $final_out = "</div><!--afPubMain-->"
-            . $af->translate_templateL10N($tmpl->output);
-
-        return($final_out);
-    }
-    
-
-
-    
Index: affelio_farm/admin/skelton/affelio/incoming.cgi
diff -u affelio_farm/admin/skelton/affelio/incoming.cgi:1.1.1.1 affelio_farm/admin/skelton/affelio/incoming.cgi:removed
--- affelio_farm/admin/skelton/affelio/incoming.cgi:1.1.1.1	Tue Oct 25 04:14:39 2005
+++ affelio_farm/admin/skelton/affelio/incoming.cgi	Tue Oct 25 04:20:42 2005
@@ -1,226 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright (C) 2005 FishGrove Inc.
-#
-# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# $Id: incoming.cgi,v 1.1.1.1 2005/10/24 19:14:39 slash5234 Exp $
-
-use strict;
-
-use lib("./extlib");
-use CGI qw(-unique_headers);
-$CGI::DISABLE_UPLOADS = 1;
-$CGI::POST_MAX = 102_400;
-use CGI::Session qw(-ip_match);
-use HTML::Template;
-use Error qw(:try);
-
-use lib("./lib");
-use Affelio;
-use Affelio::misc::CGIError;
-use Affelio::misc::Debug      qw(debug_print);
-use Affelio::misc::Time qw(get_timestamp get_expire_stamp);
-use Affelio::misc::MyCrypt qw(msg_decrypt url_decode);
-use Affelio::misc::NetMisc;
-use Affelio::SNS::Handshaker_c;
-use Affelio::misc::WebInput;
-
-debug_print("incoming.cgi: start.");
-my $q = new CGI;
-
-############################################################################
-#Load Affelio, CGI
-############################################################################
-my $cfg_dir = "./config/";
-my $af;
-try{
-    $af = new Affelio(ConfigDir => $cfg_dir);
-}catch Error with{
-    my $e = shift;
-    error($q, "Affelio load error.\n" . $e);
-};
-my $wi = new Affelio::misc::WebInput(); 
-my $sid = $q->cookie("affelio-$af->{user__nickname}");
-debug_print("incoming.cgi: sid from cookie = $sid");
-my $session="";
-if($sid){
-    $session = new CGI::Session(undef, 
-				$sid, 
-				{Directory=> $af->{site__session_dir}});
-}
-
-############################################################################
-#Get args
-############################################################################
-my $forward_id = $q->url_param("forward_id");
-my $referrer = $q->param("referrer");
-debug_print("incoming.cgi: forward_id      =$forward_id");
-
-############################################################################
-#Load Friend manager and get passAB
-############################################################################
-my $passAB;
-try{
-   $passAB = $af->{fm}->get_attribute_by_afid($referrer, "password");
-}catch Error with{
-    my $e = shift;
-    error($q, "Error from FriendManager.\n" . $e);
-};
-debug_print("incoming.cgi: passAB=$passAB\n");
-if(!defined($passAB) || $passAB eq ""){
-    error($q, "Affelio: Invalid forwarding. Shared key not found!");
-}
-
-
-############################################################################
-#Decrypt the forward_id message;
-############################################################################
-my ($FID_timestamp, $FID_expire, $FID_remoteip, $FID_visitorAFID, $FID_visitor_nickname, $FID_visitor_type)
-    =split('\*', msg_decrypt( url_decode($forward_id), $passAB ) ); 
-
-$FID_visitorAFID = url_decode($FID_visitorAFID);
-$FID_visitor_nickname = url_decode($FID_visitor_nickname);
-
-debug_print("incoming.cgi: timestamp      =$FID_timestamp");
-debug_print("incoming.cgi: expire         =$FID_expire");
-debug_print("incoming.cgi: remote_ip      =$FID_remoteip");
-debug_print("incoming.cgi: visitor_afid      =$FID_visitorAFID");
-debug_print("incoming.cgi: visitor_nickname  =$FID_visitor_nickname");
-debug_print("incoming.cgi: visitor_type(original)      =$FID_visitor_type");
-
-if((my $i=index($FID_visitor_type, "self"))==0){
-    $FID_visitor_type = "f1";
-}elsif((my $i=index($FID_visitor_type, "f1"))==0){
-    $FID_visitor_type = "f2";
-}else{
-    $FID_visitor_type = "pb";
-}
-debug_print("incoming.cgi: visitor_type(decreased)     =$FID_visitor_type");
-
-
-############################################################################
-#Error detection
-############################################################################
-my $errormsg="";
-if(($FID_timestamp eq "") || ($FID_remoteip eq "") || 
-   ($FID_visitorAFID eq "") || ($FID_expire eq "") ||
-   ($FID_visitor_type eq "") ){
-    $errormsg .= "Forward_Id data is invalid! \n";
-}else{
-    if($FID_remoteip ne $q->remote_addr){
-	$errormsg .= "Your remote IP address does not match! \n";
-    }
-    if($FID_expire < get_timestamp() ){
-	$errormsg .= "This forward_id is too late to start. \n";
-    }
-}
-if($errormsg){
-    #error $errormsg;
-    debug_print("incoming.cgi: ERROR! : $errormsg");
-    debug_print("incoming.cgi: Just go to my Affelio without any cookie."); 
-    print $q->redirect( -url => $af->{site__web_root});
-}
-
-############################################################################
-#Check current session
-############################################################################
-#If a cookie is set already, check it and reuse it if we can.
-my $ck_visitor_type="pb";
-my $ck_visitor_nickname="anonymous";
-my $ck_visitor_afid="";
-if($session){
-    debug_print("incoming.cgi: Found a pre-existing session!");
-    $ck_visitor_type = $session->param("type");
-    $ck_visitor_nickname = $session->param("user_nickname");
-    $ck_visitor_afid = $session->param("user_afid");
-}
-debug_print("incoming.cgi: cookie visitor_type  = $ck_visitor_type");
-debug_print("incoming.cgi: cookie visitor_nickname  = $ck_visitor_nickname");
-debug_print("incoming.cgi: cookie visitor_afid  = $ck_visitor_afid");
-
-if($session &&
-   ( (($ck_visitor_type eq "self") && ( $FID_visitor_type ne "self") ) 
-     || ( ($ck_visitor_type eq "f1") && 
-	  (( $FID_visitor_type eq "f2") || ( $FID_visitor_type eq "pb") ) )
-     || ( ($ck_visitor_type eq "f2") && ( $FID_visitor_type eq "pb") )
-    )
-   ){
-    #########################
-    # OK. 
-    # This visitor is already authenticated as a closer visitor.
-    # Use existing session.
-    #########################
-    debug_print("incoming.cgi: OK. You already have a cookie, and");
-    debug_print("incoming.cgi: the existing session has higher right!");
-    debug_print("incoming.cgi: end. Forwarding to my homepage.");
-    print $q->redirect( -url => $af->{site__web_root});
-
-}else{
-    #########################
-    # Startup a new session
-    #########################
-    debug_print("incoming.cgi: You don't have a cookie, or you have");
-    debug_print("incoming.cgi: a cookie with the same or lower rights.");
-    debug_print("incoming.cgi: ");
-    debug_print("incoming.cgi: Let's start up a session with a cooike.");
-
-    #lookup our friend table with FID_visitorAFID
-    my $tmp1;
-    try{
-	$tmp1 = $af->{fm}->get_attribute_by_afid($FID_visitorAFID, "password");
-    }catch Error with{
-	my $e = shift;
-	error($q, "Error from FriendManager.\n" . $e);
-    };
-    if($tmp1 ne ""){	$FID_visitor_type="f1";    }
-
-    #Start up a sesion
-    my $ss = new CGI::Session("driver:File", 
-			      undef, 
-			      {Directory=> $af->{site__session_dir}});
-    #Set values into session
-    $ss->param("user_afid", $FID_visitorAFID);
-    $ss->param("user_nickname", $FID_visitor_nickname);
-    $ss->param("type", $FID_visitor_type);
-    #current time
-    #expire time
-    $ss->expire('+1h');
-
-    debug_print("incoming.cgi: startup_session finished.\n");    
-
-    #Retrieve a sesion_id
-    my $session_id = $ss->id();
-    debug_print("incoming.cgi: session_id = [$session_id]\n");
-
-    #Prepare a cookie with the session_id
-    my $cookie = $q->cookie ( -name => "affelio-$af->{user__nickname}",
-			      -value => $session_id,
-			      -path => URL2path($af->{site__web_root}));
-
-    debug_print("incoming.cgi: new cookie [$session_id]\n");
-    debug_print("incoming.cgi: new cookie [" . URL2domain($af->{site__web_root}) .  "]\n");
-    debug_print("incoming.cgi: new cookie [" . URL2path($af->{site__web_root}) .  "]\n");
-    debug_print("incoming.cgi: New session has been established.");
-    debug_print("incoming.cgi: user_type:    " . $ss->param("type") );
-    debug_print("incoming.cgi: user_afid:    " . $ss->param("user_afid") );
-    debug_print("incoming.cgi: user_nickname:" . $ss->param("user_nickname") );
-
-    debug_print("incoming.cgi: end. Forwarding to my homepage.");
-    print $q->redirect( -url => $af->{site__web_root},
-			-cookie => $cookie);
-}
-
-exit(1);
Index: affelio_farm/admin/skelton/affelio/index.cgi
diff -u affelio_farm/admin/skelton/affelio/index.cgi:1.1.1.1 affelio_farm/admin/skelton/affelio/index.cgi:removed
--- affelio_farm/admin/skelton/affelio/index.cgi:1.1.1.1	Tue Oct 25 04:14:39 2005
+++ affelio_farm/admin/skelton/affelio/index.cgi	Tue Oct 25 04:20:42 2005
@@ -1,265 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright (C) 2005 FishGrove Inc.
-#
-# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# $Id: index.cgi,v 1.1.1.1 2005/10/24 19:14:39 slash5234 Exp $
-
-use strict;
-
-use lib("./extlib");
-use CGI qw(-unique_headers);
-$CGI::DISABLE_UPLOADS = 1;
-$CGI::POST_MAX = 102_400;
-use CGI::Session qw(-ip_match);
-use HTML::Template;
-use Error qw(:try);
-
-use lib("./lib");
-use Affelio;
-use Affelio::misc::CGIError;
-use Affelio::misc::Debug qw(debug_print);
-use Affelio::misc::NetMisc;
-use Affelio::misc::Time;
-use Affelio::misc::WebInput;
-use Affelio::SNS::Handshaker_c;
-
-debug_print("index.cgi: start.");
-my $q = new CGI;
-
-############################################################################
-#Load Affelio
-############################################################################
-my $wi = new Affelio::misc::WebInput(); 
-my $cfg_dir = "./config/";
-my $af;
-try{
-    $af = new Affelio(ConfigDir => $cfg_dir);
-}catch Error with{
-    my $e = shift;
-    error($q, "Affelio load error.\n" . $e);
-};
-
-############################################################################
-#Check session w/ cookie
-############################################################################
-my $sid = $q->cookie("affelio-$af->{user__nickname}");
-debug_print("index.cgi: sid from cookie = $sid");
-my $session;
-if($sid){
-    $session = new CGI::Session(undef, 
-				$sid, 
-				{Directory=> $af->{site__session_dir}});
-}
-
-my $visitor_type="pb";
-my $visitor_nickname="anonymous";
-my $visitor_afid="";
-
-if($session){
-    $visitor_type 
-	= $wi->PTN_visitor_type($session->param("type"));
-    $visitor_nickname 
-	= $wi->PTN_nickname($session->param("user_nickname"));
-
-    $visitor_afid 
-	= $wi->PTN_URL($session->param("user_afid"));
-}
-if($visitor_type eq ""){
-    $visitor_type="pb";
-    $visitor_nickname="anonymous";
-}
-debug_print("index.cgi: visitor_type=      $visitor_type");
-debug_print("index.cgi: visitor_nickname=  $visitor_nickname");
-debug_print("index.cgi: visitor_afid=      $visitor_afid");
-
-
-############################################################################
-#Main
-############################################################################
-my %output_data = ();
-my $TMPL_FILE ="";
-
-######################################################
-#Template file
-######################################################
-my $mode = $wi->PTN_mode($q->url_param("mode"));
-debug_print("================$mode");
-
-if(($mode eq "") ||  !defined($mode)){
-    #If "mode" is not set, we will look at $self->{userpref__toppage_app_path}
-    #value. 
-    my $abs_next_URL = $af->{site__web_root} . "/" . $af->{userpref__toppage_app_path};
-
-    print "Location: $abs_next_URL", "\n\n";    
-    exit(1);
-}
-$TMPL_FILE = "$af->{site__fs_root}/templates_dyn/"  . $mode . ".tmpl";
-
-
-######################################################
-#Data prep (1)
-######################################################
-
-#################
-#Site info
-#################
-$output_data{"site__web_root"} = $af->{site__web_root};
-$output_data{"site__skin_dir"} = $af->{site__web_root} . "/skins/" . $af->{userpref__skin};
-$output_data{"site__locale"} = $af->{site__locale};
-
-try{
-    $af->get_module_list(\%output_data, $visitor_afid, $visitor_type);
-    $af->get_guest_owner_list(\%output_data);
-}catch Error with{
-    my $e = shift;
-    error($q, "Affelio init error.\n" . $e);
-};
-
-
-#################
-#Client info
-#################
-$output_data{'client_afid'}= $visitor_afid;
-#
-my $relation;
-if($visitor_type eq "self"){
-    $relation = $af->{lh}->maketext("_VISITOR_TYPE_SELF");
-}elsif($visitor_type eq "f1"){
-    $relation = $af->{lh}->maketext("_VISITOR_TYPE_F1");
-}elsif($visitor_type eq "f2"){
-    $relation = $af->{lh}->maketext("_VISITOR_TYPE_F2");
-}else{
-    $relation = $af->{lh}->maketext("_VISITOR_TYPE_PB");
-}
-$output_data{'client_relationship'}= $relation;
-
-$output_data{'client_type'}= $visitor_type;
-$output_data{'client_nickname'}= $visitor_nickname;
-$output_data{'client_type_' . $visitor_type}= "true";
-
-#################
-#Default profile info
-#################
-$output_data{'profile_nickname'} = $af->{user__nickname};
-$output_data{"profile_intromesg1"} = $af->{user__intromesg1};
-$output_data{'profile_myimage_path'} = 
-    "./bin/get_content.cgi?module=core&content=/profile/profile_face.jpg";
-
-######################################################
-#Data prep from Models 
-######################################################
-#Inject Profile Data
-use Affelio::App::ShowProfile;
-try{
-    Affelio::App::ShowProfile::show_profile($af,
-					    \%output_data, 
-					    $visitor_type,
-					    $visitor_afid);
-}catch Error with{
-    my $e = shift;
-    error($q, "Affelio: model execution  error.\n" . $e);
-};
-
-#Friendlist
-use Affelio::App::FriendRoutines;
-my @friendlist_5;
-try{
-    @friendlist_5 = get_friends_list($af, $visitor_afid, $visitor_type, 5);
-}catch Error with{
-    my $e = shift;
-    error($q, "Affelio: model execution  error.\n" . $e);
-};
-$output_data{"friendlist_5"} = \@friendlist_5;
-
-my @friendlist_5_IF;
-try{
-    @friendlist_5_IF = get_friends_list_IF($af,$visitor_afid, $visitor_type,5);
-}catch Error with{
-    my $e = shift;
-    error($q, "Affelio: model execution  error.\n" . $e);
-};
-$output_data{"friendlist_5_IF"} = \@friendlist_5_IF;
-
-my @friendlist_all;
-try{
-    @friendlist_all = get_friends_list($af, $visitor_afid, $visitor_type, -1);
-}catch Error with{
-    my $e = shift;
-    error($q, "Affelio: model execution  error.\n" . $e);
-};
-$output_data{"friendlist_all"} = \@friendlist_all;
-
-my @friendlist_all_IF;
-try{
-    @friendlist_all_IF=get_friends_list_IF($af,$visitor_afid,$visitor_type,-1);
-}catch Error with{
-    my $e = shift;
-    error($q, "Affelio: model execution  error.\n" . $e);
-};
-$output_data{"friendlist_all_IF"} = \@friendlist_all_IF;
-
-try{
-    $output_data{"friend__F1count"} = $af->{fm}->get_F1_count();
-    $output_data{"friend__F2count"} = $af->{fm}->get_F2_count();
-}catch Error with{
-    my $e = shift;
-    error($q, "Affelio: error from FriendManager\n" . $e);
-};
-
-###########################################################################
-#Inject data into template 
-###########################################################################
-my $tmpl;
-try{
-    $tmpl = new HTML::Template( filename => $TMPL_FILE,
-			       die_on_bad_params => 0);
-}catch Error with{
-    my $e = shift;
-    error($q, "Affelio: error in HTML::Template init.\n" . $e);
-};
-
-foreach my $data_key (keys(%output_data)) {
-    debug_print("index.cgi: $data_key = $output_data{$data_key}");
-    $tmpl->param($data_key => $output_data{$data_key});
-} 
-
-###########################################################################
-#AccessLog
-###########################################################################
-if($visitor_type ne "self"){
-    my $afid;
-    if($visitor_afid eq ""){
-	$afid = $q->remote_host;
-    }else{
-	$afid = $visitor_afid;
-    }
-
-    try{
-	$af->{alm}->save_log($afid, $visitor_nickname, $visitor_type);
-    }catch Error with{
-	my $e = shift;
-	error($q, "Affelio: error in AccessLogging\n" . $e);
-    };
-
-}
-
-###########################################################################
-#Output
-###########################################################################
-print "Content-type: text/html; charset=UTF-8\n";
-print "Pragma: no-cache", "\n\n"; 
-print $af->translate_templateL10N($tmpl->output);
Index: affelio_farm/admin/skelton/affelio/outgoing.cgi
diff -u affelio_farm/admin/skelton/affelio/outgoing.cgi:1.1.1.1 affelio_farm/admin/skelton/affelio/outgoing.cgi:removed
--- affelio_farm/admin/skelton/affelio/outgoing.cgi:1.1.1.1	Tue Oct 25 04:14:39 2005
+++ affelio_farm/admin/skelton/affelio/outgoing.cgi	Tue Oct 25 04:20:42 2005
@@ -1,198 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright (C) 2005 FishGrove Inc.
-#
-# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-# $Id: outgoing.cgi,v 1.1.1.1 2005/10/24 19:14:39 slash5234 Exp $
-
-use strict;
-
-use lib("./extlib");
-use CGI qw(-unique_headers);
-$CGI::DISABLE_UPLOADS = 1;
-$CGI::POST_MAX = 102_400;
-use CGI::Session qw(-ip_match);
-use HTML::Template;
-use Error qw(:try);
-
-use lib("./lib");
-use Affelio;
-use Affelio::SNS::Handshaker_c;
-use Affelio::misc::CGIError;
-use Affelio::misc::Debug;
-use Affelio::misc::Time;
-use Affelio::misc::MyCrypt;
-use Affelio::misc::NetMisc;
-use Affelio::misc::WebInput;
-
-debug_print("outgoing.cgi: start.\n");
-my $q = new CGI;
-
-############################################################################
-#Load Affelio
-############################################################################
-my $cfg_dir = "./config/";
-my $af;
-try{
-    $af = new Affelio(ConfigDir => $cfg_dir);
-}catch Error with{
-    my $e = shift;
-    error($q, "Affelio load error.\n" . $e);
-};
-my $wi = new Affelio::misc::WebInput(); 
-
-############################################################################
-#Check session w/ cookie
-############################################################################
-my $sid = $q->cookie("affelio-$af->{user__nickname}");
-my $session = new CGI::Session(undef, 
-			       $sid, 
-			       {Directory=> $af->{site__session_dir}});
-
-my $visitor_type="pb";
-my $visitor_nickname="anonymous";
-my $visitor_afid="";
-
-if($session){
-    $visitor_type = $session->param("type");
-    $visitor_nickname = $session->param("user_nickname");
-    $visitor_afid = $session->param("user_afid");
-}
-debug_print("outgoing.cgi: visitor_type=      $visitor_type");
-debug_print("outgoing.cgi: visitor_nickname=  $visitor_nickname");
-debug_print("outgoing.cgi: visitor_afid=      $visitor_afid");
-
-############################################################################
-#Main
-############################################################################
-
-#########################################
-# Retrieve user's IP current address
-my $user_addr = $q->remote_addr;
-my $user_addr_is_private = check_private_IP_addr($user_addr);
-debug_print("outgoing.cgi: user's IP= $user_addr\n");
-debug_print("outgoing.cgi: user's IP privateflag= $user_addr_is_private\n");
-
-#########################################
-# Retrieve destination URL
-my $dest_URL = $wi->PTN_URL($q->param("dest_url"));
-debug_print("outgoing.cgi: dst_URL=$dest_URL");
-
-#########################################
-# retrieve passAB
-my $passAB="";
-try{
-    $passAB = $af->{fm}->get_attribute_by_afid($dest_URL, "password");
-}catch Error with{
-    my $e = shift;
-    error($q, "Error from FriendManager.\n" . $e);
-};
-debug_print("outgoing.cgi: passAB=$passAB\n");
-if(!defined($passAB) || $passAB eq ""){
-    print $q->redirect($dest_URL);
-    exit(1);
-}
-
-#########################################
-# Put this forwarding information into my DB
-# so that we can logout this session in the future.
-# XXX
-
-#########################################
-#Output HTTP reply (Location header).
-#
-# Location-header:
-#  http://siteB.com/bin/incoming.cgi?session=(1)&referrer=(2)
-#
-#1.PassAB(timestamp, 
-#         expire,  
-#         browser's IP, 
-#         AF_ID,             Who is accessing?
-#         nickname,          Who is accessing?
-#         type)
-#
-#2.URL(A)               Where is this forwarding from?
-
-my $plain_msg = "";
-if($visitor_type eq "self"){
-    $plain_msg = get_timestamp()    . "*" . 
-	get_expire_stamp(1,0,0)     . "*" . 
-	$q->remote_addr             . "*" . 
-	url_encode($visitor_afid)       . "*" . 
-	url_encode($visitor_nickname)   . "*" . 
-	"self" .'*';
-}elsif($visitor_type eq "f1"){
-    $plain_msg = get_timestamp()    . "*" . 
-	get_expire_stamp(1,0,0)     . "*" . 
-	$q->remote_addr             . "*" . 
-	url_encode($visitor_afid)       . "*" . 
-	url_encode($visitor_nickname)   . "*" . 
-	"f1" . '*';
-}elsif($visitor_type eq "f2"){
-    $plain_msg = get_timestamp()    . "*" . 
-	get_expire_stamp(1,0,0)     . "*" . 
-	$q->remote_addr             . "*" . 
-	url_encode($visitor_afid)       . "*" . 
-	url_encode($visitor_nickname)   . "*" . 
-	"f2" . '*';
-}else{
-    $plain_msg = get_timestamp()    . "*" . 
-	get_expire_stamp(1,0,0)     . "*" . 
-	$q->remote_addr             . "*" . 
-	url_encode($visitor_afid)         . "*" . 
-	url_encode($visitor_nickname)     . "*" . 
-	"pb" . '*';
-}
-debug_print("outgoing.cgi: plain_msg= $plain_msg\n");
-
-#Encrypt
-my $cipher_msg = url_encode( msg_encrypt( $plain_msg, $passAB ) );
-debug_print("outgoing.cgi: cipher_msg= $cipher_msg\n");
-
-#Build up URL
-my $forwarding_to = "$dest_URL/incoming.cgi?"
-    . "forward_id=$cipher_msg" 
-    . "&" 
-    . "referrer=$af->{site__web_root}";
-debug_print("outgoing.cgi: forwarding_to= $forwarding_to\n");
-
-
-############################################################################
-#Output
-############################################################################
-if($user_addr_is_private){
-    #This access is from some private IP address.
-    #It means the user may have some problem in 
-    #session forwarding when the user is forwarded
-    #to the destination Affelio. So warn the user.
-
-    my $TMPL_FILE = "$af->{site__fs_root}/templates/$af->{site__template}/" 
-	."owner_side/outgoing_warn.tmpl";
-
-    my $tmpl = new HTML::Template( filename => $TMPL_FILE,
-				   die_on_bad_params => 0);    
-
-    my $warning_message = "<AF_M text='_SYS_WARN_OUTGOING_PRIV_IP' param='$user_addr'><P><A HREF=\"$forwarding_to\">Destination Affelio</A>: <AF_M text='_SYS_WARN_OUTGOING_PRIV_IP2'>";
-    $tmpl->param(message => $warning_message);
-    $tmpl->param(forwarding_to => $forwarding_to);
-    $tmpl->param(tmpl_path => "$af->{site__web_root}/templates/$af->{site__template}/owner_side/");
-    print "Content-type: text/html; charset=UTF-8\n";
-    print "Pragma: no-cache", "\n\n"; 
-    print $af->translate_templateL10N($tmpl->output);
-
-}else{
-    print $q->redirect($forwarding_to);
-}
Index: affelio_farm/admin/skelton/affelio/setup.cgi
diff -u affelio_farm/admin/skelton/affelio/setup.cgi:1.1.1.1 affelio_farm/admin/skelton/affelio/setup.cgi:removed
--- affelio_farm/admin/skelton/affelio/setup.cgi:1.1.1.1	Tue Oct 25 04:14:39 2005
+++ affelio_farm/admin/skelton/affelio/setup.cgi	Tue Oct 25 04:20:42 2005
@@ -1,572 +0,0 @@
-#!/usr/bin/perl 
-
-# Copyright (C) 2005 FishGrove Inc.
-#
-# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# $Id: setup.cgi,v 1.1.1.1 2005/10/24 19:14:39 slash5234 Exp $
-
-use strict;
-
-use CGI qw(-unique_headers);
-$CGI::DISABLE_UPLOADS = 1;
-$CGI::POST_MAX = 102_400;
-use Cwd;
-use DBI;
-use lib("./extlib");
-use HTML::Template;
-use Error qw(:try);
-
-use lib("./lib");
-use Affelio;
-use Affelio::misc::CGIError;
-use Affelio::misc::MyCrypt;
-use Affelio::misc::L10N;
-use Affelio::misc::InitAffelio;
-use Affelio::misc::Debug qw(debug_print);
-
-############################################################################
-#Main
-############################################################################
-my $g_username="";
-my $g_password="";
-my $g_nickname="";
-my $g_email="";
-my $g_crypted_password="";
-my $cgi = new CGI;
-my $g_fsroot = cwd();
-my $g_webroot = $cgi->self_url();
-my $g_lh = "";
-my $g_locale =""; 
-my $g_actionurl="";
-my $g_btn_name_accept="";
-my $g_err="";
-my $g_msg="";
-my $g_img="";
-my $g_title="";
-my $TMPL_FILE="";
-my %output_data=();
-
-$g_webroot =~ s|/setup\.cgi.*||;
-$g_locale = $cgi->param("locale");
-
-my $g_stage = $cgi->url_param("stage");
-if($g_stage eq "") { $g_stage =0};
-
-if($g_locale ne ""){
-    load_locale($g_locale);
-}
-
-############################################
-if($g_stage ==0){
-    show_0();
-
-}elsif($g_stage ==10){
-    show_10();
-
-
-}elsif($g_stage ==30){
-    show_30();
-
-}elsif($g_stage ==50){
-    show_50();
-
-}elsif($g_stage ==100){
-    $g_err= check_50();
-    if($g_err ne ""){
-	show_50();
-    }else{
-	show_100();
-    }
-
-}elsif($g_stage ==200){
-    $g_err= check_100();
-    if($g_err ne ""){
-	show_100();
-    }else{
-	show_200();
-    }
-
-}elsif($g_stage ==350){
-    $g_err= check_200();
-    if($g_err ne ""){
-	show_200();
-    }else{
-	show_350();
-    }
-
-}elsif($g_stage ==400){
-    $g_err= check_350();
-    if($g_err ne ""){
-	show_350();
-    }else{
-	show_400();
-    }
-
-}elsif($g_stage==500){
-    $g_err= check_400();
-    if($g_err ne ""){
-	show_400();
-    }else{
-	show_500();
-    }
-}
-
-#########################################
-#HTML::Template processing
-#########################################
-%output_data = ("msg", $g_msg,
-		"title", $g_title,
-		"btn_name_accept", $g_btn_name_accept,
-		"err_msg", $g_err,
-		"tmpl_path", "$g_webroot/templates/default/owner_side",
-		"locale", $g_locale,
-		"action_url", $g_actionurl,
-		"img_filename", $g_img
-		);
-
-my $tmpl = new HTML::Template( filename => $TMPL_FILE,
-			       die_on_bad_params => 0);
-foreach my $data_key (keys(%output_data)) {
-    $tmpl->param($data_key => $output_data{$data_key});
-} 
-my $out_msg =  $tmpl->output;
-
-#########################################
-#<AF_M> L10N Template processing
-#########################################
-$out_msg = translate_templateL10N_for_setup($out_msg);
-
-print "Content-type: text/html; charset=UTF-8\n";
-print "Pragma: no-cache", "\n\n"; 
-print $out_msg;
-exit(1);
-
-
-
-############################################################################
-#Sub routines
-############################################################################
-sub show_0{
-    $TMPL_FILE = "$g_fsroot/templates/default/owner_side/setup_0.tmpl";
-    $g_title ="";
-    $g_msg="";
-    $g_img= "0.gif";
-    $g_actionurl="setup.cgi?stage=10";
-}
-
-#########################################
-sub show_10{
-    $TMPL_FILE = "$g_fsroot/templates/default/owner_side/setup_1.tmpl";
-    $g_title= $g_lh->maketext("_SETUP_title_10");
-    $g_msg= $g_lh->maketext("_SETUP_msg_10");
-    $g_img= "10.jpg";
-    $g_actionurl="setup.cgi?stage=30";
-}
-
-#########################################
-sub show_30{
-    $TMPL_FILE = "$g_fsroot/templates/default/owner_side/setup_1.tmpl";
-    $g_title= $g_lh->maketext("_SETUP_title_30");
-    $g_msg= $g_lh->maketext("_SETUP_msg_30");
-    $g_img= "30.jpg";
-    $g_btn_name_accept="true";
-    $g_actionurl="setup.cgi?stage=50";
-}
-
-#########################################
-sub show_50{
-    $TMPL_FILE = "$g_fsroot/templates/default/owner_side/setup_1.tmpl";
-    $g_title= $g_lh->maketext("_SETUP_title_50");
-    $g_msg= msg_50();
-    $g_img= "50.jpg";
-    $g_actionurl="setup.cgi?stage=100";
-}
-
-sub msg_50{
-    my $msg = $g_lh->maketext("_SETUP_msg_50_1");
-    $msg .= '<blockquote>';
-    $msg .= check_module("CGI");
-    $msg .= check_module("CGI::Session");
-    $msg .= check_module("LWP");
-    $msg .= check_module("URI");
-    $msg .= check_module("DBI");
-    $msg .= $g_lh->maketext("_SETUP_msg_50_3");
-    $msg .= check_module("DBD::SQLite");
-    $msg .= check_module("DBD::mysql");
-    $msg .= '</blockquote>';
-    $msg .= $g_lh->maketext("_SETUP_msg_50_2");
-}
-
-sub check_50{
-    my $err=0;
-    my $err_msg="";
-
-    $err += load_module("CGI");
-    $err += load_module("CGI::Session");
-    $err += load_module("LWP");
-    $err += load_module("URI");
-    $err += load_module("DBI");
-#    my $err_sqlite = load_module("DBD::SQLite");
-#    my $err_mysql  = load_module("DBD::mysql");
-
-    if($err < 0){
-	$err_msg = $g_lh->maketext("_SETUP_check_50_err1");
-    }
-    return $err_msg;
-}
-
-#########################################
-sub show_100{
-    $TMPL_FILE = "$g_fsroot/templates/default/owner_side/setup_1.tmpl";
-    $g_title= $g_lh->maketext("_SETUP_title_100");
-    $g_msg= $g_lh->maketext("_SETUP_msg_100");
-    $g_img= "100.jpg";
-    $g_actionurl="setup.cgi?stage=200";
-}
-
-sub check_100{
-    my $err_msg="";
-
-    if(! -w "config"){
-	$err_msg .= $g_lh->maketext("_SETUP_check_100_err4",  "config");
-    }
-    if(! -w "userdata"){
-	$err_msg .= $g_lh->maketext("_SETUP_check_100_err4",  "userdata");
-    }
-    if(! -r "userdata"){
-	$err_msg .= $g_lh->maketext("_SETUP_check_100_err5",  "userdata");
-    }
-    if(! -w "session"){
-	$err_msg .= $g_lh->maketext("_SETUP_check_100_err4",  "session");
-    }
-    if(! -r "session"){
-	$err_msg .= $g_lh->maketext("_SETUP_check_100_err5",  "session");
-    }
-    if(! -w "skins"){
-	$err_msg .= $g_lh->maketext("_SETUP_check_100_err4",  "skins");
-    }
-    if(! -r "skins"){
-	$err_msg .= $g_lh->maketext("_SETUP_check_100_err5",  "skins");
-    }
-    if(! -w "templates_dyn"){
-	$err_msg .= $g_lh->maketext("_SETUP_check_100_err4",  "templates_dyn");
-    }
-    if(! -r "templates_dyn"){
-	$err_msg .= $g_lh->maketext("_SETUP_check_100_err5",  "templates_dyn");
-    }
-    if($err_msg ne ""){
-	return $err_msg;
-    }
-
-    #make userdata/xxxxx session/yyyy directories
-    Affelio::misc::InitAffelio::create_userdir("./");
-
-    return("");
-}
-
-#########################################
-sub show_200{
-    $TMPL_FILE = "$g_fsroot/templates/default/owner_side/setup_1.tmpl";
-    $g_title= $g_lh->maketext("_SETUP_title_200");
-    $g_msg= msg_200();
-    $g_img= "200.jpg";
-    $g_actionurl="setup.cgi?stage=350";
-}
-
-sub msg_200{
-    my $sendmail_path="";
-    if(-f "/usr/sbin/sendmail"){
-	$sendmail_path = "/usr/sbin/sendmail";
-    }
-    if(-f "/usr/lib/sendmail"){
-	$sendmail_path = "/usr/lib/sendmail";
-    }
-
-    my $msg = $g_lh->maketext("_SETUP_msg_200");
-    $msg .= '<P><TABLE BORDR="0"><TR><TD>Sendmail:&nbsp;</TD>';
-    $msg .= '<TD><INPUT TYPE="text" NAME="sendmail_path" SIZE="40" VALUE="';
-    $msg .= $sendmail_path;
-    $msg .= '"></TD></TR>';
-    $msg .= '</TABLE>';
-    return($msg);
-}
-
-sub check_200{
-    my $err_msg="";
-
-    my $sendmail_path = $cgi->param("sendmail_path");
-    if(-f $sendmail_path){
-    }else{
-	$err_msg .= $g_lh->maketext("_SETUP_check_200_err1", $sendmail_path);
-	return $err_msg;
-    }
-
-    Affelio::misc::InitAffelio::create_af_cfg("$g_fsroot/config/affelio.cfg",
-					      $g_fsroot,
-					      $g_webroot,
-					      $g_locale,
-					      "default",
-					      $sendmail_path);
-    chmod 0700, "$g_fsroot/config";
-    return("");
-}
-
-#########################################
-sub show_350{
-    $TMPL_FILE = "$g_fsroot/templates/default/owner_side/setup_1.tmpl";
-    $g_title= $g_lh->maketext("_SETUP_title_350");
-    $g_msg= $g_lh->maketext("_SETUP_msg_350");
-    $g_img= "350.jpg";
-    $g_actionurl="setup.cgi?stage=400";
-}
-
-sub check_350{
-    my $db_type = $cgi->param("dbtype");
-    my $db_dbname ="";
-    my $db_username ="";
-    my $db_password = "";
-    my $db_hostname ="";
-    my $db_port ="";
-
-    if((!$db_type) || ($db_type eq "")){
-	return("invlalid input.");
-    }
-    if($db_type eq "mysql"){
-	if(load_module("DBD::mysql") < 0){
-	    return("Perl module not found.");
-	}
-	$db_dbname = $cgi->param("mysql_dbname");
-	$db_username = $cgi->param("mysql_username");
-	$db_password = $cgi->param("mysql_password");
-	$db_hostname = $cgi->param("mysql_hostname");
-	$db_port     = $cgi->param("mysql_port");
-    }else{
-	if(load_module("DBD::SQLite") < 0){
-	    return("Perl module not found.");
-	}
-    }
-
-    #determine userdata/xxx/ directory
-    my $userdata_dir = "";
-    try{    
-	$userdata_dir = Affelio::misc::InitAffelio::get_userdir("./userdata");
-    }catch Error with{
-	my $e = shift;
-	error $cgi, "Error in check350: $e";
-    };
-
-    debug_print("check_350: userdata dir = [$userdata_dir]");
-
-    #Generate db.cfg file
-    try{
-	Affelio::misc::InitAffelio::create_db_cfg("$userdata_dir/db.cfg",
-						  $db_type,
-						  $db_dbname,
-						  $db_username,
-						  $db_password,
-						  $db_hostname,
-						  $db_port);
-    }catch Error with{
-	my $e = shift;
-	error $cgi, "Error in check350: $e";
-    };
-
-    return("");
-}
-
-#########################################
-sub show_400{
-    $TMPL_FILE = "$g_fsroot/templates/default/owner_side/setup_1.tmpl";
-    $g_title= $g_lh->maketext("_SETUP_title_400");
-    $g_msg= $g_lh->maketext("_SETUP_msg_400");
-    $g_img= "400.jpg";
-    $g_actionurl="setup.cgi?stage=500";
-}
-
-sub check_400{
-    $g_username = $cgi->param("username");
-    $g_password = $cgi->param("password");
-    $g_nickname = $cgi->param("nickname");
-    $g_email = $cgi->param("email");
-
-    ##########################################################
-    #Input check
-    ##########################################################
-    my @salts = ( "A".."Z", "a".."z", "0".."9", ".", "/" );
-    my $salt = $salts[int(rand(64))] . $salts[int(rand(64))];
-    try{
-	$g_crypted_password = crypt($g_password, $salt);
-    }catch Error with{
-	my $e = shift;
-	error($cgi, "Check400-1: password generation : $e");
-    };
-
-    ##########################################################
-    #Determine userdata/..../ directory
-    ##########################################################
-    #determine userdata/xxx/ directory
-    my $userdata_dir = "";
-    try{    
-	$userdata_dir = Affelio::misc::InitAffelio::get_userdir("./userdata");
-    }catch Error with{
-	my $e = shift;
-	error $cgi, "Error in check400-2: $e";
-    };
-
-    ##########################################################
-    #Create login.cfg
-    ##########################################################
-    try{
-	Affelio::misc::InitAffelio::create_login_cfg("$userdata_dir/login.cfg",
-						     $g_username,
-						     $g_crypted_password);
-    }catch Error with{
-	my $e = shift;
-	error $cgi, "Error in check400-8: $e";
-    };
-
-    ##########################################################
-    #Copy default files to user directory
-    ##########################################################
-    try{
-	Affelio::misc::InitAffelio::copy_def_files(".",
-						   $userdata_dir,
-						   $g_locale);
-    }catch Error with{
-	my $e = shift;
-	error($cgi, "Error in copying default files: $e");
-    };
-
-    ##########################################################
-    #DB initialization
-    ##########################################################
-    try{
-	Affelio::misc::InitAffelio::init_db(".",
-					    $g_nickname,
-					    $g_email,
-					    $g_lh);
-    }catch Error with{
-	my $e = shift;
-	error($cgi, "Error in init_db: $e");
-    };
-
-    ##########################################################
-    #Rebuild templates_dyn
-    ##########################################################
-    use Affelio::App::Admin::EditTemplates qw(rebuild);
-    my $af;
-    try{				    
-	$af = new Affelio(ConfigDir => "./config/");
-	Affelio::App::Admin::EditTemplates::rebuild($af);
-    }catch Error with{
-	my $e = shift;
-	error $cgi, "Check400-36: Template rebuild error: $e";
-    };
-
-    ##########################################################
-    #Check and set data directory permission
-    ##########################################################
-    try{
-	Affelio::misc::InitAffelio::set_datadir_perm(".");
-    }catch Error with{
-	my $e = shift;
-	error $cgi, "Check400-37: $e";
-    };
-    return("");
-}
-
-#########################################
-sub show_500{
-    $TMPL_FILE = "$g_fsroot/templates/default/owner_side/setup_1.tmpl";
-    $g_title= $g_lh->maketext("_SETUP_title_500");
-    $g_msg= $g_lh->maketext("_SETUP_msg_500", $g_webroot);
-    $g_img= "500.jpg";
-    $g_actionurl="";
-}
-
-
-#########################################
-#Perl module
-#########################################
-sub check_module{
-    my $mod_name = shift;
-    my $mod_ver="";
-    my $err=0;
-    
-    $err = load_module($mod_name);
-    if ($err < 0) {
-	return( $g_lh->maketext("_SETUP_err_module_notfound", $mod_name) );
-    } else {
-	$mod_ver = $mod_name->VERSION;
-	return( $g_lh->maketext("_SETUP_module_found", $mod_name, $mod_ver) );
-    }
-}
-
-sub load_module{
-    my $mod_name = shift;
-
-    $mod_name =~ s!::!/!g;
-    eval {
-	require "$mod_name.pm";
-    };
-    if($@){
-	return -1;
-    }else{
-	return 0;
-    }
-}
-
-#########################################
-#Locale
-#########################################
-sub load_locale{
-    my $locale_name = shift;
-    $g_lh = Affelio::misc::L10N->get_handle(($locale_name));
-    error $cgi, "Couldn't make a language handle. \n$@" unless $g_lh;
-}
-
-sub translate_templateL10N_for_setup {
-    #my $af=shift;
-    my $mesg = shift;
-
-    my $tag_body ="";
-    my $text_value="";
-    my $param_value="";
-
-    while( $mesg =~ /<AF_M ([^>]+)>/ ){
-        $tag_body = $1;
-
-        $tag_body =~ /text(\s*)=(\s*)["']([^"']*)["'](\s*)param(\s*)=(\s*)["']([^"']*)["']/;
-        $text_value=$3;
-        $param_value=$7;
-        if($text_value eq ""){
-            $tag_body =~ /text(\s*)=(\s*)["']([^"']*)["']/;
-	    $text_value=$3;
-        }
-
-        #print "[$tag_body]\n";
-        #print "[$text_value]\n";
-        #print "[$param_value]\n";
-
-        my $sbst = $g_lh->maketext($text_value, $param_value);
-
-        $mesg =~ s/<AF_M $tag_body>/$sbst/g;
-    }
-
-    return($mesg);
-}
-
-
Index: affelio_farm/admin/skelton/affelio/upgrade-0954-10RC1.cgi
diff -u affelio_farm/admin/skelton/affelio/upgrade-0954-10RC1.cgi:1.1.1.1 affelio_farm/admin/skelton/affelio/upgrade-0954-10RC1.cgi:removed
--- affelio_farm/admin/skelton/affelio/upgrade-0954-10RC1.cgi:1.1.1.1	Tue Oct 25 04:14:39 2005
+++ affelio_farm/admin/skelton/affelio/upgrade-0954-10RC1.cgi	Tue Oct 25 04:20:42 2005
@@ -1,74 +0,0 @@
-#!/usr/bin/perl 
-
-use strict;
-
-use CGI qw(-unique_headers);
-use Cwd;
-use DBI;
-use lib("./extlib");
-use HTML::Template;
-use Error qw(:try);
-use lib("./lib");
-use Affelio;
-use Affelio::misc::MyCrypt;
-use Affelio::misc::Debug qw(debug_print);
-
-############################################################################
-#Main
-############################################################################
-my $g_username="";
-my $g_password="";
-my $g_nickname="";
-my $g_email="";
-my $g_crypted_password="";
-my $q = new CGI;
-my $g_fsroot = cwd();
-my $g_webroot = $q->self_url();
-
-if($q->url_param("mode") eq "go"){
-################################
-#Start Affelio
-################################
-my $af;
-try{
-    $af = new Affelio(ConfigDir => ".");
-}catch Error with{
-    my $e = shift;
-    error($q, "Affelio load error.\n" . $e->stacktrace);
-};
-
-################################
-#Copy default template files
-################################
-my $g_locale = $af->{site__locale};
-try{
-    system("cp -fr defaults/af_templates/$g_locale/*.aftmpl ./$af->{site__user_dir}/af_templates/");
-}catch Error with{
-    my $e = shift;
-    error($q, "Could not copy default templates.\n" . $e->stacktrace);
-};
-
-################################
-#Rebuild templates_dyn
-################################
-try{
-    use Affelio::App::Admin::EditTemplates qw(rebuild);
-    Affelio::App::Admin::EditTemplates::rebuild($af);
-}catch Error with{
-    my $e = shift;
-    error($q, "Could not rebuild templates.\n" . $e->stacktrace);
-};
-
-print "Content-type: text/html; charset=UTF-8\n";
-print "Pragma: no-cache", "\n\n"; 
-print 'OK. Successfuly done.<P><B>Delete this CGI immediately!!</B>';
-exit(1);
-
-
-}else{
-    print "Content-type: text/html; charset=UTF-8\n";
-    print "Pragma: no-cache", "\n\n"; 
-    print '<HTML><B>Upgrade Affelio from 0.9.5.4 to 1.0RC1</B><P><FORM ACTION="upgrade-0954-10RC1.cgi?mode=go" method=POST><INPUT TYPE="submit" VALUE="Go"></FORM></HTML>';
-    exit(1);
-}
-
Index: affelio_farm/admin/skelton/affelio/upgrade-10RC1-10RC11.cgi
diff -u affelio_farm/admin/skelton/affelio/upgrade-10RC1-10RC11.cgi:1.1.1.1 affelio_farm/admin/skelton/affelio/upgrade-10RC1-10RC11.cgi:removed
--- affelio_farm/admin/skelton/affelio/upgrade-10RC1-10RC11.cgi:1.1.1.1	Tue Oct 25 04:14:39 2005
+++ affelio_farm/admin/skelton/affelio/upgrade-10RC1-10RC11.cgi	Tue Oct 25 04:20:42 2005
@@ -1,70 +0,0 @@
-#!/usr/bin/perl 
-
-use strict;
-
-use CGI qw(-unique_headers);
-use Cwd;
-use DBI;
-use lib("./extlib");
-use HTML::Template;
-use Error qw(:try);
-use lib("./lib");
-use Affelio;
-use Affelio::misc::MyCrypt;
-use Affelio::misc::Debug qw(debug_print);
-
-############################################################################
-#Main
-############################################################################
-my $g_username="";
-my $g_password="";
-my $g_nickname="";
-my $g_email="";
-my $q = new CGI;
-my $g_fsroot = cwd();
-my $g_webroot = $q->self_url();
-
-#########################################################################
-#1st screen
-#########################################################################
-if($q->url_param("mode") ne "go"){
-    print "Content-type: text/html; charset=UTF-8\n";
-    print "Pragma: no-cache", "\n\n"; 
-    print '<HTML><B>Upgrade Affelio from 1.0RC1 to 1.0RC1.1</B><P>このスクリプトは、1.0RC1で不具合のある足跡データベースをリセットします。<bR>1.0RC1をMySQLとともにお使いで、足跡が表示されない場合のみ実行してください。<P><FORM ACTION="upgrade-10RC1-10RC11.cgi?mode=go" method=POST><INPUT TYPE="submit" VALUE="Go"></FORM></HTML>';
-    exit(1);
-
-#########################################################################
-#Do upgrade
-#########################################################################
-}else{
-    ################################
-    #Start Affelio
-    ################################
-    my $af;
-    try{
-	$af = new Affelio(ConfigDir => ".");
-    }catch Error with{
-	my $e = shift;
-	error($q, "Affelio load error.\n" . $e->stacktrace);
-    };
-    
-    my $query = 'drop table AFuser_CORE_accesslog';
-    my $sth;
-    eval{
-	$sth = $af->{db}->prepare($query);
-	$sth->execute;
-    };
-    if($@){
-	print "Content-type: text/html; charset=UTF-8\n";
-	print "Pragma: no-cache", "\n\n"; 
-	print 'Error!<BR><BR>' .  $@;
-	exit(1);
-    }
-
-    print "Content-type: text/html; charset=UTF-8\n";
-    print "Pragma: no-cache", "\n\n"; 
-    print 'OK. Successfuly done.<P><B>Delete this CGI immediately!!</B>';
-    exit(1);
-}
-
-


Affelio-cvs メーリングリストの案内
Back to archive index