diff -up css_injector_cvs/css_injector.admin.inc css_injector_spawar/css_injector.admin.inc --- css_injector_cvs/css_injector.admin.inc 2008-08-09 18:56:58.000000000 -0700 +++ css_injector_spawar/css_injector.admin.inc 2008-12-02 15:25:45.000000000 -0700 @@ -59,7 +59,7 @@ function theme_css_injector_admin_form(& $row = array(); $rule = $form['rules'][$crid]['#rule']; $row[] = check_plain($rule['title']); - $row[] = check_plain($rule['file_path']); + $row[] = check_plain(_css_injector_rule_path($rule['crid'])); $row[] = drupal_render($form['rules'][$crid]); $rows[] = $row; } @@ -96,13 +96,10 @@ function css_injector_edit($form_state, '#type' => 'value', '#value' => $crid, ); - $path = file_create_path($rule['file_path']); + + $path = file_create_path(_css_injector_rule_path($rule['crid'])); if (file_exists($path)) { $rule['css_text'] = file_get_contents($path); - $form['file_path'] = array( - '#type' => 'value', - '#value' => $rule['file_path'], - ); } else { $rule['css_text'] = ''; @@ -212,15 +209,9 @@ function css_injector_edit_validate($for */ function css_injector_edit_save($form, &$form_state) { $rule = $form_state['rule']; - - if (empty($rule['crid'])) { - drupal_write_record('css_injector_rule', $rule); - $directory = file_directory_path(); - $rule['file_path'] = file_create_path($directory .'/css_injector_'. $rule['crid'] .'.css'); - } - drupal_write_record('css_injector_rule', $rule, array('crid')); + drupal_write_record('css_injector_rule', $rule, empty($rule['crid']) ? NULL : 'crid'); - file_save_data($rule['css_text'], file_create_path($rule['file_path']), FILE_EXISTS_REPLACE); + file_save_data($rule['css_text'], file_create_path(_css_injector_rule_path($rule['crid'])), FILE_EXISTS_REPLACE); _css_injector_load_rule(NULL, TRUE); drupal_set_message('Your CSS injection rule was saved.'); diff -up css_injector_cvs/css_injector.install css_injector_spawar/css_injector.install --- css_injector_cvs/css_injector.install 2008-08-09 18:56:58.000000000 -0700 +++ css_injector_spawar/css_injector.install 2008-12-02 15:25:45.000000000 -0700 @@ -45,11 +45,6 @@ function css_injector_schema() { 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0), - 'file_path' => array( - 'description' => 'The path of the CSS file to inject', - 'type' => 'varchar', - 'length' => 255, - 'not null' => TRUE), ), 'primary key' => array('crid'), ); @@ -67,3 +62,12 @@ function css_injector_uninstall() { } db_query("DROP TABLE {css_injector_rule}"); } + +/** + * Removes file path field from table + */ +function css_injector_update_6000() { + $ret = array(); + db_drop_field($ret, 'css_injector_rule', 'file_path'); + return $ret; +} diff -up css_injector_cvs/css_injector.module css_injector_spawar/css_injector.module --- css_injector_cvs/css_injector.module 2008-08-09 18:56:58.000000000 -0700 +++ css_injector_spawar/css_injector.module 2008-12-02 15:25:45.000000000 -0700 @@ -34,7 +34,7 @@ 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_rule['file_path']), 'module', $css_rule['media'], $css_rule['preprocess']); + drupal_add_css(file_create_path(_css_injector_rule_path($css_rule['crid'])), 'module', $css_rule['media'], $css_rule['preprocess']); } } } @@ -131,7 +131,7 @@ function _css_injector_load_rule($crid = */ function _css_injector_delete_rule($crid) { if ($rule = _css_injector_load_rule($crid)) { - file_delete(file_create_path($rule['file_path'])); + file_delete(file_create_path(_css_injector_rule_path($crid))); db_query("DELETE FROM {css_injector_rule} WHERE crid = %d", $crid); } } @@ -164,3 +164,14 @@ function _css_injector_evaluate_rule($cs } return $page_match; } + +/** + * Helper function to get file path for a rule + */ +function _css_injector_rule_path($crid) { + if (!empty($crid)) { + $directory = file_directory_path(); + return $directory . '/css_injector_'. $crid .'.css'; + } + return NULL; +}