Added "open links in new window" to main menu and links module

Added cache destroy when for portal_modules when installing portal

root/adm/style/portal/acp_portal_links.html

@@ -111,7 +111,24 @@
 		<!-- ENDIF -->
 	</fieldset>
 	<!-- ENDIF -->	
+<!-- BEGIN options -->
+	<!-- IF options.S_LEGEND -->
+		<!-- IF not options.S_FIRST_ROW -->
+			</fieldset>
+		<!-- ENDIF -->
+		<fieldset>
+			<legend>{options.LEGEND}</legend>
+	<!-- ELSE -->
 
+		<dl>
+			<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+			<dd>{options.CONTENT}</dd>
+		</dl>
+
+	<!-- ENDIF -->
+<!-- BEGINELSE -->
+	<fieldset>
+<!-- END options -->
 	<fieldset class="tabulated">
 	<legend>{L_ACP_PORTAL_LINKS}</legend>
 
@@ -151,6 +168,7 @@
 	</p>
 	{S_FORM_TOKEN}
 	</fieldset>
+	</fieldset>
 	</form>
 
 <!-- ENDIF -->

root/adm/style/portal/acp_portal_menu.html

@@ -118,7 +118,24 @@
 		<!-- ENDIF -->
 	</fieldset>
 	<!-- ENDIF -->	
+<!-- BEGIN options -->
+	<!-- IF options.S_LEGEND -->
+		<!-- IF not options.S_FIRST_ROW -->
+			</fieldset>
+		<!-- ENDIF -->
+		<fieldset>
+			<legend>{options.LEGEND}</legend>
+	<!-- ELSE -->
 
+		<dl>
+			<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+			<dd>{options.CONTENT}</dd>
+		</dl>
+
+	<!-- ENDIF -->
+<!-- BEGINELSE -->
+	<fieldset>
+<!-- END options -->
 	<fieldset class="tabulated">
 	<legend>{L_ACP_PORTAL_LINKS}</legend>
 
@@ -158,6 +175,7 @@
 	</p>
 	{S_FORM_TOKEN}
 	</fieldset>
+	</fieldset>
 	</form>
 
 <!-- ENDIF -->

root/language/de/mods/portal/portal_links_module.php

@@ -48,4 +48,5 @@ $lang = array_merge($lang, array(
 	'ACP_PORTAL_LINK_URL_EXP'		=> 'Externe Links:<br />Alle Links sollten mit einem http:// eingegeben werden.<br /><br />Interne Links:<br />Gebe nur die PHP Datei als Link URL ein, z.B. index.php?style=4.',
 	'ACP_PORTAL_LINK_PERMISSION'	=> 'Link Berechtigungen',
 	'ACP_PORTAL_LINK_PERMISSION_EXP'=> 'Wähle die Gruppen aus die berechtigt sein sollen den Link zu sehen. Falls alle Benutzer den Link sehen sollen, dann wähle nichts aus.<br />Wähle mehrere Gruppen aus/ab indem du <samp>STRG</samp> gedrückt hältst und klickst.',
+	'ACP_PORTAL_LINKS_NEW_WINDOW'	=> 'Öffne externe Verknüpfungen in einem neuen Fenster',
 ));

root/language/de/mods/portal/portal_main_menu_module.php

@@ -61,4 +61,5 @@ $lang = array_merge($lang, array(
 	'ACP_PORTAL_MENU_URL_EXP'		=> 'Externe Links:<br />Alle Links sollten mit einem http:// eingegeben werden.<br /><br />Interne Links:<br />Gebe nur die PHP Datei als Link URL ein, z.B. index.php?style=4.',
 	'ACP_PORTAL_MENU_PERMISSION'	=> 'Link Berechtigungen',
 	'ACP_PORTAL_MENU_PERMISSION_EXP'=> 'Wähle die Gruppen aus die berechtigt sein sollen den Link zu sehen. Falls alle Benutzer den Link sehen sollen, dann wähle nichts aus.<br />Wähle mehrere Gruppen aus/ab indem du <samp>STRG</samp> gedrückt hältst und klickst.',
+	'ACP_PORTAL_MENU_EXT_NEW_WINDOW'=> 'Öffne externe Verknüpfungen in einem neuen Fenster',
 ));

root/language/en/mods/portal/portal_links_module.php

@@ -48,4 +48,5 @@ $lang = array_merge($lang, array(
 	'ACP_PORTAL_LINK_URL_EXP'		=> 'External links:<br />All links should be entered with a http://<br /><br />Internal links:<br />Only enter the php file as link url, i.e. index.php?style=4.',
 	'ACP_PORTAL_LINK_PERMISSION'	=> 'Link permissions',
 	'ACP_PORTAL_LINK_PERMISSION_EXP'=> 'Select the groups that should be authorized to view the link. If you want all users to be able to view the link, don’t select anything.<br />Select/Deselect multiple groups by holding <samp>CTRL</samp> and clicking.',
+	'ACP_PORTAL_LINKS_NEW_WINDOW'	=> 'Open external links in a new window',
 ));

root/language/en/mods/portal/portal_main_menu_module.php

@@ -61,4 +61,5 @@ $lang = array_merge($lang, array(
 	'ACP_PORTAL_MENU_URL_EXP'		=> 'External links:<br />All links should be entered with a http://<br /><br />Internal links:<br />Only enter the php file as link url, i.e. index.php?style=4.',
 	'ACP_PORTAL_MENU_PERMISSION'	=> 'Link permissions',
 	'ACP_PORTAL_MENU_PERMISSION_EXP'=> 'Select the groups that should be authorized to view the link. If you want all users to be able to view the link, don’t select anything.<br />Select/Deselect multiple groups by holding <samp>CTRL</samp> and clicking.',
+	'ACP_PORTAL_MENU_EXT_NEW_WINDOW'=> 'Open external links in a new window',
 ));

root/portal/includes/functions.php

@@ -936,6 +936,9 @@ function board3_basic_install($mode = 'install', $purge_modules = true, $u_actio
 
 			$c_class->install($db->sql_nextid());
 		}
+		
+		// Make sure we get rid of old data
+		$cache->destroy('portal_modules');
 
 		if ($mode == 'update')
 		{

root/portal/modules/portal_links.php

@@ -102,6 +102,7 @@ class portal_links_module
 					'LINK_TITLE'		=> (isset($user->lang[$links[$i]['title']])) ? $user->lang[$links[$i]['title']] : $links[$i]['title'],
 					'LINK_URL'			=> $cur_url,
 					'MODULE_ID'			=> $module_id,
+					'NEW_WINDOW'		=> ($links[$i]['type'] != self::LINK_INT && $config['board3_links_url_new_window_' . $module_id]) ? true : false,
 				));
 			}
 		}
@@ -115,8 +116,9 @@ class portal_links_module
         return array(
 			'title'	=> 'ACP_PORTAL_LINKS',
 			'vars'	=> array(
-				'legend1'				=> 'ACP_PORTAL_MENU',
+				'legend1'				=> 'ACP_PORTAL_LINKS',
 				'board3_links_' . $module_id	=> array('lang' => 'ACP_PORTAL_MENU_MANAGE', 'validate' => 'string',	'type' => 'custom',	'explain' => true, 'method' => 'manage_links', 'submit' => 'update_links'),
+				'board3_links_url_new_window_' . $module_id => array('lang' => 'ACP_PORTAL_LINKS_NEW_WINDOW', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
 			),
 		);
 	}
@@ -163,6 +165,7 @@ class portal_links_module
 		$board3_menu_array = serialize($links);
 		set_portal_config('board3_links_array_' . $module_id, $board3_menu_array);
 		set_config('board3_links_' . $module_id, '');
+		set_config('board3_links_url_new_window_' . $module_id, 0);
 		
 		return true;
 	}
@@ -181,6 +184,7 @@ class portal_links_module
 			
 		$del_config = array(
 			'board3_links_' . $module_id,
+			'board3_links_url_new_window_' . $module_id
 		);
 		$sql = 'DELETE FROM ' . CONFIG_TABLE . '
 			WHERE ' . $db->sql_in_set('config_name', $del_config);

root/portal/modules/portal_main_menu.php

@@ -111,6 +111,7 @@ class portal_main_menu_module
 					$template->assign_block_vars('portalmenu.links', array(
 						'LINK_TITLE'		=> (isset($user->lang[$links[$i]['title']])) ? $user->lang[$links[$i]['title']] : $links[$i]['title'],
 						'LINK_URL'			=> $cur_url,
+						'NEW_WINDOW'		=> ($links[$i]['type'] != self::LINK_INT && $config['board3_menu_url_new_window_' . $module_id]) ? true : false,
 					));
 				}
 			}
@@ -127,6 +128,7 @@ class portal_main_menu_module
 			'vars'	=> array(
 				'legend1'				=> 'ACP_PORTAL_MENU',
 				'board3_menu_' . $module_id	=> array('lang' => 'ACP_PORTAL_MENU_MANAGE', 'validate' => 'string',	'type' => 'custom',	'explain' => true, 'method' => 'manage_links', 'submit' => 'update_links'),
+				'board3_menu_url_new_window_' . $module_id => array('lang' => 'ACP_PORTAL_MENU_EXT_NEW_WINDOW', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
 			),
 		);
 	}
@@ -219,6 +221,7 @@ class portal_main_menu_module
 		$board3_menu_array = serialize($links);
 		set_portal_config('board3_menu_array_' . $module_id, $board3_menu_array);
 		set_config('board3_menu_' . $module_id, '');
+		set_config('board3_menu_url_new_window_' . $module_id, 0);
 		
 		return true;
 	}
@@ -237,6 +240,7 @@ class portal_main_menu_module
 			
 		$del_config = array(
 			'board3_menu_' . $module_id,
+			'board3_menu_url_new_window_' . $module_id,
 		);
 		$sql = 'DELETE FROM ' . CONFIG_TABLE . '
 			WHERE ' . $db->sql_in_set('config_name', $del_config);

root/styles/prosilver/template/portal/modules/links_side.html

@@ -2,7 +2,7 @@
 	<div class="portal-navigation">
 			<ul>
 			<!-- BEGIN portallinks -->
-				<!-- IF $MODULE_ID eq portallinks.MODULE_ID --><li><a href="{portallinks.LINK_URL}" title="{portallinks.LINK_TITLE}">{portallinks.LINK_TITLE}</a></li><!-- ENDIF -->
+				<!-- IF $MODULE_ID eq portallinks.MODULE_ID --><li><a href="{portallinks.LINK_URL}" title="{portallinks.LINK_TITLE}" <!-- IF portallinks.NEW_WINDOW -->onclick="window.open('{portallinks.LINK_URL}'); return false;"<!-- ENDIF -->>{portallinks.LINK_TITLE}</a></li><!-- ENDIF -->
 			<!-- BEGINELSE -->
 				<span style="float:left;" class="gensmall"><strong>{L_LINKS_NO_LINKS}</strong></span><br />
 			<!-- END portallinks -->

root/styles/prosilver/template/portal/modules/main_menu_side.html

@@ -5,7 +5,7 @@
 		<div class="menutitle">{portalmenu.CAT_TITLE}</div>
 			<ul>
 			<!-- BEGIN links -->
-				<li><a href="{portalmenu.links.LINK_URL}">{portalmenu.links.LINK_TITLE}</a></li>
+				<li><a href="{portalmenu.links.LINK_URL}" <!-- IF portalmenu.links.NEW_WINDOW -->onclick="window.open('{portalmenu.links.LINK_URL}'); return false;"<!-- ENDIF -->>{portalmenu.links.LINK_TITLE}</a></li>
 			<!-- END links -->
 			</ul>
 		<hr class="dashed" />

root/styles/subsilver2/template/portal/modules/links_side.html

@@ -3,7 +3,7 @@
 	<!-- BEGIN portallinks -->
 		<tr class="row1">
 			<td>
-				<!-- IF $MODULE_ID eq portallinks.MODULE_ID --><img src="{T_THEME_PATH}/images/portal/arrowbullet.gif" width="12" height="11" alt="" />&nbsp;<a href="{portallinks.LINK_URL}" title="{portallinks.LINK_TITLE}">{portallinks.LINK_TITLE}</a><!-- ENDIF -->
+				<!-- IF $MODULE_ID eq portallinks.MODULE_ID --><img src="{T_THEME_PATH}/images/portal/arrowbullet.gif" width="12" height="11" alt="" />&nbsp;<a href="{portallinks.LINK_URL}" title="{portallinks.LINK_TITLE}" <!-- IF portallinks.NEW_WINDOW -->onclick="window.open('{portallinks.LINK_URL}'); return false;"<!-- ENDIF -->>{portallinks.LINK_TITLE}</a><!-- ENDIF -->
 			</td>
 		</tr>
 	<!-- BEGINELSE -->

root/styles/subsilver2/template/portal/modules/main_menu_side.html

@@ -10,7 +10,7 @@
 			<!-- BEGIN links -->
 			<tr class="row1">
 				<td>
-					<a href="{portalmenu.links.LINK_URL}" title="{portalmenu.links.LINK_TITLE}"><img src="{T_THEME_PATH}/images/portal/arrowbullet.gif" width="12" height="11" alt="" />&nbsp;{portalmenu.links.LINK_TITLE}</a>
+					<a href="{portalmenu.links.LINK_URL}" title="{portalmenu.links.LINK_TITLE}" <!-- IF portalmenu.links.NEW_WINDOW -->onclick="window.open('{portalmenu.links.LINK_URL}'); return false;"<!-- ENDIF -->><img src="{T_THEME_PATH}/images/portal/arrowbullet.gif" width="12" height="11" alt="" />&nbsp;{portalmenu.links.LINK_TITLE}</a>
 				</td>
 			</tr>
 			<!-- END links -->