allow people to move www/ folder where they want it, now one just has to change www...

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@643 b3834d28-1941-0410-a4f8-b48e95affb8f

diff --git a/doc/ChangeLog b/doc/ChangeLog
index dd395860adc6c70bfbcccba6c16bb37e21d5165f..aae0c76505f97da18e31e66df75c8db0d2371ff1 100644 (file)
--- 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 b02712c8320b74485d369b26c2ef2e37db3eb6b6..adc68ceb99215e14e5aa77a8aba069c1a4a7a470 100644 (file)
--- a/src/SemanticScuttle/header.php
+++ b/src/SemanticScuttle/header.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Base file that every other file in www/ should include.
+ * Base file that is used by shell scripts and www/www-header.php.
  *
  * SemanticScuttle - your social bookmark manager.
  *

diff --git a/www/about.php b/www/about.php
index 9644320b6233b77f2f40075b8fc40df6b4e9dcbb..9bd37b0a98eedd000c5a53c7b5b525870a708b97 100644 (file)
--- a/www/about.php
+++ b/www/about.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';
 
 $tplVars['pagetitle'] = T_('About');
 $tplVars['subtitle'] = T_('About');

diff --git a/www/admin.php b/www/admin.php
index 60146709dcd15760a73c2b2a7fe266fce1744908..1dc21bd769a2a35bcf8a1326c6159b9536646b5b 100644 (file)
--- a/www/admin.php
+++ b/www/admin.php
@@ -17,7 +17,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 */
 $bookmark2tagservice = SemanticScuttle_Service_Factory::get('Bookmark2Tag');

diff --git a/www/ajax/getadminlinkedtags.php b/www/ajax/getadminlinkedtags.php
index 2b1c3ac04fecf59b0de2576c4f9ecb0f0c0f2886..6abc06762209e0423e0b0705fa0ba5e63ad8ae7b 100644 (file)
--- a/www/ajax/getadminlinkedtags.php
+++ b/www/ajax/getadminlinkedtags.php
@@ -21,7 +21,7 @@
 
 /* Return a json file with list of linked tags */
 
-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/ajax/getadmintags.php b/www/ajax/getadmintags.php
index 00e890679b670c9981d76a93c37d1ea3172eb7c7..db62fc77608fbbf388f26311ccecb15b0b100202 100644 (file)
--- a/www/ajax/getadmintags.php
+++ b/www/ajax/getadmintags.php
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 /* Return a json file with list of tags according to current user and sort by popularity*/
 
-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/ajax/getcontacttags.php b/www/ajax/getcontacttags.php
index 4ddc49384da562a3d50a59515474406bea87b5d4..85ef1aedac9fab426b97469edcf191f014ffbaa7 100644 (file)
--- a/www/ajax/getcontacttags.php
+++ b/www/ajax/getcontacttags.php
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 /* Return a json file with list of tags according to current user and sort by popularity*/
 
-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/ajax/getlinkedtags.php b/www/ajax/getlinkedtags.php
index 621d1c469848a7812e70ac0365c9dde2a2055686..6de272b2c3fab86071002725a02b9012c9ad05dc 100644 (file)
--- a/www/ajax/getlinkedtags.php
+++ b/www/ajax/getlinkedtags.php
@@ -21,7 +21,7 @@
 
 /* Return a json file with list of linked tags */
 
-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/ajax/gettags.php b/www/ajax/gettags.php
index 3a4a39346b2ade71e995f0ab51e7f7be3b389c4e..3672832a9d532328cfc88c2fff936d81dfd40611 100644 (file)
--- a/www/ajax/gettags.php
+++ b/www/ajax/gettags.php
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 /* Return a json file with list of tags according to current user and sort by popularity*/
 
-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/ajaxDelete.php b/www/ajaxDelete.php
index be9ed516633043ca31a612ce320bc23cb7b63ac6..467e20e974f727a49fe88bba88cb88576aa1b7c9 100644 (file)
--- a/www/ajaxDelete.php
+++ b/www/ajaxDelete.php
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 header('Content-Type: text/xml; charset=UTF-8');
 header('Last-Modified: '. gmdate("D, d M Y H:i:s") .' GMT');
 header('Cache-Control: no-cache, must-revalidate');
