Fixing conflicts??

.gitignore

@@ -1,14 +1,16 @@
-# Excludes all files within the ./ files directory
-/files/*
-
-# Excludes the site's configuration file
-/conf/config.php
-
-#excludes cache files
-/tmp/*
+# Excludes all files within the ./ files directory
+/files/*
+
+# Excludes the site's configuration file
+/conf/config.php
+
+#excludes cache files
+/tmp/*
 
 .buildpath
 .project
 index.html
 .gitignore
-.mailmap
+.mailmap
+/.settings/
+/.idea/

core_rss.php

@@ -255,10 +255,12 @@ class FeedHtmlField {
 	 * 
 	 */
 	var $truncSize, $syndicateHtml;
-	
+
 	/**
 	 * Creates a new instance of FeedHtmlField.
-	 * @param  $string: if given, sets the rawFieldContent property
+	 * @param $parFieldContent
+	 *
+	 * @internal param $string : if given, sets the rawFieldContent property
 	 */
 	function FeedHtmlField($parFieldContent) {
 		if ($parFieldContent) {
@@ -371,50 +373,60 @@ function _setFormat($format) {
 			}
 		}
 	}
-	
+
 	/**
 	 * Creates a syndication feed based on the items previously added.
 	 *
 	 * @see        FeedCreator::addItem()
-	 * @param    string    format    format the feed should comply to. Valid values are:
+	 * @param string $format
+	 *
+	 * @internal param \format $string format the feed should comply to. Valid values are:
 	 *			"PIE0.1", "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM0.3", "HTML", "JS"
 	 * @return    string    the contents of the feed.
 	 */
 	function createFeed($format = "RSS0.91") {
 		$this->_setFormat($format);
 		return $this->_feed->createFeed();
 	}
-
-
-
+
+
 	/**
 	 * Saves this feed as a file on the local disk. After the file is saved, an HTTP redirect
 	 * header may be sent to redirect the use to the newly created file.
 	 * @since 1.4
-	 * 
-	 * @param	string	format	format the feed should comply to. Valid values are:
+	 *
+	 * @param string $format
+	 * @param string $filename
+	 * @param bool $displayContents
+	 *
+	 * @internal param \format $string format the feed should comply to. Valid values are:
 	 *			"PIE0.1" (deprecated), "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM", "ATOM0.3", "HTML", "JS"
-	 * @param	string	filename	optional	the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
-	 * @param	boolean	displayContents	optional	send the content of the file or not. If true, the file will be sent in the body of the response.
+	 *
+	 * @internal param \filename $string optional	the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
+	 *
+	 * @internal param \displayContents $boolean optional	send the content of the file or not. If true, the file will be sent in the body of the response.
 	 */
 	function saveFeed($format="RSS0.91", $filename="", $displayContents=true) {
 		$this->_setFormat($format);
 		$this->_feed->saveFeed($filename, $displayContents);
 	}
 
 
