banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use absolute paths in is_dir() checks to prevent open_basedir related warnings

Browse Source
pull/85/head
Aleksander Machniak 11 years ago
parent d4a2ea1d87
commit b7addfc77c
2 changed files with 20 additions and 57 deletions
Show Stats Download Patch File Download Diff File

75
program/include/rcmail_output_html.php
Unescape Escape View File

@ -106,7 +106,6 @@ class rcmail_output_html extends rcmail_output
));
}
/**
* Set environment variable
*
@ -122,7 +121,6 @@ class rcmail_output_html extends rcmail_output
}
}
/**
* Getter for the current page title
*
@ -146,17 +144,17 @@ class rcmail_output_html extends rcmail_output
return $title;
}
/**
* Set skin
*/
public function set_skin($skin)
{
$valid = false;
$path = RCUBE_INSTALL_PATH . 'skins/';
if (!empty($skin) && is_dir('skins/'.$skin) && is_readable('skins/'.$skin)) {
$skin_path = 'skins/'.$skin;
$valid = true;
if (!empty($skin) && is_dir($path . $skin) && is_readable($path . $skin)) {
$skin_path = 'skins/' . $skin;
$valid = true;
}
else {
$skin_path = $this->config->get('skin_path');
@ -184,13 +182,16 @@ class rcmail_output_html extends rcmail_output
$this->skin_paths[] = $skin_path;
// read meta file and check for dependecies
$meta = @json_decode(@file_get_contents($skin_path.'/meta.json'), true);
if ($meta['extends'] && is_dir('skins/' . $meta['extends'])) {
$this->load_skin('skins/' . $meta['extends']);
$meta = @file_get_contents(RCUBE_INSTALL_PATH . $skin_path . '/meta.json');
$meta = @json_decode($meta, true);
if ($meta['extends']) {
$path = RCUBE_INSTALL_PATH . 'skins/';
if (is_dir($path . $meta['extends']) && is_readable($path . $meta['extends'])) {
$this->load_skin('skins/' . $meta['extends']);
}
}
}
/**
* Check if a specific template exists
*
@ -199,16 +200,17 @@ class rcmail_output_html extends rcmail_output
*/
public function template_exists($name)
{
$found = false;
foreach ($this->skin_paths as $skin_path) {
$filename = $skin_path . '/templates/' . $name . '.html';
$found = (is_file($filename) && is_readable($filename)) || ($this->deprecated_templates[$name] && $this->template_exists($this->deprecated_templates[$name]));
if ($found)
break;
$filename = RCUBE_INSTALL_PATH . $skin_path . '/templates/' . $name . '.html';
if ((is_file($filename) && is_readable($filename))
|| ($this->deprecated_templates[$name] && $this->template_exists($this->deprecated_templates[$name]))
) {
return true;
}
}
return $found;
}
return false;
}
/**
* Find the given file in the current skin path stack
@ -234,7 +236,6 @@ class rcmail_output_html extends rcmail_output
return false;
}
/**
* Register a GUI object to the client script
*
@ -247,7 +248,6 @@ class rcmail_output_html extends rcmail_output
$this->add_script(self::JS_OBJECT_NAME.".gui_object('$obj', '$id');");
}
/**
* Call a client method
*
@ -263,7 +263,6 @@ class rcmail_output_html extends rcmail_output
$this->js_commands[] = $cmd;
}
/**
* Add a localized label to the client environment
*/
@ -278,7 +277,6 @@ class rcmail_output_html extends rcmail_output
}
}
/**
* Invoke display_message command
*
@ -305,7 +303,6 @@ class rcmail_output_html extends rcmail_output
}
}
/**
* Delete all stored env variables and commands
*
@ -328,7 +325,6 @@ class rcmail_output_html extends rcmail_output
$this->body = '';
}
/**
* Redirect to a certain url
*
@ -344,7 +340,6 @@ class rcmail_output_html extends rcmail_output
exit;
}
/**
* Send the request output to the client.
* This will either parse a skin tempalte or send an AJAX response
@ -378,7 +373,6 @@ class rcmail_output_html extends rcmail_output
}
}
/**
* Process template and write to stdOut
*
@ -414,7 +408,6 @@ class rcmail_output_html extends rcmail_output
$this->_write($template, $this->config->get('skin_path'));
}
/**
* Parse a specific skin template and deliver to stdout (or return)
*
@ -539,7 +532,6 @@ class rcmail_output_html extends rcmail_output
}
}
/**
* Return executable javascript code for all registered commands
*
@ -571,7 +563,6 @@ class rcmail_output_html extends rcmail_output
return $out;
}
/**
* Make URLs starting with a slash point to skin directory
*
@ -591,7 +582,6 @@ class rcmail_output_html extends rcmail_output
return $str;
}
/**
* Show error page and terminate script execution
*
@ -626,7 +616,6 @@ class rcmail_output_html extends rcmail_output
array($this, 'globals_callback'), $input);
}
/**
* Callback funtion for preg_replace_callback() in parse_with_globals()
*/
@ -635,7 +624,6 @@ class rcmail_output_html extends rcmail_output
return $GLOBALS[$matches[1]];
}
/**
* Correct absolute paths in images and other tags
* add timestamp to .js and .css filename
@ -647,7 +635,6 @@ class rcmail_output_html extends rcmail_output
array($this, 'file_callback'), $output);
}
/**
* Callback function for preg_replace_callback in write()
*
@ -673,7 +660,6 @@ class rcmail_output_html extends rcmail_output
return $matches[1] . '=' . $matches[2] . $file . $matches[4];
}
/**
* Public wrapper to dipp into template parsing.
*
@ -690,7 +676,6 @@ class rcmail_output_html extends rcmail_output
return $input;
}
/**
* Parse for conditional tags
*
@ -728,7 +713,6 @@ class rcmail_output_html extends rcmail_output
return $input;
}
/**
* Determines if a given condition is met
*
@ -741,7 +725,6 @@ class rcmail_output_html extends rcmail_output
return $this->eval_expression($condition);
}
/**
* Inserts hidden field with CSRF-prevention-token into POST forms
*/
@ -758,7 +741,6 @@ class rcmail_output_html extends rcmail_output
return $out;
}
/**
* Parse & evaluate a given expression and return its result.
*
@ -805,7 +787,6 @@ class rcmail_output_html extends rcmail_output
return $fn($this->app, $this->browser, $this->env);
}
/**
* Search for special tags in input and replace them
* with the appropriate content
@ -820,7 +801,6 @@ class rcmail_output_html extends rcmail_output
return preg_replace_callback('/<roundcube:([-_a-z]+)\s+((?:[^>]|\\\\>)+)(?<!\\\\)>/Ui', array($this, 'xml_command'), $input);
}
/**
* Callback function for parsing an xml command tag
* and turn it into real html content
@ -1029,7 +1009,6 @@ class rcmail_output_html extends rcmail_output
return '';
}
/**
* Include a specific file and return it's contents
*
@ -1046,7 +1025,6 @@ class rcmail_output_html extends rcmail_output
return $out;
}
/**
* Create and register a button
*
@ -1202,7 +1180,6 @@ class rcmail_output_html extends rcmail_output
return $out;
}
/**
* Link an external script file
*
@ -1233,7 +1210,6 @@ class rcmail_output_html extends rcmail_output
$this->script_files[$position][] = $file;
}
/**
* Add inline javascript code
*
@ -1250,7 +1226,6 @@ class rcmail_output_html extends rcmail_output
}
}
/**
* Link an external css file
*
@ -1261,7 +1236,6 @@ class rcmail_output_html extends rcmail_output
$this->css_files[] = $file;
}
/**
* Add HTML code to the page header
*
@ -1272,7 +1246,6 @@ class rcmail_output_html extends rcmail_output
$this->header .= "\n" . $str;
}
/**
* Add HTML code to the page footer
* To be added right befor </body>
@ -1284,7 +1257,6 @@ class rcmail_output_html extends rcmail_output
$this->footer .= "\n" . $str;
}
/**
* Process template and write to stdOut
*
@ -1409,7 +1381,6 @@ class rcmail_output_html extends rcmail_output
}
}
/**
* Returns iframe object, registers some related env variables
*
@ -1440,7 +1411,6 @@ class rcmail_output_html extends rcmail_output
/* ************* common functions delivering gui objects ************** */
/**
* Create a form tag with the necessary hidden fields
*
@ -1467,7 +1437,6 @@ class rcmail_output_html extends rcmail_output
array('id','class','style','name','method','action','enctype','onsubmit'));
}
/**
* Build a form tag with a unique request token
*
@ -1498,7 +1467,6 @@ class rcmail_output_html extends rcmail_output
return $this->form_tag($attrib, $hidden->show() . $content);
}
/**
* GUI object 'username'
* Showing IMAP username of the current session
@ -1530,7 +1498,6 @@ class rcmail_output_html extends rcmail_output
return rcube_utils::idn_to_utf8($username);
}
/**
* GUI object 'loginform'
* Returns code for the webmail login form
@ -1630,7 +1597,6 @@ class rcmail_output_html extends rcmail_output
return $out;
}
/**
* GUI object 'preloader'
* Loads javascript code for images preloading
@ -1653,7 +1619,6 @@ class rcmail_output_html extends rcmail_output
}', 'docready');
}
/**
* GUI object 'searchform'
* Returns code for search function
@ -1692,7 +1657,6 @@ class rcmail_output_html extends rcmail_output
return $out;
}
/**
* Builder for GUI object 'message'
*
@ -1710,7 +1674,6 @@ class rcmail_output_html extends rcmail_output
return html::div($attrib, '');
}
/**
* GUI object 'charsetselector'
*

2
program/steps/settings/func.inc
Unescape Escape View File

@ -1170,7 +1170,7 @@ function rcmail_user_prefs($current = null)
function rcmail_get_skins()
{
$path = 'skins';
$path = RCUBE_INSTALL_PATH . 'skins';
$skins = array();
$dir = opendir($path);

Write Preview
Loading…
Cancel
Save