add PAGE_NAME constant to every page under src/.

These can/will be used in various tests, and for consistency every page
sets the constant to the appropriate setting.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12530 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/about.php b/src/about.php
index f54c1cd68b9701407691d23a158a2f8c7fe42949..47a558517e2e07085d7f7f0895837a5fbe34f97b 100644 (file)
--- a/src/about.php
+++ b/src/about.php
@@ -16,6 +16,9 @@
  * @package squirrelmail
  */
 
+/** This is the about page */
+define('PAGE_NAME', 'about');
+
 /**
  * Include the SquirrelMail initialization file.
  */

diff --git a/src/addrbook_popup.php b/src/addrbook_popup.php
index dc5d30ae5c87cd4e35b8472c880a02984ab609f4..90d2d2b5e0e80e9f6bc2a9907b7e4c43deaaeafe 100644 (file)
--- a/src/addrbook_popup.php
+++ b/src/addrbook_popup.php
@@ -12,6 +12,9 @@
  * @subpackage addressbook
  */
 
+/** This is the addrbook_popup page */
+define('PAGE_NAME', 'addrbook_popup');
+
 /**
  * Include the SquirrelMail initialization file.
  */

diff --git a/src/addrbook_search.php b/src/addrbook_search.php
index b2e337743df8d1e35f3abfeb2bdb9cd41be42c5a..1b0869451f04b9d3162fb57bafb9022f8811aad9 100644 (file)
--- a/src/addrbook_search.php
+++ b/src/addrbook_search.php
@@ -15,6 +15,9 @@
  * @subpackage addressbook
  */
 
+/** This is the addrbook_search page */
+define('PAGE_NAME', 'addrbook_search');
+
 /**
  * Include the SquirrelMail initialization file.
  */

diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index a534da0a149e8a8264edfb19f8a578d2ebb493c6..0322132feb0dc6d29b79dd3b7593c6f1918ae86f 100644 (file)
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -20,6 +20,9 @@
  * init.php.
  */
 if (!isset($bInit)) {
+    /** This is the addrbook_search_html page */
+    define('PAGE_NAME', 'addrbook_search_html');
+
     include('../include/init.php');
 }
 

diff --git a/src/addressbook.php b/src/addressbook.php
index 69e45f7bc794e88197338807f88d858fa1f5bfdd..302170fb879d6c761e5d7f5edf04e0b435b71429 100644 (file)
--- a/src/addressbook.php
+++ b/src/addressbook.php
@@ -12,6 +12,9 @@
  * @subpackage addressbook
  */
 
+/** This is the addressbook page */
+define('PAGE_NAME', 'addressbook');
+
 /**
  * Include the SquirrelMail initialization file.
  */
@@ -279,4 +282,3 @@ echo "</form>\n";
 do_hook('addressbook_bottom', $null);
 
 $oTemplate->display('footer.tpl');
-?>

diff --git a/src/compose.php b/src/compose.php
index 4bc00a2fa49e009e8ac8abf00085ebe84ed7d0e9..e49b174b9e8df55e24f8795dddaec6ad2645ab2e 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -16,6 +16,9 @@
  * @package squirrelmail
  */
 
+/** This is the compose page */
+define('PAGE_NAME', 'compose');
+
 /**
  * Include the SquirrelMail initialization file.
  */

diff --git a/src/configtest.php b/src/configtest.php
index 703645f6c955033567a95bd0e6a755e0b97e6ad0..9a92669cc936acd3042411c6d9acaa851c58e347 100644 (file)
--- a/src/configtest.php
+++ b/src/configtest.php
@@ -15,6 +15,9 @@
  * If it throws errors you need to adjust your config.      *
  ************************************************************/
 
+/** This is the configtest page */
+define('PAGE_NAME', 'configtest');
+
 // This script could really use some restructuring as it has grown quite rapidly
 // but is not very 'clean'. Feel free to get some structure into this thing.
 
@@ -920,4 +923,3 @@ if ($warnings) {
 EOF;
     echo $footer;
 }
-?>

