Merge lp:~edb/quam-plures/main_link_in_menu_widget into lp:quam-plures

[EdB]

http://forums.quamplures.net/viewtopic.php?f=11&t=889

This branch adds a "Main" option in the menu widget that points to $app_baseurl. This branch also fixes how you can't suggest a widget with params in a template. More on that at http://forums.quamplures.net/viewtopic.php?f=11&t=827

To test this branch you will need a template that suggests a widget with params, so I put some code in the forum thread that shows how to do that. Edit the template then create a new blog with that template and you will see the new "Main" widget installed with params.

[Lee Turner (leeturner)]

Just downloading this now. Will test tonight or tomorrow.

L

[Lee Turner (leeturner)]

OK, this all looks cool as far as I can tell but I do have questions. The 'Main' menu option works fine although I never realised you couldn't change the text for those menu items. That might be something for us to look at in a different branch in the future. I am sure we will get someone saying they want to change 'Main' or 'Home' etc. However, for this branch this is all good.

The suggestive template code also looks good from what I could tell. The only question I have is how will template authors know about it and understand how to use it? Is this going to be in the phpdocs or something? The reason I ask is because (from what I can tell) the existence of an empty method (to provide a method signature and some phpdocs) means no widgets will be installed (basically the template is suggesting no widgets get installed) and this is probably not what the template author wants.

review: Needs Information

[Lee Turner (leeturner)]

Also, the reason I mentioned phpdocs is that it takes a little digging to figure out what codes and param names to return in the array. Without some guidance I am not sure the average template dev would know what they were looking for.

L

[EdB (edb)]

On "suggestive templates", the best way to show it will be with an example but I don't really have a good one handy. Yabs had a branch for a photoblog-like template that I haven't even really looked at. Perhaps we can use it to showcase this feature? Plus not using evo template names as defaults would be nice.

But yeah it's a completely undocumented feature at this point so I'm going to mark this "needs fixing" and give some effort on somehow coding up an example of usage. Not even sure if core installation will trigger this little routine or if we have to use canned widgets for that, so that's something to consider.

Worst-case would be using a combination of "create a new blog with {this} template and see {this page} in autodocs".

review: Needs Fixing

[EdB (edb)]

Autodocs is hard to trust right now because it doesn't get updated with each branch merge. Having said that, I don't think I went after making sure it is "friendlier than default" with regard to finding the params that matter.

IMHO examples will be much better than autodocs.

[Lee Turner (leeturner)]

Yeah, an example would be a good way to go. I am totally fine with how it all works though if you want me to approve it and have a separate branch for coding up the example etc?

L

[EdB (edb)]

Let me get some sort of example/explanation in. Couple of days for it I reckon...

[lp:~edb/quam-plures/main_link_in_menu_widget]

7614. By EdB on 2011-08-21

photoblog uses the new feature, but another "bug" shows up and it still needs a sample post

[EdB (edb)]

Update: photoblog now installs it's own widgets, BUT we can't install the same widget name twice this way. The problem is that the widget name is used as a key and array_merge which means the later value for that key will overwrite the previous one (per php.net).

Also, the sample post about widgets needs to say something like "if you're writing templates check out how photoblog injects it's own widgets" or some such. That is easy, the first one is why it'll be another day or so.

[Lee Turner (leeturner)]

Is this the same widget per container or that we can't install the same widget across all containers?

L

[lp:~edb/quam-plures/main_link_in_menu_widget]

7615. By EdB on 2011-08-21

multiple widgets with same type can be installed in the same container, re-ordered "add widget" list a bit

7616. By EdB on 2011-08-21

finished issue with multiple same-code widgets, documented for autodocs, updated sample post to say where to see an example

[EdB (edb)]

The problem was having 2 "menu_link" widgets in one container. Array keys as strings can't be duplicated is the problem. ('Header' => array( 'menu_link' => array( foo... ), 'menu_link' => array( bar... ) ) ) won't work due to that is how PHP is.

My solution was to give the widgets numeric keys then untangle them when we really want to install the widgets. Containers still go by string keys because (duh) we can't be having 2 containers called "Header" in the same template.

Also done is everything else. Sample post about widgets says check out photoblog template file, autodocs shows example and says some shit about it, and marginally related the order of widgets when adding new widgets is different.

review: Needs Resubmitting

[Lee Turner (leeturner)]

Downloaded and tested. Looking good from what I can see.

review: Approve

[lp:~edb/quam-plures/main_link_in_menu_widget]

7617. By EdB on 2011-08-25

core to 7614

[Tilman Blumenbach (tblue)]

