mirror of
https://github.com/joomla/joomla-cms.git
synced 2024-08-26 13:09:46 +00:00
Various bug fixes
git-svn-id: http://joomlacode.org/svn/joomla/development/trunk@3367 6f6e1ebd-4c2b-0410-823f-f34bde69bce9
This commit is contained in:
parent
76172a9a8b
commit
c8d1699255
@ -37,6 +37,13 @@ Legend:
|
||||
- -> Removed
|
||||
! -> Note
|
||||
|
||||
01-May-2006 Johan Janssens
|
||||
# Fixed artf4480 : Menu ordering
|
||||
# Fixed artf4526 : PDF button don't works
|
||||
# Fixed artf4036 : JDocumentHTML constructor incorrectly calls parent constructor.
|
||||
# Fixed artf3287 : Syndicate module not viewable by default
|
||||
# Fixed artf4405 : [patch] Print, PDF and email buttons aren't accessible
|
||||
|
||||
01-May-2006 David Gal
|
||||
^ Changed the syntax of sql queries tags in component installer xml file
|
||||
|
||||
|
@ -336,7 +336,8 @@ function editCategory( $uid=0, $section='' )
|
||||
break;
|
||||
}
|
||||
|
||||
if ( $row->section > 0 ) {
|
||||
if ( $row->section > 0 )
|
||||
{
|
||||
// content
|
||||
$query = "SELECT *"
|
||||
. "\n FROM #__menu"
|
||||
@ -398,7 +399,6 @@ function editCategory( $uid=0, $section='' )
|
||||
$order[] = mosHTML::makeOption( $i );
|
||||
}
|
||||
|
||||
echo 'test';
|
||||
// build the html select list for sections
|
||||
if ( $section == 'content' ) {
|
||||
$query = "SELECT s.id AS value, s.title AS text"
|
||||
@ -407,7 +407,7 @@ function editCategory( $uid=0, $section='' )
|
||||
;
|
||||
$database->setQuery( $query );
|
||||
$sections = $database->loadObjectList();
|
||||
$lists['section'] = mosHTML::selectList( $sections, 'section', 'class="inputbox" size="1"', 'value', 'text' );;
|
||||
$lists['section'] = mosHTML::selectList( $sections, 'section', 'class="inputbox" size="1"', 'value', 'text', $row->section );;
|
||||
} else {
|
||||
if ( $type == 'other' ) {
|
||||
$section_name = JText::_( 'N/A' );
|
||||
|
@ -231,6 +231,7 @@ function editUser( )
|
||||
$myGroupName = strtolower( $acl->get_group_name( $myGroups[0], 'ARO' ) );;
|
||||
|
||||
// ensure user can't add/edit group higher than themselves
|
||||
/* NOTE : This check doesn't work commented out for the time being
|
||||
if ( is_array( $myGroups ) && count( $myGroups ) > 0 ) {
|
||||
$excludeGroups = (array) $acl->get_group_children( $myGroups[0], 'ARO', 'RECURSE' );
|
||||
} else {
|
||||
@ -241,6 +242,7 @@ function editUser( )
|
||||
echo 'not auth';
|
||||
josRedirect( 'index2.php?option=com_users', JText::_('NOT_AUTH') );
|
||||
}
|
||||
*/
|
||||
|
||||
//if ( $userGroupName == 'super administrator' ) {
|
||||
// super administrators can't change
|
||||
|
@ -134,13 +134,11 @@ class JModelFrontpage extends JObject
|
||||
|
||||
$query = "SELECT a.id, a.title, a.title_alias, a.introtext, a.sectionid, a.state, a.catid, a.created, a.created_by, a.created_by_alias, a.modified, a.modified_by," .
|
||||
"\n a.checked_out, a.checked_out_time, a.publish_up, a.publish_down, a.images, a.attribs, a.urls, a.ordering, a.metakey, a.metadesc, a.access," .
|
||||
"\n CHAR_LENGTH( a.`fulltext` ) AS readmore, s.published AS sec_pub, cc.published AS cat_pub, s.access AS sec_access, cc.access AS cat_access," .
|
||||
"\n u.name AS author, u.usertype, s.name AS section, cc.name AS category, g.name AS groups".
|
||||
"\n CHAR_LENGTH( a.`fulltext` ) AS readmore," .
|
||||
"\n u.name AS author, u.usertype, g.name AS groups".
|
||||
$voting['select'] .
|
||||
"\n FROM #__content AS a" .
|
||||
"\n INNER JOIN #__content_frontpage AS f ON f.content_id = a.id" .
|
||||
"\n LEFT JOIN #__categories AS cc ON cc.id = a.catid" .
|
||||
"\n LEFT JOIN #__sections AS s ON s.id = a.sectionid" .
|
||||
"\n LEFT JOIN #__users AS u ON u.id = a.created_by" .
|
||||
"\n LEFT JOIN #__groups AS g ON a.access = g.id".
|
||||
$voting['join'].
|
||||
@ -154,16 +152,9 @@ class JModelFrontpage extends JObject
|
||||
$rows = array();
|
||||
foreach ($Arows as $row)
|
||||
{
|
||||
if (($row->sec_pub == 1 && $row->cat_pub == 1) || ($row->sec_pub == '' && $row->cat_pub == ''))
|
||||
{
|
||||
// check to determine if section or category is published
|
||||
if (($row->sec_access <= $gid && $row->cat_access <= $gid) || ($row->sec_access == '' && $row->cat_access == ''))
|
||||
{
|
||||
// check to determine if section or category has proper access rights
|
||||
$rows[$i] = $row;
|
||||
$i ++;
|
||||
}
|
||||
}
|
||||
// check to determine if section or category has proper access rights
|
||||
$rows[$i] = $row;
|
||||
$i ++;
|
||||
}
|
||||
$this->_content = $rows;
|
||||
}
|
||||
@ -217,9 +208,6 @@ class JModelFrontpage extends JObject
|
||||
"\n AND ( publish_down = '$nullDate' OR publish_down >= '$now' )";
|
||||
}
|
||||
|
||||
$where .= "\n AND s.published = 1";
|
||||
$where .= "\n AND cc.published = 1";
|
||||
|
||||
return $where;
|
||||
}
|
||||
}
|
||||
|
@ -90,6 +90,26 @@ class JInstallation extends JApplication
|
||||
{
|
||||
return 'template';
|
||||
}
|
||||
|
||||
/**
|
||||
* Return a reference to the JDocument object
|
||||
*
|
||||
* @access public
|
||||
* @since 1.5
|
||||
*/
|
||||
function &getDocument($type = 'html')
|
||||
{
|
||||
if(is_object($this->_document)) {
|
||||
return $this->_document;
|
||||
}
|
||||
|
||||
$doc =& parent::getDocument($type);
|
||||
|
||||
//set base URL
|
||||
$doc->setBase( $this->getBaseURL() );
|
||||
|
||||
return $this->_document;
|
||||
}
|
||||
|
||||
/**
|
||||
* Create the user session
|
||||
|
@ -1,38 +0,0 @@
|
||||
<?php
|
||||
/**
|
||||
* @version $Id$
|
||||
* @package Joomla
|
||||
* @copyright Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved.
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php
|
||||
* Joomla! is free software. This version may have been modified pursuant
|
||||
* to the GNU General Public License, and as distributed it includes or
|
||||
* is derivative of works licensed under the GNU General Public License or
|
||||
* other free or open source software licenses.
|
||||
* See COPYRIGHT.php for copyright notices and details.
|
||||
*/
|
||||
|
||||
// no direct access
|
||||
defined( '_JEXEC' ) or die( 'Restricted access' );
|
||||
|
||||
/**
|
||||
* Initialise the document
|
||||
*
|
||||
* @param object $doc The document instance to initialise
|
||||
*/
|
||||
function initDocument(&$doc, $file = 'index.html')
|
||||
{
|
||||
global $mainframe;
|
||||
|
||||
$lang =& $mainframe->getLanguage();
|
||||
|
||||
$template = $mainframe->getTemplate();
|
||||
|
||||
$version = new JVersion();
|
||||
|
||||
if ($lang->isRTL()) {
|
||||
$doc->addStyleSheet( 'template/css/template_rtl.css' );
|
||||
} else {
|
||||
$doc->addStyleSheet( 'template/css/template.css' );
|
||||
}
|
||||
}
|
||||
?>
|
@ -16,7 +16,6 @@ define( 'JPATH_BASE', dirname( __FILE__ ) );
|
||||
|
||||
require_once( JPATH_BASE .'/includes/defines.php' );
|
||||
require_once( JPATH_BASE .'/includes/application.php' );
|
||||
require_once( JPATH_BASE .'/includes/template.php' );
|
||||
|
||||
// create the mainframe object
|
||||
$mainframe = new JInstallation();
|
||||
|
@ -22,4 +22,5 @@ GUEST=%s guest
|
||||
GUESTS=%s guests
|
||||
MEMBER=%s member
|
||||
MEMBERS=%s members
|
||||
WHO`S ONLINE=Who`s Online
|
||||
WE HAVE= We have
|
||||
WHO`S ONLINE=Who`s Online
|
||||
|
@ -200,7 +200,8 @@ class JMenu extends JObject
|
||||
$user = & $mainframe->getUser();
|
||||
$sql = "SELECT *" .
|
||||
"\n FROM #__menu" .
|
||||
"\n WHERE published = 1";
|
||||
"\n WHERE published = 1".
|
||||
"\n ORDER BY parent, ordering";
|
||||
|
||||
$db->setQuery($sql);
|
||||
if (!($menus = $db->loadObjectList('id'))) {
|
||||
|
@ -54,7 +54,7 @@ class mosMainFrame extends JApplication
|
||||
* the mos_sessions table.
|
||||
*/
|
||||
function initSession( ) {
|
||||
//do nothing, contructor handles session creation
|
||||
$this->setSession($this->getCfg('live_site').$this->getClientId());
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -54,7 +54,7 @@ class patTemplate_Renderer_Component extends patTemplate_Renderer
|
||||
}
|
||||
|
||||
$component = !isset($component) ? $option : $component;
|
||||
|
||||
|
||||
/*
|
||||
* Check to see if component is enabled and get parameters
|
||||
*/
|
||||
|
@ -1 +0,0 @@
|
||||
<html><body bgcolor="#FFFFFF"></body></html>
|
Loading…
Reference in New Issue
Block a user