Rev: 4638

19 files changed, 50 insertions, 36 deletions

diff --git a/egyéb/nextcloud/mayor-nextcloud.php b/egyéb/nextcloud/mayor-nextcloud.php
index ee5014e1..6be31e55 100644
--- a/egyéb/nextcloud/mayor-nextcloud.php
+++ b/egyéb/nextcloud/mayor-nextcloud.php
@@ -373,16 +373,10 @@ if (function_exists('mysqli_connect') and PHP_MAJOR_VERSION >= 7) { //MySQLi (Im
     }
 
     function add_param_to_user($list, $user, $paramname, $param){      //Naplón kívüli csoportokat adhatunk a felhasználókhoz
-        $curr = "";
         foreach($list as $key => $val){   // Csak rendezett tömbökön!
-            if($curr != $val['userAccount'] && ($user === null or ($user !== null && $val['userAccount'] == $user ))){ //Vagy mindenki vagy adott user + rendezett lista
+            if($user === null or ($user !== null && $val['userAccount'] == $user )){ //Vagy mindenki vagy adott user + rendezett lista
                 
                 $list[$key][$paramname] = $param;    // A paraméter
-
-                if($user !== null && $val['userAccount'] == $user ){    // Null -> mindenkihez, "user" -> csak neki
-                    break;
-                }
-                $curr = $val['userAccount'];
             }
         }
         return $list;    
diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index b02620cf..7ea43f6c 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4636
+4638
diff --git a/mayor-orig/mayor-base/www/include/share/net/upload.php b/mayor-orig/mayor-base/www/include/share/net/upload.php
index 7181c94e..d58708ed 100644
--- a/mayor-orig/mayor-base/www/include/share/net/upload.php
+++ b/mayor-orig/mayor-base/www/include/share/net/upload.php
@@ -99,7 +99,7 @@ function filename2ext($filename) {
     $ext = substr(strrchr($filename, '.'), 1);
     $ext = substr($filename, strrpos($filename, '.') + 1);
     $ext = preg_replace('/^.*\.([^.]+)$/D', '$1', $filename);
-    $exts = split("[/\\.]", $filename);
+    $exts = explode('.', $filename);
     $n    = count($exts)-1;
     $ext  = $exts[$n];
     return $ext;
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index b02620cf..7ea43f6c 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4636
+4638
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index b02620cf..7ea43f6c 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4636
+4638
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index b02620cf..7ea43f6c 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4636
+4638
diff --git a/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev b/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev
index b02620cf..7ea43f6c 100644
--- a/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev
+++ b/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev
@@ -1 +1 @@
-4636
+4638
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index b02620cf..7ea43f6c 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4636
+4638
diff --git a/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev b/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev
index b02620cf..7ea43f6c 100644
--- a/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev
+++ b/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev
@@ -1 +1 @@
-4636
+4638
diff --git a/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev b/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev
index b02620cf..7ea43f6c 100644
--- a/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev
+++ b/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev
@@ -1 +1 @@
-4636
+4638
diff --git a/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev b/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev
index b02620cf..7ea43f6c 100644
--- a/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev
+++ b/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev
@@ -1 +1 @@
-4636
+4638
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index b02620cf..7ea43f6c 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4636
+4638
diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/haladasi/haladasi.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/haladasi/haladasi.php
index 92d07ee8..c755a77e 100644
--- a/mayor-orig/mayor-naplo/www/include/modules/naplo/haladasi/haladasi.php
+++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/haladasi/haladasi.php
@@ -72,7 +72,7 @@
 	// Csatlakozás az adatbázishoz
 	$lr = db_connect('naplo', array('fv' => 'getHaladasi'));
         $q = "SELECT oraId, dt, ora, ki, kit, tankorId, teremId, ora.leiras, tipus, eredet, csoportId, feladatTipusId,
-		hazifeladatId,
+		hazifeladatId,hazifeladatFeltoltesEngedely,
 		getOraTolTime(oraId) AS tolTime,
 		getOraIgTime(oraId) AS igTime
                         FROM ora 
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/haladasi.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/haladasi.phtml
index e267cf27..ce15cd4d 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/haladasi.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/haladasi.phtml
@@ -527,6 +527,25 @@
 		  }
 		}
 		echo '<a href="'.href('index.php?page=naplo&sub=haladasi&f=hazifeladat&oraId='.$dOra['oraId'].'&hazifeladatId='.$ADAT['tankorHazifeladat'][ $dOra['oraId'] ]).'" class="onClickUpdateWindow" title="'._HAZIFELADAT.'">';
+
+		
+                                   if (isset($dOra['hazifeladatId'])) {
+                                        if ($dOra['hazifeladatFeltoltesEngedely']==1) {
+                                            $_icon = 'icon-paper-clip-alt';
+                                            if ($ADAT['diakHazifeladat'][$dOra['oraId']]['hazifeladatDiakStatus'] == 'kész') { $_hfcolor = 'lightgreen';
+                                            } else { $_hfcolor = '#3f51b5'; }
+                                        } else {
+                                            $_icon= 'icon-home-alt';
+                                            if ($ADAT['diakHazifeladat'][$dOra['oraId']]['hazifeladatDiakStatus'] == 'kész') { $_hfcolor = 'lightgreen';
+                                            } else { $_hfcolor = '#e91e63'; }
+                                        }
+                                        echo '<span class="'.$_icon.'" title="h.f." style="color:'.$_hfcolor.';"></span>';
+		    } else {
+			echo '<span class="icon-home" style="color: #aaa"></span>';
+		    }
+
+/*
+
 		    if ($dOra['hazifeladatId']>0) {
 			if ($ADAT['diakHazifeladat'][$dOra['oraId']]['hazifeladatDiakStatus'] =='kész') {
 			    $hfColor = 'lightgreen';
@@ -537,6 +556,7 @@
 		    } else {
 			echo '<span class="icon-home" style="color: #aaa"></span>';
 		    }
+*/
 		echo '</a>';
 
 
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index b02620cf..7ea43f6c 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4636
+4638
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index b02620cf..7ea43f6c 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4636
+4638
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index 64df47f5..6169ebe3 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4636
-3984cb91cd9401421a7c228920d9afa8  mayor-fenntarto-rev4636.tgz
-e9dc0d99d56ed7ce0feac0b88d517b49  mayor-installer-sulix-rev4636.tgz
-9ed22b632285302d049d4d615b0e65cf  mayor-wiki-rev4636.tgz
-2ac683038891b9b45e5c6e49f41e90f6  mayor-installer-rev4636.tgz
-64a4bd3f5dedd3dd85b20f6a16add9a6  mayor-portal-rev4636.tgz
-6730cc3657155fccbcb90e01c1698b62  mayor-felveteli-rev4636.tgz
-43524fe82ae26bc04368eb604585f8d7  mayor-jatek-rev4636.tgz
-e7a3f8a719957e93270e9957da4ac705  mayor-locales-jp_JP-rev4636.tgz
-6388bc1e38d1010b7232fee7e0cd6805  mayor-locales-de_DE-rev4636.tgz
-43cc1f581483a40a268865af7f2f9353  mayor-locales-en_US-rev4636.tgz
-9049ffb272a96153f0f33ff7e52b63df  mayor-naplo-rev4636.tgz
-ed384ad9581b23262a1266d1fbd25d5c  mayor-base-rev4636.tgz
+Revision 4638
+7c04d7dfb70a7dac5bf44b5a080aae0a  mayor-fenntarto-rev4638.tgz
+320681a070309e09f0f85b4484524588  mayor-installer-sulix-rev4638.tgz
+8a8d27bb703c8fb4ae4349861cccde30  mayor-wiki-rev4638.tgz
+442b160029578e84c4d2f6a858e5b9f3  mayor-installer-rev4638.tgz
+99787799c8b0486039d403d262412995  mayor-portal-rev4638.tgz
+561679bc58969c7c8446f41dee75e9e2  mayor-felveteli-rev4638.tgz
+130347b3a3729665d7d39b2dc2a59573  mayor-jatek-rev4638.tgz
+290202bba8a3e8f26aceda07fa7ad05d  mayor-locales-jp_JP-rev4638.tgz
+4fec8cd164478db181b9e1c5d2bcc984  mayor-locales-de_DE-rev4638.tgz
+342f21279660750bd11e1be6495b1994  mayor-locales-en_US-rev4638.tgz
+c7fc720e8165be32d97deecbb1784697  mayor-naplo-rev4638.tgz
+d7b34ad65c6a757a86dc79883b2233a3  mayor-base-rev4638.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index b02620cf..7ea43f6c 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4636
+4638
diff --git a/rev.txt b/rev.txt
index b02620cf..7ea43f6c 100644
--- a/rev.txt
+++ b/rev.txt
@@ -1 +1 @@
-4636
+4638