Index: embed_widgets.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/embed_widgets/embed_widgets.module,v
retrieving revision 1.5.2.88
diff -u -u -r1.5.2.88 embed_widgets.module
--- embed_widgets.module 16 Aug 2008 19:02:24 -0000 1.5.2.88
+++ embed_widgets.module 7 Feb 2009 20:00:20 -0000
@@ -49,6 +49,7 @@
* Implementation of hook_perm().
*/
function embed_widgets_perm() {
+ $perm = array();
$widget_types = embed_widgets_get_types();
if (!empty($widget_types)) {
foreach ($widget_types as $type => $type_info) {
Index: embed_widgets_facebook/embed_widgets_facebook.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/embed_widgets/embed_widgets_facebook/Attic/embed_widgets_facebook.module,v
retrieving revision 1.1.2.4
diff -u -u -r1.1.2.4 embed_widgets_facebook.module
--- embed_widgets_facebook/embed_widgets_facebook.module 14 Aug 2008 06:28:34 -0000 1.1.2.4
+++ embed_widgets_facebook/embed_widgets_facebook.module 7 Feb 2009 20:00:20 -0000
@@ -19,6 +19,8 @@
'code callback' => 'embed_widgets_facebook_code',
'content callback' => 'embed_widgets_iframe_content',
'preview callback' => 'embed_widgets_iframe_code',
+ 'embed filename' => NULL,
+ 'embed callback' => NULL,
'live preview callback' => 'embed_widgets_iframe_live_preview',
'settings form callback' => 'embed_widgets_facebook_settings',
'custom theme callback' => 'embed_widgets_iframe_customize',
Index: embed_widgets_ui/embed_widgets_ui.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/embed_widgets/embed_widgets_ui/Attic/embed_widgets_ui.module,v
retrieving revision 1.4.2.129
diff -u -u -r1.4.2.129 embed_widgets_ui.module
--- embed_widgets_ui/embed_widgets_ui.module 15 Aug 2008 21:58:56 -0000 1.4.2.129
+++ embed_widgets_ui/embed_widgets_ui.module 7 Feb 2009 20:00:21 -0000
@@ -158,7 +158,7 @@
'description' => 'Get HTML code for '. $type_info['title'] .' widget.',
'type' => MENU_CALLBACK,
);
- if (function_exists($type_info['admin settings form'])) {
+ if (isset($type_info['admin settings form']) && function_exists($type_info['admin settings form'])) {
$items['admin/settings/embed-widgets/'. $type] = array(
'title' => $type_info['title'],
'description' => 'Configuration for ' . $type_info['title'] . 'widgets.',
@@ -319,7 +319,7 @@
* Preprocess function for page.tpl.php
*/
function embed_widgets_ui_preprocess_page(&$variables) {
- if (!$_REQUEST['embed_widgets_mode'] && variable_get('embed_widgets_button', TRUE) && user_access('create widgets')) {
+ if (empty($_REQUEST['embed_widgets_mode']) && variable_get('embed_widgets_button', TRUE) && user_access('create widgets')) {
$source = embed_widgets_page_load($_GET['q']);
if ($source) {
$image = theme('image', drupal_get_path('module', 'embed_widgets') . '/embed_button.gif', t("Embed this page's content on your site."), t("Embed this page's content on your site."));
@@ -335,7 +335,7 @@
* Preprocess function for block.tpl.php
*/
function embed_widgets_ui_preprocess_block(&$variables) {
- if (!$_REQUEST['embed_widgets_mode'] && variable_get('embed_widgets_button', TRUE) && user_access('create widgets')) {
+ if (empty($_REQUEST['embed_widgets_mode']) && variable_get('embed_widgets_button', TRUE) && user_access('create widgets')) {
$source = embed_widgets_block_load($variables['block']->module, $variables['block']->delta);
if ($source) {
$image = theme('image', drupal_get_path('module', 'embed_widgets') . '/embed_button.gif', t('Embed this content on your site.'), t('Embed this content on your site.'));
@@ -1588,7 +1588,7 @@
}
}
- $output .= "" . t('Widget Sources') . "
";
+ $output = "" . t('Widget Sources') . "
";
$output .= theme('table', $header, $rows);
$output .= theme('pager', NULL, 25, 0);
@@ -1729,7 +1729,7 @@
* @see embed_widgets_ui_source_edit_submit()
*/
function embed_widgets_ui_source_edit(&$form_state, $source = array()) {
- if ($source) {
+ if (isset($source['title'])) {
drupal_set_title(t('Edit %title', array('%title' => $source['title'])));
}
$ahah = array();
@@ -1770,7 +1770,7 @@
$form['basic_info']['title'] = array(
'#type' => 'textfield',
'#title' => t('Title'),
- '#default_value' => $source['title'],
+ '#default_value' => isset($source['title']) ? $source['title'] : '',
'#size' => 30,
'#maxlength' => 35,
'#required' => TRUE,
@@ -1778,7 +1778,7 @@
$form['basic_info']['description'] = array(
'#type' => 'textfield',
'#title' => t('Description'),
- '#default_value' => $source['description'],
+ '#default_value' => isset($source['description']) ? $source['description'] : '',
'#size' => 60,
'#maxlength' => 255,
'#required' => TRUE,
@@ -1812,7 +1812,7 @@
'#description' => t('Select the type of element you would like to embed.'),
);
if (isset($source['sid'])) {
- $form['config']['type']['#default_value'] = $source['type'];
+ $form['config']['type']['#default_value'] = isset($source['type']) ? $source['type'] : '';
$form['config']['type']['#disabled'] = TRUE;
$form['config']['type']['#description'] = t('This cannot be changed after it has been set.');
if ($source['type'] == 'page') {
@@ -1853,8 +1853,8 @@
* Validate form embed_widgets_ui_source_edit
*/
function embed_widgets_ui_source_edit_validate($form, &$form_state) {
- if ($form_state['values']['type'] == 'page') {
- $path = drupal_get_normal_path($form_state['values']['page']);
+ if ($form_state['values']['config']['type'] == 'page') {
+ $path = drupal_get_normal_path($form_state['values']['config']['new_source']['page']);
if (preg_match('/http:/', $path)) {
form_set_error('path', t("The path '@path' is not a valid path.", array('@path' => $path)));
}
@@ -1876,7 +1876,7 @@
*/
function embed_widgets_ui_source_edit_submit($form, &$form_state) {
// Submitted from source edit page.
- $source = isset($form_state['values']['source']) ? $form_state['values']['source'] : array();
+ $source = isset($form_state['values']['source']) ? $form_state['values']['source'] : array('settings'=> array());
$source['title'] = $form_state['values']['basic_info']['title'];
$source['description'] = $form_state['values']['basic_info']['description'];
$source['type'] = $form_state['values']['config']['type'];
@@ -2151,9 +2151,8 @@
$view_list = array('' => '');
foreach ($views as $view) {
- if (!$view->disabled) {
- $title = $view->display['default']->display_options['title'];
- if ($title) {
+ if (empty($view->disabled)) {
+ if (!empty($view->display['default']->display_options['display_title'])) {
$view_list[$view->name] = $view->name . ': ' . $view->display['default']->display_options['title'];
}
else {
@@ -2272,7 +2271,7 @@
function _embed_widgets_ui_ahah_view_args_form($view, $display = 'default', $defaults = array()) {
$form = array();
$view = views_get_view($view);
- $arguments = $view->display[$display]->display_options['arguments'];
+ $arguments = isset($view->display[$display]->display_options['arguments']) ?$view->display[$display]->display_options['arguments'] : array();
if ($view && !empty($arguments)) {
$form['config']['new_source']['view']['arguments'] = array(
'#type' => 'fieldset',
@@ -2284,7 +2283,7 @@
foreach ($arguments as $id => $argument) {
$data = array();
$data = views_fetch_data($argument['table']);
- $id_field = $data[$argument['table']]['table']['base']['field'];
+ $id_field = $data['table']['base']['field'];
$group = isset($data[$id]['group']) ? $data[$id]['group'] : $data['table']['group'];
if ($argument['table'] == 'node' && $id == 'type') {
$default = isset($defaults[$id]) ? $defaults[$id] : array($argument['wildcard'] => $argument['wildcard_substitution']);