Merge pull request #225 from rmdstudio/master

bug fixes, removed legacy force_ssl code

CHANGELOG.md

@@ -8,6 +8,7 @@ Anahita 4.1.1 Birth Release
 * fixed permalinks in comment stories and notifications
 * fixed the default list limit bug in the admin back-end
 * lots of development on the Subscriptions app, but sorry it isn't ready for this release yet.
+* removed legacy force_ssl and implemented a global isSSL() auto detection method
 
 Anahita 4.1.0 Birth Release
 =============================

src/administrator/components/com_application/application.php

@@ -98,13 +98,11 @@ function initialise($options = array())
 	function route()
 	{
 		$uri = JURI::getInstance();
-
-		if($this->getCfg('force_ssl') >= 1 && strtolower($uri->getScheme()) != 'https') 
-		{
-			//forward to https
-			$uri->setScheme('https');
-			$this->redirect($uri->toString());
-		}
+
+		//forward to https
+		$scheme = (isSSL()) ? 'https' : 'http';
+		$uri->setScheme( $scheme );
+		$this->redirect($uri->toString());
 	}
 
 	/**

src/media/lib_anahita/js/anahita/actions/entity.js

@@ -153,7 +153,7 @@
 		if ( action == 'addcomment' ) {
 
 			var form = $(this);
-			var comments = form.prev('.an-comments');
+			var comments = form.siblings('.an-comments');
 
 			$.ajax({
 				method : 'post',

src/media/lib_anahita/js/anahita/paginator.js

@@ -44,7 +44,7 @@
 
         	var a = $(event.target);
             var self = this;
-            var currentEntities = $(this.element).prev(this.options.entities);
+            var currentEntities = $(this.element).siblings(this.options.entities);
             var isComments = ( currentEntities.hasClass('an-comments') ) ? true : false; 
 
             $.ajax({

src/media/lib_anahita/js/production/site.uncompressed.js

@@ -19333,7 +19333,7 @@ var sortable = $.widget("ui.sortable", $.ui.mouse, {
 
         	var a = $(event.target);
             var self = this;
-            var currentEntities = $(this.element).prev(this.options.entities);
+            var currentEntities = $(this.element).siblings(this.options.entities);
             var isComments = ( currentEntities.hasClass('an-comments') ) ? true : false; 
 
             $.ajax({
@@ -20146,7 +20146,7 @@ var sortable = $.widget("ui.sortable", $.ui.mouse, {
 		if ( action == 'addcomment' ) {
 
 			var form = $(this);
-			var comments = form.prev('.an-comments');
+			var comments = form.siblings('.an-comments');
 
 			$.ajax({
 				method : 'post',

vendor/joomla/administrator/components/com_config/controllers/application.php

@@ -69,13 +69,6 @@ public static function showConfig()
 		$lists['error_reporting'] = JHTML::_('select.genericlist',  $errors, 'error_reporting', 'class="inputbox" size="1"', 'value', 'text', $row->error_reporting);
 		$lists['enable_ftp'] 	= JHTML::_('select.booleanlist', 'ftp_enable', 'class="inputbox"', intval($row->ftp_enable));
 
-        $forceSSL = array(
-                                JHTML::_('select.option', 0, JText::_('None')),
-                                JHTML::_('select.option', 1, JText::_('Administrator Only')),
-                                JHTML::_('select.option', 2, JText::_('Entire Site')),
-                        );
-        $lists['force_ssl'] = JHTML::_('select.genericlist', $forceSSL, 'force_ssl', 'class="inputbox" size="1"', 'value', 'text', @$row->force_ssl);
-
 		// LOCALE SETTINGS
 		$timeoffset = array (
 			JHTML::_('select.option', -12, JText::_('(UTC -12:00) International Date Line West')),
@@ -235,8 +228,7 @@ function save()
 		$config_array['log_path']			= JRequest::getVar('log_path', JPATH_ROOT.DS.'logs', 'post', 'string');
 		$config_array['tmp_path']			= JRequest::getVar('tmp_path', JPATH_ROOT.DS.'tmp', 'post', 'string');
 		$config_array['live_site'] 			= preg_replace('/\/administrator.*/','',JURI::getInstance()->toString(array('scheme','host','port','path')));//rtrim(JRequest::getVar('live_site','','post','string'), );
-		$config_array['force_ssl']            = JRequest::getVar('force_ssl', 0, 'post', 'int');
-
+
 		// LOCALE SETTINGS
 		$config_array['offset']				= JRequest::getVar('offset', 0, 'post', 'float');
 

vendor/joomla/administrator/components/com_config/views/application/tmpl/config_server.php

@@ -25,17 +25,7 @@
 					<?php echo $lists['error_reporting']; ?>
 				</td>
 			</tr>
-
-			<tr>
-                <td class="key">
-                    <span class="editlinktip hasTip" title="<?php echo JText::_('Force SSL'); ?>::<?php echo JText::_( 'TIPFORCESSL' ); ?>">
-                        <?php echo JText::_('Force SSL'); ?>
-                    </span>
-                </td>
-                <td>
-                    <?php echo $lists['force_ssl']; ?>
-                </td>
-            </tr>
+
 		</tbody>
 	</table>
 </fieldset>

vendor/joomla/libraries/joomla/application/application.php

@@ -743,18 +743,7 @@ function &_createSession( $name )
 	{
 		$options = array();
 		$options['name'] = $name;
-		switch($this->_clientId) {
-			case 0:
-				if($this->getCfg('force_ssl') == 2) {
-					$options['force_ssl'] = true;
-				}
-				break;
-			case 1:
-				if($this->getCfg('force_ssl') >= 1) {
-					$options['force_ssl'] = true;
-				}
-				break;
-		}
+        $options['force_ssl'] = isSSL();
 
 		$session =& JFactory::getSession($options);
 

vendor/joomla/libraries/joomla/session/session.php

@@ -554,9 +554,9 @@ private function _createId( )
 	 */
 	private function _setCookieParams() {
 		$cookie	=	session_get_cookie_params();
-		if($this->_force_ssl) {
-			$cookie['secure'] = true;
-		}
+
+        $cookie['secure'] = isSSL();
+        
 		session_set_cookie_params( $cookie['lifetime'], $cookie['path'], $cookie['domain'], $cookie['secure'] );
 	}