Will look at this tomorrow. It's almost 12 am here and I need some sleep.

[lp:~edb/quam-plures/main_link_in_menu_widget]

7618. By EdB on 2011-08-26

core up to 7618

[Tilman Blumenbach (tblue)]

Hm, I'm wondering what's the purpose of this bit? :)

// do a mysql_real_escape_string to each $key and $value in 'params'
foreach( $settings['params'] as $key => $value )
{
    if( $DB->escape( $key ) != $key ) { die( 'invalid params key in widget: '.$key ); }
    if( $DB->escape( $value ) != $value ) { die( 'invalid params value in widget: '.$value ); }
}

[Tilman Blumenbach (tblue)]

Let's try out some review statuses. See last message,

review: Needs Information

[EdB (edb)]

One should always escape inputs to a db, but if we escape something we serialized it will put a \ before each " that serialize makes in the params field. So we can't escape if we want it to work. BUT we should escape before storing. The examples given frequently of why you need to escape involve putting extra commands into the mysql query string, which involve typically something that escaping will put a \ in front of.

Therefore I figured if we compare the escaped version to the original version and we detect a change we simply assume it is bad and die for it. A template author will see the problem and be mad, but a malicious author will not be able to distribute a template that is allowed to do (potentially) bad things ... even if it also blocks an occasional "good" use.

That is way too long for a comment in code though eh?

BTW I don't know how someone can do something malicious with a bad command in there, but if we don't at least check we open a door that might be exploitable.

[Tilman Blumenbach (tblue)]

Hm, I removed the die() bits and named a widget 'Menu" link' (note the double quote) -- everything seems to work safely...?

[EdB (edb)]

Yes, that is true. Then again adding a double-quote is not malicious behavior. The thing is if we do not check then we open a door, and the params for a widget simply do not need any of the characters that mysql_real_escape_string will escape. In other words a well-made template will never fail for that check, and a template made with malicious intent (even though I have no idea how that could happen) will not install.

One thing I'm about to push though is a change in the die() message. It should (and will) say "unacceptable character in widget key|value" but won't actually say what that problem is.

Also, no one will ever be able to say we are not escaping our database inputs :)

[lp:~edb/quam-plures/main_link_in_menu_widget]

7619. By EdB on 2011-08-26

changed die() message if mysql_real_escape_string blocks a widget

[Tilman Blumenbach (tblue)]

Well, I'm willing to accept the code if you say that the die() will not be triggered _too_ frequently ;) On the other hand, aren't we escaping our database inputs as we are doing $DB->quote( serialize( ... ) ) anyway?

Just one note: Maybe better use debug_die()? That produces a "nice" Red Screen of Death.

[EdB (edb)]

Personally I don't think it will be, but perhaps SOMEWHERE I should document "do not use the characters that escaping will escape due to ... ". Auto-docs seems appropriate? BUT perhaps it doesn't matter given that you are correct: the DB->quote( whatever ) will do the escape thing prior to it entering the database.

Now I have to back up again in my head. hmmm... Originally it was "serialize then escape" which caused widgets with params to fail completely. I needed to get rid of escaping due to it was failing. See http://forums.quamplures.net/viewtopic.php?p=5670#p5670 for an example of what ended up in the database that did not work.

Clearly function quote($str) returns an escaped $str, yet what I see in the database now does not show slashes in front of the double-quote used to test. So the database is telling me it is not being escaped, yet obviously it is supposed to be.

MORE TESTING REQUIRED!

review: Needs Fixing

[lp:~edb/quam-plures/main_link_in_menu_widget]

7620. By EdB on 2011-08-27

changed die() to debug_die(), added more info for autodocs

[EdB (edb)]

see http://forums.quamplures.net/viewtopic.php?f=11&t=889&p=6009#p6009 please

[lp:~edb/quam-plures/main_link_in_menu_widget]

7621. By EdB on 2011-08-27

removed extraneous check, removed associated note in comments, change "ahve" to "have" in 3 places

[EdB (edb)]

removed extraneous check, removed associated note in comments, change "ahve" to "have" in 3 places

review: Needs Resubmitting

[Tilman Blumenbach (tblue)]

Works fine!

review: Approve

=== modified file 'qp_inc/plugins/_plugin.class.php'
--- qp_inc/plugins/_plugin.class.php	2011-02-04 04:06:29 +0000
+++ qp_inc/plugins/_plugin.class.php	2011-08-27 14:11:25 +0000
@@ -3078,7 +3078,7 @@
 		// Try default values:
 		$params = $this->get_coll_setting_definitions( $tmp_params = array('for_editing'=>true) );
 		if( isset( $params[$parname]['defaultvalue'] ) )
