From 6c2fa2f020a76dcf6fda5b776653c6d2958900b7 Mon Sep 17 00:00:00 2001 From: cweiske Date: Mon, 8 Feb 2010 07:32:34 +0000 Subject: [PATCH] allow people to move www/ folder where they want it, now one just has to change www/www-header.php git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@643 b3834d28-1941-0410-a4f8-b48e95affb8f --- doc/ChangeLog | 1 + src/SemanticScuttle/header.php | 2 +- www/about.php | 2 +- www/admin.php | 2 +- www/ajax/getadminlinkedtags.php | 2 +- www/ajax/getadmintags.php | 2 +- www/ajax/getcontacttags.php | 2 +- www/ajax/getlinkedtags.php | 2 +- www/ajax/gettags.php | 2 +- www/ajaxDelete.php | 2 +- www/ajaxGetTitle.php | 2 +- www/ajaxIsAvailable.php | 2 +- www/alltags.php | 2 +- www/api/export_csv.php | 2 +- www/api/export_gcs.php | 2 +- www/api/export_sioc.php | 2 +- www/api/httpauth.inc.php | 2 +- www/api/opensearch.php | 2 +- www/api/posts_add.php | 2 +- www/api/posts_all.php | 2 +- www/api/posts_delete.php | 2 +- www/api/posts_public.php | 2 +- www/api/posts_update.php | 2 +- www/api/tags_get.php | 2 +- www/api/tags_rename.php | 2 +- www/bookmarkcommondescriptionedit.php | 2 +- www/bookmarks.php | 2 +- www/edit.php | 2 +- www/go.php | 2 +- www/gsearch/context.php | 2 +- www/gsearch/index.php | 2 +- www/history.php | 2 +- www/import.php | 2 +- www/importNetscape.php | 2 +- www/importStructure.php | 2 +- www/index.php | 2 +- www/jsScuttle.php | 2 +- www/login.php | 2 +- www/password.php | 2 +- www/populartags.php | 2 +- www/profile.php | 2 +- www/register.php | 2 +- www/rss.php | 2 +- www/search.php | 2 +- www/tag2tagadd.php | 2 +- www/tag2tagdelete.php | 2 +- www/tag2tagedit.php | 2 +- www/tagcommondescriptionedit.php | 2 +- www/tagdelete.php | 2 +- www/tagedit.php | 2 +- www/tagrename.php | 2 +- www/tags.php | 2 +- www/upgrade.php | 2 +- www/users.php | 2 +- www/vote.php | 2 +- www/watch.php | 2 +- www/watchlist.php | 2 +- www/www-header.php | 19 +++++++++++++++++++ 58 files changed, 76 insertions(+), 56 deletions(-) create mode 100644 www/www-header.php diff --git a/doc/ChangeLog b/doc/ChangeLog index dd39586..aae0c76 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -28,6 +28,7 @@ ChangeLog for SemantiScuttle services via PEAR's Auth package - Add special header file for shell scripts (header-standalone.php) - Fix some problems when using mysqli database driver. +- Make it easy to have www/ in any location one wants it to have 0.95.2 - 2010-01-16 diff --git a/src/SemanticScuttle/header.php b/src/SemanticScuttle/header.php index b02712c..adc68ce 100644 --- a/src/SemanticScuttle/header.php +++ b/src/SemanticScuttle/header.php @@ -1,6 +1,6 @@ diff --git a/www/api/posts_add.php b/www/api/posts_add.php index 4cece23..c919ee7 100644 --- a/www/api/posts_add.php +++ b/www/api/posts_add.php @@ -12,7 +12,7 @@ // Force HTTP authentication require_once('httpauth.inc.php'); -require_once '../../src/SemanticScuttle/header.php'; +require_once '../www-header.php'; /* Service creation: only useful services are created */ $bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark'); diff --git a/www/api/posts_all.php b/www/api/posts_all.php index 286d3b3..f53f363 100644 --- a/www/api/posts_all.php +++ b/www/api/posts_all.php @@ -6,7 +6,7 @@ // Force HTTP authentication first! require_once('httpauth.inc.php'); -require_once '../../src/SemanticScuttle/header.php'; +require_once '../www-header.php'; /* Service creation: only useful services are created */ $bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark'); diff --git a/www/api/posts_delete.php b/www/api/posts_delete.php index 9e2781a..88e2584 100644 --- a/www/api/posts_delete.php +++ b/www/api/posts_delete.php @@ -8,7 +8,7 @@ // Force HTTP authentication first! require_once('httpauth.inc.php'); -require_once '../../src/SemanticScuttle/header.php'; +require_once '../www-header.php'; /* Service creation: only useful services are created */ $bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark'); diff --git a/www/api/posts_public.php b/www/api/posts_public.php index ca63f44..0c93ca2 100644 --- a/www/api/posts_public.php +++ b/www/api/posts_public.php @@ -6,7 +6,7 @@ // Force HTTP authentication first! //require_once('httpauth.inc.php'); -require_once '../../src/SemanticScuttle/header.php'; +require_once '../www-header.php'; /* Service creation: only useful services are created */ $bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark'); diff --git a/www/api/posts_update.php b/www/api/posts_update.php index 9eb5dbd..9152f26 100644 --- a/www/api/posts_update.php +++ b/www/api/posts_update.php @@ -6,7 +6,7 @@ // Force HTTP authentication first! require_once('httpauth.inc.php'); -require_once '../../src/SemanticScuttle/header.php'; +require_once '../www-header.php'; /* Service creation: only useful services are created */ $bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark'); diff --git a/www/api/tags_get.php b/www/api/tags_get.php index 23dfd2a..85684d4 100644 --- a/www/api/tags_get.php +++ b/www/api/tags_get.php @@ -6,7 +6,7 @@ // Force HTTP authentication first! require_once('httpauth.inc.php'); -require_once '../../src/SemanticScuttle/header.php'; +require_once '../www-header.php'; /* Service creation: only useful services are created */ $b2tservice =SemanticScuttle_Service_Factory::get('Bookmark2Tag'); diff --git a/www/api/tags_rename.php b/www/api/tags_rename.php index a8e281c..59ba8a4 100644 --- a/www/api/tags_rename.php +++ b/www/api/tags_rename.php @@ -6,7 +6,7 @@ // Force HTTP authentication first! require_once('httpauth.inc.php'); -require_once '../../src/SemanticScuttle/header.php'; +require_once '../www-header.php'; /* Service creation: only useful services are created */ $b2tservice =SemanticScuttle_Service_Factory::get('Bookmark2Tag'); diff --git a/www/bookmarkcommondescriptionedit.php b/www/bookmarkcommondescriptionedit.php index 6e39a9a..d182dd0 100644 --- a/www/bookmarkcommondescriptionedit.php +++ b/www/bookmarkcommondescriptionedit.php @@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -require_once '../src/SemanticScuttle/header.php'; +require_once 'www-header.php'; /* Service creation: only useful services are created */ $bookmarkservice = SemanticScuttle_Service_Factory :: get('Bookmark'); diff --git a/www/bookmarks.php b/www/bookmarks.php index 8424edb..e356750 100644 --- a/www/bookmarks.php +++ b/www/bookmarks.php @@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -require_once '../src/SemanticScuttle/header.php'; +require_once 'www-header.php'; /* Service creation: only useful services are created */ $bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark'); diff --git a/www/edit.php b/www/edit.php index ba4ae89..fbea163 100644 --- a/www/edit.php +++ b/www/edit.php @@ -20,7 +20,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -require_once '../src/SemanticScuttle/header.php'; +require_once 'www-header.php'; /* Service creation: only useful services are created */ $bookmarkservice = SemanticScuttle_Service_Factory :: get('Bookmark'); diff --git a/www/go.php b/www/go.php index cc6d666..3d271c4 100644 --- a/www/go.php +++ b/www/go.php @@ -15,7 +15,7 @@ * @license GPL http://www.gnu.org/licenses/gpl.html * @link http://sourceforge.net/projects/semanticscuttle */ -require_once '../src/SemanticScuttle/header.php'; +require_once 'www-header.php'; if (!$GLOBALS['shorturl']) { header('HTTP/1.0 500 Internal Server Error'); diff --git a/www/gsearch/context.php b/www/gsearch/context.php index 8b419da..d714ec1 100644 --- a/www/gsearch/context.php +++ b/www/gsearch/context.php @@ -1,5 +1,5 @@ diff --git a/www/login.php b/www/login.php index 18d055f..2a61224 100644 --- a/www/login.php +++ b/www/login.php @@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -require_once '../src/SemanticScuttle/header.php'; +require_once 'www-header.php'; /* Service creation: only useful services are created */ diff --git a/www/password.php b/www/password.php index 3a822c4..77a58ce 100644 --- a/www/password.php +++ b/www/password.php @@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -require_once '../src/SemanticScuttle/header.php'; +require_once 'www-header.php'; /* Service creation: only useful services are created */ // No specific services diff --git a/www/populartags.php b/www/populartags.php index 06813e9..5b69b86 100644 --- a/www/populartags.php +++ b/www/populartags.php @@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -require_once '../src/SemanticScuttle/header.php'; +require_once 'www-header.php'; /* Service creation: only useful services are created */ $b2tservice =SemanticScuttle_Service_Factory::get('Bookmark2Tag'); diff --git a/www/profile.php b/www/profile.php index 0c2776e..35864db 100644 --- a/www/profile.php +++ b/www/profile.php @@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -require_once '../src/SemanticScuttle/header.php'; +require_once 'www-header.php'; /* Service creation: only useful services are created */ // No specific services diff --git a/www/register.php b/www/register.php index 5a12573..c01939a 100644 --- a/www/register.php +++ b/www/register.php @@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -require_once '../src/SemanticScuttle/header.php'; +require_once 'www-header.php'; if (!$GLOBALS['enableRegistration']) { header('HTTP/1.0 501 Not implemented'); diff --git a/www/rss.php b/www/rss.php index 9315d5d..7f706d5 100644 --- a/www/rss.php +++ b/www/rss.php @@ -19,7 +19,7 @@ * @link http://sourceforge.net/projects/semanticscuttle */ -require_once '../src/SemanticScuttle/header.php'; +require_once 'www-header.php'; /* Service creation: only useful services are created */ $bookmarkservice = SemanticScuttle_Service_Factory::get('Bookmark'); diff --git a/www/search.php b/www/search.php index 11c382c..3cff550 100644 --- a/www/search.php +++ b/www/search.php @@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -require_once '../src/SemanticScuttle/header.php'; +require_once 'www-header.php'; /* Managing all possible inputs */ isset($_POST['terms']) ? define('POST_TERMS', $_POST['terms']): define('POST_TERMS', ''); diff --git a/www/tag2tagadd.php b/www/tag2tagadd.php index 166a0d3..cf8a639 100644 --- a/www/tag2tagadd.php +++ b/www/tag2tagadd.php @@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -require_once '../src/SemanticScuttle/header.php'; +require_once 'www-header.php'; /* Service creation: only useful services are created */ $tag2tagservice = SemanticScuttle_Service_Factory :: get('Tag2Tag'); diff --git a/www/tag2tagdelete.php b/www/tag2tagdelete.php index af639b3..c1e52cd 100644 --- a/www/tag2tagdelete.php +++ b/www/tag2tagdelete.php @@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -require_once '../src/SemanticScuttle/header.php'; +require_once 'www-header.php'; /* Service creation: only useful services are created */ $tag2tagservice = SemanticScuttle_Service_Factory :: get('Tag2Tag'); diff --git a/www/tag2tagedit.php b/www/tag2tagedit.php index 9ee7b96..a652d8a 100644 --- a/www/tag2tagedit.php +++ b/www/tag2tagedit.php @@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -require_once '../src/SemanticScuttle/header.php'; +require_once 'www-header.php'; /* Service creation: only useful services are created */ $tag2tagservice = SemanticScuttle_Service_Factory :: get('Tag2Tag'); diff --git a/www/tagcommondescriptionedit.php b/www/tagcommondescriptionedit.php index 0616740..979eca2 100644 --- a/www/tagcommondescriptionedit.php +++ b/www/tagcommondescriptionedit.php @@ -15,7 +15,7 @@ * @link http://sourceforge.net/projects/semanticscuttle */ -require_once '../src/SemanticScuttle/header.php'; +require_once 'www-header.php'; /* Service creation: only useful services are created */ $b2tservice = SemanticScuttle_Service_Factory::get('Bookmark2Tag'); diff --git a/www/tagdelete.php b/www/tagdelete.php index 1d2ce5e..1a237d4 100644 --- a/www/tagdelete.php +++ b/www/tagdelete.php @@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -require_once '../src/SemanticScuttle/header.php'; +require_once 'www-header.php'; /* Service creation: only useful services are created */ $b2tservice = SemanticScuttle_Service_Factory :: get('Bookmark2Tag'); diff --git a/www/tagedit.php b/www/tagedit.php index 8b27b7d..af490a7 100644 --- a/www/tagedit.php +++ b/www/tagedit.php @@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -require_once '../src/SemanticScuttle/header.php'; +require_once 'www-header.php'; /* Service creation: only useful services are created */ $tagservice = SemanticScuttle_Service_Factory :: get('Tag'); diff --git a/www/tagrename.php b/www/tagrename.php index 7222acf..b07d49d 100644 --- a/www/tagrename.php +++ b/www/tagrename.php @@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -require_once '../src/SemanticScuttle/header.php'; +require_once 'www-header.php'; /* Service creation: only useful services are created */ $b2tservice = SemanticScuttle_Service_Factory :: get('Bookmark2Tag'); diff --git a/www/tags.php b/www/tags.php index fed4510..a4e6555 100644 --- a/www/tags.php +++ b/www/tags.php @@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -require_once '../src/SemanticScuttle/header.php'; +require_once 'www-header.php'; /* Service creation: only useful services are created */ $bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark'); diff --git a/www/upgrade.php b/www/upgrade.php index 10a63ff..e9d9643 100644 --- a/www/upgrade.php +++ b/www/upgrade.php @@ -34,7 +34,7 @@ exit(); ///////////////// // This part below will be executed once you comment the two lines above ///////////////// -require_once '../src/SemanticScuttle/header.php'; +require_once 'www-header.php'; $tagstatservice = SemanticScuttle_Service_Factory :: get('TagStat'); ?> diff --git a/www/users.php b/www/users.php index 72f5a3d..a357b56 100644 --- a/www/users.php +++ b/www/users.php @@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -require_once '../src/SemanticScuttle/header.php'; +require_once 'www-header.php'; /* Service creation: only useful services are created */ $bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark'); diff --git a/www/vote.php b/www/vote.php index 20e77fc..0f33d75 100644 --- a/www/vote.php +++ b/www/vote.php @@ -7,7 +7,7 @@ * * vote/for/123 */ -require_once '../src/SemanticScuttle/header.php'; +require_once 'www-header.php'; if (!$GLOBALS['enableVoting']) { header('HTTP/1.0 501 Not implemented'); diff --git a/www/watch.php b/www/watch.php index 64dd316..07d4127 100644 --- a/www/watch.php +++ b/www/watch.php @@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -require_once '../src/SemanticScuttle/header.php'; +require_once 'www-header.php'; /* Service creation: only useful services are created */ //No specific services diff --git a/www/watchlist.php b/www/watchlist.php index b92fb9c..ded6782 100644 --- a/www/watchlist.php +++ b/www/watchlist.php @@ -18,7 +18,7 @@ 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 ***************************************************************************/ -require_once '../src/SemanticScuttle/header.php'; +require_once 'www-header.php'; /* Service creation: only useful services are created */ $bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark'); diff --git a/www/www-header.php b/www/www-header.php new file mode 100644 index 0000000..430cd9b --- /dev/null +++ b/www/www-header.php @@ -0,0 +1,19 @@ + + * @author Christian Weiske + * @author Eric Dane + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ +require_once '../src/SemanticScuttle/header.php'; +?> \ No newline at end of file