diff -urp imagebrowser-org\imagebrowser.module imagebrowser\imagebrowser.module
--- imagebrowser-org\imagebrowser.module Sat Oct 24 18:04:41 2009
+++ imagebrowser\imagebrowser.module Wed Dec 09 19:58:27 2009
@@ -191,11 +191,11 @@ function imagebrowser_init() {
drupal_add_js(array('imagebrowser' => $settings), "setting");
- if(!file_exists(file_directory_path() . "/ibstyles.css")) {
+ if(!file_exists(file_directory_path() . variable_get('imagebrowser_css_path_default', "/") . "/ibstyles.css")) {
imagebrowser_rebuild_cache();
}
- drupal_add_css(file_directory_path() . "/ibstyles.css");
+ drupal_add_css(file_directory_path() . variable_get('imagebrowser_css_path_default', "/") . "/ibstyles.css");
}
@@ -237,8 +237,13 @@ function imagebrowser_upload_validate($f
* Make the upload permanent.
*/
function imagebrowser_upload_submit($form_id, $form_values) {
- // Make file permanent and move to images direction
- $file = file_save_upload('upload', array(), file_directory_path().'/images'); //Save temp file
+ //Take role id
+ global $user;
+ $role = array_slice($user->roles, 0, 1, TRUE);
+ $rid = key($role);
+
+ // Make file permanent and move to images direction
+ $file = file_save_upload('upload', array(), file_directory_path() . variable_get('imagebrowser_images_path_default_'. $rid, '/')); //Save temp file
file_set_status($file, FILE_STATUS_PERMANENT);
@@ -783,7 +788,41 @@ function imagebrowser_defaults_edit_form
}
$form = array();
- $form['image_preset'] = array(
+
+ $form['imagebrowser_paths'] = array(
+ '#type' => 'fieldset',
+ '#title' => t('Paths defaults'),
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
+ );
+ $form['imagebrowser_paths']['images_path'] = array(
+ '#id' => 'images_path',
+ '#type' => 'textfield',
+ '#size' => '50',
+ '#title' => t('Images path'),
+ '#default_value' => variable_get('imagebrowser_images_path_default_'. $rid, '/'),
+ '#description' => t("Path to writable directory where original uploaded images will be saved inside default drupal file path: !base!files
Current path: !current
Remember about '/' character at the beggining!", array('!base' => base_path(), '!files' => file_directory_path(), '!current' => base_path() . file_directory_path() . variable_get('imagebrowser_images_path_default_'. $rid, '/'))),
+ '#weight' => 0,
+ );
+
+ $form['imagebrowser_paths']['css_path'] = array(
+ '#id' => 'css_path',
+ '#type' => 'textfield',
+ '#size' => '50',
+ '#title' => t('CSS path'),
+ '#default_value' => variable_get('imagebrowser_css_path_default', "/"),
+ '#description' => t("Path to writable directory where css file will be saved inside default drupal file path: !base!files
Current path: !current
Remember about '/' character at the beggining!
This setting is global, it doesn''t' depend on role!'", array('!base' => base_path(), '!files' => file_directory_path(), '!current' => base_path() . file_directory_path() . variable_get('imagebrowser_css_path_default', '/'))),
+ '#weight' => 1,
+ );
+
+ $form['imagebrowser_images'] = array(
+ '#type' => 'fieldset',
+ '#title' => t('Images defaults'),
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
+ );
+
+ $form['imagebrowser_images']['image_preset'] = array(
'#id' => 'image_preset',
'#type' => 'select',
'#title' => t('ImageCache Preset'),
@@ -792,7 +831,7 @@ function imagebrowser_defaults_edit_form
'#weight' => 0,
);
- $form['link'] = array(
+ $form['imagebrowser_images']['link'] = array(
'#id' => 'link',
'#type' => 'select',
'#title' => t('Link'),
@@ -801,7 +840,7 @@ function imagebrowser_defaults_edit_form
'#weight' => 1,
);
- $form['custom_url'] = array(
+ $form['imagebrowser_images']['custom_url'] = array(
'#id' => 'custom_url',
'#type' => 'textfield',
'#size' => '30',
@@ -811,7 +850,7 @@ function imagebrowser_defaults_edit_form
'#weight' => 2,
);
- $form['link_target'] = array(
+ $form['imagebrowser_images']['link_target'] = array(
'#id' => 'link_target',
'#type' => 'select',
'#title' => t('Link Target'),
@@ -820,7 +859,7 @@ function imagebrowser_defaults_edit_form
'#weight' => 3,
);
- $form['styles'] = array(
+ $form['imagebrowser_images']['styles'] = array(
'#id' => 'styles',
'#type' => 'select',
'#title' => t('Styles'),
@@ -853,7 +892,46 @@ function imagebrowser_defaults_edit_form
variable_set('imagebrowser_custom_url_default_'.$form_state['values']['rid'], $form_state['values']['custom_url']);
variable_set('imagebrowser_link_target_default_'.$form_state['values']['rid'], $form_state['values']['link_target']);
variable_set('imagebrowser_styles_default_'.$form_state['values']['rid'], $form_state['values']['styles']);
-
+
+ //images path
+ $images_path = $form_state['values']['images_path'];
+ if(strpos($images_path, '/') !== 0)
+ $images_path = "/" . $images_path;
+ variable_set('imagebrowser_images_path_default_'.$form_state['values']['rid'], $images_path);
+ $images_fullpath = file_directory_path() . $images_path;
+ file_check_directory($images_fullpath, true, 'defaults_edit_form');
+
+ //css path
+ $css_path_new = $form_state['values']['css_path'];
+ if(strpos($css_path_new, '/') !== 0)
+ $css_path_new = "/" . $css_path_new;
+ $css_path_old = variable_get('imagebrowser_css_path_default', "/");
+ if(strcmp($css_path_new, $css_path_old)!=0)
+ {
+ $css_fullpath_new = file_directory_path() . $css_path_new;
+ $css_fullpath_old = file_directory_path() . $css_path_old;
+ file_check_directory($css_fullpath_new, true, 'defaults_edit_form');
+
+ //move css files if exists
+ if(file_exists($css_fullpath_old . "/ibstyles.css"))
+ {
+ $css_file_fullpath_old = $css_fullpath_old . "/ibstyles.css";
+ if(file_move($css_file_fullpath_old, $css_fullpath_new, FILE_EXISTS_REPLACE))
+ {
+ drupal_set_message(t('CSS file was succesfully moved to %directory', array('%directory' => $css_fullpath_new)));
+ variable_set('imagebrowser_css_path_default', $css_path_new);
+ }
+ else
+ {
+ drupal_set_message(t('CSS cannot be moved to %directory', array('%directory' => $css_fullpath_new)), 'error');
+ }
+ }
+ else
+ {
+ variable_set('imagebrowser_css_path_default', $css_path_new);
+ }
+ }
+
drupal_set_message(t('Defaults saved for %role.', array('%role' => $role[$form_state['values']['rid']])));
$form_state['redirect'] = 'admin/settings/imagebrowser/defaults';
}
@@ -891,7 +969,7 @@ function imagebrowser_rebuild_cache() {
cache_set('imagebrowser_styles', $styles);
- $css = file_directory_path() . "/ibstyles.css";
+ $css = file_directory_path() . variable_get('imagebrowser_css_path_default', "/") . "/ibstyles.css";
$file = fopen($css, 'w') or die("can't open file");
$data = NULL;
foreach($styles as $style) {
diff -urp imagebrowser-org\README.txt imagebrowser\README.txt
--- imagebrowser-org\README.txt Sat Oct 24 18:04:41 2009
+++ imagebrowser\README.txt Wed Dec 09 19:55:46 2009
@@ -20,8 +20,10 @@ Installation
1. Drop the "imagebrowser" folder into the modules directory (/sites/all/modules/)
2. Enable the "Image Browser" module (?q=/admin/build/modules)
3. Enable at least one Image Browser Plugin (?q=/admin/build/modules)
- 4. Add the "Image Browser Images" filter to one of your Input Formats (?q=admin/settings/filters/list)
- 5. Setup your permissions (?q=/admin/user/permissions)
+ 4. Follow instructions in README.txt file for enabled Image Browser Plugin ('plugins/ib_fckeditor' or 'plugins/ib_wysiwyg' directory)
+ 5. Add the "Image Browser Images" filter to one of your Input Formats (?q=admin/settings/filters/list)
+ 6. Setup your permissions (?q=/admin/user/permissions)
+ 7. Go to administration pages of Image Browser and configure defaults, styles and views (?q=admin/settings/imagebrowser)
==============================
Upgrading