From ca479ad18c00a6a4ff2ddfb58a2f0af40bc81379 Mon Sep 17 00:00:00 2001
From: tokul <tokul@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Sun, 29 May 2005 08:39:49 +0000
Subject: [PATCH] include_once instead of require_once. subpackage tags in
 order to separate prefs functions and files in phpdoc

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@9473 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 functions/options.php      |  1 +
 src/options.php            | 15 ++++++++-------
 src/options_highlight.php  | 13 +++++++------
 src/options_identities.php |  7 ++++---
 src/options_order.php      | 15 ++++++++-------
 5 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/functions/options.php b/functions/options.php
index 421fe557..0e8d32ed 100644
--- a/functions/options.php
+++ b/functions/options.php
@@ -10,6 +10,7 @@
  *
  * @version $Id$
  * @package squirrelmail
+ * @subpackage prefs
  */
 
 /**********************************************/
diff --git a/src/options.php b/src/options.php
index beb684a8..23d4db99 100644
--- a/src/options.php
+++ b/src/options.php
@@ -11,6 +11,7 @@
  *
  * @version $Id$
  * @package squirrelmail
+ * @subpackage prefs
  */
 
 /**
@@ -21,13 +22,13 @@ define('SM_PATH','../');
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');
-require_once(SM_PATH . 'functions/global.php');
-require_once(SM_PATH . 'functions/display_messages.php');
-require_once(SM_PATH . 'functions/imap.php');
-require_once(SM_PATH . 'functions/options.php');
-require_once(SM_PATH . 'functions/strings.php');
-require_once(SM_PATH . 'functions/html.php');
-require_once(SM_PATH . 'functions/forms.php');
+include_once(SM_PATH . 'functions/global.php');
+include_once(SM_PATH . 'functions/display_messages.php');
+include_once(SM_PATH . 'functions/imap.php');
+include_once(SM_PATH . 'functions/options.php');
+include_once(SM_PATH . 'functions/strings.php');
+include_once(SM_PATH . 'functions/html.php');
+include_once(SM_PATH . 'functions/forms.php');
 
 /*********************************/
 /*** Build the resultant page. ***/
diff --git a/src/options_highlight.php b/src/options_highlight.php
index fe3563bb..d724910e 100644
--- a/src/options_highlight.php
+++ b/src/options_highlight.php
@@ -10,6 +10,7 @@
  *
  * @version $Id$
  * @package squirrelmail
+ * @subpackage prefs
  */
 
 /**
@@ -20,12 +21,12 @@ define('SM_PATH','../');
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');
-require_once(SM_PATH . 'functions/display_messages.php');
-require_once(SM_PATH . 'functions/imap.php');
-require_once(SM_PATH . 'functions/plugin.php');
-require_once(SM_PATH . 'functions/strings.php');
-require_once(SM_PATH . 'functions/html.php');
-require_once(SM_PATH . 'functions/forms.php');
+include_once(SM_PATH . 'functions/display_messages.php');
+include_once(SM_PATH . 'functions/imap.php');
+include_once(SM_PATH . 'functions/plugin.php');
+include_once(SM_PATH . 'functions/strings.php');
+include_once(SM_PATH . 'functions/html.php');
+include_once(SM_PATH . 'functions/forms.php');
 
 /* get globals */
 sqGetGlobalVar('action', $action);
diff --git a/src/options_identities.php b/src/options_identities.php
index 5744561c..a8c0e653 100644
--- a/src/options_identities.php
+++ b/src/options_identities.php
@@ -10,6 +10,7 @@
  *
  * @version $Id$
  * @package squirrelmail
+ * @subpackage prefs
  */
 
 /**
@@ -20,9 +21,9 @@ define('SM_PATH','../');
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');
-require_once(SM_PATH . 'functions/global.php');
-require_once(SM_PATH . 'functions/display_messages.php');
-require_once(SM_PATH . 'functions/html.php');
+include_once(SM_PATH . 'functions/global.php');
+include_once(SM_PATH . 'functions/display_messages.php');
+include_once(SM_PATH . 'functions/html.php');
 
 /* POST data var names are dynamic because
    of the possible multiple idents so lets get
diff --git a/src/options_order.php b/src/options_order.php
index c5c5339a..f58456b9 100644
--- a/src/options_order.php
+++ b/src/options_order.php
@@ -10,6 +10,7 @@
  *
  * @version $Id$
  * @package squirrelmail
+ * @subpackage prefs
  */
 
 /**
@@ -20,13 +21,13 @@ define('SM_PATH','../');
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');
-require_once(SM_PATH . 'functions/global.php');
-require_once(SM_PATH . 'functions/display_messages.php');
-require_once(SM_PATH . 'functions/imap.php');
-require_once(SM_PATH . 'functions/plugin.php');
-require_once(SM_PATH . 'functions/html.php');
-require_once(SM_PATH . 'functions/forms.php');
-require_once(SM_PATH . 'functions/arrays.php');
+include_once(SM_PATH . 'functions/global.php');
+include_once(SM_PATH . 'functions/display_messages.php');
+include_once(SM_PATH . 'functions/imap.php');
+include_once(SM_PATH . 'functions/plugin.php');
+include_once(SM_PATH . 'functions/html.php');
+include_once(SM_PATH . 'functions/forms.php');
+include_once(SM_PATH . 'functions/arrays.php');
 //require_once(SM_PATH . 'functions/options.php');
 
 /* get globals */
-- 
2.25.1