diff --git a/oss/joomla/trunk/administrator/components/com_admin/admin.admin.html.php b/oss/joomla/trunk/administrator/components/com_admin/admin.admin.html.php
new file mode 100644
index 00000000..336ac332
--- /dev/null
+++ b/oss/joomla/trunk/administrator/components/com_admin/admin.admin.html.php
@@ -0,0 +1,335 @@
+setBuffer($contents, 'modules', 'submenu');
+ ?>
+
+
+
+ /','',$changelog);
+
+ // Convert all other HTML entities
+ echo htmlentities($changelog);
+ ?>
+
+ '. JText::_( 'Writable' ) .'';
+ $unwriteable = ''. JText::_( 'Unwritable' ) .'';
+
+ echo '';
+ echo '| ';
+ echo $text;
+ if ( $visible ) {
+ echo $folder . '/';
+ }
+ echo ' | ';
+ echo '';
+ if ( $relative ) {
+ echo is_writable( "../$folder" ) ? $writeable : $unwriteable;
+ } else {
+ echo is_writable( "$folder" ) ? $writeable : $unwriteable;
+ }
+ echo ' | ';
+ echo '
';
+}
+
+/**
+ * Compiles the help table of contents
+ * @param string A specific keyword on which to filter the resulting list
+ */
+function getHelpTOC( $helpsearch )
+{
+ global $mainframe;
+
+ $lang =& JFactory::getLanguage();
+ jimport( 'joomla.filesystem.folder' );
+
+ $helpurl = $mainframe->getCfg('helpurl');
+
+ // Check for files in the actual language
+ $langTag = $lang->getTag();
+ if( !JFolder::exists( JPATH_BASE.DS.'help'.DS.$langTag ) ) {
+ $langTag = 'en-GB'; // use english as fallback
+ }
+ $files = JFolder::files( JPATH_BASE.DS.'help'.DS.$langTag, '\.xml$|\.html$' );
+
+ $toc = array();
+ foreach ($files as $file) {
+ $buffer = file_get_contents( JPATH_BASE.DS.'help'.DS.$langTag.DS.$file );
+ if (preg_match( '#(.*?)#', $buffer, $m )) {
+ $title = trim( $m[1] );
+ if ($title) {
+ if ($helpurl) {
+ // strip the extension
+ $file = preg_replace( '#\.xml$|\.html$#', '', $file );
+ }
+ if ($helpsearch) {
+ if (JString::strpos( strip_tags( $buffer ), $helpsearch ) !== false) {
+ $toc[$file] = $title;
+ }
+ } else {
+ $toc[$file] = $title;
+ }
+ }
+ }
+ }
+ asort( $toc );
+ return $toc;
+}
diff --git a/oss/joomla/trunk/administrator/components/com_admin/admin.admin.php b/oss/joomla/trunk/administrator/components/com_admin/admin.admin.php
new file mode 100644
index 00000000..eae282ec
--- /dev/null
+++ b/oss/joomla/trunk/administrator/components/com_admin/admin.admin.php
@@ -0,0 +1,48 @@
+