mirror of
https://gitlab.easter-eggs.com/ee/ldapsaisie.git
synced 2024-11-20 00:59:17 +01:00
Add CLI commands manager
This commit is contained in:
parent
ffdb8d4cf7
commit
43d0df60cd
16 changed files with 433 additions and 59 deletions
6
debian/conf/apache.conf
vendored
6
debian/conf/apache.conf
vendored
|
@ -5,5 +5,9 @@ Alias /ldapsaisie /usr/share/ldapsaisie
|
|||
php_flag magic_quotes_gpc Off
|
||||
php_flag register_globals Off
|
||||
</IfModule>
|
||||
Options -Indexes +FollowSymLinks
|
||||
Options -Indexes +FollowSymLinks
|
||||
</Directory>
|
||||
|
||||
<Directory /usr/share/ldapsaisie/bin>
|
||||
Require all denied
|
||||
</Directory>
|
||||
|
|
1
debian/ldapsaisie.links
vendored
1
debian/ldapsaisie.links
vendored
|
@ -2,3 +2,4 @@ var/cache/ldapsaisie usr/share/ldapsaisie/tmp
|
|||
usr/local/share/ldapsaisie usr/share/ldapsaisie/local
|
||||
usr/local/share/ldapsaisie etc/ldapsaisie/local
|
||||
usr/share/ldapsaisie/lang/generate_lang_file.php usr/bin/ldapsaisie-generate-lang-file
|
||||
usr/share/ldapsaisie/bin/ldapsaisie.php usr/sbin/ldapsaisie
|
||||
|
|
34
public_html/bin/ldapsaisie.php
Executable file
34
public_html/bin/ldapsaisie.php
Executable file
|
@ -0,0 +1,34 @@
|
|||
#!/usr/bin/php
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Copyright (C) 2007 Easter-eggs
|
||||
* http://ldapsaisie.labs.libre-entreprise.org
|
||||
*
|
||||
* Author: See AUTHORS file in top-level directory.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License version 2
|
||||
* as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
******************************************************************************/
|
||||
|
||||
require_once realpath(dirname(__FILE__)."/../")."/core.php";
|
||||
|
||||
if(LSsession :: startCliLSsession()) {
|
||||
|
||||
// Handle CLI arguments and run command (if provided)
|
||||
LScli :: handle_args();
|
||||
|
||||
}
|
||||
else {
|
||||
die('An error occured initializing CLI LSsession');
|
||||
}
|
|
@ -24,7 +24,7 @@
|
|||
ini_set( 'magic_quotes_gpc', 'off' );
|
||||
ini_set( 'magic_quotes_sybase', 'off' );
|
||||
ini_set( 'magic_quotes_runtime', 'off' );
|
||||
if (isset($_REQUEST['LSdebug']) || preg_match('/^127\.[0-9]+\.[0-9]+\.[0-9]+$/', $_SERVER['HTTP_HOST']))
|
||||
if ((isset($_REQUEST) && isset($_REQUEST['LSdebug'])) || (isset($_SERVER['HTTP_HOST']) && preg_match('/^127\.[0-9]+\.[0-9]+\.[0-9]+$/', $_SERVER['HTTP_HOST'])))
|
||||
error_reporting(E_ALL);
|
||||
else
|
||||
error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED);
|
||||
|
@ -49,7 +49,9 @@ define('LS_LIB_DIR', LS_INCLUDE_DIR .'libs/');
|
|||
define('LS_ADDONS_DIR', LS_INCLUDE_DIR .'addons/');
|
||||
define('LS_JS_DIR', LS_INCLUDE_DIR .'js/');
|
||||
define('LS_TMP_DIR', 'tmp/');
|
||||
define('LS_TMP_DIR_PATH', LS_ROOT_DIR . '/' . LS_TMP_DIR);
|
||||
define('LS_LOCAL_DIR', 'local/');
|
||||
define('LS_LOCAL_DIR', LS_ROOT_DIR . '/' . LS_LOCAL_DIR);
|
||||
|
||||
// Locale
|
||||
define('LS_TEXT_DOMAIN', 'ldapsaisie');
|
||||
|
@ -58,4 +60,3 @@ define('LS_I18N_DIR', 'lang');
|
|||
require_once LS_INCLUDE_DIR.'functions.php';
|
||||
|
||||
require_once LS_CLASS_DIR.'class.LSsession.php';
|
||||
|
||||
|
|
|
@ -68,7 +68,7 @@ LSerror :: defineError('FTP_05',
|
|||
if (!defined('NET_FTP')) {
|
||||
LSerror :: addErrorCode('FTP_SUPPORT_02','NET_FTP');
|
||||
$retval=false;
|
||||
} else if(!LSsession::includeFile(NET_FTP)) {
|
||||
} else if(!LSsession::includeFile(NET_FTP, true)) {
|
||||
LSerror :: addErrorCode('FTP_SUPPORT_01');
|
||||
$retval=false;
|
||||
}
|
||||
|
|
|
@ -48,7 +48,7 @@ LSerror :: defineError('MAIL_01',
|
|||
|
||||
// Dependance de librairie
|
||||
if (!class_exists('Mail')) {
|
||||
if(!LSsession::includeFile(PEAR_MAIL)) {
|
||||
if(!LSsession::includeFile(PEAR_MAIL, true)) {
|
||||
LSerror :: addErrorCode('MAIL_SUPPORT_01');
|
||||
$retval=false;
|
||||
}
|
||||
|
|
|
@ -73,7 +73,7 @@ LSerror :: defineError('SSH_07',
|
|||
if (!defined('PHPSECLIB_AUTOLOAD')) {
|
||||
LSerror :: addErrorCode('SSH_SUPPORT_02','PHPSECLIB_AUTOLOAD');
|
||||
$retval=false;
|
||||
} else if(!LSsession::includeFile(PHPSECLIB_AUTOLOAD)) {
|
||||
} else if(!LSsession::includeFile(PHPSECLIB_AUTOLOAD, true)) {
|
||||
LSerror :: addErrorCode('SSH_SUPPORT_01');
|
||||
$retval=false;
|
||||
}
|
||||
|
@ -280,4 +280,3 @@ LSerror :: defineError('SSH_07',
|
|||
$exit_status = $cnx->getExitStatus();
|
||||
return array($exit_status, $result);
|
||||
}
|
||||
|
||||
|
|
|
@ -36,7 +36,7 @@ class LSauthMethod_CAS extends LSauthMethod {
|
|||
if (!parent :: __construct())
|
||||
return;
|
||||
|
||||
if (LSsession :: includeFile(PHP_CAS_PATH)) {
|
||||
if (LSsession :: includeFile(PHP_CAS_PATH, true)) {
|
||||
if (defined('PHP_CAS_DEBUG_FILE')) {
|
||||
LSlog :: debug('LSauthMethod_CAS : enable debug file '.PHP_CAS_DEBUG_FILE);
|
||||
phpCAS::setDebug(PHP_CAS_DEBUG_FILE);
|
||||
|
|
178
public_html/includes/class/class.LScli.php
Normal file
178
public_html/includes/class/class.LScli.php
Normal file
|
@ -0,0 +1,178 @@
|
|||
<?php
|
||||
/*******************************************************************************
|
||||
* Copyright (C) 2007 Easter-eggs
|
||||
* http://ldapsaisie.labs.libre-entreprise.org
|
||||
*
|
||||
* Author: See AUTHORS file in top-level directory.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License version 2
|
||||
* as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
******************************************************************************/
|
||||
|
||||
/**
|
||||
* CLI Manager for LdapSaisie
|
||||
*
|
||||
* @author Benjamin Renard <brenard@easter-eggs.com>
|
||||
*/
|
||||
class LScli {
|
||||
|
||||
// Configured commands
|
||||
private static $commands = array();
|
||||
|
||||
/**
|
||||
* Add a CLI command
|
||||
*
|
||||
* @param[in] $command string The CLI command name (required)
|
||||
* @param[in] $handler callable The CLI command handler (must be callable, required)
|
||||
* @param[in] $short_desc string|false A short description of what this command does (required)
|
||||
* @param[in] $usage_args string|false A short list of commands available arguments show in usage message (optional, default: false)
|
||||
* @param[in] $long_desc string|false A long description of what this command does (optional, default: false)
|
||||
* @param[in] $override boolean Allow override if a command already exists with the same name (optional, default: false)
|
||||
**/
|
||||
public static function add_command($command, $handler, $short_desc, $usage_args=false, $long_desc=false, $override=false) {
|
||||
if (array_key_exists($command, self :: $commands) && !$override) {
|
||||
LSerror :: addErrorCode('LScli_01', $command);
|
||||
return False;
|
||||
}
|
||||
|
||||
if (!is_callable($handler)) {
|
||||
LSerror :: addErrorCode('LScli_02', $command);
|
||||
return False;
|
||||
}
|
||||
|
||||
self :: $commands[$command] = array (
|
||||
'handler' => $handler,
|
||||
'short_desc' => $short_desc,
|
||||
'usage_args' => $usage_args,
|
||||
'long_desc' => $long_desc,
|
||||
);
|
||||
return True;
|
||||
}
|
||||
|
||||
/**
|
||||
* Show usage message
|
||||
*
|
||||
* @param[in] $error string|false Error message to display before usage message (optional, default: false)
|
||||
* @retval void
|
||||
**/
|
||||
public static function usage($error=false) {
|
||||
global $argv;
|
||||
|
||||
if ($error)
|
||||
echo "$error\n\n";
|
||||
|
||||
echo "Usage : ".basename($argv[0])." [-h] [-qdC] command\n";
|
||||
echo " -h Show this message\n";
|
||||
echo " -q|--quiet Quiet mode\n";
|
||||
echo " -d|--debug Debug mode\n";
|
||||
echo " -C|--console Log on console\n";
|
||||
echo " command Command to run\n";
|
||||
echo "\n";
|
||||
echo "Available commands :\n";
|
||||
|
||||
foreach (self :: $commands as $command => $info) {
|
||||
echo " $command : ".$info['short_desc']."\n";
|
||||
echo " ".basename($argv[0])." $command ".($info['usage_args']?$info['usage_args']:'')."\n";
|
||||
if ($info['long_desc']) {
|
||||
if (is_array($info['long_desc']))
|
||||
$info['long_desc'] = implode("\n", $info['long_desc']);
|
||||
echo "\n ".str_replace("\n", "\n ", wordwrap($info['long_desc']))."\n";
|
||||
}
|
||||
echo "\n";
|
||||
}
|
||||
if (empty(self :: $commands))
|
||||
echo " Currently no available command is declared.\n";
|
||||
|
||||
exit(($error?1:0));
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle CLI arguments and run command (if provided)
|
||||
*
|
||||
* @retval void
|
||||
**/
|
||||
public static function handle_args() {
|
||||
global $argv;
|
||||
$log_level = 'INFO';
|
||||
$command = false;
|
||||
$command_args = array();
|
||||
LSlog :: debug("handle_args :\n".varDump($argv));
|
||||
for ($i=1; $i < count($argv); $i++) {
|
||||
if (array_key_exists($argv[$i], self :: $commands)) {
|
||||
if (!$command)
|
||||
$command = $argv[$i];
|
||||
else
|
||||
self :: usage(_("Only one command could be executed !"));
|
||||
}
|
||||
else {
|
||||
switch($argv[$i]) {
|
||||
case '-h':
|
||||
case '--help':
|
||||
self :: usage();
|
||||
break;
|
||||
case '-d':
|
||||
case '--debug':
|
||||
$log_level = 'DEBUG';
|
||||
break;
|
||||
case '-q':
|
||||
case '--quiet':
|
||||
$log_level = 'WARNING';
|
||||
break;
|
||||
case '-C':
|
||||
case '--console':
|
||||
LSlog :: logOnConsole();
|
||||
break;
|
||||
default:
|
||||
if ($command)
|
||||
$command_args[] = $argv[$i];
|
||||
else
|
||||
self :: usage(
|
||||
getFData(_("Invalid parameter \"%{parameter}\".\nNote: Command's parameter/argument must be place after the command."), $argv[$i])
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Set log level
|
||||
LSlog :: setLevel($log_level);
|
||||
|
||||
if (!$command) {
|
||||
LSlog :: debug("LScli :: handle_args() : no detected command => show usage");
|
||||
self :: usage();
|
||||
}
|
||||
|
||||
// Run command
|
||||
LSlog :: debug('Run '.basename($argv[0])." command $command with argument(s) '".implode("', '", $command_args)."'");
|
||||
try {
|
||||
$result = call_user_func($cli_commands[$command]['handler'], $command_args);
|
||||
|
||||
exit($result?0:1);
|
||||
}
|
||||
catch(Exception $e) {
|
||||
LSlog :: exception($e, "An exception occured running CLI command $command");
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
* Error Codes
|
||||
*/
|
||||
LSerror :: defineError('LScli_01',
|
||||
_("LScli : The CLI command '%{command}' already exists.")
|
||||
);
|
||||
LSerror :: defineError('LScli_02',
|
||||
_("LScli : The CLI command '%{command}' handler is not callable.")
|
||||
);
|
|
@ -61,9 +61,9 @@ class LSformElement_image extends LSformElement {
|
|||
}
|
||||
|
||||
if (!empty($this -> values[0])) {
|
||||
$img_path = LSsession :: getTmpFile($this -> values[0]);
|
||||
$img_url = LSsession :: getTmpFileURL($this -> values[0]);
|
||||
LStemplate :: assign('LSformElement_image',array(
|
||||
'img' => $img_path,
|
||||
'img' => $img_url,
|
||||
'id' => $id,
|
||||
));
|
||||
if (!$this -> isFreeze()) {
|
||||
|
@ -100,10 +100,6 @@ class LSformElement_image extends LSformElement {
|
|||
$fp = fopen($_FILES[$this -> name]['tmp_name'], "r");
|
||||
$buf = fread($fp, filesize($_FILES[$this -> name]['tmp_name']));
|
||||
fclose($fp);
|
||||
$tmp_file = LS_TMP_DIR.$this -> name.'_'.rand().'.tmp';
|
||||
if (move_uploaded_file($_FILES[$this -> name]['tmp_name'],$tmp_file)) {
|
||||
LSsession :: addTmpFile($buf,$tmp_file);
|
||||
}
|
||||
$return[$this -> name][0] = $buf;
|
||||
}
|
||||
else {
|
||||
|
|
|
@ -53,7 +53,7 @@ class LSimport {
|
|||
$fp = fopen($_FILES['importfile']['tmp_name'], "r");
|
||||
$buf = fread($fp, filesize($_FILES['importfile']['tmp_name']));
|
||||
fclose($fp);
|
||||
$tmp_file = LS_TMP_DIR.'importfile'.'_'.rand().'.tmp';
|
||||
$tmp_file = LS_TMP_DIR_PATH.'importfile'.'_'.rand().'.tmp';
|
||||
if (move_uploaded_file($_FILES['importfile']['tmp_name'],$tmp_file)) {
|
||||
LSsession :: addTmpFile($buf,$tmp_file);
|
||||
}
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
******************************************************************************/
|
||||
|
||||
/**
|
||||
/**
|
||||
* Handle logging
|
||||
*
|
||||
* @author Benjamin Renard <brenard@easter-eggs.com>
|
||||
|
@ -61,8 +61,7 @@ class LSlog {
|
|||
public static function start() {
|
||||
// Load configuration
|
||||
self :: $enabled = self :: getConfig('enable', false, 'bool');
|
||||
self :: $level = self :: getConfig('level', self :: $default_level, 'string');
|
||||
if (!array_key_exists(self :: $level, self :: $levels)) self :: $level = 'WARNING';
|
||||
self :: setLevel();
|
||||
|
||||
// Load default handlers class
|
||||
if (!LSsession :: loadLSclass('LSlog_handler', null, true)) {
|
||||
|
@ -80,31 +79,83 @@ class LSlog {
|
|||
$handler_config = array('handler' => $handler);
|
||||
else
|
||||
$handler = (isset($handler_config['handler'])?$handler_config['handler']:'system');
|
||||
|
||||
$handler_class = "LSlog_$handler";
|
||||
|
||||
// Load handler class
|
||||
if (!LSsession :: loadLSclass($handler_class) || !class_exists($handler_class)) {
|
||||
LSerror :: addErrorCode('LSlog_01', $handler);
|
||||
if (!self :: add_handler($handler, $handler_config))
|
||||
continue;
|
||||
}
|
||||
|
||||
$handler_obj = new $handler_class($handler_config);
|
||||
if ($handler_obj -> checkCompatibility())
|
||||
self :: $handlers[] = $handler_obj;
|
||||
else
|
||||
LSdebug("LSlog handler $handler not supported.");
|
||||
$debug_handlers[] = $handler;
|
||||
}
|
||||
LSdebug('LSlog enabled with level='.self :: $level.' and following handlers : '.implode(', ', $debug_handlers));
|
||||
|
||||
set_exception_handler(array('LSlog', 'exception'));
|
||||
return True;
|
||||
}
|
||||
|
||||
/**
|
||||
* Add handler
|
||||
*
|
||||
* @param[in] $handler string The handler name
|
||||
* @param[in] $handler_config array The handler configuration (optional)
|
||||
*
|
||||
* @retval boolean True if handler added, false otherwise
|
||||
**/
|
||||
public static function add_handler($handler, $handler_config = array()) {
|
||||
$handler_class = "LSlog_$handler";
|
||||
|
||||
// Load handler class
|
||||
if (!LSsession :: loadLSclass($handler_class) || !class_exists($handler_class)) {
|
||||
LSerror :: addErrorCode('LSlog_01', $handler);
|
||||
return false;
|
||||
}
|
||||
|
||||
$handler_obj = new $handler_class($handler_config);
|
||||
if ($handler_obj -> checkCompatibility()) {
|
||||
self :: $handlers[] = $handler_obj;
|
||||
return True;
|
||||
}
|
||||
LSdebug("LSlog handler $handler not supported.");
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Enable console handler (if not already enabled)
|
||||
*
|
||||
* @retval boolean True if log on console enabled, false otherwise
|
||||
**/
|
||||
public static function logOnConsole() {
|
||||
for ($i=0; $i < count(self :: $handlers); $i++)
|
||||
if (is_a(self :: $handlers[$i], 'LSlog_console'))
|
||||
return true;
|
||||
return self :: add_handler('console');
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Set log level
|
||||
*
|
||||
* @param[in] $level string|null The log level (optinal, default: from configuration or 'WARNING')
|
||||
*
|
||||
* @retval boolean True if log level set, false otherwise
|
||||
**/
|
||||
public static function setLevel($level=null) {
|
||||
if (!$level) {
|
||||
$level = self :: getConfig('level', self :: $default_level, 'string');
|
||||
if (!array_key_exists(self :: $level, self :: $levels)) {
|
||||
self :: $level = 'WARNING';
|
||||
if ($level)
|
||||
self :: warning("Invalid log level '$level' configured. Set log level to WARNING.");
|
||||
$level = 'WARNING';
|
||||
}
|
||||
}
|
||||
else if (!array_key_exists($level, self :: $levels))
|
||||
return false;
|
||||
self :: $level = $level;
|
||||
|
||||
// Set PHP error/exception handlers
|
||||
if (self :: $level == 'DEBUG')
|
||||
set_error_handler(array('LSlog', 'php_error'), E_ALL & ~E_STRICT);
|
||||
else
|
||||
set_error_handler(array('LSlog', 'php_error'), E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED);
|
||||
set_exception_handler(array('LSlog', 'exception'));
|
||||
|
||||
return True;
|
||||
}
|
||||
|
||||
|
@ -236,7 +287,7 @@ class LSlog {
|
|||
$traces = debug_backtrace();
|
||||
if (!is_array($traces) || count($traces) <= 2)
|
||||
return "";
|
||||
|
||||
|
||||
$msg = array();
|
||||
for ($i=2; $i < count($traces); $i++) {
|
||||
$trace = array("#$i");
|
||||
|
@ -248,7 +299,7 @@ class LSlog {
|
|||
$trace[] = $traces[$i]['function']. "()";
|
||||
$msg[] = implode(" - ", $trace);
|
||||
}
|
||||
|
||||
|
||||
return implode("\n", $msg);
|
||||
}
|
||||
|
||||
|
@ -382,4 +433,3 @@ class LSlog {
|
|||
LSerror :: defineError('LSlog_01',
|
||||
_("LSlog : Fail to load logging handler %{handler}.")
|
||||
);
|
||||
|
||||
|
|
61
public_html/includes/class/class.LSlog_console.php
Normal file
61
public_html/includes/class/class.LSlog_console.php
Normal file
|
@ -0,0 +1,61 @@
|
|||
<?php
|
||||
/*******************************************************************************
|
||||
* Copyright (C) 2007 Easter-eggs
|
||||
* http://ldapsaisie.labs.libre-entreprise.org
|
||||
*
|
||||
* Author: See AUTHORS file in top-level directory.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License version 2
|
||||
* as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
******************************************************************************/
|
||||
|
||||
/**
|
||||
* Handle logging to console
|
||||
*
|
||||
* @author Benjamin Renard <brenard@easter-eggs.com>
|
||||
*/
|
||||
class LSlog_console extends LSlog_handler {
|
||||
|
||||
// File-descriptors for stdout/stderr
|
||||
private $stdout;
|
||||
private $stderr;
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*
|
||||
* @param[in] $config array The handler configuration
|
||||
*
|
||||
* @retval void
|
||||
**/
|
||||
public function __construct($config) {
|
||||
parent :: __construct($config);
|
||||
$this -> stdout = fopen('php://stdout', 'w');
|
||||
$this -> stderr = fopen('php://stderr', 'w');
|
||||
}
|
||||
|
||||
/**
|
||||
* Log a message
|
||||
*
|
||||
* @param[in] $level string The message level
|
||||
* @param[in] $message string The message
|
||||
*
|
||||
* @retval void
|
||||
**/
|
||||
public function logging($level, $message) {
|
||||
return fwrite(
|
||||
($level > 1?$this -> stderr:$this -> stdout),
|
||||
date('Y/m/d H:i:s').' - '.$level.' - '.$message."\n"
|
||||
);
|
||||
}
|
||||
}
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
******************************************************************************/
|
||||
|
||||
/**
|
||||
/**
|
||||
* Handle logging to file (using error_log PHP function with message_type = 3)
|
||||
*
|
||||
* @author Benjamin Renard <brenard@easter-eggs.com>
|
||||
|
@ -41,6 +41,8 @@ class LSlog_file extends LSlog_handler {
|
|||
parent :: __construct($config);
|
||||
// For reto-compatibilty, use LSlog.filename as default log path value
|
||||
$this -> path = self :: getConfig('path', LSlog :: getConfig('filename', 'tmp/LS.log'));
|
||||
if (substr($this -> path, 0, 1) != '/')
|
||||
$this -> path = LS_ROOT_DIR."/".$this -> path;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -98,14 +98,14 @@ class LSsession {
|
|||
*
|
||||
* @retval true si tout c'est bien passé, false sinon
|
||||
*/
|
||||
public static function includeFile($file) {
|
||||
if (file_exists(LS_LOCAL_DIR.'/'.$file)) {
|
||||
$file=LS_LOCAL_DIR.'/'.$file;
|
||||
}
|
||||
elseif (!file_exists($file)) {
|
||||
public static function includeFile($file, $external=false) {
|
||||
$path = ($external?'':LS_ROOT_DIR."/").$file;
|
||||
$local_path = ($external?'':LS_ROOT_DIR."/").LS_LOCAL_DIR.'/'.$file;
|
||||
$path = (file_exists($local_path)?$local_path:$path);
|
||||
if (!file_exists($path)) {
|
||||
return;
|
||||
}
|
||||
return include_once($file);
|
||||
return include_once($path);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -147,24 +147,24 @@ class LSsession {
|
|||
* @author Benjamin Renard <brenard@easter-eggs.com>
|
||||
*
|
||||
* @retval true si tout c'est bien passé, false sinon
|
||||
*/
|
||||
*/
|
||||
private static function startLStemplate() {
|
||||
if ( self :: loadLSclass('LStemplate') ) {
|
||||
return LStemplate :: start(
|
||||
array(
|
||||
'smarty_path' => LSconfig :: get('Smarty'),
|
||||
'template_dir' => LS_TEMPLATES_DIR,
|
||||
'image_dir' => LS_IMAGES_DIR,
|
||||
'css_dir' => LS_CSS_DIR,
|
||||
'compile_dir' => LS_TMP_DIR,
|
||||
'debug' => LSdebug,
|
||||
'debug_smarty' => (isset($_REQUEST['LStemplate_debug'])),
|
||||
'smarty_path' => LSconfig :: get('Smarty'),
|
||||
'template_dir' => LS_ROOT_DIR . '/'. LS_TEMPLATES_DIR,
|
||||
'image_dir' => LS_IMAGES_DIR,
|
||||
'css_dir' => LS_CSS_DIR,
|
||||
'compile_dir' => LS_TMP_DIR_PATH,
|
||||
'debug' => LSdebug,
|
||||
'debug_smarty' => (isset($_REQUEST) && isset($_REQUEST['LStemplate_debug'])),
|
||||
)
|
||||
);
|
||||
}
|
||||
return False;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Retourne le topDn de la session
|
||||
*
|
||||
|
@ -320,6 +320,23 @@ class LSsession {
|
|||
return;
|
||||
}
|
||||
|
||||
/**
|
||||
* Load LdapSaisie CLI class
|
||||
*
|
||||
* @author Benjamin Renard <brenard@easter-eggs.com
|
||||
*
|
||||
* @retval boolean true if loaded, false otherwise.
|
||||
*/
|
||||
public static function loadLScli() {
|
||||
if (self :: loadLSclass('LScli')) {
|
||||
return true;
|
||||
}
|
||||
else {
|
||||
LSerror :: addErrorCode('LSsession_05','LScli');
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
/**
|
||||
* Chargement des addons LdapSaisie
|
||||
*
|
||||
|
@ -495,7 +512,8 @@ class LSsession {
|
|||
self :: startLSlog();
|
||||
self :: startLStemplate();
|
||||
|
||||
session_start();
|
||||
if (php_sapi_name() != "cli")
|
||||
session_start();
|
||||
|
||||
self :: setLocale($lang,$encoding);
|
||||
|
||||
|
@ -694,7 +712,19 @@ class LSsession {
|
|||
return;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Initialize a CLI session for LdapSaisie
|
||||
*
|
||||
* @retval boolean True if intialized, false otherwise.
|
||||
*/
|
||||
public static function startCliLSsession() {
|
||||
if (php_sapi_name() != "cli") return;
|
||||
if (!self :: initialize()) return;
|
||||
if (!self :: loadLScli()) return;
|
||||
return True;
|
||||
}
|
||||
|
||||
/**
|
||||
* Do recover password
|
||||
*
|
||||
|
@ -1038,7 +1068,7 @@ class LSsession {
|
|||
*/
|
||||
public static function LSldapConnect() {
|
||||
if (self :: $ldapServer) {
|
||||
self :: includeFile(LSconfig :: get('NetLDAP2'));
|
||||
self :: includeFile(LSconfig :: get('NetLDAP2'), true);
|
||||
if (!self :: loadLSclass('LSldap')) {
|
||||
return;
|
||||
}
|
||||
|
@ -2247,18 +2277,37 @@ class LSsession {
|
|||
public static function getTmpFile($value) {
|
||||
$exist = self :: tmpFileExist($value);
|
||||
if (!$exist) {
|
||||
$img_path = LS_TMP_DIR .rand().'.tmp';
|
||||
$img_path = LS_TMP_DIR_PATH .rand().'.tmp';
|
||||
$fp = fopen($img_path, "w");
|
||||
fwrite($fp, $value);
|
||||
fclose($fp);
|
||||
self :: addTmpFile($value,$img_path);
|
||||
self :: addTmpFile($value, $img_path);
|
||||
return $img_path;
|
||||
}
|
||||
else {
|
||||
return $exist;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Retourne l'URL du fichier temporaire
|
||||
*
|
||||
* Retourne l'URL du fichier temporaire qu'il créera à partir de la valeur
|
||||
* s'il n'existe pas déjà .
|
||||
*
|
||||
* @author Benjamin Renard <brenard@easter-eggs.com>
|
||||
*
|
||||
* @param[in] $value La valeur du fichier
|
||||
*
|
||||
* @retval mixed
|
||||
**/
|
||||
public static function getTmpFileURL($value) {
|
||||
$path = self :: getTmpFile($value);
|
||||
if (substr($path, 0, strlen(LS_ROOT_DIR)) == LS_ROOT_DIR)
|
||||
return substr($path, strlen(LS_ROOT_DIR)+1);
|
||||
return False;
|
||||
}
|
||||
|
||||
/**
|
||||
* Supprime les fichiers temporaires
|
||||
*
|
||||
|
|
|
@ -86,12 +86,12 @@ class LStemplate {
|
|||
self :: $config[$key] = $value;
|
||||
}
|
||||
|
||||
if (LSsession :: includeFile(self :: $config['smarty_path'])) {
|
||||
if (LSsession :: includeFile(self :: $config['smarty_path'], true)) {
|
||||
self :: $_smarty = new Smarty();
|
||||
self :: $_smarty -> template_dir = self :: $config['template_dir'];
|
||||
|
||||
if ( ! is_writable(self :: $config['compile_dir']) ) {
|
||||
die(_('LStemplate : compile directory is not writable (dir : '.self :: $config['compile_dir'].')'));
|
||||
LSlog :: fatal(getFData(_("LStemplate : compile directory is not writable (dir : %{dir})"), self :: $config['compile_dir']));
|
||||
}
|
||||
self :: $_smarty -> compile_dir = self :: $config['compile_dir'];
|
||||
|
||||
|
@ -442,4 +442,3 @@ _("LStemplate : Fail to execute trigger %{callable} on event %{event} : is not c
|
|||
LSerror :: defineError('LStemplate_03',
|
||||
_("LStemplate : Error during the execution of the trigger %{callable} on event %{event}.")
|
||||
);
|
||||
|
||||
|
|
Loading…
Reference in a new issue