Small change to theme.xml naming for plugin installation.

e107_admin/plugin.php

@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/plugin.php,v $
-|     $Revision: 1.39 $
+|     $Revision: 1.40 $
-|     $Date: 2009-08-28 16:10:57 $
+|     $Date: 2009-08-31 14:37:24 $
-|     $Author: marj_nl_fr $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
@@ -1028,7 +1028,7 @@ class pluginManager{
 			$emessage->add($message, $type, $session);
 		}
 
-        function pluginOptions()
+        function pluginMenuOptions()
 		{
 		   //	$e107 = &e107::getInstance();
 
@@ -1057,7 +1057,7 @@ class pluginManager{
 function plugin_adminmenu()
 {
 	global $pman;
-	$pman -> pluginOptions();
+	$pman -> pluginMenuOptions();
 }
 
 ?>

e107_handlers/theme_handler.php

@@ -9,9 +9,9 @@
  * e107 Admin Theme Handler
  *
  * $Source: /cvs_backup/e107_0.8/e107_handlers/theme_handler.php,v $
- * $Revision: 1.49 $
+ * $Revision: 1.50 $
- * $Date: 2009-08-27 12:58:29 $
+ * $Date: 2009-08-31 14:37:24 $
- * $Author: secretr $
+ * $Author: e107coders $
 */
 
 if (!defined('e107_INIT')) { exit; }
@@ -678,11 +678,11 @@ class themeHandler{
                     <td style='vertical-align:top; width:24%;'><b>".TPVLAN_53."</b></td>
 					<td colspan='2' style='vertical-align:top width:auto;'>";
 
-					if(varset($theme['pluginOptions']))
+					if(varset($theme['plugins']))
 					{
-						foreach($theme['pluginOptions'] as $key=>$val)
+						foreach($theme['plugins'] as $key=>$val)
 						{
-	                  		$text .= $this->renderPlugins($theme['pluginOptions']);
+	                  		$text .= $this->renderPlugins($theme['plugins']);
 							$text .= "&nbsp;";
 						}
 					}
@@ -917,11 +917,11 @@ class themeHandler{
 		return $text;
 	}
 
-    function renderPlugins($pluginOptions)
+    function renderPlugins($pluginOpts)
 	{
 		global $frm,$sql;
 
-     	$tmp = (varset($pluginOptions['plugin'][1])) ? $pluginOptions['plugin'] :  $pluginOptions;   // if there is 1 entry, then it's not the same array.
+     	$tmp = (varset($pluginOpts['plugin'][1])) ? $pluginOpts['plugin'] :  $pluginOpts;   // if there is 1 entry, then it's not the same array.
         $text = "";
 
 		foreach($tmp as $p)

e107_themes/_blank/theme.xml

@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id: theme.xml,v 1.8 2009-08-31 02:22:00 e107coders Exp $ -->  
+<!-- $Id: theme.xml,v 1.9 2009-08-31 14:37:24 e107coders Exp $ -->  
 <e107Theme name="blank" version="0.1" date="2008-12-01" compatibility="0.8">
 	<author name ="Desislav Yosifov [SonicE]" email="support@free-source.net" url="http://free-source.net" />
 	<description>Blank e107 admin theme</description>
 	<compliance xhtml="1.1" css="2.1" />
-
+    <plugins>
+		<plugin name='chatbox_menu' url='core' />
+	</plugins>
 	<layouts>
 		<layout name='default' title='3 Columns' preview='preview.jpg' previewFull='preview_full.png' default='true' >
 		<menuPresets>
@@ -23,7 +25,4 @@
 		<custompages>usersettings.php</custompages>
 		</layout>
 	</layouts>
-    <pluginOptions>
-		<plugin name='chatbox_menu' url='core' />
-	</pluginOptions>
 </e107Theme>

e107_themes/e107v4a/theme.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id: theme.xml,v 1.16 2009-08-31 02:22:00 e107coders Exp $ -->  
+<!-- $Id: theme.xml,v 1.17 2009-08-31 14:37:24 e107coders Exp $ -->  
 <e107Theme name="e107.v4" version="3.0" date="2003-06-11" compatibility="0.8" releaseUrl='http://www.e107.org/themeupdate.php'>
 	<author name ="Steve Dunstan [jalist]" email="jalist@e107.org" url="http://e107.org" />
 	<description>Classic e107 theme</description>
 	<compliance xhtml="1.1" css="2.1" />
 	<category>generic</category>
-	<pluginOptions>
+	<plugins>
 		<plugin name='chatbox_menu' url='core' />
 		<plugin name='poll' url='core' />
-	</pluginOptions>
+	</plugins>
 	<layouts>
 		<layout name='3_column' title='3 Columns' preview='preview.jpg' previewFull='preview_full.png' default='true' >
 		<menuPresets>

install_.php

@@ -9,8 +9,8 @@
 * Installation file
 *
 * $Source: /cvs_backup/e107_0.8/install_.php,v $
-* $Revision: 1.30 $
+* $Revision: 1.31 $
-* $Date: 2009-08-31 02:49:02 $
+* $Date: 2009-08-31 14:37:24 $
 * $Author: e107coders $
 *
 */
@@ -939,7 +939,7 @@ class e_install
 		{
 			if($themeInfo = $this->get_theme_xml($this->previous_steps['prefs']['sitetheme']))
 			{
-				foreach($themeInfo['pluginOptions']['plugin'] as $k=>$plug) //TODO refactor pluginOptions as 'plugins' in theme.xml etc
+				foreach($themeInfo['plugins']['plugin'] as $k=>$plug) 
 				{
 					 $this->install_plugin($plug['@attributes']['name']);	
 				}