Several depreciated PHP constructions fixed.

This commit is contained in:
tomas 2005-02-20 21:33:46 +00:00
parent 90f154c31c
commit 5a3bc31dba
1 changed files with 16 additions and 16 deletions

View File

@ -23,7 +23,7 @@
Author : $Author: tomas $ Author : $Author: tomas $
Version : $Revision: 1.13 $ Version : $Revision: 1.14 $
Location : $ $ Location : $ $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -33,7 +33,7 @@ require_once"gbHtml_h.php";
* storageServer WWW-form interface * storageServer WWW-form interface
* *
* @author $Author: tomas $ * @author $Author: tomas $
* @version $Revision: 1.13 $ * @version $Revision: 1.14 $
* @see Alib * @see Alib
* @see GreenBox * @see GreenBox
*/ */
@ -69,11 +69,11 @@ switch($_REQUEST['act']){
*/ */
case"login"; case"login";
$sessid = $gb->login($_REQUEST['login'], $_REQUEST['pass']); $sessid = $gb->login($_REQUEST['login'], $_REQUEST['pass']);
if($sessid && !PEAR::isError($sessid)){ if($sessid && !$dbc->isError($sessid)){
setcookie($config['authCookieName'], $sessid); setcookie($config['authCookieName'], $sessid);
$redirUrl="gbHtmlBrowse.php"; $redirUrl="gbHtmlBrowse.php";
$fid = $gb->getObjId($_REQUEST['login'], $gb->storId); $fid = $gb->getObjId($_REQUEST['login'], $gb->storId);
if(!PEAR::isError($fid)) $redirUrl.="?id=$fid"; if(!$dbc->isError($fid)) $redirUrl.="?id=$fid";
}else{ }else{
$redirUrl="gbHtmlLogin.php"; $_SESSION['alertMsg']='Login failed.'; $redirUrl="gbHtmlLogin.php"; $_SESSION['alertMsg']='Login failed.';
} }
@ -117,7 +117,7 @@ switch($_REQUEST['act']){
} }
} }
$r = $gb->putFile($id, $_REQUEST['filename'], $ntmp, $mdtmp, $sessid); $r = $gb->putFile($id, $_REQUEST['filename'], $ntmp, $mdtmp, $sessid);
if(PEAR::isError($r)) $_SESSION['alertMsg'] = $r->getMessage(); if($dbc->isError($r)) $_SESSION['alertMsg'] = $r->getMessage();
else{ else{
@unlink($ntmp); @unlink($ntmp);
@unlink($mdtmp); @unlink($mdtmp);
@ -134,7 +134,7 @@ switch($_REQUEST['act']){
*/ */
case"newFolder": case"newFolder":
$r = $gb->createFolder($id, $_REQUEST['newname'], $sessid); $r = $gb->createFolder($id, $_REQUEST['newname'], $sessid);
if(PEAR::isError($r)) $_SESSION['alertMsg'] = $r->getMessage(); if($dbc->isError($r)) $_SESSION['alertMsg'] = $r->getMessage();
$redirUrl = BROWSER."?id=$id"; $redirUrl = BROWSER."?id=$id";
break; break;
/** /**
@ -148,7 +148,7 @@ switch($_REQUEST['act']){
case"rename": case"rename":
$parid = $gb->getParent($id); $parid = $gb->getParent($id);
$r = $gb->renameFile($id, $_REQUEST['newname'], $sessid); $r = $gb->renameFile($id, $_REQUEST['newname'], $sessid);
if(PEAR::isError($r)) $_SESSION['alertMsg'] = $r->getMessage(); if($dbc->isError($r)) $_SESSION['alertMsg'] = $r->getMessage();
$redirUrl = BROWSER."?id=$parid"; $redirUrl = BROWSER."?id=$parid";
break; break;
/** /**
@ -163,14 +163,14 @@ switch($_REQUEST['act']){
case"move": case"move":
$newPath = urlencode($_REQUEST['newPath']); $newPath = urlencode($_REQUEST['newPath']);
$did = $gb->getObjIdFromRelPath($id, $newPath); $did = $gb->getObjIdFromRelPath($id, $newPath);
if(PEAR::isError($did)){ if($dbc->isError($did)){
$_SESSION['alertMsg'] = $did->getMessage(); $_SESSION['alertMsg'] = $did->getMessage();
$redirUrl = BROWSER."?id=$parid"; $redirUrl = BROWSER."?id=$parid";
break; break;
} }
$parid = $gb->getParent($id); $parid = $gb->getParent($id);
$r = $gb->moveFile($id, $did, $sessid); $r = $gb->moveFile($id, $did, $sessid);
if(PEAR::isError($r)){ if($dbc->isError($r)){
$_SESSION['alertMsg'] = $r->getMessage(); $_SESSION['alertMsg'] = $r->getMessage();
$redirUrl = BROWSER."?id=$parid"; $redirUrl = BROWSER."?id=$parid";
break; break;
@ -191,7 +191,7 @@ switch($_REQUEST['act']){
$did = $gb->getObjIdFromRelPath($id, $newPath); $did = $gb->getObjIdFromRelPath($id, $newPath);
$parid = $gb->getParent($id); $parid = $gb->getParent($id);
$r = $gb->copyFile($id, $did, $sessid); $r = $gb->copyFile($id, $did, $sessid);
if(PEAR::isError($r)){ if($dbc->isError($r)){
$_SESSION['alertMsg'] = $r->getMessage(); $_SESSION['alertMsg'] = $r->getMessage();
#$_SESSION['alertMsg'] = $r->getMessage()." ".$r->getUserInfo(); #$_SESSION['alertMsg'] = $r->getMessage()." ".$r->getUserInfo();
$redirUrl = BROWSER."?id=$parid"; $redirUrl = BROWSER."?id=$parid";
@ -208,7 +208,7 @@ switch($_REQUEST['act']){
case"delete": case"delete":
$parid = $gb->getParent($id); $parid = $gb->getParent($id);
$r = $gb->deleteFile($id, $sessid); $r = $gb->deleteFile($id, $sessid);
if(PEAR::isError($r)) $_SESSION['alertMsg'] = $r->getMessage(); if($dbc->isError($r)) $_SESSION['alertMsg'] = $r->getMessage();
$redirUrl = BROWSER."?id=$parid"; $redirUrl = BROWSER."?id=$parid";
break; break;
/** /**
@ -265,7 +265,7 @@ switch($_REQUEST['act']){
$_SESSION['alertMsg']='Access denied.'; $_SESSION['alertMsg']='Access denied.';
break; break;
} }
if(PEAR::isError($res)) $_SESSION['alertMsg'] = $res->getMessage(); if($dbc->isError($res)) $_SESSION['alertMsg'] = $res->getMessage();
break; break;
/** /**
* removeSubj * removeSubj
@ -282,7 +282,7 @@ switch($_REQUEST['act']){
$_SESSION['alertMsg']='Access denied.'; $_SESSION['alertMsg']='Access denied.';
break; break;
} }
if(PEAR::isError($res)) $_SESSION['alertMsg'] = $res->getMessage(); if($dbc->isError($res)) $_SESSION['alertMsg'] = $res->getMessage();
break; break;
/** /**
* addSubj2 * addSubj2
@ -300,7 +300,7 @@ switch($_REQUEST['act']){
$_SESSION['alertMsg']='Access denied.'; $_SESSION['alertMsg']='Access denied.';
break; break;
} }
if(PEAR::isError($res)) $_SESSION['alertMsg'] = $res->getMessage(); if($dbc->isError($res)) $_SESSION['alertMsg'] = $res->getMessage();
break; break;
/** /**
* removeSubjFromGr * removeSubjFromGr
@ -318,7 +318,7 @@ switch($_REQUEST['act']){
$_SESSION['alertMsg']='Access denied.'; $_SESSION['alertMsg']='Access denied.';
break; break;
} }
if(PEAR::isError($res)) $_SESSION['alertMsg'] = $res->getMessage(); if($dbc->isError($res)) $_SESSION['alertMsg'] = $res->getMessage();
break; break;
/** /**
* passwd * passwd
@ -370,7 +370,7 @@ switch($_REQUEST['act']){
} }
$res = $gb->addPerm($_REQUEST['subj'], $_REQUEST['permAction'], $res = $gb->addPerm($_REQUEST['subj'], $_REQUEST['permAction'],
$_REQUEST['id'], $_REQUEST['allowDeny']); $_REQUEST['id'], $_REQUEST['allowDeny']);
if(PEAR::isError($res)){ if($dbc->isError($res)){
$_SESSION['alertMsg'] = $res->getMessage()." (".$res->getCode().")"; $_SESSION['alertMsg'] = $res->getMessage()." (".$res->getCode().")";
} }
break; break;