-   /**
-    * Turns on caching and checks if there is a recent version of this feed in the cache.
-    * If there is, an HTTP redirect header is sent.
-    * To effectively use caching, you should create the FeedCreator object and call this method
-    * before anything else, especially before you do the time consuming task to build the feed
-    * (web fetching, for example).
-    *
-    * @param   string   format   format the feed should comply to. Valid values are:
-    *       "PIE0.1" (deprecated), "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM0.3".
-    * @param filename   string   optional the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
-    * @param timeout int      optional the timeout in seconds before a cached version is refreshed (defaults to 3600 = 1 hour)
-    */
+	/**
+	 * Turns on caching and checks if there is a recent version of this feed in the cache.
+	 * If there is, an HTTP redirect header is sent.
+	 * To effectively use caching, you should create the FeedCreator object and call this method
+	 * before anything else, especially before you do the time consuming task to build the feed
+	 * (web fetching, for example).
+	 *
+	 * @param string $format
+	 * @param filename   string   optional the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
+	 * @param timeout int      optional the timeout in seconds before a cached version is refreshed (defaults to 3600 = 1 hour)
+	 *
+	 * @internal param \format $string format the feed should comply to. Valid values are:
+	 *       "PIE0.1" (deprecated), "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM0.3".
+	 *
+	 */
    function useCached($format="RSS0.91", $filename="", $timeout=3600) {
       $this->_setFormat($format);
       $this->_feed->useCached($filename, $timeout);
@@ -486,29 +498,33 @@ class FeedCreator extends HtmlDescribable {
 	 * the FeedCreator class used.
 	 */
 	var $additionalElements = Array();
-   
-    
+
+
 	/**
 	 * Adds an FeedItem to the feed.
 	 *
-	 * @param object FeedItem $item The FeedItem to add to the feed.
+	 * @param $item
+	 *
+	 * @internal param \FeedItem $object $item The FeedItem to add to the feed.
 	 * @access public
 	 */
 	function addItem($item) {
 		$this->items[] = $item;
 	}
-	
-	
+
+
 	/**
 	 * Truncates a string to a certain length at the most sensible point.
 	 * First, if there's a '.' character near the end of the string, the string is truncated after this character.
 	 * If there is no '.', the string is truncated after the last ' ' character.
 	 * If the string is truncated, " ..." is appended.
 	 * If the string is already shorter than $length, it is returned unchanged.
-	 * 
+	 *
 	 * @static
 	 * @param string    string A string to be truncated.
-	 * @param int        length the maximum length the string should be truncated to
+	 * @param $length
+	 *
+	 * @internal param \length $int the maximum length the string should be truncated to
 	 * @return string    the truncated string
 	 */
 	function iTrunc($string, $length) {
@@ -543,6 +559,7 @@ function iTrunc($string, $length) {
 	 * Creates a comment indicating the generator of this feed.
 	 * The format of this comment seems to be recognized by
 	 * Syndic8.com.
+	 * @return string
 	 */
 	function _createGeneratorComment() {
 		return "<!-- generator=\"".FEEDCREATOR_VERSION."\" -->\n";
@@ -602,11 +619,12 @@ function _generateFilename() {
 		$fileInfo = pathinfo($_SERVER["PHP_SELF"]);
 		return substr($fileInfo["basename"],0,-(strlen($fileInfo["extension"])+1)).".xml";
 	}
-	
-	
+
+
 	/**
 	 * @since 1.4
 	 * @access private
+	 * @param $filename
 	 */
 	function _redirect($filename) {
 		// attention, heavily-commented-out-area
@@ -647,15 +665,17 @@ function useCached($filename="", $timeout=3600) {
 			$this->_redirect($filename);
 		}
 	}
-	
-	
+
+
 	/**
 	 * Saves this feed as a file on the local disk. After the file is saved, a redirect
 	 * header may be sent to redirect the user to the newly created file.
 	 * @since 1.4
-	 * 
+	 *
 	 * @param filename	string	optional	the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
-	 * @param redirect	boolean	optional	send an HTTP redirect header or not. If true, the user will be automatically redirected to the created file.
+	 * @param bool $displayContents
+	 *
+	 * @internal param bool $redirect optional	send an HTTP redirect header or not. If true, the user will be automatically redirected to the created file.
 	 */
 	function saveFeed($filename="", $displayContents=true) {
 		if ($filename=="") {
@@ -874,10 +894,11 @@ function RSSCreator091() {
 		$this->_setRSSVersion("0.91");
 		$this->contentType = "application/rss+xml";
 	}
-	
+
 	/**
 	 * Sets this RSS feed's version number.
 	 * @access private
+	 * @param $version
 	 */
 	function _setRSSVersion($version) {
 		$this->RSSVersion = $version;
@@ -886,6 +907,7 @@ function _setRSSVersion($version) {
 	/**
 	 * Sets an XML namepace fot hos RSS feed
 	 * @access private
+	 * @param $xmlns
 	 */
 	function _setXMLNS($xmlns) {
 		$this->XMLNS = $xmlns;

exponent.php

@@ -7,7 +7,7 @@
  *  Software Foundation; either version 2 of the
  *  License, or (at your option) any later version.
  *
- * The file thats holds the expRecord class
+ * The file that initializes everything
  *
  * @link http://www.gnu.org/licenses/gpl.txt GPL http://www.gnu.org/licenses/gpl.txt
  * @package Exponent-CMS
@@ -93,24 +93,24 @@
 
 // Initialize permissions variables
 exponent_permissions_initialize();
-// initialize the expRouter
 /**
+ * initialize the expRouter
  * the routing/link/url object
  * @global expRouter $router
  * @name $router
  */
 $router = new expRouter();
 
-// initialize this users cart if they have ecomm installed.
 /**
+ * initialize this users cart if they have ecomm installed.
  * the shopping cart/order object
  * @global order $order
  * @name $order
  */
 if (controllerExists('cart')) $order = order::getUserCart();
 
-//Initialize the navigation heirarchy
 /**
+ * Initialize the navigation hierarchy
  * the list of sections/pages for the site
  * @global array $sections
  * @name $sections

exponent_version.php

@@ -17,7 +17,7 @@
 ##################################################
 
 if (!defined('EXPONENT_VERSION_MAJOR')) {
-	// the RELEASE constant is changed by the build scripts at code freeeze
+	// the RELEASE constant is changed by the build scripts at code freeze
 	define('RELEASE','%%RELEASE%%');
 	if (RELEASE != '%%RELEASE%%') {
 

external/phpThumb/phpThumb.config.php

@@ -28,7 +28,7 @@
 //$PHPTHUMB_CONFIG['document_root'] = $_SERVER['DOCUMENT_ROOT'];
 //$PHPTHUMB_CONFIG['document_root'] = realpath((@$_SERVER['DOCUMENT_ROOT'] && file_exists(@$_SERVER['DOCUMENT_ROOT'].$_SERVER['PHP_SELF'])) ? $_SERVER['DOCUMENT_ROOT'] : str_replace(dirname(@$_SERVER['PHP_SELF']), '', str_replace(DIRECTORY_SEPARATOR, '/', realpath('.'))));
 //$PHPTHUMB_CONFIG['document_root'] = realpath((getenv('DOCUMENT_ROOT') && ereg('^'.preg_quote(realpath(getenv('DOCUMENT_ROOT'))), realpath(__FILE__))) ? getenv('DOCUMENT_ROOT') : str_replace(dirname(@$_SERVER['PHP_SELF']), '', str_replace(DIRECTORY_SEPARATOR, '/', dirname(__FILE__))));
-$PHPTHUMB_CONFIG['document_root'] = realpath((getenv('DOCUMENT_ROOT') && preg_match('^'.preg_quote(realpath(getenv('DOCUMENT_ROOT'))), realpath(__FILE__))) ? getenv('DOCUMENT_ROOT') : str_replace(dirname(@$_SERVER['PHP_SELF']), '', str_replace(DIRECTORY_SEPARATOR, '/', dirname(__FILE__))));
+$PHPTHUMB_CONFIG['document_root'] = realpath((getenv('DOCUMENT_ROOT') && preg_match('^'.preg_quote(realpath(getenv('DOCUMENT_ROOT'))).'^', realpath(__FILE__))) ? getenv('DOCUMENT_ROOT') : str_replace(dirname(@$_SERVER['PHP_SELF']), '', str_replace(DIRECTORY_SEPARATOR, '/', dirname(__FILE__))));
 
 // * Cache directory configuration (choose only one of these - leave the other lines commented-out):
 // Note: this directory must be writable (usually chmod 777 is neccesary) for caching to work.

framework/core/assets/css/admin-global.css

@@ -30,6 +30,13 @@ a.managemodules {
     background:url(../images/exp-admin-sprite.png) no-repeat 3px -386px;
 }
 
+a.password {
+    display:inline-block;
+    zoom:1;
+    padding:4px 5px 4px 20px;
+    background:url(../images/change_password.png) no-repeat 0 50%;
+}
+
 a.selectall {
     display:inline-block;
     zoom:1;

framework/core/controllers/expCommentController.php

@@ -7,7 +7,7 @@
  *  Software Foundation; either version 2 of the
  *  License, or (at your option) any later version.
  *
- * The file thats holds the expCommentController class.
+ * The file that holds the expCommentController class.
  *
  * @link http://www.gnu.org/licenses/gpl.txt GPL http://www.gnu.org/licenses/gpl.txt
  * @package Exponent-CMS

framework/core/controllers/expController.php

@@ -25,7 +25,14 @@
 class expController {   
     protected $basemodel = null;
     protected $classname = '';
-    protected $permissions = array('create'=>'Create', 'edit'=>'Edit', 'delete'=>'Delete', 'configure'=>'Configure', 'perms'=>'Manage Permissions', 'manage'=>'Manage Module');
+    protected $permissions = array(
+        'manage'=>'Manage',
+        'create'=>'Create', 
+        'edit'=>'Edit', 
+        'delete'=>'Delete', 
+        'configure'=>'Configure', 
+        //'perms'=>'Manage Permissions', 
+        );
     protected $remove_permissions = array();    
     protected $add_permissions = array();
 

framework/core/controllers/expHTMLEditorController.php

@@ -7,7 +7,7 @@
  *  Software Foundation; either version 2 of the
  *  License, or (at your option) any later version.
  *
- * The file thats holds the expHTMLEditorController class.
+ * The file that holds the expHTMLEditorController class.
  *
  * @link http://www.gnu.org/licenses/gpl.txt GPL http://www.gnu.org/licenses/gpl.txt
  * @package Exponent-CMS

framework/core/controllers/expModuleController.php

@@ -8,7 +8,7 @@
  *  Software Foundation; either version 2 of the
  *  License, or (at your option) any later version.
  *
- * The file thats holds the expModuleController class.
+ * The file that holds the expModuleController class.
  *
  * @link http://www.gnu.org/licenses/gpl.txt GPL http://www.gnu.org/licenses/gpl.txt
  * @package Exponent-CMS

framework/core/controllers/expNestedNodeController.php

@@ -8,7 +8,7 @@
  *  Software Foundation; either version 2 of the
  *  License, or (at your option) any later version.
  *
- * The file thats holds the expNestedNodeController class.
+ * The file that holds the expNestedNodeController class.
  *
  * @link http://www.gnu.org/licenses/gpl.txt GPL http://www.gnu.org/licenses/gpl.txt
  * @package Exponent-CMS

framework/core/controllers/expRatingController.php

@@ -8,7 +8,7 @@
  *  Software Foundation; either version 2 of the
  *  License, or (at your option) any later version.
  *
- * The file thats holds the expTagController class.
+ * The file that holds the expTagController class.
  *
  * @link http://www.gnu.org/licenses/gpl.txt GPL http://www.gnu.org/licenses/gpl.txt
  * @package Exponent-CMS

framework/core/controllers/expSimpleNoteController.php

@@ -8,7 +8,7 @@
  *  Software Foundation; either version 2 of the
  *  License, or (at your option) any later version.
  *
- * The file thats holds the expSimpleNoteController class.
+ * The file that holds the expSimpleNoteController class.
  *
  * @link http://www.gnu.org/licenses/gpl.txt GPL http://www.gnu.org/licenses/gpl.txt
  * @package Exponent-CMS

framework/core/datatypes/expComment.php

@@ -7,7 +7,7 @@
  *  Software Foundation; either version 2 of the
  *  License, or (at your option) any later version.
  *
- * The file thats holds the expComment class
+ * The file that holds the expComment class
  *
  * @link http://www.gnu.org/licenses/gpl.txt GPL http://www.gnu.org/licenses/gpl.txt
  * @package Exponent-CMS

framework/core/datatypes/expConfig.php

@@ -7,7 +7,7 @@
  *  Software Foundation; either version 2 of the
  *  License, or (at your option) any later version.
  *
- * The file thats holds the expComment class
+ * The file that holds the expComment class
  *
  * @link http://www.gnu.org/licenses/gpl.txt GPL http://www.gnu.org/licenses/gpl.txt
  * @package Exponent-CMS

framework/core/datatypes/expFile.php

@@ -7,7 +7,7 @@
  *  Software Foundation; either version 2 of the
  *  License, or (at your option) any later version.
  *
- * The file thats holds the expFile class
+ * The file that holds the expFile class
  *
  * @link http://www.gnu.org/licenses/gpl.txt GPL http://www.gnu.org/licenses/gpl.txt
  * @package Exponent-CMS