rooty/Qware_core
0
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for addcom object

Browse Source
This commit is contained in:
Rooty 2021-04-27 05:31:32 +02:00
parent b7c321b145
commit eeb2704632
5 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/object_coordination/addcom/addcom.php
View File

@ -363,11 +363,11 @@ function execAdmin()
$MyUser->setTel($_POST['user_tel']);
$MyUser->setFax($_POST['user_fax']);
$MyUser->setWebSite($_POST['user_website']);
$MyUser->setMsn($_POST['user_msn']);
// $MyUser->setMsn($_POST['user_msn']);
$MyUser->setJabber($_POST['user_jabber']);
$MyUser->setFacebook($_POST['user_facebook']);
$MyUser->setMastodon($_POST['user_mastodon']);
$MyUser->SetAccountActive(1);
$MyUser->setAccountActive(1);
//On enregistre les paramètres
$MyUser = $GLOBALS["SYSTEM_MANAGER"]["USER"]->saveInstance($MyUser);
@ -388,21 +388,22 @@ function execAdmin()
}
}
$Node->SetIcone( ((isset($_POST["iconeN"]))?(htmlentitiesconv($_POST["iconeN"])):"") );
$Node->setIcone( ((isset($_POST["iconeN"]))?(htmlentitiesconv($_POST["iconeN"])):"") );
$Node->setCType( ((isset($_POST["NodeEntry_type"])&&$_POST["NodeEntry_type"]!="#")?($_POST["NodeEntry_type"]):"default") );
$Node->setCTypereg( ((isset($_POST["NodeEntry_typereg"]))?($_POST["NodeEntry_typereg"]):"") );
$Node->setDomain( ((isset($_POST["NodeEntry_domain"]))?($_POST["NodeEntry_domain"]):"") );
$Node->SetHasPublic( ((isset($_POST["haspublic"]))?($_POST["haspublic"]):0) );
$Node->setHasPublic( ((isset($_POST["haspublic"]))?($_POST["haspublic"]):0) );
$Node->setMailNode( ((isset($_POST["user_mail"]))?($_POST["user_mail"]):"") );
$NodeSettings->SetEmail( ((isset($_POST["node_email"]))?($_POST["node_email"]):"") );
$NodeSettings->SetGit( ((isset($_POST["node_git"]))?($_POST["node_git"]):"") );
$NodeSettings->setId($Node->getId());
$NodeSettings->setEmail( ((isset($_POST["node_email"]))?($_POST["node_email"]):"") );
$NodeSettings->setGit( ((isset($_POST["node_git"]))?($_POST["node_git"]):"") );
$NodeSettings->setMastodon( ((isset($_POST["node_mastodon"]))?($_POST["node_mastodon"]):"") );
$NodeSettings->setMobilizon( ((isset($_POST["node_mobilizon"]))?($_POST["node_mobilizon"]):"") );
$NodeSettings->setMatrix( ((isset($_POST["node_matrix"]))?($_POST["node_matrix"]):"") );
$NodeSettings->SetPeertube( ((isset($_POST["node_peertube"]))?($_POST["node_peertube"]):"") );
$NodeSettings->setPeertube( ((isset($_POST["node_peertube"]))?($_POST["node_peertube"]):"") );
$NodeSettings->setNextcloud( ((isset($_POST["node_nextcloud"]))?($_POST["node_nextcloud"]):"") );
$NodeSettings->SetTwitter( ((isset($_POST["node_twitter"]))?($_POST["node_twitter"]):"") );
$NodeSettings->setTwitter( ((isset($_POST["node_twitter"]))?($_POST["node_twitter"]):"") );
$NodeSettings->setFacebook( ((isset($_POST["node_facebook"]))?($_POST["node_facebook"]):"") );
// Récupération de la template!!!
@ -425,10 +426,10 @@ function execAdmin()
$Group =$GLOBALS["SYSTEM_MANAGER"]["GROUP"]->insertInstance($Group);
/*vérification de l'inexistance du répertoire*/
if( !is_dir ($GLOBALS['CONF_DATA_PATH']."data/upload/fckeditor/userimages/".$Node->getId()))
{
mkdir($GLOBALS['CONF_DATA_PATH']."data/upload/fckeditor/userimages/".$Node->getId(),0775);
}
// if( !is_dir ($GLOBALS['CONF_DATA_PATH']."data/upload/fckeditor/userimages/".$Node->getId()))
// {
// mkdir($GLOBALS['CONF_DATA_PATH']."data/upload/fckeditor/userimages/".$Node->getId(),0775);
// }
// Création des groupes et des noeuds secondaires
$NodeUtil =new Node();

