Changeset 8965 for extensions/ConcoursPhoto/admin/add_concours.php

Timestamp:

Jan 28, 2011, 10:22:28 PM (13 years ago)

Author:

tiico

Message:

• Correct hour/min bug when time is set to 00h00 and control coherence between end and begin dates/hours
• Correct export to csv file (utf8decode)

File:

• extensions/ConcoursPhoto/admin/add_concours.php (modified) (6 diffs)

extensions/ConcoursPhoto/admin/add_concours.php

@@ -40 +40 @@
 
 
+
   
 // Month initialization for date selection...
@@ -66 +67 @@
 }
 
+
+// Add informations from previous pages if present
+if (isset($_GET['infos']) && isset($concours))
+{
+  $infos = $_GET['infos'];
+  switch($infos)
+  {
+    case "1" :
+    array_push($page['errors'],  sprintf( l10n('concours_end_date_change_to') ,$concours->concours_infos['end_date'] ));
+    break;
+        
+  }
+            
+}
+
  
 // Add criteria
@@ -75 +91 @@
 {
 
-        $concours->concours_infos['method'] = $_POST['concours_method'];
 
         if ($action == "modify_crit")
-                redirect(PHPWG_ROOT_PATH.'admin.php?page=plugin&section=' . CONCOURS_DIR . '%2Fadmin%2Fadmin.php');
+    {
+        $concours->infos = 0;
+        redirect(PHPWG_ROOT_PATH.'admin.php?page=plugin&section=' . CONCOURS_DIR . '%2Fadmin%2Fadmin.php&concours=' . $concours_id.(isset($concours->infos) ? '&infos=' .$concours->infos: ''));
+//              redirect(PHPWG_ROOT_PATH.'admin.php?page=plugin&section=' . CONCOURS_DIR . '%2Fadmin%2Fadmin.php');
+    }
 
         if ($action == "edit")
@@ -87 +106 @@
                 redirect(PHPWG_ROOT_PATH.'admin.php?page=plugin&section=' . CONCOURS_DIR . '%2Fadmin%2Fadmin.php');
         }
+
+    $concours->concours_infos['method'] = $_POST['concours_method'];
 
 // Step 1 : action = modify
@@ -113 +134 @@
     $concours->concours_infos['end_date'] = sprintf("%04d-%02d-%02d %02d:%02d:%02d",$_POST['end_year'], $_POST['end_month'], $_POST['end_day'], $_POST['end_hour'], $_POST['end_min'], 0);
 
-
+if ($concours->debug)   
+{
+    echo "BEGIN=".$concours->concours_infos['begin_date']."\n";
+    echo "END=".$concours->concours_infos['end_date']."\n";
+    sleep(5);
+}
+    
+    $BeginToEnd = NbJours($concours->concours_infos['begin_date'], $concours->concours_infos['end_date']);
+//    echo "NB=".$BeginToEnd;
+    // Test if end date is lower than end date
+    if ($BeginToEnd == 0)
+    {
+        $tBeginDate = explodeDateArray($concours->concours_infos['begin_date']);
+        $tEndDate = explodeDateArray($concours->concours_infos['end_date']);
+//    echo "Hour=".intval($tBeginDate[3])." / ".intval($tEndDate[3]);
+//    echo "Min=".intval($tBeginDate[4])." / ".intval($tEndDate[4]);
+        if ( (intval(@$tEndDate[3]) < intval(@$tBeginDate[3]))    // End hour is lower than begin hour 
+            OR ( (intval(@$tBeginDate[3]) == intval(@$tEndDate[3]))    // End hour is equal to begin hour 
+                 AND (intval(@$tEndDate[4]) < intval(@$tBeginDate[4]))) // End min is lower than begin hour
+            )
+        {
+            $concours->concours_infos['end_date'] = AjoutJours ($concours->concours_infos['begin_date'], 1);
+            $concours->infos = 1;  // sprintf( l10n('concours_end_date_change_to') ,$concours->concours_infos['end_date'] ));
+        }
+    }
+    elseif ($BeginToEnd < 0 )
+    {
+        $concours->concours_infos['end_date'] = AjoutJours ($concours->concours_infos['begin_date'], 1);
+        $concours->infos = 1;  // sprintf( l10n('concours_end_date_change_to') ,$concours->concours_infos['end_date'] ));
+    }
+    // End test date
+        
         $concours->concours_infos['groups'] = (!empty($_POST['groups']) ? '"' . implode(',', $_POST['groups']) . '"' : 'NULL');
         $concours->concours_infos['guest'] = isset($_POST['guest']);
@@ -131 +183 @@
 if ($concours->debug)   sleep(5);
                         // Redirect to admin
-                        redirect(PHPWG_ROOT_PATH.'admin.php?page=plugin&section=' . CONCOURS_DIR . '%2Fadmin%2Fadmin.php&amp;tab=add_concours&amp;action=modify_crit&amp;concours=' . $concours_id);
+                        redirect(PHPWG_ROOT_PATH.'admin.php?page=plugin&section=' . CONCOURS_DIR . '%2Fadmin%2Fadmin.php&amp;tab=add_concours&amp;action=modify_crit&amp;concours=' . $concours_id.(isset($concours->infos) ? '&amp;infos=' .$concours->infos: ''));
 
                         break;
                 case "modify" :
-                        $concours->update_concours();
-                        redirect(PHPWG_ROOT_PATH.'admin.php?page=plugin&section=' . CONCOURS_DIR . '%2Fadmin%2Fadmin.php&amp;tab=add_concours&amp;action=modify_crit&amp;concours=' . $concours_id);
+            $concours->update_concours();
+                        redirect(PHPWG_ROOT_PATH.'admin.php?page=plugin&section=' . CONCOURS_DIR . '%2Fadmin%2Fadmin.php&amp;tab=add_concours&amp;action=modify_crit&amp;concours=' . $concours_id.(isset($concours->infos) ? '&amp;infos=' .$concours->infos: ''));
 
                         break;
                 case "modify_crit" :
-                        redirect(PHPWG_ROOT_PATH.'admin.php?page=plugin&section=' . CONCOURS_DIR . '%2Fadmin%2Fadmin.php');
+//        echo "ICI";sleep(5);
+            $concours->infos = 0;
+                        redirect(PHPWG_ROOT_PATH.'admin.php?page=plugin&section=' . CONCOURS_DIR . '%2Fadmin%2Fadmin.php&amp;concours=' . $concours_id.(isset($concours->infos) ? '&amp;infos=' .$concours->infos: ''));
                         break;
         }