Tadashi Okoshi
slash****@users*****
2006年 3月 7日 (火) 23:39:08 JST
Index: affelio/CHANGES
diff -u affelio/CHANGES:1.29 affelio/CHANGES:1.30
--- affelio/CHANGES:1.29 Thu Feb 23 21:41:36 2006
+++ affelio/CHANGES Tue Mar 7 23:39:08 2006
@@ -1,22 +1,21 @@
-2006-0222
- Debug
- In a message of "Arrived AFLink request", requester's
- AffelioURL is surrounded by () without any space
- characters. That made IE to misunderstand the URL
- as if the URL contained ")" characters at the end.
-
+2006-0307
+ Update: Several changes from AffelioCore CL (commercial
+ version)
+
+2006-0307
+ *************************
+ TAG: "stable-20060307-01"
+ *************************
+
+2006-0307
+ Debug: Affelio link request
+ Messages indicating a new AF link request arrived
+ contained that a URL which makes wrong hyperlink.
2006-0220
- Debug
+ Debug: "screen" in CSS files
media="screen" has been removed from .css files.
- Structure: "platform" option
- In affeli.cfg, "platform" attribute can be set in
- [site_config] section. We will use here for ActivePerl
- mode in the future.
-
- Structure: "AFE2" mode
- Several changes are ported back from AFE2 branch.
1.1 (Nov 5, 2005)
New Feature: Access Log of selected people
Index: affelio/admin.cgi
diff -u affelio/admin.cgi:1.34 affelio/admin.cgi:1.35
--- affelio/admin.cgi:1.34 Thu Feb 23 21:41:36 2006
+++ affelio/admin.cgi Tue Mar 7 23:39:08 2006
@@ -16,12 +16,25 @@
# 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.34 2006/02/23 12:41:36 slash5234 Exp $
+# $Id: admin.cgi,v 1.35 2006/03/07 14:39:08 slash5234 Exp $
use strict;
use lib("lib");
use lib("extlib");
-use Affelio::App::Env;
-use Affelio::App::Admin;
-my $admin = new Affelio::App::Admin(ConfigDir => "./config/");
+my $exec_type = "";
+if ($ENV{'REDIRECT_AF_EXEC_TYPE'}) {
+ $exec_type = $ENV{'REDIRECT_AF_EXEC_TYPE'};
+ eval{
+ use lib("$ENV{'FARM_FS_TOP'}/$ENV{'REDIRECT_AF_EXEC_TYPE'}Farm/lib/");
+ };
+}else{
+ $exec_type = "Standalone";
+}
+
+my $env_cls = "Affelio::App::" . $exec_type . "::Env";
+my $admin_cls = "Affelio::App::" . $exec_type . "::Admin";
+eval "use $env_cls;";
+eval "use $admin_cls;";
+
+my $admin = new $admin_cls (ConfigDir => './config/');
$admin->run();
Index: affelio/incoming.cgi
diff -u affelio/incoming.cgi:1.19 affelio/incoming.cgi:1.20
--- affelio/incoming.cgi:1.19 Thu Feb 23 21:41:36 2006
+++ affelio/incoming.cgi Tue Mar 7 23:39:08 2006
@@ -16,13 +16,25 @@
# 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.19 2006/02/23 12:41:36 slash5234 Exp $
+# $Id: incoming.cgi,v 1.20 2006/03/07 14:39:08 slash5234 Exp $
use strict;
use lib("lib");
use lib("extlib");
-use Affelio::App::Env;
-use Affelio::App::Public;
-my $public = new Affelio::App::Public();
-$public->run(App=> "Incoming");
+my $exec_type = "";
+if ($ENV{'REDIRECT_AF_EXEC_TYPE'}) {
+ $exec_type = $ENV{'REDIRECT_AF_EXEC_TYPE'};
+ eval{
+ use lib("$ENV{'FARM_FS_TOP'}/$ENV{'REDIRECT_AF_EXEC_TYPE'}Farm/lib/");
+ };
+}else{
+ $exec_type = "Standalone";
+}
+my $env_cls = "Affelio::App::" . $exec_type . "::Env";
+my $pub_cls = "Affelio::App::" . $exec_type . "::Public";
+eval "use $env_cls;";
+eval "use $pub_cls;";
+
+my $pub = new $pub_cls;
+$pub->run(App=> "Incoming");
Index: affelio/index.cgi
diff -u affelio/index.cgi:1.34 affelio/index.cgi:1.35
--- affelio/index.cgi:1.34 Thu Feb 23 21:41:36 2006
+++ affelio/index.cgi Tue Mar 7 23:39:08 2006
@@ -16,13 +16,26 @@
# 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.34 2006/02/23 12:41:36 slash5234 Exp $
+# $Id: index.cgi,v 1.35 2006/03/07 14:39:08 slash5234 Exp $
use strict;
use lib("lib");
use lib("extlib");
-use Affelio::App::Env;
-use Affelio::App::Public;
-my $public = new Affelio::App::Public();
-$public->run(App=> "Index");
+my $exec_type = "";
+if ($ENV{'REDIRECT_AF_EXEC_TYPE'}) {
+ $exec_type = $ENV{'REDIRECT_AF_EXEC_TYPE'};
+ eval{
+ use lib("$ENV{'FARM_FS_TOP'}/$ENV{'REDIRECT_AF_EXEC_TYPE'}Farm/lib/");
+ };
+}else{
+ $exec_type = "Standalone";
+}
+
+my $env_cls = "Affelio::App::" . $exec_type . "::Env";
+my $pub_cls = "Affelio::App::" . $exec_type . "::Public";
+eval "use $env_cls;";
+eval "use $pub_cls;";
+
+my $pub = new $pub_cls;
+$pub->run(App=> "Index");
Index: affelio/outgoing.cgi
diff -u affelio/outgoing.cgi:1.15 affelio/outgoing.cgi:1.16
--- affelio/outgoing.cgi:1.15 Thu Feb 23 21:41:36 2006
+++ affelio/outgoing.cgi Tue Mar 7 23:39:08 2006
@@ -16,13 +16,26 @@
# 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.15 2006/02/23 12:41:36 slash5234 Exp $
+# $Id: outgoing.cgi,v 1.16 2006/03/07 14:39:08 slash5234 Exp $
use strict;
use lib("lib");
use lib("extlib");
-use Affelio::App::Env;
-use Affelio::App::Public;
-my $public = new Affelio::App::Public();
-$public->run(App=> "Outgoing");
+my $exec_type = "";
+if ($ENV{'REDIRECT_AF_EXEC_TYPE'}) {
+ $exec_type = $ENV{'REDIRECT_AF_EXEC_TYPE'};
+ eval{
+ use lib("$ENV{'FARM_FS_TOP'}/$ENV{'REDIRECT_AF_EXEC_TYPE'}Farm/lib/");
+ };
+}else{
+ $exec_type = "Standalone";
+}
+
+my $env_cls = "Affelio::App::" . $exec_type . "::Env";
+my $pub_cls = "Affelio::App::" . $exec_type . "::Public";
+eval "use $env_cls;";
+eval "use $pub_cls;";
+
+my $pub = new $pub_cls;
+$pub->run(App=> "Outgoing");
Index: affelio/setup.cgi
diff -u affelio/setup.cgi:1.16 affelio/setup.cgi:1.17
--- affelio/setup.cgi:1.16 Tue Oct 25 03:41:21 2005
+++ affelio/setup.cgi Tue Mar 7 23:39:08 2006
@@ -16,7 +16,7 @@
# 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.16 2005/10/24 18:41:21 slash5234 Exp $
+# $Id: setup.cgi,v 1.17 2006/03/07 14:39:08 slash5234 Exp $
use strict;
@@ -466,11 +466,11 @@
##########################################################
#Rebuild templates_dyn
##########################################################
- use Affelio::App::Admin::EditTemplates qw(rebuild);
+ use Affelio::App::Standalone::Admin::EditTemplates qw(rebuild);
my $af;
try{
$af = new Affelio(ConfigDir => "./config/");
- Affelio::App::Admin::EditTemplates::rebuild($af);
+ Affelio::App::Standalone::Admin::EditTemplates::rebuild($af);
}catch Error with{
my $e = shift;
error $cgi, "Check400-36: Template rebuild error: $e";