Merge remote-tracking branch 'upstream/master'

process/cron/orders.cron

@@ -11,10 +11,5 @@ fi
 
 for GAME in $*
 do
-  if [ "$GAME" == "eressea" ]; then GAME=2 ; fi
-  if [ "$GAME" == "e3a" ]; then GAME=3 ; fi
-  if [ -e $HOME/eressea/game-$GAME/orders.queue ]
-  then
-    $HOME/bin/orders-process $GAME
-  fi
+  $HOME/eressea/orders-php/check-orders.sh $GAME
 done

process/orders-accept

@@ -22,5 +22,5 @@ filename=$(basename "$ACCEPT_FILE")
 email="$ACCEPT_MAIL"
 if [ -d "$ERESSEA/orders-php" ]
 then
-  php "$ERESSEA/orders-php/cli.php" insert "$filename" "$email" "$lang"
+  php "$ERESSEA/orders-php/cli.php" insert "$filename" "$lang" "$email"
 fi

src/automate.c

@@ -161,7 +161,7 @@ void autostudy_run(scholar scholars[], int nscholars)
     }
 }
 
-#define MAXSCHOLARS 512
+#define MAXSCHOLARS 1024
 
 void do_autostudy(region *r)
 {