hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-16 06:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'FixSeparator' into 3.6

Browse Source
This commit is contained in:
Romain Neutron
2011-12-28 23:05:46 +01:00
parent 646db61ca7 28736fb20c
commit c7e0dd378c
4 changed files with 461 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/classes/caption/field.class.php
View File

@@ -206,6 +206,9 @@ class caption_field implements cache_cacheableInterface
*/ */
protected static function serialize_value(Array $value, $separator) protected static function serialize_value(Array $value, $separator)
{ {
if(strlen($separator) > 1)
$separator = $separator[0];
if (trim($separator) === '') if (trim($separator) === '')
$separator = ' '; $separator = ' ';
else else

39
lib/classes/task/manager.class.php
View File

@@ -113,4 +113,43 @@ class task_manager
return $row; return $row;
} }
public static function getAvailableTasks()
{
$registry = registry::get_instance();
$taskdir = array( $registry->get('GV_RootPath') . "lib/classes/task/period/"
, $registry->get('GV_RootPath') . "config/classes/task/period/"
);
$tasks = array();
foreach($taskdir as $path)
{
if( ($hdir = @opendir($path)) )
{
$tskin = array();
$max = 9999;
while (($max-- > 0) && (($file = readdir($hdir)) !== false))
{
if (!is_file($path . '/' . $file) || substr($file, 0, 1) == "." || substr($file, -10) != ".class.php")
continue;
$classname = 'task_period_' . substr($file, 0, strlen($file) - 10);
try
{
// $testclass = new $classname(null);
if ($classname::interfaceAvailable())
{
$tasks[] = array("class" => $classname, "name" => $classname::getName(), "err" => null);
}
}
catch (Exception $e)
{
}
}
closedir($hdir);
}
}
return $tasks;
}
} }

9
templates/web/admin/task.html
View File

@@ -150,8 +150,17 @@
<!-- _____________ head added part of graphic interface of '{{task.getName()}}' _____________ --> <!-- _____________ head added part of graphic interface of '{{task.getName()}}' _____________ -->
{{task.printInterfaceHEAD()}} {{task.printInterfaceHEAD()}}
<!-- ______________ end of head part of graphic interface of '{{task.getName()}}' ______________ --> <!-- ______________ end of head part of graphic interface of '{{task.getName()}}' ______________ -->
<script type="text/javascript" src="/include/jslibs/jquery-1.5.2.js"></script>
<script type="text/javascript" src="/include/jslibs/jquery-ui-1.8.12/js/jquery-ui-1.8.12.custom.min.js"></script>
<script type="text/javascript" src="/include/minify/g=admin"></script>
<script type="text/javascript"> <script type="text/javascript">
var p4 = {users:{sel:[]}};
var bodySize = {x:0,y:0};
var language = {
};
jsTaskObj = { jsTaskObj = {
SettingsIsDirty:false, SettingsIsDirty:false,

30
www/admin/taskmanager.php
View File

@@ -33,35 +33,6 @@ $registry = $appbox->get_registry();
$task_manager = new task_manager($appbox); $task_manager = new task_manager($appbox);
$tasks = array();
$path = $registry->get('GV_RootPath') . "lib/classes/task/period/";
if ($hdir = opendir($path))
{
$tskin = array();
$max = 9999;
while (($max-- > 0) && (($file = readdir($hdir)) !== false))
{
if (!is_file($path . '/' . $file) || substr($file, 0, 1) == "." || substr($file, -10) != ".class.php")
continue;
$classname = 'task_period_' . substr($file, 0, strlen($file) - 10);
try
{
// $testclass = new $classname(null);
if ($classname::interfaceAvailable())
{
$tasks[] = array("class" => $classname, "name" => $classname::getName(), "err" => null);
}
}
catch (Exception $e)
{
}
}
closedir($hdir);
}
?> ?>
<html lang="<?php echo $session->get_I18n(); ?>"> <html lang="<?php echo $session->get_I18n(); ?>">
<head> <head>
@@ -346,6 +317,7 @@ if ($hdir = opendir($path))
var menuNewTask = [ var menuNewTask = [
<?php <?php
// fill the 'new task' menu // fill the 'new task' menu
$tasks = task_manager::getAvailableTasks();
$ntasks = count($tasks); $ntasks = count($tasks);
foreach ($tasks as $t) foreach ($tasks as $t)
{ {