Updated: - allowed some more characters in phpmyadmin url (system config) ...

mcramer

2012-11-02 8c94bf5373eac407062046e5b2cacdda0b1375dd

Updated:
 - allowed some more characters in phpmyadmin url (system config) like redirect urls do
 - added [DATABASENAME] as placeholder to the phpmyadmin url to be able to use urls like http://[SERVERNAME]/?db=[DATABASENAME]

 interface/web/admin/form/system_config.tform.php

@@ -128,7 +128,7 @@
            'datatype'    => 'VARCHAR',
            'formtype'    => 'TEXT',
            'validators'    => array ( 0 => array (    'type'    => 'REGEX',
                                                                'regex' => '/^[0-9a-zA-Z\:\/\-\.\[\]]{0,255}$/',
                                                                'regex' => '@^(([\.]{0})|(https?://([-\w\.\[\]]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%\[\]]*(\?\S+)?)?)?)|(/[\w/_\.\-\:\[\]]{0,255}/))$@',
                                                                'errmsg'=> 'phpmyadmin_url_error_regex'),
                                                ),
            'default'    => '',

 interface/web/sites/database_phpmyadmin.php

@@ -45,7 +45,7 @@
/*
 * Get the data to connect to the database
 */
$dbData = $app->db->queryOneRecord("SELECT server_id FROM web_database WHERE database_id = " . $databaseId);
$dbData = $app->db->queryOneRecord("SELECT server_id, database_name FROM web_database WHERE database_id = " . $databaseId);
$serverId = $app->functions->intval($dbData['server_id']);
if ($serverId == 0){
    die ("No DB-Server found!");
@@ -64,7 +64,7 @@
 
if($global_config['phpmyadmin_url'] != '') {
    $phpmyadmin_url = $global_config['phpmyadmin_url'];
    $phpmyadmin_url = str_replace('[SERVERNAME]',$serverData['server_name'],$phpmyadmin_url);
    $phpmyadmin_url = str_replace(array('[SERVERNAME]', '[DATABASENAME]'),array($serverData['server_name'], $dbData['database_name']),$phpmyadmin_url);
    header('Location:'.$phpmyadmin_url);
} else {
    isset($_SERVER['HTTPS'])? $http = 'https' : $http = 'http';