Merge remote-tracking branch 'origin/develop' into develop

exponentcms · Jul 26, 2011 · bb399d2 · bb399d2
2 parents 5330b5f + 9e126a9
commit bb399d2
Show file tree

Hide file tree

Showing 204 changed files with 943 additions and 1,714 deletions.
diff --git a/core_rss.php b/core_rss.php
diff --git a/cron/bootstrap.php b/cron/bootstrap.php
@@ -41,6 +41,8 @@
 
     //define('BASE',str_ireplace('/cron','',__realpath(dirname(__FILE__))));
     define("EXP_PATH", BASE);
+/** @define "EXP_PATH" ".." */
+
     //Pull in the mysqli helper class form exponet. 
     // Sure, we could have used mysqli directly but we have this nice friendly class so why not use it
     require_once(EXP_PATH . "subsystems/database/mysqli.php");

diff --git a/datatypes/calendar.php b/datatypes/calendar.php
@@ -16,6 +16,7 @@
 # GPL: http://www.gnu.org/licenses/gpl.txt
 #
 ##################################################
+/** @define "BASE" ".." */
 
 class calendar {
 	function form($object) {

diff --git a/datatypes/calendarmodule_config.php b/datatypes/calendarmodule_config.php
@@ -16,6 +16,7 @@
 # GPL: http://www.gnu.org/licenses/gpl.txt
 #
 ##################################################
+/** @define "BASE" ".." */
 
 class calendarmodule_config {
 	function form($object) {

diff --git a/datatypes/database_importer.php b/datatypes/database_importer.php
@@ -16,6 +16,7 @@
 # GPL: http://www.gnu.org/licenses/gpl.txt
 #
 ##################################################
+/** @define "BASE" ".." */
 
 class database_importer {
 	function form() {

diff --git a/datatypes/file.php b/datatypes/file.php
@@ -16,6 +16,7 @@
 # GPL: http://www.gnu.org/licenses/gpl.txt
 #
 ##################################################
+/** @define "BASE" ".." */
 
 class file {
 	function update($name,$dest,$object,$destname = null,$force=false) {

diff --git a/datatypes/file_collection.php b/datatypes/file_collection.php
@@ -16,6 +16,7 @@
 # GPL: http://www.gnu.org/licenses/gpl.txt
 #
 ##################################################
+/** @define "BASE" ".." */
 
 class file_collection {
 	function form($object) {

diff --git a/datatypes/formbuilder_form.php b/datatypes/formbuilder_form.php
@@ -16,6 +16,7 @@
 # GPL: http://www.gnu.org/licenses/gpl.txt
 #
 ##################################################
+/** @define "BASE" ".." */
 
 class formbuilder_form {
 	function form($object) {

diff --git a/datatypes/formbuilder_report.php b/datatypes/formbuilder_report.php
@@ -16,6 +16,7 @@
 # GPL: http://www.gnu.org/licenses/gpl.txt
 #
 ##################################################
+/** @define "BASE" ".." */
 
 class formbuilder_report {
 	function form($object) {

diff --git a/datatypes/poll_answer.php b/datatypes/poll_answer.php
@@ -30,6 +30,7 @@
 #
 # $Id: poll_answer.php,v 1.2 2005/04/25 19:02:17 filetreefrog Exp $
 ##################################################
+/** @define "BASE" ".." */
 
 class poll_answer {
 	function form($object) {

diff --git a/datatypes/poll_question.php b/datatypes/poll_question.php
@@ -30,6 +30,7 @@
 #
 # $Id: poll_question.php,v 1.3 2005/04/25 19:02:17 filetreefrog Exp $
 ##################################################
+/** @define "BASE" ".." */
 
 class poll_question {
 	function form($object) {

diff --git a/datatypes/rssfeed.php b/datatypes/rssfeed.php
@@ -29,6 +29,8 @@ function (refreshRSS()) in a datatype ($datetype)
 if (!defined('MAGPIE_OUTPUT_ENCODING')) {
     define('MAGPIE_OUTPUT_ENCODING', 'UTF-8');
 }
+
+/** @define "MAGPIE_DIR" "../external/magpierss/" */
 require_once(MAGPIE_DIR.'rss_fetch.inc');
 require_once(MAGPIE_DIR.'rss_utils.inc');
 define('MAGPIE_CACHE_DIR', BASE.'tmp/rsscache');

diff --git a/datatypes/section.php b/datatypes/section.php
@@ -15,6 +15,7 @@
 # GPL: http://www.gnu.org/licenses/gpl.txt
 #
 ##################################################
+/** @define "BASE" ".." */
 
 class section {
 	/*

diff --git a/datatypes/section_template.php b/datatypes/section_template.php
@@ -16,6 +16,7 @@
 # GPL: http://www.gnu.org/licenses/gpl.txt
 #
 ##################################################
+/** @define "BASE" ".." */
 
 class section_template {
 	function form($object = null) {

diff --git a/datatypes/simplepollmodule_config.php b/datatypes/simplepollmodule_config.php
@@ -30,6 +30,7 @@
 #
 # $Id: simplepollmodule_config.php,v 1.2 2005/04/25 19:02:17 filetreefrog Exp $
 ##################################################
+/** @define "BASE" ".." */
 
 class simplepollmodule_config {
 	function form($object) {

diff --git a/exponent.js.php b/exponent.js.php
@@ -17,6 +17,7 @@
 # GPL: http://www.gnu.org/licenses/gpl.txt
 #
 ##################################################
+/** @define "BASE" "." */
 
 //Initialize exponent Framework
 //include_once('exponent_common.php');  // incorporated into exponent_bootstrap.php

diff --git a/exponent.php b/exponent.php
@@ -16,6 +16,7 @@
 # GPL: http://www.gnu.org/licenses/gpl.txt
 #
 ##################################################
+/** @define "BASE" "." */
 
 /**
  * The file that initializes everything

diff --git a/exponent_bootstrap.php b/exponent_bootstrap.php
@@ -16,6 +16,7 @@
 # GPL: http://www.gnu.org/licenses/gpl.txt
 #
 ##################################################
+/** @define "BASE" "." */
 
 // Following code taken from http://us4.php.net/manual/en/function.get-magic-quotes-gpc.php
 //   - it allows magic_quotes to be on without screwing stuff up.
@@ -71,7 +72,7 @@ function __realpath($path) {
 define('EXPONENT', '1');
 
 // load the constants from the global config, theme config, and then default config settings
-require_once(BASE . '/subsystems/config/load.php');
+require_once(BASE . 'subsystems/config/load.php');
 
 // define remaining constants throughout the system based on loaded configuration constants
 

diff --git a/external/ExtPrograms.csv b/external/ExtPrograms.csv
@@ -0,0 +1,17 @@
+Program,Version,URL,Avail version,Exponent Customization Notes:
+Ckeditor,3.6.1,ckeditor.com,3.6.1,ckeditor.js - delete the '#' part
+FlowPlayer,3.2.7,flowplayer.org,3.2.7,
+Swift,4.0.5,swiftmailer.org,4.1.1,
+ups-php,0.2,code.google.com/p/ups-php,0.2,
+fedex-php,9.0.0,,,
+swfobject,2.2,code.google.com/p/swfobject,2.2,
+Smarty,2.6.19,smarty.net,2.6.26/3.0.8,
+phpthumb,1.7.9,phpthumb.sourceforge.net,1.7.9,phpThumb.config.php - set the cache folder
+minify,2.1.3,code.google.com/p/minify,2.1.3,
+magpierss,0.51,magpierss.sourceforge.net,0.72,
+YUI2,2.8.0r4,developer.yahoo.com/yui/2,2.9.0,
+YUI3,3.3.0,developer.yahoo.com/yui/3,3.3.0,
+lissa,,github.com/cauld/lissa,,
+,,github.com/yui/phploader,,
+recaptchalib,1.11,code.google.com/p/recaptcha,1.11,
+feedcreator.class.php,1.7?,,1.80dev,
diff --git a/framework/core/datatypes/expFile.php b/framework/core/datatypes/expFile.php
@@ -15,6 +15,7 @@
  * @author Adam Kessler <adam@oicgroup.net>
  * @version 2.0.0
  */
+/** @define "BASE" "../../.." */
 
  /**
   * Class to handle files at the File System Level and updating

diff --git a/framework/core/datatypes/expRss.php b/framework/core/datatypes/expRss.php
@@ -21,7 +21,8 @@
  * @subpackage Core-Datatypes
  * @package Framework
  */
-
+/** @define "BASE" "../../../" */
+
 class expRss extends expRecord {
     public $table = 'expRss';
     protected $attachable_item_types = array(

diff --git a/framework/core/subsystems/expJavascript.php b/framework/core/subsystems/expJavascript.php
@@ -15,6 +15,9 @@
  * @author Adam Kessler <adam@oicgroup.net>
  * @version 2.0.0
  */
+/** @define "BASE" "../../.." */
+
+
 /**
  * This is the class expJavascript
  *

diff --git a/framework/core/subsystems/expLang.php b/framework/core/subsystems/expLang.php
@@ -15,6 +15,9 @@
  * @author Phillip Ball <phillip@oicgroup.net>
  * @version 2.0.0
  */
+/** @define "BASE" "../../.." */
+
+
 /**
  * This is the class expLang
  *

diff --git a/framework/core/subsystems/expMail.php b/framework/core/subsystems/expMail.php
@@ -17,7 +17,7 @@
  * @version    Release: @package_version@
  * @link       http://www.exponent-docs.org/api/package/PackageName
  */
-
+/** @define "BASE" "../../.." */
 
 /* 
 exponentMail is an integrator class, bringing the flexibility of SwiftMail into Exponent gracefully.
@@ -85,7 +85,7 @@ function __construct($params = array()) {
 						$conn = new Swift_Connection_Sendmail($params['connections']);
 					} else {
 						// Attempt to auto-detect.
-						$conn = new Swift_Connection_Sendmail(Swift_Conection_Sendmail::AUTO_DETECT);
+						$conn = new Swift_Connection_Sendmail(Swift_Connection_Sendmail::AUTO_DETECT);
 					}
 				break;
 				case "rotator":

diff --git a/framework/core/subsystems/expValidator.php b/framework/core/subsystems/expValidator.php
@@ -15,6 +15,8 @@
  * @author Adam Kessler <adam@oicgroup.net>
  * @version 2.0.0
  */
+/** @define "BASE" "../../.." */
+
 /**
  * This is the class expValidator
  *

diff --git a/framework/datatypes/keywords.php b/framework/datatypes/keywords.php
@@ -16,6 +16,7 @@
 # GPL: http://www.gnu.org/licenses/gpl.txt
 #
 ##################################################
+/** @define "BASE" "../.." */
 
 class keywords {