diff --git a/app/widgets/Admin/Admin.php b/app/widgets/Admin/Admin.php index 355b8e932..fe792a13d 100644 --- a/app/widgets/Admin/Admin.php +++ b/app/widgets/Admin/Admin.php @@ -26,6 +26,26 @@ class Admin extends WidgetBase { { $this->addjs('admin.js'); $this->_conf = Conf::getServerConf(); + + $this->saveConfig($_POST); + $_POST = null; + } + + private function saveConfig($form) { + if($form['pass'] != '' && $form['repass'] != '' + && $form['pass'] == $form['repass']) { + unset($form['repass']); + $form['pass'] = sha1($form['pass']); + } else { + $form['pass'] = $this->_conf['pass']; + } + + foreach($this->_conf as $key => $value) { + if(isset($form[$key])) + $this->_conf[$key] = $form[$key]; + } + + Conf::saveConfFile($this->_conf); } private function isValid($what) @@ -43,32 +63,6 @@ class Admin extends WidgetBase { private function testFile($file) { return (file_exists($file) && is_writable($file)); } - - /* - * Create the dirs - */ - function createDirs(){ - if(!file_exists(DOCUMENT_ROOT.'/cache') && !@mkdir(DOCUMENT_ROOT.'/cache')) { - echo t("Couldn't create directory '%s'.", 'cache'); - return false; - } - - if(!file_exists(DOCUMENT_ROOT.'/log') && !@mkdir(DOCUMENT_ROOT.'/log')) { - echo t("Couldn't create directory '%s'.", 'log'); - return false; - } - - if(!file_exists(DOCUMENT_ROOT.'/config') && !@mkdir(DOCUMENT_ROOT.'/config')) { - echo t("Couldn't create directory '%s'.", 'config'); - return false; - } - - if(!file_exists(DOCUMENT_ROOT.'/users') && !@mkdir(DOCUMENT_ROOT.'/users')) { - echo t("Couldn't create directory '%s'.", 'users'); - return false; - } else - touch(DOCUMENT_ROOT.'/users/index.html'); - } private function listThemes() { @@ -89,71 +83,14 @@ class Admin extends WidgetBase { private function listLangs() { - $dir = opendir(DOCUMENT_ROOT.'/locales'); - $langs = array('en' => 'English'); - $languages = get_lang_list(); - - while($lang = readdir($dir)) { - if(!preg_match('/\.po$/', $lang)) { - continue; - } - - $lang = substr($lang, 0, strlen($lang) - 3); - $langs[$lang] = $languages[$lang]; - } - - return $langs; + return load_lang_array(); } - function testBosh($url) { - $ch = curl_init($url); - - curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); - curl_setopt($ch, CURLOPT_ENCODING, 'gzip,deflate'); - curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); - - curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0); - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0); - - // We put a short timeout - curl_setopt($ch, CURLOPT_TIMEOUT, 5); - - // Fire ! - $rs = array(); - - $rs['content'] = curl_exec($ch); - $rs['errno'] = curl_errno($ch); - $rs['errmsg'] = curl_error($ch); - $rs['header'] = curl_getinfo($ch); - - if($rs['content'] != false && $rs['content'] != '') { - return true; - } - - elseif($rs['errno'] != 0 || $rs['content'] == '') { - return false; - } - curl_close($ch); - } - - public function ajaxAdminSubmit($form) + function testBosh($url) { - if($form['pass'] != '' && $form['repass'] != '' - && $form['pass'] == $form['repass']) { - unset($form['repass']); - $form['pass'] = sha1($form['pass']); - } else { - $form['pass'] = $this->_conf['pass']; - } - - foreach($this->_conf as $key => $value) { - if(isset($form[$key])) - $this->_conf[$key] = $form[$key]; - } - - \system\Conf::saveConfFile($this->_conf); + return requestURL($url, 2); } - + public function ajaxUpdateDatabase() { $md = \modl\Modl::getInstance(); @@ -161,18 +98,11 @@ class Admin extends WidgetBase { RPC::call('movim_reload_this'); } - private function prepareAdminComp() - { - // setTimeout(function() {location.reload(false)}, 3000); - if($this->testDir(DOCUMENT_ROOT)) - $this->createDirs(); - - $submit = $this->genCallAjax('ajaxAdminSubmit', "movim_parse_form('admin')") - ."this.className='button color orange icon loading'; location.reload(true);"; - + function prepareAdminComp() + { $this->_validatebutton = '
- '.t('Submit').''; + '; $html = '
@@ -229,7 +159,6 @@ class Admin extends WidgetBase {
'; - foreach($this->listLangs() as $key => $value) { if((string)$this->_conf['defLang'] == $key) $sel = 'selected="selected"'; @@ -287,13 +215,7 @@ class Admin extends WidgetBase { $html .= '
'; - /* - $html .= ' -
- - -
'; - */ + $html .= '
@@ -497,21 +419,4 @@ class Admin extends WidgetBase { return $html; } - - function build() - { - ?> -
-
"> - prepareAdminComp(); ?> -
-
- prepareAdminGen(); ?> -
-
"> - prepareAdminDB(); ?> -
-
- +
+ {$c->prepareAdminComp()} +
+
+ {$c->prepareAdminGen()} +
+
+ {$c->prepareAdminDB()} +
+ diff --git a/system/Utils.php b/system/Utils.php index ef9ec403d..81cf8309f 100644 --- a/system/Utils.php +++ b/system/Utils.php @@ -16,6 +16,10 @@ * All rights reserved. */ +use Monolog\Logger; +use Monolog\Handler\SyslogHandler; +use Monolog\Handler\StreamHandler; + /** * Return the list of gender */ @@ -369,13 +373,15 @@ function generateUUID($string = false) { } -function movim_log($log) { - //\system\Logs\Logger::log($log); - - openlog('movim', LOG_NDELAY, LOG_USER); - $errlines = explode("\n", $log); - foreach ($errlines as $txt) { syslog(LOG_DEBUG, $txt); } - closelog(); +function movim_log($logs) { + $log = new Logger('movim'); + $log->pushHandler(new SyslogHandler('movim')); + + $log->pushHandler(new StreamHandler(LOG_PATH.'/logger.log', Logger::DEBUG)); + if(is_array($logs)) + $log->addInfo('', $logs); + else + $log->addInfo($logs); } /**