-		{	// We ahve a default value:
+		{	// We have a default value:
 			return $params[$parname]['defaultvalue'] ;
 		}
 

=== modified file 'qp_inc/templates/model/_template.class.php'
--- qp_inc/templates/model/_template.class.php	2010-12-31 12:12:03 +0000
+++ qp_inc/templates/model/_template.class.php	2011-08-27 14:11:25 +0000
@@ -87,13 +87,13 @@
 		);
 
 		if( is_null($db_row) )
-		{	// We are creating an object here:
+		{ // We are creating an object here:
 			$this->set( 'folder', $template_folder );
 			$this->set( 'name', $this->get_default_name() );
 			$this->set( 'type', $this->get_default_type() );
 		}
 		else
-		{	// Wa are loading an object:
+		{ // Wa are loading an object:
 			$this->ID = $db_row->template_ID;
 			$this->name = $db_row->template_name;
 			$this->folder = $db_row->template_folder;
@@ -112,7 +112,7 @@
 	{
 		// Look for containers in template file:
 		if( ! $this->discover_containers() )
-		{	// Error messages already added.
+		{ // Error messages already added.
 			return false;
 		}
 
@@ -134,25 +134,30 @@
 		global $DB, $Messages;
 		if( $default_widgets = $this->get_default_widgets( array( 'Blog' => & $edited_Blog ) ) )
 		{ // we have widgets
-			foreach( $default_widgets as $container => $widgets )
+			foreach( $default_widgets as $container => $numeric_key )
 			{
 				$count = 0;
-				foreach( $widgets as $widget => $settings )
+				foreach( $numeric_key as $numeric_widget )
 				{
-					$settings = array_merge( array(
-						'type' => 'widget',
-						'params' => array(),
-					), $settings );
-
-					$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code, wi_params )
-											 VALUES(
-											 	'.$edited_Blog->ID.',
-											 	'.$DB->quote( $container ).',
-											 	'.( ++$count ).',
-											 	'.$DB->quote( $settings['type'] ).',
-											 	'.$DB->quote( $widget ).',
-											 	'.$DB->quote( $DB->escape( serialize( $settings['params'] ) ) ).' )' );
-
+					foreach( $numeric_widget as $widget => $settings )
+					{
+						$settings = array_merge( array(
+							'type' => 'widget',
+							'params' => array(),
+						), $settings );
+
+						$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code, wi_params )
+							VALUES(
+								'.$edited_Blog->ID.',
+								'.$DB->quote( $container ).',
+								'.( ++$count ).',
+								'.$DB->quote( $settings['type'] ).',
+								'.$DB->quote( $widget ).',
+								'.$DB->quote( serialize( $settings['params'] ) ).'
+							)'
+						);
+
+					}
 				}
 			}
 			$Messages->add( T_('Default widgets have been set-up for this blog.'), 'success' );
@@ -161,9 +166,45 @@
 
 
 	/**
-	 * Get default widgets for template
-	 *
-	 * @todo yabs > document params, default_widgets_structure
+	 * Get default widgets for new blog
+	 *
+	 * The new blog's template can suggest/select a list of widgets.
+	 * If it does not a default list is used.
+	 *
+	 * A template can suggest/select any widget by identifying the container, and
+	 * each widget's code and type. The code can be 'widget' or 'plugin'. If
+	 * 'plugin' and the plugin is not installed nothing bad happens. I think.
+	 *
+	 * <code>
+	 * $default_widgets = array(
+	 *   'Header' => array(),
+	 *   'Menu' => array(),
+	 *   'Sidebar' => array(),
+	 * );
+	 * $default_widgets['Header'][] = array(
+	 *   'title' => array(
+	 *     'type' => 'widget',
+	 *   ),
+	 * );
+	 * $default_widgets['Menu'][] = array(
+	 *   'menu_link' => array(
+	 *     'type' => 'widget',
+	 *     'params' => array(
+	 *       'link_type'=>'ownercontact',
+	 *     ),
+	 *   ),
+	 * );
+	 * $default_widgets['Sidebar'][] = array(
+	 *   'calendar' => array(
+	 *     'type' => 'plugin',
+	 *   ),
+	 * );
+	 * </code>
+	 *
+	 * A widget installed with only code and type will have default values for
+	 * any parameters it may have.
+	 *
+	 * @todo (EdB/7618): verify/ensure each widget needs to identify it's own param possibilities
 	 *
 	 * @return array widgets for each container
 	 */
@@ -174,80 +215,105 @@
 			'Blog' => & $Blog,
 		), $params );
 
+		// Containers
 		$default_widgets = array(
-			'Page Top' => array(
-				'bloglist' => array(
-					'type' => 'widget',
-					'params' => array(
-						'coll_list_type' => ( $params['Blog']->get( 'in_bloglist' ) ? 'public' : 'owner' ),
-					),
-				),
-			),
-
-			'Header' => array(
-				'title' => array(
-					'type' => 'widget',
-				),
-				'tagline' => array(
-					'type' => 'widget',
-				),
-			),
-
-			'Menu' => array(
-				'menu_link' => array(
-					'type' => 'widget',
-					'params' => array(
-						'link_type'=>'home',
-					),
-				),
-				'page_list' => array(
-					'type' => 'widget',
-				),
-				'menu_link' => array(
-					'type' => 'widget',
-					'params' => array(
-						'link_type'=>'ownercontact',
-					),
-				),
-				'menu_link' => array(
-					'type' => 'widget',
-					'params' => array(
-						'link_type'=>'login',
-					),
-				),
-			),
-
-			'Sidebar' => array(
-				'calendar' => array(
-					'type' => 'plugin',
-				),
-				'title' => array(
-					'type' => 'widget',
-				),
-				'longdesc' => array(
-					'type' => 'widget',
-				),
-				'common_links' => array(
-					'type' => 'widget',
-				),
-				'search_form' => array(
-					'type' => 'widget',
-				),
-				'category_list' => array(
-					'type' => 'widget',
-				),
-				'xml_feeds' => array(
-					'type' => 'widget',
-				),
-			),
-		);
-
+			'Page Top' => array(),
+			'Header' => array(),
+			'Menu' => array(),
+			'Sidebar' => array(),
+		);
+
+		// Page Top widgets
+		$default_widgets['Page Top'][] = array(
+			'bloglist' => array(
+				'type' => 'widget',
+				'params' => array(
+					'coll_list_type' => ( $params['Blog']->get( 'in_bloglist' ) ? 'public' : 'owner' ),
+				),
+			),
+		);
+		// Header widgets
+		$default_widgets['Header'][] = array(
+			'title' => array(
+				'type' => 'widget',
+			),
+		);
+		$default_widgets['Header'][] = array(
+			'tagline' => array(
+				'type' => 'widget',
+			),
+		);
+		// Menu widgets
+		$default_widgets['Menu'][] = array(
+			'menu_link' => array(
+				'type' => 'widget',
+				'params' => array(
+					'link_type'=>'home',
+				),
+			),
+		);
+		$default_widgets['Menu'][] = array(
+			'page_list' => array(
+				'type' => 'widget',
+			),
+		);
+		$default_widgets['Menu'][] = array(
+			'menu_link' => array(
+				'type' => 'widget',
+				'params' => array(
+					'link_type'=>'ownercontact',
+				),
+			),
+		);
+		$default_widgets['Menu'][] = array(
+			'menu_link' => array(
+				'type' => 'widget',
+				'params' => array(
+					'link_type'=>'login',
+				),
+			),
+		);
+		// Sidebar widgets with numeric keys
+		$default_widgets['Sidebar'][] = array(
+			'calendar' => array(
+				'type' => 'plugin',
+			),
+		);
+		$default_widgets['Sidebar'][] = array(
+			'title' => array(
+				'type' => 'widget',
+			),
+		);
+		$default_widgets['Sidebar'][] = array(
+			'longdesc' => array(
+				'type' => 'widget',
+			),
+		);
+		$default_widgets['Sidebar'][] = array(
+			'common_links' => array(
+				'type' => 'widget',
+			),
+		);
+		$default_widgets['Sidebar'][] = array(
+			'search_form' => array(
+				'type' => 'widget',
+			),
+		);
+		$default_widgets['Sidebar'][] = array(
+			'category_list' => array(
+				'type' => 'widget',
+			),
+		);
+		$default_widgets['Sidebar'][] = array(
+			'xml_feeds' => array(
+				'type' => 'widget',
+			),
+		);
 
 		return $default_widgets;
-
 	}
 
-  /**
+	/**
 	 * Get default name for the template.
 	 * Note: the admin can customize it.
 	 */
@@ -257,7 +323,7 @@
 	}
 
 
-  /**
+	/**
 	 * Get default type for the template.
 	 */
 	function get_default_type()
@@ -275,7 +341,7 @@
 	}
 
 
-  /**
+	/**
 	 * Get credits for linkback on credits page.
 	 *
 	 * Each template can and should provide an array for credits for domains/authors
@@ -300,9 +366,9 @@
 	 *
 	 * 'pre' => T_('Design by') or T_('Inspired by') or T_('Ported by')
 	 * 'text' => the linked text - your name or domain name for example
-	 * 'post' => can be '' (empty), and can hold HTML if you want.  Please keep it reasonably short!
-	 * 'url' => REQUIRED (of course).  Without a URL there is no linkback!
-	 * 'title' => can be whatever you like, but should never be empty.  Use the URL if nothing else.
+	 * 'post' => can be '' (empty), and can hold HTML if you want. Please keep it reasonably short!
+	 * 'url' => REQUIRED (of course). Without a URL there is no linkback!
+	 * 'title' => can be whatever you like, but should never be empty. Use the URL if nothing else.
 	 *
 	 * @return array The credits array (see above).
 	 */
@@ -356,7 +422,7 @@
 	 * <code>
 	 * $params = array_merge( array( // stop annoying validation errors when container is <ul> and empty
 	 *   'container_start' => '<div id="%sco_name%" class="container">',
-	 *   'container_end'   => '</div>',
+	 *   'container_end' => '</div>',
 	 * ), $params );
 	 * </code>
 	 *
@@ -377,7 +443,7 @@
 
 		$params = array_merge( array( // stop annoying validation errors when container is <ul> and empty
 			'container_start' => '<div id="%sco_name%" class="container">',
-			'container_end'   => '</div>',
+			'container_end' => '</div>',
 		), $params );
 
 		$sco_dom_ID = preg_replace( '~[^a-z0-9]~i', '', ucwords( $sco_name ) );
@@ -443,7 +509,7 @@
 
 			// if( ! preg_match_all( '~ \$Template->container\( .*? (\' (.+?) \' )|(" (.+?) ") ~xmi', $file_contents, $matches ) )
 			if( ! preg_match_all( '~ (\$Template->|template_)container\( .*? ((\' (.+?) \')|(" (.+?) ")) ~xmi', $file_contents, $matches ) )
-			{	// No containers in this file
+			{ // No containers in this file
 				continue;
 			}
 
@@ -454,14 +520,14 @@
 			foreach( $container_list as $container )
 			{
 				if( empty($container) )
-				{	// regexp empty match
+				{ // regexp empty match
 					continue;
 				}
 
 				$c++;
 
 				if( in_array( $container, $this->container_list ) )
-				{	// we already have that one
+				{ // we already have that one
 					continue;
 				}
 
@@ -475,7 +541,7 @@
 		}
 
 		if( empty($this->container_list) )
-		{	// Display a warning:
+		{ // Display a warning:
 			$Messages->add( T_('No containers found in this template!'), 'note' );
 		}
 
@@ -487,7 +553,7 @@
 	 */
 	function get_containers()
 	{
-    /**
+		/**
 		 * @var DB
 		 */
 		global $DB;
@@ -515,7 +581,7 @@
 		$DB->begin();
 
 		if( parent::dbupdate() !== false )
-		{	// Template updated, also save containers:
+		{ // Template updated, also save containers:
 			$this->db_save_containers();
 		}
 
@@ -537,7 +603,7 @@
 		$DB->begin();
 
 		if( parent::dbinsert() )
-		{	// Template saved, also save containers:
+		{ // Template saved, also save containers:
 			$this->db_save_containers();
 		}
 
@@ -653,10 +719,10 @@
 
 
 	/**
-   * Get definitions for editable params
-   *
-   * @todo this is destined to be overridden by derived Template classes
-   *
+	 * Get definitions for editable params
+	 *
+	 * @todo this is destined to be overridden by derived Template classes
+	 *
 	 * @see Plugin::GetDefaultSettings()
 	 * @param local params like 'for_editing' => true
 	 */
@@ -669,8 +735,8 @@
 
 
 	/**
- 	 * Get a template specific param value from current Blog
- 	 *
+	 * Get a template specific param value from current Blog
+	 *
 	 */
 	function get_setting( $parname )
 	{
@@ -685,14 +751,14 @@
 		$value = $Blog->get_setting( $blog_setting_name );
 
 		if( ! is_null( $value ) )
-		{	// We have a value for this param:
+		{ // We have a value for this param:
 			return $value;
 		}
 
 		// Try default values:
 		$params = $this->get_param_definitions( NULL );
 		if( isset( $params[$parname]['defaultvalue'] ) )
-		{	// We ahve a default value:
+		{ // We have a default value:
 			return $params[$parname]['defaultvalue'] ;
 		}
 
@@ -766,9 +832,9 @@
 
 		if( ( $return = T_( $string, $req_locale, array(
 								'ext_transarray' => & $this->_trans,
-								'alt_basedir'    => $templates_path.$this->folder.'/po/',
+								'alt_basedir' => $templates_path.$this->folder.'/po/',
 							) ) ) == $string )
-		{	// This template did not provide a translation - fallback to global T_():
+		{ // This template did not provide a translation - fallback to global T_():
 			return T_( $string, $req_locale );
 		}
 

=== modified file 'qp_inc/widgets/model/_widget.class.php'
--- qp_inc/widgets/model/_widget.class.php	2010-12-31 12:12:03 +0000
+++ qp_inc/widgets/model/_widget.class.php	2011-08-27 14:11:25 +0000
@@ -335,7 +335,7 @@
 		// Try default values:
 		$params = $this->get_param_definitions( NULL );
 		if( isset( $params[$parname]['defaultvalue'] ) )
-		{	// We ahve a default value:
+		{	// We have a default value:
 			return $params[$parname]['defaultvalue'] ;
 		}
 

=== modified file 'qp_inc/widgets/views/_widget_list_available.view.php'
--- qp_inc/widgets/views/_widget_list_available.view.php	2010-12-31 12:12:03 +0000
+++ qp_inc/widgets/views/_widget_list_available.view.php	2011-08-27 14:11:25 +0000
@@ -19,7 +19,6 @@
 echo '<h2><span class="right_icons">'.action_icon( T_('Cancel!'), 'close', regenerate_url( 'container' ) ).'</span>'
 	.sprintf(T_('Widgets available for insertion into &laquo;%s&raquo;'), $container ).'</h2>';
 
-
 $core_componentwidget_defs = array(
 		'*'.T_('General purpose widgets'),
 			'free_html',
@@ -27,26 +26,26 @@
 		'*'.T_('Different ways of listing the blog contents'),
 			'item_list',			// Universal Item List
 			'post_list',			// Simple List
+			'page_list',			// Simple List
 			'related_post_list',			// Simple List
-			'page_list',			// Simple List
 			'link_list',     // Simple List
 			'linkblog',	        	// Simple List
+			'comment_list',
 			'media_index',
-			'comment_list',
 		'*'.T_('Blog navigation'),
+			'bloglist',
+			'category_list',
 			'tag_cloud',
-			'category_list',
-			'common_links',
 			'search_form',
-			'xml_feeds',
 			'menu_link',
+			'common_links',
 		'*'.T_('Meta info for the blog'),
 			'title',
 			'tagline',
 			'longdesc',
 		'*'.T_('Other'),
-			'bloglist',
 			'user_tools',
+			'xml_feeds',
 	);
 $i = 0;
 $wiCache = get_Cache( 'WidgetCache');

=== modified file 'qp_install/_functions_create.php'
--- qp_install/_functions_create.php	2011-06-25 18:44:14 +0000
+++ qp_install/_functions_create.php	2011-08-27 14:11:25 +0000
@@ -980,7 +980,7 @@
 
 <p>Widgets are placed in containers. Each container appears in a specific place in a template. If you change your blog template, the new template may not use the same containers as the previous one. Make sure you place your widgets in containers that exist in the specific template you are using.</p>
 
-<p>Widgets can also be "hard-coded" into your template. If you know that you always want a certain widget in a certain place, forcing it through your template is a good idea.</p>
+<p>Widgets can also be "hard-coded" into your template. All widgets for all containers need to be hard-coded as the template list will over-ride the default list. See the "photoblog" template\'s _template.class.php file for an example of this.</p>
 '), $app_name ),
 		$now, $cat_appname );
 

=== modified file 'qp_install/_functions_install.php'
--- qp_install/_functions_install.php	2011-07-13 15:12:18 +0000
+++ qp_install/_functions_install.php	2011-08-27 14:11:25 +0000
@@ -511,74 +511,86 @@
 	// Add blog list to all blog Page Tops:
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code, wi_params )
 							 SELECT blog_ID, "Page Top", 1, "widget", "bloglist", \'a:5:{s:14:"coll_list_type";s:6:"public";s:11:"widget_name";s:9:"Blog List";}\'
-							   FROM T_blogs' );
+							   FROM T_blogs
+							  WHERE blog_ID < 4' );
 
 	// Add title to all blog Headers:
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code )
 							 SELECT blog_ID, "Header", 1, "widget", "title"
-							   FROM T_blogs' );
+							   FROM T_blogs
+							  WHERE blog_ID < 4' );
 
 	// Add tagline to all blogs Headers:
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code )
 							 SELECT blog_ID, "Header", 2, "widget", "tagline"
-							   FROM T_blogs' );
+							   FROM T_blogs
+							  WHERE blog_ID < 4' );
 
 	// Add home link to all blogs Menus:
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code, wi_params )
 							 SELECT blog_ID, "Menu", 1, "widget", "menu_link", "'.$DB->escape(serialize(array('link_type'=>'home'))).'"
-							   FROM T_blogs' );
+							   FROM T_blogs
+							  WHERE blog_ID < 4' );
 
 	// Add info pages to all blogs Menus:
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code )
 							 SELECT blog_ID, "Menu", 2, "widget", "page_list"
-							   FROM T_blogs' );
+							   FROM T_blogs
+							  WHERE blog_ID < 4' );
 
 	// Add contact link to all blogs Menus:
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code, wi_params )
 							 SELECT blog_ID, "Menu", 3, "widget", "menu_link", "'.$DB->escape(serialize(array('link_type'=>'ownercontact'))).'"
-							   FROM T_blogs' );
+							   FROM T_blogs
+							  WHERE blog_ID < 4' );
 
 	// Add login link to all blogs Menus:
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code, wi_params )
 							 SELECT blog_ID, "Menu", 4, "widget", "menu_link", "'.$DB->escape(serialize(array('link_type'=>'login'))).'"
-							   FROM T_blogs' );
+							   FROM T_blogs
+							  WHERE blog_ID < 4' );
 
 	// Add Calendar plugin to all blog Sidebars except blog A:
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code )
 							 SELECT blog_ID, "Sidebar", 1, "plugin", "calendar"
 							   FROM T_blogs
-							  WHERE blog_ID > 1' );
+							  WHERE blog_ID > 1 AND blog_ID < 4' );
 
 	// Add title to all blog Sidebars:
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code )
 							 SELECT blog_ID, "Sidebar", 2, "widget", "title"
-							   FROM T_blogs' );
+							   FROM T_blogs
+							  WHERE blog_ID < 4' );
 
 	// Add longdesc to all blogs Sidebars:
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code )
 							 SELECT blog_ID, "Sidebar", 3, "widget", "longdesc"
-							   FROM T_blogs' );
+							   FROM T_blogs
+							  WHERE blog_ID < 4' );
 
 	// Add common links to all blogs Sidebars:
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code )
 							 SELECT blog_ID, "Sidebar", 4, "widget", "common_links"
-							   FROM T_blogs' );
+							   FROM T_blogs
+							  WHERE blog_ID < 4' );
 
 	// Add search form to all blogs Sidebars:
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code )
 							 SELECT blog_ID, "Sidebar", 5, "widget", "search_form"
-							   FROM T_blogs' );
+							   FROM T_blogs
+							  WHERE blog_ID < 4' );
 
 	// Add categories list to all blog Sidebars:
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code )
 							 SELECT blog_ID, "Sidebar", 6, "widget", "category_list"
-							   FROM T_blogs' );
+							   FROM T_blogs
+							  WHERE blog_ID < 4' );
 
 	// Add Random photo to blog Sidebars except blog B:
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code, wi_params )
 							 SELECT blog_ID, "Sidebar", 7, "widget", "media_index", \'a:11:{s:5:"title";s:12:"Random photo";s:10:"thumb_size";s:7:"fit-160";s:12:"thumb_layout";s:4:"grid";s:12:"grid_nb_cols";s:1:"1";s:5:"limit";s:1:"1";s:8:"order_by";s:4:"RAND";s:9:"order_dir";s:3:"ASC";s:7:"blog_ID";s:1:"4";s:11:"widget_name";s:12:"Random photo";s:16:"widget_css_class";s:0:"";s:9:"widget_ID";s:0:"";}\'
 							   FROM T_blogs
