bin/update.sh | ●●●●● patch | view | raw | blame | history | |
installer/check.php | ●●●●● patch | view | raw | blame | history | |
installer/config.php | ●●●●● patch | view | raw | blame | history | |
installer/index.php | ●●●●● patch | view | raw | blame | history | |
installer/test.php | ●●●●● patch | view | raw | blame | history | |
program/include/rcmail_install.php | ●●●●● patch | view | raw | blame | history | |
program/lib/Roundcube/rcube.php | ●●●●● patch | view | raw | blame | history |
bin/update.sh
@@ -22,7 +22,6 @@ define('INSTALL_PATH', realpath(dirname(__FILE__) . '/..') . '/' ); require_once INSTALL_PATH . 'program/include/clisetup.php'; require_once INSTALL_PATH . 'installer/rcube_install.php'; // get arguments $opts = rcube_utils::get_opt(array('v' => 'version', 'y' => 'accept')); @@ -36,7 +35,7 @@ $opts['version'] = RCMAIL_VERSION; } $RCI = rcube_install::get_instance(); $RCI = rcmail_install::get_instance(); $RCI->load_config(); if ($RCI->configured) { installer/check.php
@@ -1,6 +1,6 @@ <?php if (!class_exists('rcube_install') || !is_object($RCI)) { if (!class_exists('rcmail_install', false) || !is_object($RCI)) { die("Not allowed! Please open installer/index.php instead."); } installer/config.php
@@ -1,6 +1,6 @@ <?php if (!class_exists('rcube_install') || !is_object($RCI)) { if (!class_exists('rcmail_install', false) || !is_object($RCI)) { die("Not allowed! Please open installer/index.php instead."); } installer/index.php
@@ -50,14 +50,13 @@ set_include_path($include_path); require_once 'Roundcube/bootstrap.php'; require_once 'rcube_install.php'; // deprecated aliases (to be removed) require_once 'bc.php'; if (function_exists('session_start')) session_start(); $RCI = rcube_install::get_instance(); $RCI = rcmail_install::get_instance(); $RCI->load_config(); if (isset($_GET['_getconfig'])) { installer/test.php
@@ -1,6 +1,6 @@ <?php if (!class_exists('rcube_install') || !is_object($RCI)) { if (!class_exists('rcmail_install', false) || !is_object($RCI)) { die("Not allowed! Please open installer/index.php instead."); } program/include/rcmail_install.php
File was renamed from installer/rcube_install.php @@ -2,10 +2,10 @@ /* +-----------------------------------------------------------------------+ | rcube_install.php | | rcmail_install.php | | | | This file is part of the Roundcube Webmail package | | Copyright (C) 2008-2012, The Roundcube Dev Team | | Copyright (C) 2008-2014, The Roundcube Dev Team | | | | Licensed under the GNU General Public License version 3 or | | any later version with exceptions for skins & plugins. | @@ -21,7 +21,7 @@ * @package Roundcube * @author Thomas Bruederli */ class rcube_install class rcmail_install { var $step; var $is_post = false; @@ -75,7 +75,7 @@ static $inst; if (!$inst) $inst = new rcube_install(); $inst = new rcmail_install(); return $inst; } @@ -162,7 +162,7 @@ $value = $this->config[$name]; if ($name == 'des_key' && !$this->configured && !isset($_REQUEST["_$name"])) $value = rcube_install::random_key(24); $value = self::random_key(24); return $value !== null && $value !== '' ? $value : $default; } @@ -214,7 +214,7 @@ $value = ''; } else if ($prop == 'default_host' && is_array($value)) { $value = rcube_install::_clean_array($value); $value = self::_clean_array($value); if (count($value) <= 1) $value = $value[0]; } @@ -251,7 +251,7 @@ foreach ($config as $prop => $value) { // copy option descriptions from existing config or defaults.inc.php $out .= $this->comments[$prop]; $out .= "\$config['$prop'] = " . rcube_install::_dump_var($value, $prop) . ";\n\n"; $out .= "\$config['$prop'] = " . self::_dump_var($value, $prop) . ";\n\n"; } return $out; @@ -451,9 +451,9 @@ function check_mime_detection() { $files = array( 'installer/images/roundcube_logo.png' => 'image/png', 'skins/larry/images/roundcube_logo.png' => 'image/png', 'program/resources/blank.tif' => 'image/tiff', 'skins/larry/images/buttons.gif' => 'image/gif', 'program/resources/blocked.gif' => 'image/gif', 'skins/larry/README' => 'text/plain', ); @@ -689,7 +689,7 @@ } if ($isnum) return 'array(' . join(', ', array_map(array('rcube_install', '_dump_var'), $var)) . ')'; return 'array(' . join(', ', array_map(array('rcmail_install', '_dump_var'), $var)) . ')'; } } program/lib/Roundcube/rcube.php
@@ -1207,8 +1207,8 @@ } // installer if (class_exists('rcube_install', false)) { $rci = rcube_install::get_instance(); if (class_exists('rcmail_install', false)) { $rci = rcmail_install::get_instance(); $rci->raise_error($arg); return; }