Browse Source
Remove the widget AdminDB
Remove the widget AdminDB
Fix the syntax to fit with the PSR Use the argument unpacking syntax for some functions Simplify RPC Update the PHP minimal version to PHP 5.6+pull/551/head
Timothée Jaussoin
8 years ago
16 changed files with 66 additions and 251 deletions
-
1app/views/admin.tpl
-
48app/widgets/AdminDB/AdminDB.php
-
72app/widgets/AdminDB/admindb.tpl
-
12app/widgets/AdminDB/locales.ini
-
2app/widgets/AdminTest/AdminTest.php
-
6app/widgets/AdminTest/locales.ini
-
2composer.json
-
13linker.php
-
6src/Movim/Console/ConfigCommand.php
-
9src/Movim/Console/DaemonCommand.php
-
6src/Movim/Console/DatabaseCommand.php
-
38src/Movim/Daemon/Core.php
-
33src/Movim/Daemon/Session.php
-
51src/Movim/RPC.php
-
16src/Movim/Widget/Base.php
-
2src/Movim/Widget/Wrapper.php
@ -1,48 +0,0 @@ |
|||
<?php |
|||
|
|||
class AdminDB extends \Movim\Widget\Base |
|||
{ |
|||
function load() { |
|||
|
|||
} |
|||
|
|||
public function ajaxUpdateDatabase() |
|||
{ |
|||
$md = \modl\Modl::getInstance(); |
|||
$md->check(true); |
|||
$this->rpc('MovimUtils.reloadThis'); |
|||
} |
|||
|
|||
public function hidePassword($pass) |
|||
{ |
|||
return str_repeat('*', strlen($pass)); |
|||
} |
|||
|
|||
function display() |
|||
{ |
|||
$md = \Modl\Modl::getInstance(); |
|||
$infos = $md->check(); |
|||
|
|||
$errors = ''; |
|||
|
|||
$this->view->assign('infos', $infos); |
|||
$this->view->assign('db_update', $this->call('ajaxUpdateDatabase') |
|||
."this.className='button color loading';"); |
|||
try { |
|||
$md->connect(); |
|||
} catch(Exception $e) { |
|||
$errors = $e->getMessage(); |
|||
} |
|||
|
|||
if(file_exists(DOCUMENT_ROOT.'/config/db.inc.php')) { |
|||
require DOCUMENT_ROOT.'/config/db.inc.php'; |
|||
} |
|||
|
|||
$supported = $md->getSupportedDatabases(); |
|||
|
|||
$this->view->assign('connected', $md->_connected); |
|||
$this->view->assign('conf', $conf); |
|||
$this->view->assign('dbtype', $supported[$conf['type']]); |
|||
$this->view->assign('errors', $errors); |
|||
} |
|||
} |
|||
@ -1,72 +0,0 @@ |
|||
<div id="admindb" class="tabelem" title="{$c->__('db.legend')}"> |
|||
<ul class="list flex large"> |
|||
<li class="subheader"> |
|||
<p>{$c->__('db.legend')}</p> |
|||
</li> |
|||
|
|||
{if="!$connected"} |
|||
<li class="block large"> |
|||
<span class="primary icon bubble color red"> |
|||
<i class="zmdi zmdi-code-setting"></i> |
|||
</span> |
|||
<p>{$c->__('db.connect_error')}</p> |
|||
<p>{$errors}</p> |
|||
</li> |
|||
{else} |
|||
<li class="block large"> |
|||
<span class="primary icon bubble color green"> |
|||
<i class="zmdi zmdi-code-setting"></i> |
|||
</span> |
|||
<p class="normal">{$c->__('db.connect_success')}</p> |
|||
</li> |
|||
{if="null !== $infos"} |
|||
<li class="block large"> |
|||
<span class="primary icon bubble color orange"> |
|||
<i class="zmdi zmdi-refresh"></i> |
|||
</span> |
|||
<span class="control"> |
|||
<a class="button" onclick="{$db_update}"> {$c->__('button.update')}</a> |
|||
</span> |
|||
<p>{$c->__('db.update')}</p> |
|||
{loop="$infos"} |
|||
<p>{$value}</p> |
|||
{/loop} |
|||
</li> |
|||
{else} |
|||
<li class="block large"> |
|||
<span class="primary icon bubble color green"> |
|||
<i class="zmdi zmdi-refresh"></i> |
|||
</span> |
|||
<p class="normal">{$c->__('db.up_to_date')}</p> |
|||
</li> |
|||
{/if} |
|||
{/if} |
|||
</ul> |
|||
|
|||
<form class="flex padded_top_bottom"> |
|||
<div class="block"> |
|||
<input value="{$dbtype}" disabled/> |
|||
<label for="logLevel">{$c->__('db.type')}</label> |
|||
</div> |
|||
<div class="block"> |
|||
<input value="{$conf.username}" disabled/> |
|||
<label for="dbUsername">{$c->__('db.username')}</label> |
|||
</div> |
|||
<div class="block"> |
|||
<input value="{$c->hidePassword($conf.password)}" disabled/> |
|||
<label for="dbPassword">{$c->__('db.password')}</label> |
|||
</div> |
|||
<div class="block"> |
|||
<input value="{$conf.host}" disabled/> |
|||
<label for="dbHost">{$c->__('db.host')}</label> |
|||
</div> |
|||
<div class="block"> |
|||
<input value="{$conf.port}" disabled/> |
|||
<label for="dbPort">{$c->__('db.port')}</label> |
|||
</div> |
|||
<div class="block"> |
|||
<input value="{$conf.database}" disabled/> |
|||
<label for="dbName">{$c->__('db.name')}</label> |
|||
</div> |
|||
</form> |
|||
</div> |
|||
@ -1,12 +0,0 @@ |
|||
[db] |
|||
legend = Database |
|||
connect_error = "Modl wasn't able to connect to the database" |
|||
connect_success = Movim is connected to the database |
|||
update = The database need to be updated |
|||
up_to_date = Movim database is up to date |
|||
type = Database Type |
|||
username = Username |
|||
password = Password |
|||
host = Host |
|||
port = Port |
|||
name = Database Name |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue