Merge

lib/classes/User/Adapter.class.php

@@ -397,7 +397,7 @@ class User_Adapter implements User_Interface, cache_cacheableInterface
    */
   public function set_email($email)
   {
-    if (!trim($email))
+    if (trim($email) == '')
       $email = null;
     
     $test_user = User_Adapter::get_usr_id_from_email($email);
@@ -873,6 +873,9 @@ class User_Adapter implements User_Interface, cache_cacheableInterface
 
   public static function get_usr_id_from_email($email)
   {
+    if(is_null($email))
+      return false;
+    
     $conn = connection::getPDOConnection();
     $sql = 'SELECT usr_id FROM usr
             WHERE usr_mail = :email

lib/classes/module/console/systemUpgrade.class.php

@@ -37,10 +37,45 @@ class module_console_systemUpgrade extends Command
   public function execute(InputInterface $input, OutputInterface $output)
   {
     if (!setup::is_installed())
+    {
+
+      if (file_exists(dirname(__FILE__) . "/../../../../config/connexion.inc")
+              && !file_exists(dirname(__FILE__) . "/../../../../config/config.inc")
+              && file_exists(dirname(__FILE__) . "/../../../../config/_GV.php"))
+      {
+
+        $output->writeln('This version of Phraseanet requires a config/config.inc');
+        $output->writeln('Would you like it to be created based on your settings ?');
+        
+        $dialog = $this->getHelperSet()->get('dialog');
+        do
+        {
+          $continue = mb_strtolower($dialog->ask($output, '<question>' . _('Create automatically') . ' (Y/n)</question>', 'y'));
+        }
+        while (!in_array($continue, array('y', 'n')));
+      
+        if ($continue == 'y')
+        {
+          require __DIR__ . "/../../../../config/_GV.php";
+
+          $datas = '<?php'."\n"
+            .'$servername = "'.GV_ServerName.'";'."\n"
+            .'$maintenance=false;'."\n"
+            .'$debug=false;'."\n"
+            .'$debug=true;'."\n"
+            .'';
+        
+          file_put_contents(__DIR__ . "/../../../../config/config.inc", $datas);
+        }
+        else
         {  
           throw new RuntimeException('Phraseanet is not set up');
         }
 
+      }
+        
+    }
+
     require_once dirname(__FILE__) . '/../../../../lib/bootstrap.php';
 
     $output->write('Phraseanet is going to be upgraded', true);

lib/classes/task/period/archive.class.php

@@ -1541,6 +1541,7 @@ class task_period_archive extends task_abstract
         $record->set_metadatas($meta['metadatas']);
         $record->set_binary_status(databox_status::operation_or($stat0, $stat1));
         $record->rebuild_subdefs();
+        $record->reindex();
         $rid = $record->get_record_id();
         $this->log(sprintf((' (recordId %s)'), $rid));
         $this->archivedFiles++;
@@ -1881,6 +1882,7 @@ class task_period_archive extends task_abstract
         $record->set_metadatas($meta['metadatas']);
         $record->set_binary_status(databox_status::operation_or(databox_status::operation_or($stat0, $stat1), databox_status::hex2bin($hexstat)));
         $record->rebuild_subdefs();
+        $record->reindex();
 
         $rid = $record->get_record_id();
         if ($grp_rid !== NULL)

lib/conf.d/Doctrine/Entities.Basket.dcm.yml

@@ -38,6 +38,7 @@ Entities\Basket:
     validation:
       targetEntity: ValidationSession
       mappedBy: basket
+      cascade: ["remove"]
   oneToMany:
     elements:
       targetEntity: BasketElement

lib/conf.d/Doctrine/Entities.ValidationSession.dcm.yml

@@ -36,7 +36,7 @@ Entities\ValidationSession:
     participants:
       targetEntity: ValidationParticipant
       mappedBy: session
-
+      cascade: ["remove"]
 
 
 

lib/unitTest/userTest.php

@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of Phraseanet
+ *
+ * (c) 2005-2010 Alchemy
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+
+require_once dirname(__FILE__) . '/PhraseanetPHPUnitAbstract.class.inc';
+
+/**
+ *
+ * @package
+ * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
+ * @link        www.phraseanet.com
+ */
+
+
+
+class userTest extends PhraseanetPHPUnitAbstract
+{
+  
+  
+  public function testMail()
+  {
+    $this->assertFalse(User_Adapter::get_usr_id_from_email(null));
+    try
+    {
+      $appbox = appbox::get_instance();
+
+      self::$user->set_email(null); 
+
+      $this->assertFalse(User_Adapter::get_usr_id_from_email(null));
+      self::$user->set_email(''); 
+      $this->assertFalse(User_Adapter::get_usr_id_from_email(null));
+      self::$user->set_email('noonealt1@example.com');
+      $this->assertEquals(self::$user->get_id(), User_Adapter::get_usr_id_from_email('noonealt1@example.com'));
+    }
+    catch(Exception $e)
+    {
+      $this->fail($e->getMessage());
+    }
+    $this->assertFalse(User_Adapter::get_usr_id_from_email(null));
+  }
+}

www/admin/index.php

@@ -86,6 +86,8 @@ $parm = $request->get_parms('section');
 $twig = new supertwig();
 $twig->display('admin/index.html.twig', array(
     'module' => 'admin'
+    ,'events'=>  eventsmanager_broker::getInstance($appbox)
+    ,'module_name' => 'Admin'
     , 'feature' => $feature
     , 'featured' => $featured
     , 'databoxes' => $databoxes

www/admin/task2.php

@@ -82,4 +82,10 @@ if(!$task->getGraphicForm())
 
 $twig = new supertwig();
 $twig->addFilter(array('stripdoublequotes'=>'stripdoublequotes'));
+
+if(!$task->getGraphicForm())
+{
+  $parm['view'] = 'XML';
+}
+
 $twig->display('admin/task.html', array('task'=>$task, 'view'=>$parm['view']));

www/login/home.js

@@ -1,12 +1,7 @@
-
 jQuery(document).ready(function(){	
 	var date = new Date();
 	date.setMonth(date.getMonth() + 2);
-<<<<<<< HEAD
-	$.cookie('screen', screen.width+"x"+screen.height, { path: '/', expires: date });
-=======
   jQuery.cookie('screen', screen.width+"x"+screen.height, { path: '/', expires: date });
->>>>>>> FixHome
   
   var test_cookie = date.getTime();
   jQuery.cookie('test_cookie'+test_cookie, 'accepted', { path: '/', expires: date });