diff options
| author | Bruno Ribas <brunoribas@gmail.com> | 2017-10-25 02:15:27 +0000 |
|---|---|---|
| committer | Bruno Ribas <brunoribas@gmail.com> | 2017-10-25 02:15:27 +0000 |
| commit | e9727e8f0c0040dc29cb7d78a606652d453fc77f (patch) | |
| tree | 5f7ada5cece019acd254909df04645f8bb8fcb56 | |
| parent | 2c389fdd3760c2eaed76e97eac65868dd12ef9a4 (diff) | |
| parent | e6e30705f876a0a6ff07a1247145fccd09f58343 (diff) | |
| download | boca-e9727e8f0c0040dc29cb7d78a606652d453fc77f.tar.gz boca-e9727e8f0c0040dc29cb7d78a606652d453fc77f.zip | |
Merge branch 'master' of github.com:cassiopc/boca
| -rw-r--r-- | src/admin/misc.php | 2 | ||||
| -rw-r--r-- | src/fextdata.php | 2 | ||||
| -rwxr-xr-x | src/globals.php | 2 | ||||
| -rw-r--r-- | src/scoretable.php | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/admin/misc.php b/src/admin/misc.php index 7a4bd89..3e8d224 100644 --- a/src/admin/misc.php +++ b/src/admin/misc.php @@ -15,7 +15,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see <http://www.gnu.org/licenses/>. //////////////////////////////////////////////////////////////////////////////// -//Last updated 16/oct/2017 by cassio@ime.usp.br +//Last updated 24/oct/2017 by cassio@ime.usp.br require 'header.php'; ?> <br> diff --git a/src/fextdata.php b/src/fextdata.php index 49fc8fb..8dfb134 100644 --- a/src/fextdata.php +++ b/src/fextdata.php @@ -15,7 +15,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see <http://www.gnu.org/licenses/>. //////////////////////////////////////////////////////////////////////////////// -// Last modified 16/oct/2017 by cassio@ime.usp.br +// Last modified 24/oct/2017 by cassio@ime.usp.br function makeurlhttps($siteurl) { if(substr($siteurl,0,7) == 'http://') diff --git a/src/globals.php b/src/globals.php index 2dccdd1..1d449c1 100755 --- a/src/globals.php +++ b/src/globals.php @@ -15,7 +15,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see <http://www.gnu.org/licenses/>. //////////////////////////////////////////////////////////////////////////////// -// Last modified 26/jul/2017 by cassio@ime.usp.br +// Last modified 24/oct/2017 by cassio@ime.usp.br require_once('db.php'); define("dbcompat_1_4_1",true); diff --git a/src/scoretable.php b/src/scoretable.php index 33c421f..3f785f3 100644 --- a/src/scoretable.php +++ b/src/scoretable.php @@ -15,7 +15,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see <http://www.gnu.org/licenses/>. //////////////////////////////////////////////////////////////////////////////// -//Last updated 31/jul/2017 by cassio@ime.usp.br +//Last updated 24/oct/2017 by cassio@ime.usp.br require_once("db.php"); if(isset($_SESSION["locr"])) @@ -175,7 +175,7 @@ if(isset($_GET["remote"])) { if(!$redo) { $conf=globalconf(); - if($conf['doenc']) + if(isset($conf['doenc']) && $conf['doenc']) $strtmp = decryptData(substr($strtmp,strpos($strtmp,"\n")),$conf["key"],'score'); else $strtmp = substr($strtmp,strpos($strtmp,"\n")); if($strtmp=="") $redo=TRUE; @@ -395,7 +395,7 @@ if($redo) { } $conf=globalconf(); - if($conf['doenc']) + if(isset($conf['doenc']) && $conf['doenc']) $strtmp = "<!-- " . time() . " --> <?php exit; ?>\n" . encryptData($strtmp,$conf["key"],false); else $strtmp = "<!-- " . time() . " --> <?php exit; ?>\n" . $strtmp; if(file_put_contents($scoretmp, $strtmp,LOCK_EX)===FALSE) { @@ -405,7 +405,7 @@ if($redo) { LOGError("Cannot write to the ".$_SESSION["usertable"]["usertype"]."-score cache file -- performance might be compromised"); } $conf=globalconf(); - if($conf['doenc']) + if(isset($conf['doenc']) && $conf['doenc']) $strtmp = decryptData(substr($strtmp,strpos($strtmp,"\n")),$conf["key"]); else $strtmp = substr($strtmp,strpos($strtmp,"\n")); } |