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

Version 3.1.23

Browse Source
This commit is contained in:
Alchemy
2011-10-18 14:26:13 +02:00
parent 3d78a7407e
commit 6f1ee368aa
6 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/classes/base.class.php
View File

@@ -351,7 +351,7 @@ abstract class base
// { // {
// $alter[] = "ALTER TABLE `".$table['name']."` DROP `$f_name`"; // $alter[] = "ALTER TABLE `".$table['name']."` DROP `$f_name`";
// } // }
} }
foreach ($correct_table['fields'] as $f_name => $expr) foreach ($correct_table['fields'] as $f_name => $expr)
{ {
@@ -515,20 +515,25 @@ abstract class base
continue; continue;
} }
$list_patches[$patch->get_release()][] = $patch; $n = 0;
do
{
$key = $patch->get_release() . '.' . $n;
$n++;
}
while (isset($list_patches[$key]));
$list_patches[$key] = $patch;
} }
} }
ksort($list_patches); ksort($list_patches);
$success = true; $success = true;
foreach ($list_patches as $v => $patches) foreach ($list_patches as $patch)
{ {
foreach ($patches as $patch) if (!$patch->apply($this->id))
{ $success = false;
if (!$patch->apply($this->id))
$success = false;
}
} }
return $success; return $success;

3
lib/classes/task/archive.class.php
View File

@@ -618,7 +618,8 @@ class task_archive extends phraseatask
function isIgnoredFile($f) function isIgnoredFile($f)
{ {
return($f=='.' || $f=='..' || $f=='Thumbs.db' || $f=='par-SYSTEM' || substr($f, 0, 10)=='.com.apple'); $f = strtolower($f);
return(($f[0]=='.' && $f != '.phrasea.xml' && $f != '.grouping.xml') || $f=='thumbs.db' || $f=='par-system');
// return(substr($f,0,1)=='.' || $f=='Thumbs.db' || $f=='par-SYSTEM'); // return(substr($f,0,1)=='.' || $f=='Thumbs.db' || $f=='par-SYSTEM');
} }

2
lib/version.inc
View File

@@ -1,2 +1,2 @@
<?php <?php
define('GV_version','3.1.22'); define('GV_version','3.1.23');

4
templates/web/login/index_layout_displaycooliris.twig
View File

@@ -53,10 +53,10 @@
<param name="allowFullScreen" value="true" /> <param name="allowFullScreen" value="true" />
<param name="allowScriptAccess" value="always" /> <param name="allowScriptAccess" value="always" />
<param name="flashvars" <param name="flashvars"
value="feed=/atom/cooliris/&glowColor=#0077BC&style=dark&backgroundColor=#000000&showChrome=false&showEMbed=false&showSearch=false" /> value="feed=/atom/cooliris/&glowColor=#0077BC&showReflections=false&showEmbed=false&showSearch=false&style=dark&backgroundColor=#000000&showChrome=false&showItemEmbed=false&showSearch=false" />
<embed wmode="transparent" type="application/x-shockwave-flash" <embed wmode="transparent" type="application/x-shockwave-flash"
src="http://apps.cooliris.com/embed/cooliris.swf" src="http://apps.cooliris.com/embed/cooliris.swf"
flashvars="feed=/atom/cooliris/&glowColor=#0077BC&style=dark&backgroundColor=#000000&showChrome=false&showEMbed=false&showSearch=false" flashvars="feed=/atom/cooliris/&glowColor=#0077BC&showReflections=false&showEmbed=false&showSearch=false&style=dark&backgroundColor=#000000&showChrome=false&showItemEmbed=false&showSearch=false"
width="930" width="930"
height="360" height="360"
allowFullScreen="true" allowFullScreen="true"

8
www/admin/taskfacility.php
View File

@@ -1,7 +1,5 @@
<?php <?php
$r = dirname(dirname(dirname( __FILE__ ))); require_once dirname( __FILE__ ) . "/../../lib/bootstrap.php";
require_once $r . "/lib/bootstrap.php";
$request = httpRequest::getInstance(); $request = httpRequest::getInstance();
$parm = $request->get_parms( $parm = $request->get_parms(
@@ -15,9 +13,9 @@ if(!$conn)
} }
$cls = 'task_' . $parm['cls']; $cls = 'task_' . $parm['cls'];
$tskfile = $r . '/lib/classes/task/' . $parm['cls'] . '.class.php';
require_once $tskfile; // $tskfile = $r . '/lib/classes/task/' . $parm['cls'] . '.class.php';
// require_once $tskfile;
$ztask = new $cls(); $ztask = new $cls();

1
www/login/index.php
View File

@@ -119,6 +119,7 @@ $twig->display('login/index.twig', array(
'module' => $parm['app'], 'module' => $parm['app'],
'logged_out' => $parm['logged_out'], 'logged_out' => $parm['logged_out'],
'captcha_system' => $captchaSys, 'captcha_system' => $captchaSys,
'homelink' => new homelink(),
'login' => new login(), 'login' => new login(),
'sso' => new sso(), 'sso' => new sso(),
'display_layout' => GV_home_publi 'display_layout' => GV_home_publi