TRUE (PHP-mode, experts only).');
- $description .= ' '. t('If the PHP-mode is chosen, enter PHP code between %php. Note that executing incorrect PHP-code can break your Drupal site.', array('%php' => ''));
+ $description .= ' ' . t('If the PHP-mode is chosen, enter PHP code between %php. Note that executing incorrect PHP-code can break your Drupal site.', array('%php' => ''));
}
$form['conditional']['rule_type'] = array(
'#type' => 'radios',
@@ -181,7 +191,7 @@ function css_injector_edit($form_state, $crid = NULL) {
);
$form['buttons']['save_and_continue'] = array(
'#type' => 'submit',
- '#value' => t('Save and Continue'),
+ '#value' => t('Save and Continue Editing'),
'#submit' => array('css_injector_edit_save_and_continue'),
);
@@ -189,8 +199,8 @@ function css_injector_edit($form_state, $crid = NULL) {
$form['buttons']['delete'] = array(
'#type' => 'submit',
'#value' => t('Delete'),
- '#submit' => array('css_injector_admin_delete_button'),
'#crid' => $rule['crid'],
+ '#submit' => array('css_injector_admin_delete_button'),
);
}
@@ -201,39 +211,40 @@ function css_injector_edit($form_state, $crid = NULL) {
* Validation callback for the CSS rule edit form.
*/
function css_injector_edit_validate($form, &$form_state) {
- $rule = $form_state['values'];
- $directory = file_directory_path();
- file_check_directory($directory, 1);
- $form_state['rule'] = $rule;
+ $directory = 'public://css_injector';
+ if (!file_prepare_directory($directory, FILE_MODIFY_PERMISSIONS)) {
+ form_error($form, t('The directory %directory is not writable', $directory));
+ }
}
/**
* Submit button callback for the CSS rule edit form.
*/
function css_injector_edit_save($form, &$form_state) {
- $rule = $form_state['rule'];
- drupal_write_record('css_injector_rule', $rule, empty($rule['crid']) ? NULL : 'crid');
-
- file_save_data($rule['css_text'], file_create_path(_css_injector_rule_path($rule['crid'])), FILE_EXISTS_REPLACE);
+ $rule = $form_state['values'];
+ $crid = !empty($form_state['values']['crid']) ? $form_state['values']['crid'] : NULL;
+ drupal_write_record('css_injector_rule', $rule, empty($crid) ? NULL : 'crid');
+ $form_state['values']['rule'] = $rule;
+ file_unmanaged_save_data($rule['css_text'], _css_injector_rule_path($rule['crid']), FILE_EXISTS_REPLACE);
_css_injector_load_rule(NULL, TRUE);
- drupal_set_message('Your CSS injection rule was saved.');
- $form_state['redirect'] = 'admin/settings/css_injector';
+ drupal_set_message(t('Your CSS injection rule %title was saved.', array('%title' => $rule['title'])));
+ $form_state['redirect'] = 'admin/config/development/css_injector';
}
/**
* Save and continue callback for the CSS rule edit form.
*/
- function css_injector_edit_save_and_continue($form, &$form_state) {
- css_injector_edit_save($form, $form_state);
- $form_state['redirect'] = 'admin/settings/css_injector/edit/' . $form_state['rule']['crid'];
- }
+function css_injector_edit_save_and_continue($form, &$form_state) {
+ css_injector_edit_save($form, $form_state);
+ $form_state['redirect'] = 'admin/config/development/css_injector/edit/' . $form_state['values']['rule']['crid'];
+}
/**
* Menu callback -- ask for confirmation of rule deletion.
*/
-function css_injector_delete_confirm(&$form_state, $crid) {
+function css_injector_delete_confirm($form, &$form_state, $crid) {
$form['crid'] = array(
'#type' => 'value',
'#value' => $crid,
@@ -242,7 +253,7 @@ function css_injector_delete_confirm(&$form_state, $crid) {
$rule = _css_injector_load_rule($crid);
return confirm_form($form,
t('Are you sure you want to delete %title?', array('%title' => $rule['title'])),
- isset($_GET['destination']) ? $_GET['destination'] : 'admin/settings/css_injector',
+ isset($_GET['destination']) ? $_GET['destination'] : 'admin/config/development/css_injector',
t('This action cannot be undone.'),
t('Delete'),
t('Cancel')
@@ -257,6 +268,6 @@ function css_injector_delete_confirm_submit($form, &$form_state) {
_css_injector_delete_rule($form_state['values']['crid']);
}
- $form_state['redirect'] = 'admin/settings/css_injector';
+ $form_state['redirect'] = 'admin/config/development/css_injector';
return;
}
diff --git css_injector.info css_injector.info
index d922c48..c6b8308 100644
--- css_injector.info
+++ css_injector.info
@@ -1,4 +1,8 @@
;$Id: css_injector.info,v 1.1.2.2 2008/08/10 01:56:58 add1sun Exp $
name = CSS Injector
description = Adds CSS to the page output based on configurable rules.
-core = 6.x
+core = 7.x
+
+files[] = css_injector.admin.inc
+files[] = css_injector.install
+files[] = css_injector.module
diff --git css_injector.install css_injector.install
index 8442947..75bf8cf 100644
--- css_injector.install
+++ css_injector.install
@@ -2,14 +2,19 @@
// $Id: css_injector.install,v 1.1.2.3 2010/03/07 23:59:47 eaton Exp $
/**
- * Implementation of hook_install().
+ * @file
+ * Install, update and uninstall functions for the css_injector module.
+ *
+ */
+
+/**
+ * Implements hook_install().
*/
function css_injector_install() {
- drupal_install_schema('css_injector');
}
/**
- * Implementation of hook_schema().
+ * Implements hook_schema().
*/
function css_injector_schema() {
$schema['css_injector_rule'] = array(
@@ -52,22 +57,37 @@ function css_injector_schema() {
}
/**
- * Implementation of hook_uninstall().
+ * Implements hook_uninstall().
*/
function css_injector_uninstall() {
cache_clear_all('css_injector:*', 'cache', TRUE);
- $results = db_query("SELECT * FROM {css_injector_rule}");
- while ($rule = db_fetch_array($results)) {
- file_delete(file_create_path($rule['file_path']));
+ $rules = db_query("SELECT * FROM {css_injector_rule}", array(), array('fetch' => PDO::FETCH_ASSOC))->fetchAllAssoc('crid');
+ foreach($rules as $id => $rule) {
+ file_unmanaged_delete(_css_injector_rule_path($id));
}
- db_query("DROP TABLE {css_injector_rule}");
+ db_drop_table('css_injector_rule');
}
/**
- * Removes file path field from table
+ * Implements hook_requirements().
+ * We'll use this to prevent installation of the module if the file directory
+ * is not available and writable.
*/
-function css_injector_update_6000() {
- $ret = array();
- db_drop_field($ret, 'css_injector_rule', 'file_path');
- return $ret;
+function css_injector_requirements($phase) {
+ $status = REQUIREMENT_OK;
+ $dir = 'public://css_injector';
+ if (!file_prepare_directory($dir, FILE_MODIFY_PERMISSIONS)) {
+ if (!file_prepare_directory($dir, FILE_CREATE_DIRECTORY)) {
+ $status = REQUIREMENT_ERROR;
+ }
+ }
+ $requirements = array(
+ 'css_injector' => array(
+ 'title' => t('CSS Injector directory writable'),
+ 'description' => $status == REQUIREMENT_OK ? t('CSS Injector Directory %dir is writable', array('%dir' => $dir)) : t('Directory %dir is not writable', array('%dir' => $dir)),
+ 'severity' => $status,
+ 'value' => t('Not writable'),
+ ),
+ );
+ return $requirements;
}
diff --git css_injector.module css_injector.module
index fcd3b65..a8d5b73 100644
--- css_injector.module
+++ css_injector.module
@@ -9,24 +9,24 @@
*/
/**
- * Implementation of hook_help().
+ * Implements hook_help().
*/
function css_injector_help($path, $arg) {
$output = '';
switch ($path) {
- case 'admin/settings/modules#description':
+ case 'admin/config/modules#description':
$output .= t('Allows administrators to inject CSS into the page output based on configurable rules.');
break;
- case 'admin/settings/css_injector':
- $output .= ''. t('Use CSS injection rules to add small snippets of CSS to the page output when specific criteria are met. For example, a simple rule could change the page background color at night or float a particular div to the right on node editing pages.') .'
'; - $output .= ''. t('An important point to keep in mind is that in Drupal, themes always get last crack at display. Theme CSS is applied after modules. That means themes can and will override CSS put into play by CSS Injector module. If you want to override CSS that a theme is already applying, use CSS rules the way they were intended -- higher specificity rules, or the !important flag.') .'
'; + case 'admin/config/development/css_injector': + $output .= '' . t('Use CSS injection rules to add small snippets of CSS to the page output when specific criteria are met. For example, a simple rule could change the page background color at night or float a particular div to the right on node editing pages.') . '
'; + $output .= '' . t('An important point to keep in mind is that in Drupal, themes always get last crack at display. Theme CSS is applied after modules. That means themes can and will override CSS put into play by CSS Injector module. If you want to override CSS that a theme is already applying, use CSS rules the way they were intended -- higher specificity rules, or the !important flag.') . '
'; break; } return $output; } /** - * Implementation of hook_init(). + * Implements hook_init(). * Checks to see whether any CSS files should be added to the current page, * based on rules configured by the site administrator. */ @@ -34,18 +34,24 @@ function css_injector_init() { $css_rules = _css_injector_load_rule(); foreach ($css_rules as $css_rule) { if (_css_injector_evaluate_rule($css_rule)) { - drupal_add_css(file_create_path(_css_injector_rule_path($css_rule['crid'])), 'module', $css_rule['media'], $css_rule['preprocess']); + // TODO: Can't this be cleaner? An awful lot of work to translate the + // stream path to a local file path. + $scheme_base = file_directory_path('public'); + $scheme_path = _css_injector_rule_path($css_rule['crid']); + $parts = parse_url($scheme_path); + $local_path = $scheme_base . '/' . $parts['host'] . $parts['path']; + drupal_add_css($local_path, array('type' => 'file', 'media' => $css_rule['media'], 'preprocess' => $css_rule['preprocess'])); } } } /** - * Implementation of hook_menu(). + * Implements hook_menu(). * Defines menu callbacks for CSS Injector's configuration pages. */ function css_injector_menu() { $items = array( - 'admin/settings/css_injector' => array( + 'admin/config/development/css_injector' => array( 'title' => 'CSS injector', 'description' => 'Add CSS to the page output based on configurable rules.', 'page callback' => 'drupal_get_form', @@ -53,7 +59,7 @@ function css_injector_menu() { 'access arguments' => array('administer css injection'), 'file' => 'css_injector.admin.inc', ), - 'admin/settings/css_injector/edit' => array( + 'admin/config/development/css_injector/edit' => array( 'title' => 'Edit CSS injector rule', 'page callback' => 'drupal_get_form', 'page arguments' => array('css_injector_edit'), @@ -61,7 +67,7 @@ function css_injector_menu() { 'file' => 'css_injector.admin.inc', 'type' => MENU_CALLBACK, ), - 'admin/settings/css_injector/add' => array( + 'admin/config/development/css_injector/add' => array( 'title' => 'Add CSS injector rule', 'page callback' => 'drupal_get_form', 'page arguments' => array('css_injector_edit'), @@ -69,7 +75,7 @@ function css_injector_menu() { 'file' => 'css_injector.admin.inc', 'type' => MENU_CALLBACK, ), - 'admin/settings/css_injector/delete' => array( + 'admin/config/development/css_injector/delete' => array( 'title' => 'Delete CSS injector rule', 'page callback' => 'drupal_get_form', 'page arguments' => array('css_injector_delete_confirm'), @@ -82,21 +88,26 @@ function css_injector_menu() { } /** - * Implementation of hook_theme(). + * Implements hook_theme(). */ function css_injector_theme() { $items['css_injector_admin_form'] = array( - 'arguments' => array('form' => array()), + 'render element' => 'form', 'file' => 'css_injector.admin.inc', ); return $items; } /** - * Implementation of hook_perm(). + * Implements hook_permission(). */ -function css_injector_perm() { - return array('administer css injection'); +function css_injector_permission() { + return array( + 'administer css injection' => array( + 'title' => t('administer css injection'), + 'description' => t('Administer the CSS Injector module'), + ), + ); } /** @@ -104,15 +115,16 @@ function css_injector_perm() { */ function _css_injector_load_rule($crid = NULL, $reset = FALSE) { static $rules; + // TODO: Change to drupal_static_fast pattern. if (!isset($rules) || $reset) { if (!$reset && ($cache = cache_get('css_injector:rules')) && !empty($cache->data)) { $rules = $cache->data; } else { $rules = array(); - $results = db_query("SELECT * FROM {css_injector_rule}"); - while ($rule = db_fetch_array($results)) { - $rules[$rule['crid']] = $rule; + $results = db_query("SELECT * FROM {css_injector_rule}", array(), array('fetch' => PDO::FETCH_ASSOC))->fetchAllAssoc('crid'); + foreach ($results as $id => $rule) { + $rules[$id] = $rule; } cache_set('css_injector:rules', $rules); } @@ -131,8 +143,10 @@ function _css_injector_load_rule($crid = NULL, $reset = FALSE) { */ function _css_injector_delete_rule($crid) { if ($rule = _css_injector_load_rule($crid)) { - file_delete(file_create_path(_css_injector_rule_path($crid))); - db_query("DELETE FROM {css_injector_rule} WHERE crid = %d", $crid); + file_unmanaged_delete(_css_injector_rule_path($crid)); + db_delete('css_injector_rule') + ->condition('crid', $crid) + ->execute(); } } @@ -156,7 +170,10 @@ function _css_injector_evaluate_rule($css_rule = array()) { $page_match = !($css_rule['rule_type'] xor $page_match); } else { - $page_match = drupal_eval($css_rule['rule_conditions']); + if (module_exists('php')) { + $page_match = php_eval($css_rule['rule_conditions']); + + } } } else { @@ -170,8 +187,7 @@ function _css_injector_evaluate_rule($css_rule = array()) { */ function _css_injector_rule_path($crid) { if (!empty($crid)) { - $directory = file_directory_path(); - return $directory . '/css_injector_'. $crid .'.css'; + return 'public://css_injector/' . 'css_injector_' . $crid . '.css'; } return NULL; }