-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/ajaxGetTitle.php b/www/ajaxGetTitle.php
index 5d36b721994d154c240b3fe3756846563a50214d..6caa742e6e8c6da784242a38839c2a21e287bee9 100644 (file)
--- a/www/ajaxGetTitle.php
+++ b/www/ajaxGetTitle.php
@@ -23,7 +23,7 @@ header('Content-Type: text/xml; charset=UTF-8');
 header("Last-Modified: ". gmdate("D, d M Y H:i:s") ." GMT");
 header("Cache-Control: no-cache, must-revalidate");
 
-require_once '../src/SemanticScuttle/header.php';
+require_once 'www-header.php';
 
 /* Managing all possible inputs */
 isset($_GET['url']) ? define('GET_URL', $_GET['url']): define('GET_URL', '');

diff --git a/www/ajaxIsAvailable.php b/www/ajaxIsAvailable.php
index 139061c46d857c4b3a99e9a8b5bebd69b4fd5984..339056959a701db93530a7e5e98e4a7bf3e0caca 100644 (file)
--- a/www/ajaxIsAvailable.php
+++ b/www/ajaxIsAvailable.php
@@ -23,7 +23,7 @@ header('Content-Type: text/xml; charset=UTF-8');
 header("Last-Modified: ". gmdate("D, d M Y H:i:s") ." GMT");
 header("Cache-Control: no-cache, must-revalidate");
 
-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/alltags.php b/www/alltags.php
index 7a6157b8a57fa8a94f069244d5d8140fdd7fb82c..43ad1cbc0a307cdfc21657c167ba484dc4dcff07 100644 (file)
--- a/www/alltags.php
+++ b/www/alltags.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/api/export_csv.php b/www/api/export_csv.php
index 04000ef90eccb5935c033bf290c4724b8d47294c..3f63692884b91864a3f9da593e1457f9e2e630b6 100644 (file)
--- a/www/api/export_csv.php
+++ b/www/api/export_csv.php
@@ -3,7 +3,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/export_gcs.php b/www/api/export_gcs.php
index 72b3d14b82b8380fe83a911b090abeb85a7617b4..07bc726293ebdcf09880d1492e11b899eaa60360 100644 (file)
--- a/www/api/export_gcs.php
+++ b/www/api/export_gcs.php
@@ -5,7 +5,7 @@
 
 // Force HTTP authentication first!
 //require_once('httpauth.inc.php');
-require_once '../../src/SemanticScuttle/header.php';
+require_once '../www-header.php';
 
 if($GLOBALS['enableGoogleCustomSearch'] == false) {
     echo "Google Custom Search disabled. You can enable it into the config.php file.";

diff --git a/www/api/export_sioc.php b/www/api/export_sioc.php
index 4b0898e475dfba4be859a6f5a55f6dd58e32388b..ff1d1c0b549b345621a374b50be0c2bc03e72dbb 100644 (file)
--- a/www/api/export_sioc.php
+++ b/www/api/export_sioc.php
@@ -1,7 +1,7 @@
 <?php
 /* Export data with semantic format (SIOC: http://sioc-project.org/, FOAF, SKOS, Annotea Ontology) */
 
-require_once '../../src/SemanticScuttle/header.php';
+require_once '../www-header.php';
 header('Content-Type: text/xml; charset=utf-8'); //we change headers html defined in headers.inc.php
 
 /* Service creation: only useful services are created */

diff --git a/www/api/httpauth.inc.php b/www/api/httpauth.inc.php
index 8ae6bede9b4aa8fe4e47011135d23586a196a435..0e3a66d4a2a8df8468faa97e7901d74e147b2382 100644 (file)
--- a/www/api/httpauth.inc.php
+++ b/www/api/httpauth.inc.php
@@ -1,5 +1,5 @@
 <?php
-require_once '../../src/SemanticScuttle/header.php';
+require_once '../www-header.php';
 
 // Provides HTTP Basic authentication of a user
 // and logs the user in if necessary

diff --git a/www/api/opensearch.php b/www/api/opensearch.php
index 2facb034ba403ef66d5fd375c53403b1a8c9c9e3..68d094cc43259af100a85178ac5c2d219280b9d3 100644 (file)
--- a/www/api/opensearch.php
+++ b/www/api/opensearch.php
@@ -1,5 +1,5 @@
 <?php 
-require_once '../../src/SemanticScuttle/header.php';
+require_once '../www-header.php';
 header("Content-type: text/xml");
 ?>
 <?xml version="1.0" encoding="utf-8" ?>

diff --git a/www/api/posts_add.php b/www/api/posts_add.php
index 4cece23dfa2ef99f4040cb014a40a187473de711..c919ee7219f75c8e96ba1f608b0207af14831044 100644 (file)
--- 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 286d3b32fe3484edd734fd1608e917bcee47f376..f53f363f3ab55afbc90493a2610c4ef905c031a1 100644 (file)
--- 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 9e2781a73188c8e5d95b65abebfd5a147216ec94..88e25841f1763674ddd481d86fb13477ffbde7b5 100644 (file)
--- 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 ca63f44560dec82a3bd2f26fbcabdbc2acbce3ff..0c93ca22d23dd04117ca5edc300eeacabffe3049 100644 (file)
--- 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 9eb5dbdacf845dd17d0c29f6fe1c186f8f0cf2d8..9152f269a5c17db773f62e210517a5be76030950 100644 (file)
--- 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 23dfd2ac5533e01cd1bcd67710d1863b1892d0fc..85684d43ce0fa8dd9e578100a7cd6ede18d1f133 100644 (file)
--- 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 a8e281c08201bb928f721777a84f29854b488b85..59ba8a4c83529a529a58fe44e191c02c8e032ca5 100644 (file)
--- 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 6e39a9a07dbe10bf4fbef7d5e2e83c39ba1fcf8f..d182dd0adc8df917720a4474c7ef2a4853caafa8 100644 (file)
--- 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 8424edbc6a8031cdde923d873c39a204f093c449..e35675086a37f19d0b1084ec35fb36d19aff4488 100644 (file)
--- 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 ba4ae89a0fe8f908a3d7ce38abb6ed3d8d859d40..fbea163bc430a1479f56c0f90817bb95d15cdcda 100644 (file)
--- 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 cc6d666bc388e0c3fa0926bf8c168cfa465f7f3f..3d271c449e5d96cebc2cc4051a30c92731bcf86f 100644 (file)
--- 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 8b419da43eb2b2fa02de40c4d94beb334f0d71ca..d714ec18c88dd14ec2d69e66bd9e293bac597503 100644 (file)
--- a/www/gsearch/context.php
+++ b/www/gsearch/context.php
@@ -1,5 +1,5 @@
 <?php
-require_once '../../src/SemanticScuttle/header.php';
+require_once '../www-header.php';
 
 if($GLOBALS['enableGoogleCustomSearch'] == false) {
     echo "Google Custom Search disabled. You can enable it into the config.php file.";

diff --git a/www/gsearch/index.php b/www/gsearch/index.php
index ec867877fd9bfe4c2adecb33cf86ee7d2bea47de..585536aed4a03657f0e5b07d02b8e5da6c28fef6 100644 (file)
--- a/www/gsearch/index.php
+++ b/www/gsearch/index.php
@@ -1,4 +1,4 @@
-<?php require_once '../../src/SemanticScuttle/header.php';
+<?php require_once '../www-header.php';
 
 if($GLOBALS['enableGoogleCustomSearch']==false) {
     echo "Google Custom Search disabled. You can enable it into the config.php file.";

diff --git a/www/history.php b/www/history.php
index 42688a01a8cc4bffe67b9179b50ff9b14c8a3675..489d9322eac067a7978ba7b7ad3a9def4b567419 100644 (file)
--- a/www/history.php
+++ b/www/history.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 */
 $bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark');

diff --git a/www/import.php b/www/import.php
index 01056260c0068ffab86baf3a482f72a72a98f7cf..5263aba455cc014d4c04ff20e7ea526b9dad7e3c 100644 (file)
--- a/www/import.php
+++ b/www/import.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/importNetscape.php b/www/importNetscape.php
index dab1ba295c69a7093beac323fac33f722f0d3c0f..e23c156e2bc9ad541cb673c756e9df3320ed522d 100644 (file)
--- a/www/importNetscape.php
+++ b/www/importNetscape.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/importStructure.php b/www/importStructure.php
index 0611fee8202ee9d72b19f1ea8622f986b27458e2..53b1b66abf233259953158565f80a0e1195b9d67 100644 (file)
--- a/www/importStructure.php
+++ b/www/importStructure.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/index.php b/www/index.php
index 6d6f5cbeebd7cbb50236feef8c94f7fe774aad05..0ba4afae521c884c0a02dabca335fd728e192047 100644 (file)
--- a/www/index.php
+++ b/www/index.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/jsScuttle.php b/www/jsScuttle.php
index 6807e4a2074c7af348d85c8a2a82676a8b55c8cd..cc4e16d5e1d3ea86dc086ac0ed9468f5b0589933 100644 (file)
--- a/www/jsScuttle.php
+++ b/www/jsScuttle.php
@@ -1,7 +1,7 @@
 <?php
 header('Content-Type: text/javascript');
 $GLOBALS['saveInLastUrl'] = false;
-require_once '../src/SemanticScuttle/header.php';
+require_once 'www-header.php';
 require_once 'SemanticScuttle/functions.php';
 $player_root = ROOT .'includes/player/';
 ?>

diff --git a/www/login.php b/www/login.php
index 18d055fc39e1135924338ae8d156fcbba860fd34..2a612240f4ca723eb5f654004cb87b826a504dd1 100644 (file)
--- 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 3a822c4d0ca9743d56d8bafb4861f6c5376c47fd..77a58ce24749c266d9bde3da6a49be8e9b5608c8 100644 (file)
--- 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 06813e9a26b8b7d8f442f6033908f7ad9d2313ff..5b69b866869677229e64fb235d45f9b0be179c78 100644 (file)
--- 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 0c2776e1673603db17d98d2b2426847ac29acea5..35864dbc6d5258fc42aacf99e32962de50afb007 100644 (file)
--- 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 5a1257394142f84c192d37d52cb3f0718af0fe89..c01939a544a87ad9a271f84f2d14c3028161b3c9 100644 (file)
--- 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 9315d5d8a80577789550e2a5d61d9b9d97e36938..7f706d557f26bba285c36fdc17330b1d0a32de7a 100644 (file)
--- 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 11c382caa05de2ff3ec9b77c25f74afb9b61faef..3cff550781a22d4b13d48710faed161fdf4bf7a9 100644 (file)
--- 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 166a0d314531e2026cc7c220cb689aecb3127679..cf8a639f865dcd4e8d056411afc5be5605a2bd8e 100644 (file)
--- 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 af639b36ca442dc08b2f077bc5ba73565ae4a01c..c1e52cd372d71b26494f401b5fa0773e25b61be2 100644 (file)
--- 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 9ee7b96a970bc8347d3f8175e0756f19b6261082..a652d8a28e237b77138c8643291515bef0205bca 100644 (file)
--- 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 06167403dc566aedfc1d3e631abe82cd61951a71..979eca26634c570414a19feb71b5292590e94d72 100644 (file)
--- 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 1d2ce5e0406b4f6fc7dd7cb0ba48cc01fd78a8f7..1a237d4597678257cb8a661dbb7d2895b9af37d9 100644 (file)
--- 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 8b27b7dd40b6b013c95c7b68c5a657e78088a3e8..af490a737489372cb40b8f0a440c7ec794754ce1 100644 (file)
--- 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 7222acf0290fab3f8466f44dc5aabd0410e1b057..b07d49d5dfb6c678fc565a1f3d10168b6e5779f2 100644 (file)
--- 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 fed45105198e6a18cc98508a7c0a2c4a77ce221b..a4e6555a91ee7e0f7cb58a90d03f10c7ee132492 100644 (file)
--- 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 10a63ff2c02eefa4a2001ebe6c706d9a331c9986..e9d9643cf19e3c3c1a33355bcf80911407faedec 100644 (file)
--- 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 72f5a3d0a94f6e611f1f1d2da060f8747fea4e11..a357b56b1a650c4717da8bf8d44bad20e1a57441 100644 (file)
--- 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 20e77fc19b78f680bdde56361ed40d8356a31916..0f33d756fc34f24ece422f4ee4afcbb85e66a704 100644 (file)
--- 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 64dd3169f14dec0dab97812a0807524d5e3a51c6..07d4127b6be60c628c0b788f1723c1e680d0825b 100644 (file)
--- 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 b92fb9c5fd6818f77b91fc2984e210b260433f03..ded67826225fa5d65869a02f2f6f78b7f95c5830 100644 (file)
--- 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 (file)
index 0000000..430cd9b
--- /dev/null
+++ b/www/www-header.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Base file that every file in www/ should include.
+ * Loads all other SemanticScuttle files.
+ *
+ * SemanticScuttle - your social bookmark manager.
+ *
+ * PHP version 5.
+ *
+ * @category Bookmarking
+ * @package  SemanticScuttle
+ * @author   Benjamin Huynh-Kim-Bang <mensonge@users.sourceforge.net>
+ * @author   Christian Weiske <cweiske@cweiske.de>
+ * @author   Eric Dane <ericdane@users.sourceforge.net>
+ * @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