Permalink
Browse files

Cleaned trailing white space

git-svn-id: http://joomlacode.org/svn/joomla/development/trunk@1339 6f6e1ebd-4c2b-0410-823f-f34bde69bce9
  • Loading branch information...
1 parent ae8d984 commit 0c196c8e01301237072b2b7e1bbcbef5c4918c10 @eddieajau eddieajau committed Dec 7, 2005
Showing with 394 additions and 392 deletions.
  1. +3 −3 CHANGELOG.php
  2. +1 −1 administrator/components/com_config/admin.config.html.php
  3. +1 −1 administrator/components/com_content/admin.content.html.php
  4. +1 −1 administrator/components/com_content/admin.content.php
  5. +1 −1 administrator/components/com_installer/toolbar.installer.html.php
  6. +1 −1 administrator/components/com_mambots/toolbar.mambots.html.php
  7. +1 −1 administrator/components/com_media/admin.media.html.php
  8. +1 −1 administrator/components/com_media/admin.media.php
  9. +1 −1 administrator/components/com_modules/admin.modules.html.php
  10. +1 −1 administrator/components/com_modules/admin.modules.php
  11. +3 −3 administrator/components/com_modules/toolbar.modules.html.php
  12. +1 −1 administrator/components/com_modules/toolbar.modules.php
  13. +1 −1 administrator/components/com_newsfeeds/toolbar.newsfeeds.html.php
  14. +1 −1 administrator/components/com_poll/admin.poll.html.php
  15. +2 −2 administrator/components/com_poll/admin.poll.php
  16. +3 −3 administrator/components/com_users/admin.users.php
  17. +2 −2 administrator/components/com_weblinks/toolbar.weblinks.html.php
  18. +1 −1 administrator/includes/administrator.php
  19. +1 −1 administrator/index.php
  20. +1 −1 components/com_contact/contact.class.php
  21. +13 −13 components/com_content/content.php
  22. +2 −2 components/com_search/search.html.php
  23. +1 −1 includes/joomla.php
  24. +2 −2 index.php
  25. +2 −2 index2.php
  26. +1 −1 installation/includes/installation.php
  27. +1 −1 libraries/joomla/cache.php
  28. +42 −42 libraries/joomla/classes/app.class.php
  29. +131 −131 libraries/joomla/classes/page.class.php
  30. +11 −11 libraries/joomla/classes/pathway.class.php
  31. +38 −38 libraries/joomla/connectors/ftp.class.php
  32. +7 −7 libraries/joomla/editor.php
  33. +13 −13 libraries/joomla/events.php
  34. +2 −2 libraries/joomla/files.php
  35. +8 −8 libraries/joomla/help.php
  36. +1 −0 libraries/joomla/html.php
  37. +12 −12 libraries/joomla/language.php
  38. +1 −1 libraries/joomla/legacy.php
  39. +43 −43 libraries/joomla/registry/engines/database.php
  40. +5 −4 libraries/joomla/registry/formats/ini.php
  41. +5 −5 libraries/joomla/registry/formats/xml.php
  42. +13 −13 libraries/joomla/registry/main.php
  43. +6 −6 libraries/pattemplate/patTemplate/Function/Placeholder.php
  44. +1 −1 mambots/search/categories.searchbot.php
  45. +1 −1 mambots/search/weblinks.searchbot.php
  46. +1 −1 modules/mod_mostread.php
  47. +1 −1 modules/mod_poll.php
  48. +1 −1 templates/_system/error.php
  49. +1 −1 templates/_system/offline.php