4
lib/object_coordination/adminnode/adminnode.php
View File

@ -215,8 +215,8 @@ Class AdminNode extends CoordinationObj
$nodeId=($this->getData("nodeId")!="")?$this->getData("nodeId"):eid();
$node_id =( (isset($_POST["node_id"])) && ($_POST["node_id"]!="") )?$_POST["node_id"]:0;
$Node=new Node();
$Node->SetTemplate( ((isset($_POST["template_name"]))?(htmlentitiesconv($_POST["template_name"])):"") );
$Node->SetIcone( ((isset($_POST["iconeN"]))?(htmlentitiesconv($_POST["iconeN"])):"") );
$Node->setTemplate( ((isset($_POST["template_name"]))?(htmlentitiesconv($_POST["template_name"])):"") );
$Node->setIcone( ((isset($_POST["iconeN"]))?(htmlentitiesconv($_POST["iconeN"])):"") );
$Node->setCType( ( (isset($_POST["node_ctype"]) && ($_POST["node_ctype"]!="") )?($_POST["node_ctype"]):"default") );
$Node->setCTypereg( ((isset($_POST["node_ctypereg"]))?($_POST["node_ctypereg"]):"") );
$Node->setDomain( ((isset($_POST["node_domain"]))?($_POST["node_domain"]):"") );

6
lib/system/system_data/nodesettings/nodesettingsmanager.php
View File

@ -128,7 +128,7 @@ class NodeSettingsManager extends Manager
* @abstract
* @return entier
*/
function doInsert($email, $git, $mastodon, $mobilizon, $matrix, $peertube, $nextcloud, $twitter, $facebook)
function doInsert($id, $email, $git, $mastodon, $mobilizon, $matrix, $peertube, $nextcloud, $twitter, $facebook)
{
return true;
}
@ -376,8 +376,8 @@ class NodeSettingsManager extends Manager
if ($obj->isLoaded()==false)
{
/* Récupération des infos */
$id=$this->sourceInsert($obj->getEmail(), $obj->getGit(), $obj->getMastodon(), $obj->getMobilizon(), $obj->getMatrix(), $obj->getPeertube(), $obj->getNextcloud(), $obj->getTwitter(), $obj->getFacebook());
$obj->setId($id);
$id=$this->sourceInsert($obj->getId(), $obj->getEmail(), $obj->getGit(), $obj->getMastodon(), $obj->getMobilizon(), $obj->getMatrix(), $obj->getPeertube(), $obj->getNextcloud(), $obj->getTwitter(), $obj->getFacebook());
// $obj->setId($id);
$this->CallSystemPlugin("__insertNodeSettings", $obj);
return $obj;
}

5
lib/system/system_data/nodesettings/ressource/nodesettingsmanagerdb.php
View File

@ -194,9 +194,10 @@ var $conn = null;
* @access private
* @return entier
*/
function doInsert($email, $git, $mastodon, $mobilizon, $matrix, $peertube, $nextcloud, $twitter, $facebook)
function doInsert($id, $email, $git, $mastodon, $mobilizon, $matrix, $peertube, $nextcloud, $twitter, $facebook)
{
$sql="INSERT INTO ".$this->getTable()." ("
.$this->getSqlName("id").", "
.$this->getSqlName("email").", "
.$this->getSqlName("git").", "
.$this->getSqlName("mastodon").", "
@ -206,7 +207,7 @@ var $conn = null;
.$this->getSqlName("nextcloud").", "
.$this->getSqlName("twitter").", "
.$this->getSqlName("facebook").") VALUES (";
$sql.="'".$email."', '".$git."', '".$mastodon."', '".$mobilizon."', '".$matrix."', '".$peertube."', '".$nextcloud."', '".$twitter."', '".$facebook."')";
$sql.= $id.", '"."'".$email."', '".$git."', '".$mastodon."', '".$mobilizon."', '".$matrix."', '".$peertube."', '".$nextcloud."', '".$twitter."', '".$facebook."')";
# Requete
$result=$this->conn->sql_query($sql);

2
lib/system/system_data/user/user.php
View File

@ -858,7 +858,7 @@ var $accountActive = 0;
* @access public
* @return entier
*/
function SetAccountActive($accountActive)
function setAccountActive($accountActive)
{
$this->accountActive=$accountActive;
}