diff --git a/src/delete_message.php b/src/delete_message.php
index 1eb2cdf841d253f05abad706c688c5e007ae91ee..4918d98e66292dba3959983389506f04cae319d6 100644 (file)
--- a/src/delete_message.php
+++ b/src/delete_message.php
@@ -11,10 +11,11 @@
  * @package squirrelmail
  */
 
+define('PAGE_NAME', 'delete_message');
+
 /**
  * Include the SquirrelMail initialization file.
  */
 include('../include/init.php');
 error_box('delete_message.php script is obsolete since 1.5.1.');
 $oTemplate->display('footer.tpl');
-?>
\ No newline at end of file

diff --git a/src/download.php b/src/download.php
index 3661029267b354232fff54da5c81f81078d4fb3c..77b5e040ddf4a7fc856c756cb77e113be75261ce 100644 (file)
--- a/src/download.php
+++ b/src/download.php
@@ -12,6 +12,9 @@
  * @package squirrelmail
  */
 
+/** This is the download page */
+define('PAGE_NAME', 'download');
+
 /**
  * Include the SquirrelMail initialization file.
  */

diff --git a/src/empty_trash.php b/src/empty_trash.php
index 604b860753e5f1b93b39bd8f762d17dfa619f544..67adce7bbda10d5a635bb42fd7ad60b6c39383f7 100644 (file)
--- a/src/empty_trash.php
+++ b/src/empty_trash.php
@@ -12,6 +12,9 @@
  * @package squirrelmail
  */
 
+/** This is the empty_trash page */
+define('PAGE_NAME', 'empty_trash');
+
 /**
  * Include the SquirrelMail initialization file.
  */
@@ -71,4 +74,3 @@ session_write_close();
 $location = get_location();
 header ("Location: $location/left_main.php");
 
-?>

diff --git a/src/folders.php b/src/folders.php
index ae3c89676d08a95aee16c1abe6575d69b80a6dd5..60a8861daa8d7a31b3524254d0aabbab09152bdc 100644 (file)
--- a/src/folders.php
+++ b/src/folders.php
@@ -12,6 +12,9 @@
  * @package squirrelmail
  */
 
+/** This is the folders page */
+define('PAGE_NAME', 'folders');
+
 /**
  * Include the SquirrelMail initialization file.
  */
@@ -193,4 +196,3 @@ $oTemplate->assign('subbox_option_list', $subbox_option_list);
 $oTemplate->display('folder_manip.tpl');
 
 $oTemplate->display('footer.tpl');
-?>

diff --git a/src/help.php b/src/help.php
index ebfa81b19aba60897ccf8799329fbb8fa40eab0d..0b3dad8de242665cf5991306d87457a2fa124c4d 100644 (file)
--- a/src/help.php
+++ b/src/help.php
@@ -11,6 +11,9 @@
  * @package squirrelmail
  */
 
+/** This is the help page */
+define('PAGE_NAME', 'help');
+
 /**
  * Include the SquirrelMail initialization file.
  */
