[prev in list] [next in list] [prev in thread] [next in thread]
List: squirrelmail-cvs
Subject: [SM-CVS] CVS: smdoc index.php,1.11,1.12 SM_README,1.2,1.3 COPYING,1.2,1.3 .cvsignore,1.3,1.4
From: Erin Schnabel <ebullient () users ! sourceforge ! net>
Date: 2003-09-30 5:06:17
[Download RAW message or body]
Update of /cvsroot/squirrelmail/smdoc
In directory sc8-pr-cvs1:/tmp/cvs-serv32315
Modified Files:
index.php SM_README COPYING .cvsignore
Log Message:
updates for latest foowd changes (templating)
Index: index.php
===================================================================
RCS file: /cvsroot/squirrelmail/smdoc/index.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -r1.11 -r1.12
--- index.php 3 Sep 2003 05:39:31 -0000 1.11
+++ index.php 30 Sep 2003 05:06:14 -0000 1.12
@@ -1,9 +1,9 @@
<?php
-require('config.foowd.php'); // include config and Foowd functions
+require('config/config.foowd.php'); // include config and Foowd functions
// init Foowd
-$foowd = new smdoc(NULL, NULL, $DEFAULT_GROUPS);
+$foowd = new smdoc(NULL, NULL, $DEFAULT_GROUPS, NULL, 'lib');
// get object details
include_once($foowd->path.'/input.querystring.php');
@@ -32,48 +32,52 @@
$classid = $classid->value;
$version = $version->value;
$method = $method->value;
+$result = FALSE;
-if (isset($objectid)) { // fetch object and call object method
+if (isset($objectid)) // fetch object and call object method
+{
$foowd->debug('msg', 'fetch and call object method');
if ( !isset($method) )
$method = getConstOrDefault('DEFAULT_METHOD','view');
- if ($object = $foowd->fetchObject($objectid, $classid, $version, $method)) {
- if (is_object($object)) {
+ if ($object = $foowd->fetchObject($objectid, $classid, $version, $method))
+ {
+ if (is_object($object))
$className = getClassName($object->classid);
- } else {
+ else
$className = getClassName($classid);
- }
- $t = $foowd->method($object, $method);
+
+ $result = $foowd->method($object, $method);
$methodName = 'object_'.$method;
- } else {
- trigger_error('Object not found: ' .
- (isset($objectName->value) ? $objectName->value : $objectid) .
- ' (' . $className . ')', E_USER_NOTICE);
}
-} else { // call class method
+ else
+ {
+ trigger_error('Object not found: '
+ . (isset($objectName->value) ?$objectName->value : $objectid)
+ . ' (' . $className . ')', E_USER_ERROR);
+ }
+}
+else // call class method
+{
$foowd->debug('msg', 'fetch and call class method');
+
if ( !isset($className) )
$className = getClassName($classid);
+
if ( !isset($method) )
$method = getConstOrDefault('DEFAULT_CLASS_METHOD', 'create');
- $t = $foowd->method($className, $method);
+ $result = $foowd->method($className, $method);
$methodName = 'class_'.$method;
}
$foowd->debug('msg', 'display result using template');
-if (is_array($t)) {
- if ( isset($objectid) && $method != 'delete' )
- $t['showurl'] = true;
- else
- $t['showurl'] = false;
- include($foowd->getTemplateName($className, $methodName));
-} else {
- trigger_error($t, E_USER_NOTICE);
-}
+if ( $result )
+ $foowd->template->display($foowd->getTemplateName($className, $methodName));
+else
+ trigger_error("Previous error, no defined result", E_USER_NOTICE);
// destroy Foowd
$foowd->destroy();
Index: SM_README
===================================================================
RCS file: /cvsroot/squirrelmail/smdoc/SM_README,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- SM_README 5 May 2003 06:36:26 -0000 1.2
+++ SM_README 30 Sep 2003 05:06:15 -0000 1.3
@@ -1,28 +1,14 @@
-This repository is designed to pull in the 3rd party source for
-WikiTypeFramework/FOOWD, while allowing for our updates and customizations.
-
-Original Import:
-cvs import -m "Import of wtfw-0.20.2" smdoc WTFW WTFW_0_20_2
-cvs import -m "Import of foowd-0.8" smdoc WTFW FOOWD_0_8
-
-The procedures below will not work with the conversion between WTFW and FOOWD.
-Some cleaning of the CVS repository will occur with migration.
-
-Updates for later WTFW/FOOWD versions (x.x.x):
-http://www.cvshome.org/docs/manual/cvs_13.html#SEC107
-
-$ tar xfz foowd-x.x.x.tar.gz
-$ cd foowd-x.x.x
-$ cvs import -m "Import of foowd-x.x.x" smdoc WTFW FOOWD_x_x_x
-$ cvs checkout -jFOOWD_<prev_ver> -jFOOWD_<new_ver> smdoc
+SM Unique setup/installation.
-===========
+Install latest FOOWD as separate (or sub) directory.
-SM Unique setup/installation.
+Look in smdoc config/ directory, and:
-mysql.sql should be used to create tables.
+1) copy config.default.php to config.foowd.php
+ -- update path locations
+ -- update mysql DB information
+ -- update/modify debug settings
-site-config.php should be created based on the contents of site-config.sample.php.
-It contains site-specific config values pulled from the config.php file which is committed to CVS.
+2) skim through other config files, though defaults should be fine.
Index: COPYING
===================================================================
RCS file: /cvsroot/squirrelmail/smdoc/COPYING,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- COPYING 5 May 2003 06:36:25 -0000 1.2
+++ COPYING 30 Sep 2003 05:06:15 -0000 1.3
@@ -2,7 +2,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 675 Mass Ave, Cambridge, MA 02139, USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -278,63 +278,3 @@
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) <year> <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) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <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: .cvsignore
===================================================================
RCS file: /cvsroot/squirrelmail/smdoc/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- .cvsignore 23 May 2003 01:17:18 -0000 1.3
+++ .cvsignore 30 Sep 2003 05:06:15 -0000 1.4
@@ -1,5 +1,4 @@
userfiles
flatfile
-config.foowd.php
tools.php
test.php
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
--
squirrelmail-cvs mailing list
List Address: squirrelmail-cvs@lists.sourceforge.net
List Info: https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
http://squirrelmail.org/cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic