@@ -880,7 +880,7 @@ function hotblocks_item_view($oHotblocks_Item, $iDelta = 0, $sContext = 'normal'
}
/**
- * Ajax menu callback.
+ * Ajax menu callback.
* Creates an instance of the given node as a hotblocks_item for the designated block.
* Prints the block output when done.
*
@@ -893,10 +893,10 @@ function hotblocks_assign_to_block($iNid = null, $iDelta = null) {
print 'Error';
exit;
}
-
- //@todo - Maybe we should create a blank entry here so that even if all the hotblocks of this node are removed,
+
+ //@todo - Maybe we should create a blank entry here so that even if all the hotblocks of this node are removed,
//it still shows up in the list of allowable nodes to assign as a hotblocks_item.
-
+
//create the new hotblocks_item record
$oHotblocks_ItemObject->nid = $iNid;
$oHotblocks_ItemObject->delta = $iDelta;
@@ -904,7 +904,7 @@ function hotblocks_assign_to_block($iNid = null, $iDelta = null) {
$oHotblocks_ItemObject->global = $_GET['global'] ? 1 : 0;
$oHotblocks_ItemObject->systemtype = $_GET['systemtype'];
drupal_write_record('hotblocks', $oHotblocks_ItemObject);
-
+
//show the hotblocks block
print hotblocks_view_block($iDelta);
exit;
@@ -919,9 +919,9 @@ function hotblocks_assign_to_block($iNid = null, $iDelta = null) {
function hotblocks_remove_from_block($iHotblocks_Itemid, $iDelta) {
if(!isset($_GET['token']) || $_GET['token'] != drupal_valid_token($_GET['token'],"hotblocks-$iDelta-$iHotblocks_Itemid")) { drupal_access_denied(); exit();}
hotblocks_item_remove($iHotblocks_Itemid);
- if($_REQUEST['destination'] && !$_REQUEST['js']) {
+ if($_REQUEST['destination'] && !$_REQUEST['js']) {
drupal_set_message(hotblocks_terminology(false,true).' removed');
- drupal_goto();
+ drupal_goto();
}
print hotblocks_view_block($iDelta);
exit;
@@ -930,7 +930,7 @@ function hotblocks_remove_from_block($iHotblocks_Itemid, $iDelta) {
/**
* @return
- * Returns an array of all valid hotblocks_item records from the hotblocks or node table (depending on configuration) with
+ * Returns an array of all valid hotblocks_item records from the hotblocks or node table (depending on configuration) with
* their respective titles.
* Each array item is an object with members nid and title
* In the case of blocks, nid actually = bid...a legacy thing that should change one day
@@ -963,7 +963,7 @@ function hotblocks_list() {
$oRow->friendlytype = $aInfo['name'];
$aRows[] = $oRow;
}
-
+
//add in blocks if they are enabled as valid hotblocks_item types
if(variable_get('hotblocks_allow_blocks', true)) {
$blocks = _block_rehash();
@@ -981,8 +981,8 @@ function hotblocks_list() {
}
}
}
-
-
+
+
function hotblocks_list_sort($a, $b) {
return strcmp($a->title, $b->title);
}
@@ -992,7 +992,7 @@ function hotblocks_list() {
}
/**
- * An added submit handler to the node add/edit form. We inject some values into the form's node object here to
+ * An added submit handler to the node add/edit form. We inject some values into the form's node object here to
* be processed by hotblocks_nodeapi where items like node id will be already populated in the event of new nodes.
*
* @param $aForm
@@ -1021,15 +1021,15 @@ function hotblocks_get_perm($sOp, $sType = null, $iDelta) {
case 'assign items to any hotblock' :
return sprintf('assign items of type %s to %s', $sType, hotblocks_get_blockname($iDelta));
break;
-
+
case 'remove items from any hotblock' :
return sprintf('remove items of type %s from %s', $sType, hotblocks_get_blockname($iDelta));
break;
-
+
case 'reorder items in any hotblock' :
return sprintf('reorder items in %s', hotblocks_get_blockname($iDelta));
break;
-
+
}
}
@@ -1044,13 +1044,13 @@ function hotblocks_get_perm($sOp, $sType = null, $iDelta) {
* reorder hotblocks
* administer hotblocks
* view node
- *
- * @param $sType
+ *
+ * @param $sType
* Node type or node id which will be queried for type, or in the case of 'view node' can be a node object or nid
- *
- * @param $iDelta
+ *
+ * @param $iDelta
* Hotblocks_Item block delta
- *
+ *
* @return boolean
*/
function hotblocks_access($sOp, $sType = null, $iDelta = null) {
@@ -1058,34 +1058,34 @@ function hotblocks_access($sOp, $sType = null, $iDelta = null) {
if(user_access('administer hotblocks')) {
return true;
}
-
+
if($sOp == 'view node') {
if($sType == 'all') {
//We're saying you cant view all nodes without a node access check first (if respect node access is on)
return !variable_get('hotblocks_respect_node_access', true);
}
-
+
if(is_numeric($sType)) {
$oNode = node_load($sType);
}
else {
$oNode = $sType;
}
-
+
//we will respect node access unless the option is turned off, in which case a user only need some permission to administer the hotblock to see the node
return node_access('view',$oNode) || ( !variable_get('hotblocks_respect_node_access', true) && hotblocks_block_controls($iDelta) );
}
-
+
//if extended permissions is not on, we can just return the user_access equivilent of the op
if(!variable_get('hotblocks_extended_permissions', false)) {
return user_access($sOp);
}
-
+
//The generic permission supercedes granular permissions, so if we have it return true (except with 'create items in any hotblock', see below)
if($sOp != 'create items in any hotblock' && user_access($sOp)) {
return true;
}
-
+
if(is_numeric($sType)) {
$sType = db_result(db_query("SELECT type FROM {node} WHERE nid = %d",$sType));
}
@@ -1109,11 +1109,11 @@ function hotblocks_access($sOp, $sType = null, $iDelta = null) {
case 'reorder items in any hotblock' :
return user_access(hotblocks_get_perm($sOp,$sType,$iDelta));
break;
-
+
case 'administer hotblocks' :
return user_access($sOp);
break;
-
+
case 'create items in any hotblock' :
//If a block is asking, verify that we can also assign the hotblocks_item there as well, otherwise the permission is meaningless (to a block)
if($iDelta) {
@@ -1135,7 +1135,7 @@ function hotblocks_access($sOp, $sType = null, $iDelta = null) {
function hotblocks_settings($form_state, $sJsField = null) {
$aForm = array();
-
+
$iNumBlocks = variable_get('hotblocks_blockcount', 3);
$aForm['hotblocks_blockcount'] = array (
'#type' => 'textfield',
@@ -1158,13 +1158,13 @@ function hotblocks_settings($form_state, $sJsField = null) {
'#attributes' => array('id' =>'hotblocks_blockcount_fieldset'),
);
$aForm['hotblocks_blockcount_fieldset'] += (array)hotblocks_blockcount_names($iNumBlocks);
-
+
$aContentTypes = content_types();
foreach ($aContentTypes as $sTypeName => $aType) {
$aOptions[$sTypeName] = $sTypeName;
}
$aOptions['hotblocks_any'] = 'Any/all types';
-
+
$aForm['hotblocks_filtering'] = array (
'#type' => 'fieldset',
'#title' => t('Filtering content available for hotblocks'),
@@ -1178,7 +1178,7 @@ function hotblocks_settings($form_state, $sJsField = null) {
'#options' => $aOptions,
'#default_value' => variable_get('hotblocks_allowed_types',array('hotblocks_any')),
);
-
+
$aForm['hotblocks_filtering']['hotblocks_show_all_nodes_of_hotblocks_item_type'] = array (
'#type' => 'checkbox',
'#weight' => 32,
@@ -1186,14 +1186,14 @@ function hotblocks_settings($form_state, $sJsField = null) {
'#description' => 'Uncheck this if you would like to specify which nodes are availble to hotblocks on a node-by-node basis. Allowed content types filtering will still apply.',
'#default_value' => variable_get('hotblocks_show_all_nodes_of_hotblocks_item_type', true),
);
-
+
$aForm['hotblocks_filtering']['hotblocks_allow_blocks'] = array (
'#type' => 'checkbox',
'#weight' => 33,
'#title' => 'Allow other Drupal blocks to be inserted into hotblocks.',
'#default_value' => variable_get('hotblocks_allow_blocks', true),
);
-
+
$aBlockOptions = module_list();
$aForm['hotblocks_filtering']['hotblocks_blocks_excluded_modules'] = array (
'#type' => 'select',
@@ -1204,7 +1204,7 @@ function hotblocks_settings($form_state, $sJsField = null) {
'#options' => $aBlockOptions,
'#default_value' => variable_get('hotblocks_blocks_excluded_modules',array()),
);
-
+
$aForm['hotblocks_filtering']['hotblocks_respect_node_access'] = array (
'#title' => 'Respect node access',
'#type' => 'checkbox',
@@ -1212,8 +1212,8 @@ function hotblocks_settings($form_state, $sJsField = null) {
'#description' => 'If this is unchecked, hotblocks permissions will allow users to add or remove nodes from hotblocks for which they wouldn\'t normally have view access to. A user with "administer hotblocks" will still be able to view all hotblock content regardless of this setting, so delegate that permission with care.',
'#default_value' => variable_get('hotblocks_respect_node_access', true),
);
-
-
+
+
$aForm['hotblocks_reorder_titles'] = array (
'#type' => 'checkbox',
'#weight' => 31,
@@ -1221,8 +1221,8 @@ function hotblocks_settings($form_state, $sJsField = null) {
'#description' => 'If this setting is checked, only the item titles will be displayed when reordering items inside a hotblock. This is helpful when you have a large area of content and it becomes cumbersome to reorder such large pieces. If you would like the same full, visual display of the hotblock items while reordering, turn this off.',
'#default_value' => variable_get('hotblocks_reorder_titles',true),
);
-
-
+
+
$aForm['hotblocks_extended_permissions'] = array (
'#type' => 'checkbox',
'#weight' => 33,
@@ -1230,7 +1230,7 @@ function hotblocks_settings($form_state, $sJsField = null) {
'#description' => 'If this setting is checked, the hotblocks module will provide granular permissions for each hotblock and all allowed hotblocks item types. E.g., "assign hotblocks of typex to blockx". Having a permission of "assign hotblocks" will negate the need for the more specific permission, and "administer hotblocks" eliminates the need for any other permissions.',
'#default_value' => variable_get('hotblocks_extended_permissions', false),
);
-
+
$aForm['hotblocks_use_icons'] = array (
'#type' => 'checkbox',
'#weight' => 35,
@@ -1238,7 +1238,7 @@ function hotblocks_settings($form_state, $sJsField = null) {
'#description' => 'Check this box if you want hotblocks to use icons instead of text links for its administrative controls.',
'#default_value' => variable_get('hotblocks_use_icons', true),
);
-
+
$files = file_scan_directory(drupal_get_path('module','hotblocks').'/images','.*',array('.', '..', 'CVS'), $callback = 0, $recurse = false);
foreach ($files as $oVal) {
$options[$oVal->basename] = $oVal->basename;
@@ -1251,7 +1251,7 @@ function hotblocks_settings($form_state, $sJsField = null) {
'#default_value' => variable_get('hotblocks_icons_set', '48x48'),
'#options' => $options,
);
-
+
$aForm['hotblocks_floating_controls'] = array (
'#type' => 'checkbox',
'#weight' => 40,
@@ -1259,12 +1259,12 @@ function hotblocks_settings($form_state, $sJsField = null) {
'#description' => 'Check this box if you want hotblocks administrative controls to float over it\'s items when you mouse over them. If unchecked, hotblocks controls will be visible all the time.',
'#default_value' => variable_get('hotblocks_floating_controls', true),
);
-
+
$aForm['hotblocks_terminology_fieldset'] = array (
'#type' => 'fieldset',
'#title' => t('Hotblocks Terminology'),
);
-
+
$aForm['hotblocks_terminology_fieldset']['hotblocks_terminology'] = array(
'#type' => 'textfield',
'#title' => t('Term for hotblocks item'),
@@ -1277,53 +1277,53 @@ function hotblocks_settings($form_state, $sJsField = null) {
'#description' => t('This should be the plural version of the term above, as in the case of "reorder hotblock items", etc.'),
'#default_value' => variable_get('hotblocks_terminology_plural', HOTBLOCKS_DEFAULT_TERMINOLOGY_PLURAL),
);
-
+
$aForm['hotblocks_title_hiding'] = array (
'#type' => 'fieldset',
'#title' => t('Node Title Hiding'),
'#weight' => 45,
);
-
+
$aForm['hotblocks_title_hiding']['hotblocks_title_hiding_helptext'] = array (
'#type' => 'markup',
'#value' => '
' . t('If you want to hide some or all of the titles of nodes within your hotblocks from being displayed to users, check one of the 2 checkboxes below.') . '
',
);
-
+
$aForm['hotblocks_title_hiding']['hotblocks_title_hiding_hide_all'] = array(
'#type' => 'checkbox',
'#title' => t('Hide all hotblocks node titles'),
'#default_value' => variable_get('hotblocks_title_hiding_hide_all', false),
'#description' => t('If this box is checked, all node titles of hotblocks will be hidden when the item is displayed in the hotblock.'),
);
-
+
$aForm['hotblocks_title_hiding']['hotblocks_title_hiding_enable'] = array (
'#type' => 'checkbox',
'#title' => t('Hide hotblocks_item titles within delimiters'),
'#description' => t('Check this box if you want hotblocks node titles inside the delimiters to be hidden when the item displays: e.g. if your delimiters are parentheses, then (My Title) will be hidden. This can be useful to see adminstrator notes in the hotblocks picking screen that are hidden from the user. For example "(the ad we just made last night) Super Product X". You could also use this feature to hide some titles but not others. E.g. "This title can be seen", "(This cannot because the node just contains an image)".'),
'#default_value' => variable_get('hotblocks_title_hiding_enable', true),
);
-
+
$aForm['hotblocks_title_hiding']['hotblocks_title_hiding_delim_start'] = array(
'#type' => 'textfield',
'#title' => t('Starting delimiter'),
'#size' => 4,
'#default_value' => variable_get('hotblocks_title_hiding_delim_start', HOTBLOCKS_TITLE_HIDING_START),
);
-
+
$aForm['hotblocks_title_hiding']['hotblocks_title_hiding_delim_end'] = array(
'#type' => 'textfield',
'#title' => t('Ending delimiter'),
'#size' => 4,
'#default_value' => variable_get('hotblocks_title_hiding_delim_end', HOTBLOCKS_TITLE_HIDING_END),
);
-
+
if(module_exists('taxonomy')) {
$vocabularies = taxonomy_get_vocabularies();
$voptions[0] = '--None--';
foreach ((array)$vocabularies as $oVocab) {
$voptions[$oVocab->vid] = $oVocab->name;
}
-
+
$aForm['hotblocks_vocabulary'] = array(
'#type' => 'select',
'#title' => 'Hotblocks Vocabulary',
@@ -1332,7 +1332,7 @@ function hotblocks_settings($form_state, $sJsField = null) {
'#default_value' => variable_get('hotblocks_vocabulary', 0),
);
}
-
+
$aForm['submit'] = array('#type' => 'submit', '#value' => t('Save configuration'),'#weight' => 50, );
$aForm['reset'] = array('#type' => 'submit', '#value' => t('Reset to defaults') ,'#weight' => 55,);
$aForm['#theme'] = 'system_settings_form';
@@ -1345,7 +1345,7 @@ function hotblocks_settings($form_state, $sJsField = null) {
function hotblocks_settings_submit($form, &$form_state) {
//The menu titles will change when the terminology option is changed, so menu needs to be rebuilt.
menu_rebuild();
-
+
system_settings_form_submit($form, $form_state);
}
@@ -1380,7 +1380,7 @@ function hotblocks_blockcount_names_js() {
else {
$sOutput = 'You must have at least 1 hotblocks block.';
}
- print drupal_to_js(array('status' => TRUE, 'data' => $sOutput));
+ print drupal_to_js(array('status' => TRUE, 'data' => $sOutput));
exit;
}
@@ -1397,7 +1397,7 @@ function hotblocks_blockcount_names($iNumBlocks, $js = false) {
'#description' => 'The name of this block as seen in the administer blocks page.',
'#default_value' => hotblocks_get_blockname($i),
);
-
+
if($js) {
$aForm['hotblocks_block_name_'.$i]['#name'] = 'hotblocks_block_name_'.$i;
$aForm['hotblocks_block_name_'.$i]['#value'] = $aForm['hotblocks_block_name_'.$i]['#default_value'];
@@ -1426,7 +1426,7 @@ function hotblocks_get_blocknames_array() {
* 1. Unweighted globals (not ordered or ordered as the DB prefers)
* 2. All weighted hotblocks (global or not) for the block and path unless we are on node/add in which case only globals.
* 3. Unweighted non-globals for the block and path
- *
+ *
* The $bReturn parameter makes it easy for another function to get an array of hotblocks ordered in the same way that they are viewed by users.
* @todo Make the order in which non-weighted global, non-weighted non-global, and weighted items are grouped be configurable (low priority..)
*
@@ -1443,25 +1443,25 @@ function hotblocks_view_block($iDelta, $bReturn = false) {
//path will be set if this is an ajax request, otherwise use the standard q
$sPath = $_GET['path'] ? $_GET['path'] : $_GET['q'];
$aHotblocks = array();
-
+
//Not yet weighted globals for this block
$result = db_query("SELECT * FROM {hotblocks} WHERE delta = '%d' AND global = 1 AND ( (weight IS NULL) OR (weight IS NOT NULL AND path != '%s') )", $iDelta, $sPath);
while($oRow = db_fetch_object($result)) {
- if(!in_array($oRow->nid,$aHotblocks)) {
+ if(!in_array($oRow->nid,$aHotblocks)) {
//if the hotblocks_item was selected based on NOT NULL weight and path != $sPath, we dont want to put it at the top if a weighted instance exists for this page
if($oRow->path != $sPath) {
if(db_result(db_query("SELECT * FROM {hotblocks} WHERE global = 1 AND nid = %d AND path = '%s' AND delta = %d AND weight IS NOT NULL",$oRow->nid,$sPath,$iDelta))) {
continue;
}
- }
+ }
$aHotblocks[] = $oRow;
$bFoundHotblocks = true;
}
}
-
+
$bNodeAddPage = (arg(0) == 'node' && arg(1) == 'add');
-
- //All weighted hotblocks (global or not) for this block and path unless
+
+ //All weighted hotblocks (global or not) for this block and path unless
// we are on node/add in which case only globals.
if ($bNodeAddPage) {
$result = db_query("SELECT * FROM {hotblocks} WHERE delta = '%d' AND path = '%s' AND weight IS NOT NULL AND global = 1 ORDER BY weight", $iDelta, $sPath);
@@ -1475,7 +1475,7 @@ function hotblocks_view_block($iDelta, $bReturn = false) {
$bFoundHotblocks = true;
}
}
-
+
if (!$bNodeAddPage) {
//Not yet weighted non-globals for this block and path
$result = db_query("SELECT * FROM {hotblocks} WHERE delta = '%d' AND path = '%s' AND global = 0 AND weight IS NULL", $iDelta, $sPath);
@@ -1486,7 +1486,7 @@ function hotblocks_view_block($iDelta, $bReturn = false) {
}
}
}
-
+
if($bReturn) { return $aHotblocks; }
$sHotblocks = '';
@@ -1504,7 +1504,7 @@ function hotblocks_view_block($iDelta, $bReturn = false) {
$sHotblocks.
$sControls.
'
' . theme('table',$aHeader,$aTableRows,array(),"
Page: ".l(drupal_get_path_alias($oPage->path), $oPage->path)."
") . '';
unset($aTableRows);
}
-
+
return $output;
}
@@ -1721,7 +1721,7 @@ function hotblocks_overview_by_path() {
* 2. All weighted hotblocks (global or not) for the block and path unless we are on node/add in which case only globals.
* 3. Unweighted non-globals for the block and path
* However, the overview functions currently sort by weight & path (this function) block, weight, & title
- *
+ *
*
* @return unknown
*/
@@ -1736,7 +1736,7 @@ function hotblocks_overview_by_block() {
$result = db_query("SELECT n.title, n.type, p.* FROM {hotblocks} p, {node} n WHERE p.delta = 0 AND p.path IS NULL AND n.nid = p.nid ORDER BY n.title ASC");
//$result = db_query("SELECT DISTINCT hotblocks.nid, node.type, node.title FROM hotblocks, node WHERE hotblocks.nid = node.nid ORDER BY node.title ASC");
}
-
+
while($oRow = db_fetch_object($result)) {
if(!db_result(db_query("SELECT nid FROM {hotblocks} p WHERE p.delta > 0 AND p.path IS NOT NULL AND nid = %d", $oRow->nid))) {
$actions = array(
@@ -1744,43 +1744,43 @@ function hotblocks_overview_by_block() {
l('Edit', "node/$oRow->nid/edit", array('query' => drupal_get_destination())),
l('Delete', "node/$oRow->nid/delete", array('query' => drupal_get_destination())),
);
-
+
$aTableRows[] = array(
l($oRow->title, 'node/'.$oRow->nid),
node_get_types('name',$oRow->type),
implode(' | ', $actions),
- );
+ );
}
}
$aHeader = array('Name', 'Content Type', 'Action');
if(sizeof($aTableRows) < 1) {
- $aTableRows = array(array('None'));
+ $aTableRows = array(array('None'));
$aHeader = array();
}
$output .= '' . theme('table',$aHeader,$aTableRows,array(),"
Block: $name
") . '';
unset($aTableRows);
}
-
+
return $output;
}
@@ -1825,7 +1825,7 @@ function hotblocks_even_odd() {
static $i = 'hotblocks-odd';
if ($i == 'hotblocks-odd') { $i = 'hotblocks-even'; }
else { $i = 'hotblocks-odd'; }
-
+
return $i;
}
@@ -1874,7 +1874,7 @@ function hotblocks_taxonomy_build($aTree, $iDelta = 0, $depth = -1) {
$toggleable = 'toggleable';
$toggleRow = 'toggleRow';
}
-
+
//////List items in the term
$result = taxonomy_select_nodes(array($oTerm->tid));
$kids = null;
@@ -1882,7 +1882,7 @@ function hotblocks_taxonomy_build($aTree, $iDelta = 0, $depth = -1) {
if(!hotblocks_access('assign items to any hotblock',db_result(db_query("SELECT type FROM {node} WHERE nid = %d",$oRow->nid)),$iDelta) || !hotblocks_access('view node',$oRow->nid)) {
continue;
}
- $sImage = theme('image',hotblocks_icon_path('16x16') .'/page-icon.png','Folder full','Folder full', array('align' => 'absmiddle'));
+ $sImage = theme('image',hotblocks_icon_path('16x16') .'/page-icon.png','Folder full','Folder full', array('align' => 'absmiddle'));
if($iDelta > 0) {
//If we have a delta, we'll provide links that will assign the hotblocks_item to that block
$nlink = hotblocks_assign_to_block_link($iDelta, $oRow);
@@ -1893,23 +1893,23 @@ function hotblocks_taxonomy_build($aTree, $iDelta = 0, $depth = -1) {
}
$kids .= '' . $sImage . $nlink . '
';
}
-
+
//////Make term markup with an icon indicating whether or not it is empty
if($count > 0) {
- $sImage = theme('image',hotblocks_icon_path('16x16') .'/folder-full.png','Folder full','Folder full', array('align' => 'absmiddle'));
+ $sImage = theme('image',hotblocks_icon_path('16x16') .'/folder-full.png','Folder full','Folder full', array('align' => 'absmiddle'));
}
else {
- $sImage = theme('image',hotblocks_icon_path('16x16') .'/folder.png','Folder empty','Folder empty', array('align' => 'absmiddle'));
+ $sImage = theme('image',hotblocks_icon_path('16x16') .'/folder.png','Folder empty','Folder empty', array('align' => 'absmiddle'));
}
- $output .=
- '