Revision: 1382
http://mrbs.svn.sourceforge.net/mrbs/?rev=1382&view=rev
Author: cimorrison
Date: 2010-07-25 17:20:15 +0000 (Sun, 25 Jul 2010)
Log Message:
-----------
Moved all the internal, development use only, definitions and global variables
out of systemdefaults and into a new file, so that only stuff that is relevant
to site admins is contained in systemdefaults.inc.php.
Modified Paths:
--------------
mrbs/branches/custom_entry_fields/web/defaultincludes.inc
mrbs/branches/custom_entry_fields/web/systemdefaults.inc.php
Added Paths:
-----------
mrbs/branches/custom_entry_fields/web/internalconfig.inc.php
Modified: mrbs/branches/custom_entry_fields/web/defaultincludes.inc
===================================================================
--- mrbs/branches/custom_entry_fields/web/defaultincludes.inc 2010-07-25
16:53:24 UTC (rev 1381)
+++ mrbs/branches/custom_entry_fields/web/defaultincludes.inc 2010-07-25
17:20:15 UTC (rev 1382)
@@ -4,10 +4,11 @@
require_once "grab_globals.inc.php";
require_once "systemdefaults.inc.php";
+require_once "internalconfig.inc.php";
require_once "config.inc.php";
require_once "functions.inc";
require_once "dbsys.inc";
require_once "mrbs_auth.inc";
require_once "standard_vars.inc.php";
-?>
+?>
\ No newline at end of file
Added: mrbs/branches/custom_entry_fields/web/internalconfig.inc.php
===================================================================
--- mrbs/branches/custom_entry_fields/web/internalconfig.inc.php
(rev 0)
+++ mrbs/branches/custom_entry_fields/web/internalconfig.inc.php
2010-07-25 17:20:15 UTC (rev 1382)
@@ -0,0 +1,84 @@
+<?php
+
+// $Id$
+
+// This file contains internal configuration settings. You should not need
+// to change them unless you are making changes to the MRBS code.
+
+
+/***************************************
+ * DOCTYPE - internal use, do not change
+ ***************************************/
+
+ define('DOCTYPE', '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd";>');
+
+ // Records which DOCTYPE is being used. Do not change - it will not change
the DOCTYPE
+ // that is used; it is merely used when the code needs to know the DOCTYPE,
for example
+ // in calls to nl2br. TRUE means XHTML, FALSE means HTML.
+ define('IS_XHTML', FALSE);
+
+ /*************************************************
+ * ENTRY STATUS CODES - internal use, do not change
+ **************************************************/
+
+// The booking status codes that are used in the status column in the
+// entry table. Although there are only two codes at the moment, the
+// codes can be added to later if additional status types are required.
+// The default code in the database table is 1, ie a confirmed booking.
+
+define('STATUS_PROVISIONAL', 0);
+define('STATUS_CONFIRMED', 1);
+
+ /*************************************************
+ * REPEAT TYPE CODES - internal use, do not change
+ **************************************************/
+
+define('REP_NONE', 0);
+define('REP_DAILY', 1);
+define('REP_WEEKLY', 2);
+define('REP_MONTHLY', 3);
+define('REP_YEARLY', 4);
+define('REP_MONTHLY_SAMEDAY', 5);
+define('REP_N_WEEKLY', 6);
+
+ /****************************************************************
+ * DATABASE TABLES - STANDARD FIELDS - internal use, do not change
+ *****************************************************************/
+
+// These are the standard fields in the database tables. If you add more
+// standard (not user defined, custom) fields, then you need to change these
+
+$standard_fields['entry'] = array('id',
+ 'start_time',
+ 'end_time',
+ 'entry_type',
+ 'repeat_id',
+ 'room_id',
+ 'timestamp',
+ 'create_by',
+ 'name',
+ 'type',
+ 'description',
+ 'private',
+ 'status',
+ 'reminded',
+ 'info_time',
+ 'info_user',
+ 'info_text');
+
+/********************************************************
+ * PHP System Configuration - internal use, do not change
+ ********************************************************/
+
+// Disable magic quoting on database returns:
+set_magic_quotes_runtime(0);
+
+// Make sure notice errors are not reported, they can break mrbs code:
+$error_level = E_ALL ^ E_NOTICE;
+if (defined("E_DEPRECATED"))
+{
+ $error_level = $error_level ^ E_DEPRECATED;
+}
+error_reporting ($error_level);
+
+?>
\ No newline at end of file
Property changes on:
mrbs/branches/custom_entry_fields/web/internalconfig.inc.php
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Modified: mrbs/branches/custom_entry_fields/web/systemdefaults.inc.php
===================================================================
--- mrbs/branches/custom_entry_fields/web/systemdefaults.inc.php
2010-07-25 16:53:24 UTC (rev 1381)
+++ mrbs/branches/custom_entry_fields/web/systemdefaults.inc.php
2010-07-25 17:20:15 UTC (rev 1382)
@@ -833,80 +833,4 @@
$typel["I"] = "I";
// $typel["J"] = "J";
-
-/***************************************
- * DOCTYPE - internal use, do not change
- ***************************************/
-
- define('DOCTYPE', '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd";>');
-
- // Records which DOCTYPE is being used. Do not change - it will not change
the DOCTYPE
- // that is used; it is merely used when the code needs to know the DOCTYPE,
for example
- // in calls to nl2br. TRUE means XHTML, FALSE means HTML.
- define('IS_XHTML', FALSE);
-
- /*************************************************
- * ENTRY STATUS CODES - internal use, do not change
- **************************************************/
-
-// The booking status codes that are used in the status column in the
-// entry table. Although there are only two codes at the moment, the
-// codes can be added to later if additional status types are required.
-// The default code in the database table is 1, ie a confirmed booking.
-
-define('STATUS_PROVISIONAL', 0);
-define('STATUS_CONFIRMED', 1);
-
- /*************************************************
- * REPEAT TYPE CODES - internal use, do not change
- **************************************************/
-
-define('REP_NONE', 0);
-define('REP_DAILY', 1);
-define('REP_WEEKLY', 2);
-define('REP_MONTHLY', 3);
-define('REP_YEARLY', 4);
-define('REP_MONTHLY_SAMEDAY', 5);
-define('REP_N_WEEKLY', 6);
-
- /****************************************************************
- * DATABASE TABLES - STANDARD FIELDS - internal use, do not change
- *****************************************************************/
-
-// These are the standard fields in the database tables. If you add more
-// standard (not user defined, custom) fields, then you need to change these
-
-$standard_fields['entry'] = array('id',
- 'start_time',
- 'end_time',
- 'entry_type',
- 'repeat_id',
- 'room_id',
- 'timestamp',
- 'create_by',
- 'name',
- 'type',
- 'description',
- 'private',
- 'status',
- 'reminded',
- 'info_time',
- 'info_user',
- 'info_text');
-
-/********************************************************
- * PHP System Configuration - internal use, do not change
- ********************************************************/
-
-// Disable magic quoting on database returns:
-set_magic_quotes_runtime(0);
-
-// Make sure notice errors are not reported, they can break mrbs code:
-$error_level = E_ALL ^ E_NOTICE;
-if (defined("E_DEPRECATED"))
-{
- $error_level = $error_level ^ E_DEPRECATED;
-}
-error_reporting ($error_level);
-
-?>
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