@@ -237,4 +240,3 @@ if ( $chapter == 0 || !isset( $helpdir[$chapter-1] ) ) {
 do_hook('help_bottom', $null);
 
 $oTemplate->display('footer.tpl');
-?>

diff --git a/src/image.php b/src/image.php
index 2bf417c51176f9011c7ab093227a7612299e68d6..a2ef223b5d73bbece7dbc8d3f1e7cf747ffec459 100644 (file)
--- a/src/image.php
+++ b/src/image.php
@@ -11,6 +11,9 @@
  * @package squirrelmail
  */
 
+/** This is the image page */
+define('PAGE_NAME', 'image');
+
 /**
  * Include the SquirrelMail initialization file.
  */

diff --git a/src/left_main.php b/src/left_main.php
index 6d4f8eb516e86e33c2dbb16edc3c51c37c196fd2..de0055379db18f7c5391a2eb0c3de9f427680cc1 100644 (file)
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -12,6 +12,9 @@
  * @package squirrelmail
  */
 
+/** This is the left_main page */
+define('PAGE_NAME', 'left_main');
+
 /**
  * Include the SquirrelMail initialization file.
  */

diff --git a/src/login.php b/src/login.php
index 9c9389b7ad2756844dd1be1d3ce6f3b1acba2de3..d3abfc28fd1477231eadacf438b6b470efa4a8e9 100644 (file)
--- a/src/login.php
+++ b/src/login.php
@@ -12,6 +12,9 @@
  * @package squirrelmail
  */
 
+/** This is the login page */
+define('PAGE_NAME', 'login');
+
 // reduces the files included in init.php
 $sInitLocation = 'login';
 

diff --git a/src/mailto.php b/src/mailto.php
index e6afd7e15dc5ba41f2dc93fb28241df963db8b7d..94a8e7261006309d7718154388ee28e817bed574 100644 (file)
--- a/src/mailto.php
+++ b/src/mailto.php
@@ -17,6 +17,9 @@
  * @package squirrelmail
  */
 
+/** This is the mailto page */
+define('PAGE_NAME', 'mailto');
+
 // reduce the included files in int.php
 $bLogin = true;
 
@@ -78,4 +81,3 @@ if($force_login == false && sqsession_is_registered('user_is_logged_in')) {
 session_write_close();
 header('Location: ' . get_location() . '/' . $redirect);
 
-?>

diff --git a/src/options.php b/src/options.php
index 480dde5ce0d2c3d01fd177205b991eb7d870e344..b13e04a045c577e56a47a17c1ad1d930b3e93159 100644 (file)
--- a/src/options.php
+++ b/src/options.php
@@ -13,6 +13,9 @@
  * @subpackage prefs
  */
 
+/** This is the options page */
+define('PAGE_NAME', 'options');
+
 /**
  * Include the SquirrelMail initialization file.
  */

diff --git a/src/options_highlight.php b/src/options_highlight.php
index 1b9768b5f85c085e25fa7930c3cf39a4e39e19f3..872a5cdc9524453689e2f5fc20d76dd4ade344ae 100644 (file)
--- a/src/options_highlight.php
+++ b/src/options_highlight.php
@@ -12,6 +12,9 @@
  * @subpackage prefs
  */
 
+/** This is the options_highlight page */
+define('PAGE_NAME', 'options_highlight');
+
 /**
  * Include the SquirrelMail initialization file.
  */
@@ -346,4 +349,3 @@ if ($action == 'edit' || $action == 'add') {
 do_hook('options_highlight_bottom', $null);
 
 $oTemplate->display('footer.tpl');
-?>

diff --git a/src/options_identities.php b/src/options_identities.php
index 33c5c7305d637b11f694902f5d3d6835de294636..087cc0e50556752d4f2b05a869514fba5700cc54 100644 (file)
--- a/src/options_identities.php
+++ b/src/options_identities.php
@@ -13,6 +13,9 @@
  * @since 1.1.3
  */
 
+/** This is the options_identities page */
+define('PAGE_NAME', 'options_identities');
+
 /**
  * Include the SquirrelMail initialization file.
  */
@@ -226,4 +229,3 @@ function sti_textarea( $title, $name, $data, $bgcolor ) {
 
 }
 
-?>

diff --git a/src/options_order.php b/src/options_order.php
index 29ed772f7ed6d3a767cd8a91f59d165188730b85..bfc0a678d33c14ebe9755c39c392a1731dc0b2b7 100644 (file)
--- a/src/options_order.php
+++ b/src/options_order.php
@@ -11,6 +11,9 @@
  * @subpackage prefs
  */
 
+/** This is the options_order page */
+define('PAGE_NAME', 'options_order');
+
 /**
  * Include the SquirrelMail initialization file.
  */
@@ -161,4 +164,3 @@ $oTemplate->assign('addField_action', $PHP_SELF);
 $oTemplate->display('options_order.tpl');
 
 $oTemplate->display('footer.tpl');
-?>

diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php
index b65da692986a047892493bf7d30af112dca867cd..da14209be1fe48268ff760adc86f0ac92f73ad7e 100644 (file)
--- a/src/printer_friendly_bottom.php
+++ b/src/printer_friendly_bottom.php
@@ -14,6 +14,9 @@
  * @package squirrelmail
  */
 
+/** This is the printer_friendly_bottom page */
+define('PAGE_NAME', 'printer_friendly_bottom');
+
 /**
  * Include the SquirrelMail initialization file.
  */

diff --git a/src/printer_friendly_main.php b/src/printer_friendly_main.php
index 7979ea550c5c360c830248de797162fb6e46160e..8c0c03d6e4d522e013beeb0eece54a562e188504 100644 (file)
--- a/src/printer_friendly_main.php
+++ b/src/printer_friendly_main.php
@@ -9,6 +9,9 @@
  * @package squirrelmail
  */
 
+/** This is the printer_friendly_main page */
+define('PAGE_NAME', 'printer_friendly_main');
+
 /**
  * Include the SquirrelMail initialization file.
  */

diff --git a/src/printer_friendly_top.php b/src/printer_friendly_top.php
index 063b6deb6462df39d02c81ac06fba692938116a0..2473f1a55346d15ca063947b61534b2eaec45bfa 100644 (file)
--- a/src/printer_friendly_top.php
+++ b/src/printer_friendly_top.php
@@ -12,6 +12,9 @@
  * @package squirrelmail
  */
 
+/** This is the printer_friendly_top page */
+define('PAGE_NAME', 'printer_friendly_top');
+
 /**
  * Include the SquirrelMail initialization file.
  */
@@ -23,4 +26,3 @@ $oErrorHandler->setDelayedErrors(true);
 $oTemplate->display('printer_friendly_top.tpl');
 
 $oTemplate->display('footer.tpl');
-?>
\ No newline at end of file

diff --git a/src/read_body.php b/src/read_body.php
index e737e1294612ffe8a20e3da404b3605c917e9665..a814cd6ca2c94e72450b73177af31d5eab3d08b1 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -12,6 +12,9 @@
  * @package squirrelmail
  */
 
+/** This is the read_body page */
+define('PAGE_NAME', 'read_body');
+
 /**
  * Include the SquirrelMail initialization file.
  */
@@ -978,4 +981,3 @@ formatMenuBar($aMailbox, $passed_id, $passed_ent_id, $message, false, FALSE);
 do_hook('read_body_bottom', $null);
 sqimap_logout($imapConnection);
 $oTemplate->display('footer.tpl');
-?>

diff --git a/src/redirect.php b/src/redirect.php
index bfa88bef29fb2eb8058864169c7c7cc524b0b729..39e4488026e338dbe5fa7ec89e93c254dafb7433 100644 (file)
--- a/src/redirect.php
+++ b/src/redirect.php
@@ -12,6 +12,9 @@
  */
 $sInitLocation = 'redirect';
 
+/** This is the redirect page */
+define('PAGE_NAME', 'redirect');
+
 /**
  * Include the SquirrelMail initialization file.
  */

diff --git a/src/right_main.php b/src/right_main.php
index 7d24ede6465f3e65a4d52285561fea847c5dfffc..0522221fedc3013b8076ada4b730df1a966bb79e 100644 (file)
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -12,6 +12,9 @@
  * @package squirrelmail
  */
 
+/** This is the right_main page */
+define('PAGE_NAME', 'right_main');
+
 //xdebug_start_profiling("/var/spool/xdebug/right_main.txt");
 
 

diff --git a/src/search.php b/src/search.php
index 1606105d3caeeee5185daea19c3618e392659fe5..114f8d9c3646a862d353c94c2c33262875a23b56 100644 (file)
--- a/src/search.php
+++ b/src/search.php
@@ -17,6 +17,9 @@
  * @todo explain why references are used in function calls
  */
 
+/** This is the search page */
+define('PAGE_NAME', 'search');
+
 /**
  * Include the SquirrelMail initialization file.
  */
@@ -1634,4 +1637,3 @@ sqimap_logout($imapConnection);
 
 $oTemplate->display('footer.tpl');
 sqsession_register($mailbox_cache,'mailbox_cache');
-?>

diff --git a/src/squirrelmail_rpc.php b/src/squirrelmail_rpc.php
index 6b0f179ca4f0a8971715daf71806691ee43c3c3b..35969afd041d083bd0d6352535e1ec54694ca523 100644 (file)
--- a/src/squirrelmail_rpc.php
+++ b/src/squirrelmail_rpc.php
@@ -13,6 +13,10 @@
   * @since 1.5.2
   *
   */
+
+/** This is the squirrelmail_rpc page */
+define('PAGE_NAME', 'squirrelmail_rpc');
+
 //FIXME: If we decide to route ALL requests, even normal page
 //       requests through this file, need to change page requests
 //       to something like this

diff --git a/src/style.php b/src/style.php
index 341d89ffc722ff37b1578a85b487391f6670ef78..c79dcb4fc36f3f5d7da497bcc6a04f1138e1cb17 100644 (file)
--- a/src/style.php
+++ b/src/style.php
@@ -20,6 +20,9 @@
  * @package squirrelmail
  */
 
+/** This is the style page */
+define('PAGE_NAME', 'style');
+
 /**
  * Set the location in order to skip unneeded validation and other includes
  * in the SquirrelMail initialisation file.

diff --git a/src/vcard.php b/src/vcard.php
index b9766fb940d064f4020627ad8b6e86ab977beb61..a1f8005e366aa9133cb55f42177967894305eb29 100644 (file)
--- a/src/vcard.php
+++ b/src/vcard.php
@@ -11,6 +11,9 @@
  * @package squirrelmail
  */
 
+/** This is the vcard page */
+define('PAGE_NAME', 'vcard');
+
 /**
  * Include the SquirrelMail initialization file.
  */
@@ -185,4 +188,3 @@ $oTemplate->assign('info', $opts);
 $oTemplate->display('vcard.tpl');
 
 $oTemplate->display('footer.tpl');
-?>

diff --git a/src/view_header.php b/src/view_header.php
index 2d81aa62380443b1cbf2332c7239b28759036b81..0e0b2e218901a711b90ab472364ab7017f44bbf9 100644 (file)
--- a/src/view_header.php
+++ b/src/view_header.php
@@ -11,6 +11,9 @@
  * @package squirrelmail
  */
 
+/** This is the view_header page */
+define('PAGE_NAME', 'view_header');
+
 /**
  * Include the SquirrelMail initialization file.
  */
@@ -115,4 +118,3 @@ $oTemplate->assign('headers', $aTemplateHeaders);
 $oTemplate->display('view_header.tpl');
 
 $oTemplate->display('footer.tpl');
-?>
\ No newline at end of file

diff --git a/src/view_html.php b/src/view_html.php
index 28aa5a78df9a5b31c0c381df79fc532546521c1e..c0d2932a02446e988f19b83c21a7b086e27b4cd7 100644 (file)
--- a/src/view_html.php
+++ b/src/view_html.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * $Source$
+ * view_html
  * Displays html message parts
  *
  * File is used to display html message parts. Usually inside iframe.
@@ -16,6 +16,9 @@
  * @package squirrelmail
  */
 
+/** This is the view_html page */
+define('PAGE_NAME', 'view_html');
+
 /**
  * Include the SquirrelMail initialization file.
  */
@@ -74,4 +77,3 @@ $body = MagicHTML( $body, $passed_id, $message, $mailbox);
 /** TODO: charset might be part of html code. */
 header('Content-Type: text/html; charset=' . $charset);
 echo $body;
-?>

diff --git a/src/view_text.php b/src/view_text.php
index e2ea3f02e4bec4f6345560867b15390e4bc24e0a..dbdc16b89bf42173e1f73af12265f2f069845142 100644 (file)
--- a/src/view_text.php
+++ b/src/view_text.php
@@ -11,6 +11,9 @@
  * @package squirrelmail
  */
 
+/** This is the view_text page */
+define('PAGE_NAME', 'view_text');
+
 /** SquirrelMail required files. */
 include('../include/init.php');
 include(SM_PATH . 'functions/imap_general.php');
@@ -85,4 +88,3 @@ $oTemplate->assign('body', $body);
 $oTemplate->display('view_text.tpl');
 
 $oTemplate->display('footer.tpl');
-?>

diff --git a/src/webmail.php b/src/webmail.php
index cdd66223fd5247f0a91258a673b4bea1ecfdb6b4..442a0d82c9d353c50e481806f7f4b1ded721a586 100644 (file)
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -12,6 +12,9 @@
  * @package squirrelmail
  */
 
+/** This is the webmail page */
+define('PAGE_NAME', 'webmail');
+
 /**
  * Include the SquirrelMail initialization file.
  */