View
@@ -37,7 +37,7 @@
^ Upgraded TinyMCE Compressor [1.0.4]
^ Upgraded TinyMCE [2.0.1]
+ Added locale metadata to language xml file (used in setLocale function)
-
+
06-Dec-2005 Alex Kempkens
^ Installer to detect languages in correct folders
^ Added capability for the installer to install language dependend sample data
@@ -47,7 +47,7 @@
06-Dec-2005 Johan Janssens
# Fixed artf2418 : Banners Client Manager Next Page Issue: Joomla 1.04
- # Fixed artf2378 : mosCommonHTML::CheckedOutProcessing not checking if the current user
+ # Fixed artf2378 : mosCommonHTML::CheckedOutProcessing not checking if the current user
has checked out the document
# Fixed artf1948 : Pagination problem still exists
# Fixed artf2457 : VCard bug IS a bug
@@ -72,7 +72,7 @@
01-Dec-2005 Johan Janssens
+ Added new JPage class for flexible page head handling
- - Removed favicon configuration setting, system looks in template folder or root
+ - Removed favicon configuration setting, system looks in template folder or root
folder for a favicon.ico file
30-Nov-2005 Emir Sakic
@@ -798,7 +798,7 @@ function changeDirPermsMode(mode)
<input type="hidden" name="config_secret" value="<?php echo $row->config_secret; ?>"/>
<input type="hidden" name="config_multilingual_support" value="<?php echo $row->config_multilingual_support; ?>"/>
<input type="hidden" name="config_lang" value="<?php echo $row->config_lang; ?>"/>
- <input type="hidden" name="config_lang_administrator" value="<?php echo $row->config_lang_administrator; ?>"/>
+ <input type="hidden" name="config_lang_administrator" value="<?php echo $row->config_lang_administrator; ?>"/>
<input type="hidden" name="task" value=""/>
</form>
@@ -1182,7 +1182,7 @@ function submitbutton(pressbutton) {
</form>
<?php
}
-
+
function previewContent()
{
?>
@@ -119,7 +119,7 @@
case 'saveorder':
saveOrder( $cid );
break;
-
+
case 'preview' :
previewContent($id, $option);
break;
@@ -26,7 +26,7 @@ function _DEFAULT() {
}
function _DEFAULT2() {
-
+
$type = mosGetParam($_REQUEST, 'element');
mosMenuBar::startTable();
@@ -22,7 +22,7 @@ class TOOLBAR_modules {
*/
function _EDIT() {
global $id;
-
+
$text = $id ? JText::_('Edit') : JText::_('New');
mosMenuBar::startTable();
@@ -453,7 +453,7 @@ function deleteFolder(folder, numFiles) {
</style>
<?php
}
-
+
function popupUpload( $basePath ) {
global $mosConfig_absolute_path;
@@ -81,7 +81,7 @@ function makeSafe( $file ) {
case 'cancel':
mosRedirect( 'index2.php' );
break;
-
+
// popup directory creation interface for use by components
case 'popupDirectory':
HTML_Media::popupDirectory( COM_MEDIA_BASEURL );
@@ -407,7 +407,7 @@ function submitbutton(pressbutton) {
</form>
<?php
}
-
+
function previewModule()
{
?>
@@ -82,7 +82,7 @@
case 'saveorder':
saveOrder( $cid, $client );
break;
-
+
case 'preview' :
previewModule($id, $client);
break;
@@ -40,13 +40,13 @@ function _NEW($client) {
*/
function _EDIT( $publish, $module = '', $client ) {
global $id;
-
+
mosMenuBar::startTable();
mosMenuBar::title( JText::_( $client ). JText::_( 'Module' ).' <small><small>[ Edit ]</small></small>', 'module.png' );
-
+
if($module == '') {
mosMenuBar::Preview('index3.php?option=com_modules&client='.$client.'&pollid='.$id);
- }
+ }
mosMenuBar::spacer();
mosMenuBar::save();
mosMenuBar::spacer();
@@ -29,7 +29,7 @@
} else {
$mid = $cid[0];
}
-
+
$published = 0;
if ( $mid ) {
$query = "SELECT published, module"
@@ -38,7 +38,7 @@ function _DEFAULT() {
}
function _NEW() {
-
+
mosMenuBar::startTable();
mosMenuBar::title( JText::_( 'Newsfeed' ).'<small>'.JText::_( 'New' ) .'</small>' );
mosMenuBar::save();
@@ -197,7 +197,7 @@ function submitbutton(pressbutton) {
</form>
<?php
}
-
+
function previewPoll($title, $options)
{
?>
@@ -60,7 +60,7 @@
case 'cancel':
cancelPoll( $option );
break;
-
+
case 'preview':
previewPoll($option);
break;
@@ -273,7 +273,7 @@ function cancelPoll( $option ) {
function previewPoll($option) {
global $database;
-
+
$pollid = mosGetParam( $_REQUEST, 'pollid', 0 );
$css = mosGetParam( $_REQUEST, 't', '' );
@@ -414,17 +414,17 @@ function removeUsers( $cid, $option ) {
if (count( $cid )) {
//load user bot group
-
+
JBotLoader::importGroup( 'user' );
-
+
$obj = new mosUser( $database );
foreach ($cid as $id) {
// check for a super admin ... can't delete them
$objectID = $acl->get_object_id( 'users', $id, 'ARO' );
$groups = $acl->get_object_groups( $objectID, 'ARO' );
$this_group = strtolower( $acl->get_group_name( $groups[0], 'ARO' ) );
-
+
//trigger the onBeforeDeleteUser event
$results = $mainframe->triggerEvent( 'onBeforeDeleteUser', array( array( 'id' => $id ) ) );
@@ -23,8 +23,8 @@ class TOOLBAR_weblinks {
function _EDIT() {
global $id;
- $text = $id ? JText::_( 'Edit' ) : JText::_( 'New' );
-
+ $text = $id ? JText::_( 'Edit' ) : JText::_( 'New' );
+
mosMenuBar::startTable();
mosMenuBar::title( JText::_( 'Weblink' ). '<small>'. $text .'</small>' );
mosMenuBar::save();
@@ -34,7 +34,7 @@
require_once( JPATH_SITE . '/configuration.php' );
require_once( JPATH_LIBRARIES . '/loader.php' );
-define( 'JURL_SITE', $mosConfig_live_site );
+define( 'JURL_SITE', $mosConfig_live_site );
if (phpversion() < '4.2.0') {
jimport('joomla.compat.php41x' );
@@ -53,7 +53,7 @@
} else {
mosErrorAlert( JText::_( 'validUserPassAccess' ), "document.location.href='index.php'" );
}
-}
+}
initGzip();
header( 'Content-Type: text/html; charset=UTF-8');
@@ -106,7 +106,7 @@ function setAddress( $postoffice='', $extended='', $street='', $city='', $region
}
$key.= ';ENCODING=QUOTED-PRINTABLE';
- $return = encode( $postoffice );
+ $return = encode( $postoffice );
$return .= $separator . encode( $extended );
$return .= $separator . encode( $street );
$return .= $separator . encode( $city );
@@ -278,7 +278,7 @@ function showSection( $id, $gid, &$access, $now ) {
// Dynamic Page Title
$mainframe->SetPageTitle( $menu->name );
-
+
/*
* Handle Pathway
*/
@@ -495,14 +495,14 @@ function showCategory( $id, $gid, &$access, $sectionid, $limit, $selected, $limi
// Dynamic Page Title
$mainframe->SetPageTitle( $pagetitle );
-
+
/*
* Handle Pathway
*/
// Section
$section = new mosSection($database);
$section->load($category->section);
-
+
$mainframe->appendPathWay( $section->title, sefRelToAbs( 'index.php?option=com_content&amp;task=section&amp;id='. $category->section .'&amp;Itemid='.$menu->id ));
// Category
$mainframe->appendPathWay( $category->title, '');
@@ -565,10 +565,10 @@ function showBlogSection( $id=0, $gid, &$access, $pop, $now=NULL ) {
if ($menu) {
$mainframe->setPageTitle( $menu->name );
}
-
+
// Append Blog to pathway
$mainframe->appendPathWay( 'Blog', '');
-
+
BlogOutput( $rows, $params, $gid, $access, $pop, $menu );
}
@@ -627,7 +627,7 @@ function showBlogCategory( $id=0, $gid, &$access, $pop, $now ) {
// Append Blog to pathway
$mainframe->appendPathWay( 'Blog', '');
-
+
BlogOutput( $rows, $params, $gid, $access, $pop, $menu );
}
@@ -710,7 +710,7 @@ function showArchiveSection( $id=NULL, $gid, &$access, $pop, $option ) {
// Append Archives to pathway
$mainframe->appendPathWay( 'Archives', '');
-
+
if ( !$archives ) {
// if no archives for category, hides search and outputs empty message
echo '<br /><div align="center">'. JText::_( 'CATEGORY_ARCHIVE_EMPTY' ) .'</div>';
@@ -801,7 +801,7 @@ function showArchiveCategory( $id=0, $gid, &$access, $pop, $option, $now ) {
// Append Archives to pathway
$mainframe->appendPathWay( 'Archives', '');
-
+
if ( !$archives ) {
// if no archives for category, hides search and outputs empty message
echo '<br /><div align="center">'. JText::_( 'CATEGORY_ARCHIVE_EMPTY' ) .'</div>';
@@ -1136,18 +1136,18 @@ function showItem( $uid, $gid, &$access, $pop, $option, $now ) {
if ($mosConfig_MetaAuthor=='1') {
$mainframe->addMetaTag( 'author' , $row->author );
}
-
+
/*
* Handle Pathway
*/
-
+
// We need the Itemid because we haven't eliminated it
$query = "SELECT a.id"
. "\n FROM #__menu AS a"
. "\n WHERE a.componentid = ". $row->sectionid;
$database->setQuery( $query );
$_Itemid = $database->loadResult();
-
+
if (!empty($_Itemid)) {
// Section
if (!empty($row->section)) {
@@ -1160,8 +1160,8 @@ function showItem( $uid, $gid, &$access, $pop, $option, $now ) {
}
// Item
$mainframe->appendPathWay( $row->title, '');
-
-
+
+
show( $row, $params, $gid, $access, $pop, $option );
} else {
@@ -38,13 +38,13 @@ function openhtml( $params ) {
*/
function searchbox( $searchword, &$lists, $params, &$areas ) {
global $Itemid;
-
+
$showAreas = mosGetParam( $lists, 'areas', array() );
$allAreas = array();
foreach ($showAreas as $area) {
$allAreas = array_merge( $allAreas, $area );
}
-
+
?>
<form action="index.php" method="get">
<input type="hidden" name="option" value="com_search" />
View
@@ -36,7 +36,7 @@
require_once( JPATH_SITE . '/configuration.php' );
require_once( JPATH_LIBRARIES . '/loader.php' );
-define( 'JURL_SITE', $mosConfig_live_site );
+define( 'JURL_SITE', $mosConfig_live_site );
if (phpversion() < '4.2.0') {
jimport('joomla.compat.php41x' );
View
@@ -54,7 +54,7 @@
} else {
mosRedirect( 'index.php' );
}
-}
+}
if ($option == 'logout') {
$mainframe->logout();
@@ -148,7 +148,7 @@
if ($mainframe->getCfg('offline') && $my->gid < '23' ) {
$file = 'offline.php';
-}
+}
$layout = new JLayout();
$layout->parse($cur_template, $file);
View
@@ -58,7 +58,7 @@
} else {
mosRedirect( 'index.php' );
}
-}
+}
if ($option == 'logout') {
$mainframe->logout();
@@ -95,7 +95,7 @@
$file = 'index2.php';
// displays offline/maintanance page or bar
-if ($mainframe->getCfg('offline') && $my->gid < '23') {
+if ($mainframe->getCfg('offline') && $my->gid < '23') {
$file = 'offline.php';
}
@@ -35,7 +35,7 @@
$url = str_replace( 'installation/', '', $url );
$url = str_replace( '/index.php', '', $url );
-define( 'JURL_SITE', $url);
+define( 'JURL_SITE', $url);
if (phpversion() < '4.2.0') {
Oops, something went wrong.

0 comments on commit 0c196c8

Please sign in to comment.