-							  WHERE blog_ID <> 2' );
+							  WHERE blog_ID <> 2 AND blog_ID < 4' );
 
 	// Add linkblog to blog Sidebars for blog A & B:
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code, wi_params )
@@ -589,24 +601,36 @@
 	// Add XML feeds to all blogs Sidebars:
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code )
 							 SELECT blog_ID, "Sidebar", 9, "widget", "xml_feeds"
-							   FROM T_blogs' );
+							   FROM T_blogs
+							  WHERE blog_ID < 4' );
 
 	// All blog Sidebar 2:
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code )
 							 SELECT blog_ID, "Sidebar 2", 1, "widget", "post_list"
-							   FROM T_blogs' );
+							   FROM T_blogs
+							  WHERE blog_ID < 4' );
 
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code )
 							 SELECT blog_ID, "Sidebar 2", 2, "widget", "comment_list"
-							   FROM T_blogs' );
+							   FROM T_blogs
+							  WHERE blog_ID < 4' );
 
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code, wi_params )
 							 SELECT blog_ID, "Sidebar 2", 3, "widget", "media_index", \'a:11:{s:5:"title";s:13:"Recent photos";s:10:"thumb_size";s:10:"crop-80x80";s:12:"thumb_layout";s:4:"grid";s:12:"grid_nb_cols";s:1:"3";s:5:"limit";s:1:"9";s:8:"order_by";s:9:"datestart";s:9:"order_dir";s:4:"DESC";s:7:"blog_ID";s:1:"4";s:11:"widget_name";s:11:"Photo index";s:16:"widget_css_class";s:0:"";s:9:"widget_ID";s:0:"";}\'
-							   FROM T_blogs' );
+							   FROM T_blogs
+							  WHERE blog_ID < 4' );
 
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code, wi_params )
 							 SELECT blog_ID, "Sidebar 2", 4, "widget", "free_html", \'a:5:{s:5:"title";s:9:"Sidebar 2";s:7:"content";s:162:"This is the "Sidebar 2" container. You can place any widget you like in here. In the evo toolbar at the top of this page, select "Customize", then "Blog Widgets".";s:11:"widget_name";s:9:"Free HTML";s:16:"widget_css_class";s:0:"";s:9:"widget_ID";s:0:"";}\'
-							   FROM T_blogs' );
+							   FROM T_blogs
+							  WHERE blog_ID < 4' );
+
+	// Add widgets to blog #4
+	$BlogCache = get_Cache( 'BlogCache' );
+	$PhotoBlog = $BlogCache->get_by_ID( 4, false );
+	$templateCache = get_Cache( 'TemplateCache');
+	$_template = $templateCache->get_by_ID( 4 );
+	$_template->CreateDefaultWidgets( $PhotoBlog );
 
 	task_end();
 }

=== modified file 'qp_plugins/menu_link_widget/_menu_link.widget.php'
--- qp_plugins/menu_link_widget/_menu_link.widget.php	2011-01-08 03:31:49 +0000
+++ qp_plugins/menu_link_widget/_menu_link.widget.php	2011-08-27 14:11:25 +0000
@@ -47,6 +47,7 @@
 		$this->widget_title = '';
 		$this->menu_link_widget_link_types = array(
 			'home' => $this->T_('Blog home'),
+			'main' => $this->T_('Installation home'),
 			'arcdir' => $this->T_('Archive directory'),
 			'catdir' => $this->T_('Category directory'),
 			'latestcomments' => $this->T_('Latest comments'),
@@ -117,6 +118,7 @@
 	function display( $params )
 	{
 		global $Blog;
+		global $app_baseurl;
 
 		$this->init_display( $params );
 
@@ -168,6 +170,12 @@
 				$title = $this->T_('register on this website');
 				break;
 
+			case 'main':
+				$url = $app_baseurl;
+				$text = $this->T_('Main');
+				$title = $this->T_('visit this site\'s home page');
+				break;
+
 			case 'home':
 			default:
 				$url = $Blog->get('url');

=== modified file 'qp_templates/photoblog/_template.class.php'
--- qp_templates/photoblog/_template.class.php	2010-08-07 15:42:57 +0000
+++ qp_templates/photoblog/_template.class.php	2011-08-27 14:11:25 +0000
@@ -61,6 +61,54 @@
 		return $template_linkbacks;
 	}
 
+
+	/**
+	 * @see Template::get_default_widgets()
+	 */
+	function get_default_widgets( $params = array() )
+	{
+		// Containers
+		$default_widgets = array(
+			'Page Top' => array(),
+			'Menu' => array(),
+		);
+		// Page Top widgets
+		$default_widgets['Page Top'][] = array(
+			'bloglist' => array(
+				'type' => 'widget',
+				'params' => array(
+					'coll_list_type' => ( $params['Blog']->get( 'in_bloglist' ) ? 'public' : 'owner' ),
+				),
+			),
+		);
+		// Menu widgets
+		$default_widgets['Menu'][] = array(
+			'menu_link' => array(
+				'type' => 'widget',
+				'params' => array(
+					'link_type' => 'main',
+					'widget_name' => 'Menu link',
+				),
+			),
+		);
+		$default_widgets['Menu'][] = array(
+			'menu_link' => array(
+				'type' => 'widget',
+				'params' => array(
+					'link_type' => 'ownercontact',
+					'widget_name' => 'Menu link',
+				),
+			),
+		);
+		$default_widgets['Menu'][] = array(
+			'user_tools' => array(
+				'type' => 'widget',
+			),
+		);
+
+		return $default_widgets;
+	}
+
 }
 
 ?>