";
@@ -120,13 +127,29 @@
$res = $DBc->sqlQuery("SELECT sum(ap_value) as anz FROM ach_perk,ach_player_perk WHERE ap_id=app_perk AND app_player='".$_USER->getID()."'");
- $html = " ".$_USER->getName()." ![](".$_CONF[) ".max(0,$res[0]['anz'])." ";
+ $html = " ".$_USER->getName()." ".max(0,$res[0]['anz'])." ";
return $html;
}
function ach_render_facebook() {
-
+ return "
+
+ 
+
+
+
+
+  |
+ connected |
+
+
+ |
+
+
+
+
+ ";
}
function ach_render_twitter() {
@@ -446,12 +469,12 @@
| ";
- if(($prog/$val) > 0.85) {
+ if(($prog/$val) > 0.5) {
$html .= " ".nf($prog)." / ".nf($val)." ";
}
$html .= " |
";
- if(($prog/$val) <= 0.85) {
+ if(($prog/$val) <= 0.5) {
$html .= " ".nf($prog)." / ".nf($val)." ";
}
$html .= " |
diff --git a/code/web/app/app_achievements/index.php b/code/web/app/app_achievements/index.php
index 316b636ae..79edf6bfb 100644
--- a/code/web/app/app_achievements/index.php
+++ b/code/web/app/app_achievements/index.php
@@ -1,79 +1,129 @@
-isIG()) {
- require_once("include/ach_render_ig.php");
-}
-else {
- require_once("include/ach_render_web.php");
-}
-require_once("include/ach_render_common.php");
-
-require_once("class/DLL_class.php");
-#require_once("class/InDev_trait.php");
-require_once("class/Node_abstract.php");
-require_once("class/AVLTree_class.php");
-require_once("class/Parentum_abstract.php");
-require_once("class/AchList_abstract.php");
-require_once("class/Tieable_inter.php");
-require_once("class/NodeIterator_class.php");
-
-
-require_once("class/AchMenu_class.php");
-require_once("class/AchMenuNode_class.php");
-require_once("class/AchSummary_class.php");
-require_once("class/AchCategory_class.php");
-require_once("class/AchAchievement_class.php");
-require_once("class/AchPerk_class.php");
-require_once("class/AchObjective_class.php");
-
-
-
-// Update user acces on Db
-#$DBc = ryDB::getInstance(APP_NAME."_test");
-$DBc = ryDB::getInstance(APP_NAME);
-#$DBc = ryDB::getInstance("ahufler");
-
-
-if(!$_USER->isIG && $_CONF['enable_webig'] == false) {
- $c = ach_render_forbidden(false);
-}
-elseif($_USER->isIG && $_CONF['enable_offgame'] == false) {
- $c = ach_render_forbidden(true);
-}
-else {
- $c = ach_render();
-}
-
-
-echo ryzom_app_render("achievements", $c, $_USER->isIG());
-
-?>
+isIG()) {
+ require_once("include/ach_render_ig.php");
+}
+else {
+ require_once("include/ach_render_web.php");
+}
+require_once("include/ach_render_common.php");
+
+require_once("class/DLL_class.php");
+#require_once("class/InDev_trait.php");
+require_once("class/Node_abstract.php");
+require_once("class/AVLTree_class.php");
+require_once("class/Parentum_abstract.php");
+require_once("class/AchList_abstract.php");
+require_once("class/Tieable_inter.php");
+require_once("class/NodeIterator_class.php");
+
+
+require_once("class/AchMenu_class.php");
+require_once("class/AchMenuNode_class.php");
+require_once("class/AchSummary_class.php");
+require_once("class/AchCategory_class.php");
+require_once("class/AchAchievement_class.php");
+require_once("class/AchPerk_class.php");
+require_once("class/AchObjective_class.php");
+
+require_once("fb/facebook.php");
+
+// Update user acces on Db
+#$DBc = ryDB::getInstance(APP_NAME."_test");
+#$DBc = ryDB::getInstance(APP_NAME);
+$DBc = ryDB::getInstance("ahufler");
+
+$c = "";
+if(!$_USER->isIG()) {
+ $facebook = new Facebook(array(
+ 'appId' => $_CONF['fb_id'],
+ 'secret' => $_CONF['fb_secret'],
+ 'cookie' => true
+ ));
+
+ // Get the url to redirect for login to facebook
+ // and request permission to write on the user's wall.
+ $login_url = $facebook->getLoginUrl(
+ array('scope' => 'publish_stream')
+ );
+
+ // If not authenticated, redirect to the facebook login dialog.
+ // The $login_url will take care of redirecting back to us
+ // after successful login.
+ if (! $facebook->getUser()) {
+ $c .= ';';
+ }
+ else {
+ echo var_export($facebook->getUser(),true);
+ // Do the wall post.
+ try {
+
+ /*$facebook->api("/me/feed", "post", array(
+ message => "My character Talvela just achieved \"Bejeweled\" on Ryzom!",
+ picture => "http://www.3025-game.de/special/app_achievements/pic/icon/test.png",
+ link => "http://www.ryzom.com",
+ name => "Ryzom",
+ caption => "Join and play for fee!"
+ ));*/
+
+ } catch (FacebookApiException $e) {
+ echo $e;
+ $login_url = $facebook->getLoginUrl( array(
+ 'scope' => 'publish_stream'
+ ));
+ echo 'Please login.';
+ #error_log($e->getType());
+ #error_log($e->getMessage());
+ }
+
+
+ }
+
+
+}
+
+if(!$_USER->isIG && $_CONF['enable_webig'] == false) {
+ $c .= ach_render_forbidden(false);
+}
+elseif($_USER->isIG && $_CONF['enable_offgame'] == false) {
+ $c .= ach_render_forbidden(true);
+}
+else {
+ $c .= ach_render();
+}
+
+
+echo ryzom_app_render("achievements", $c, $_USER->isIG());
+
+?>
diff --git a/code/web/app/app_achievements/pic/f-connect.png b/code/web/app/app_achievements/pic/f-connect.png
new file mode 100644
index 000000000..ee067c17b
Binary files /dev/null and b/code/web/app/app_achievements/pic/f-connect.png differ
diff --git a/code/web/app/app_achievements/pic/facebook-logo.png b/code/web/app/app_achievements/pic/facebook-logo.png
new file mode 100644
index 000000000..c469dafac
Binary files /dev/null and b/code/web/app/app_achievements/pic/facebook-logo.png differ
diff --git a/code/web/app/app_achievements_admin/class/AdmAchievement_class.php b/code/web/app/app_achievements_admin/class/AdmAchievement_class.php
index bb01aafe1..635aef466 100644
--- a/code/web/app/app_achievements_admin/class/AdmAchievement_class.php
+++ b/code/web/app/app_achievements_admin/class/AdmAchievement_class.php
@@ -1,6 +1,55 @@
setParent($this);
+ $n->insert();
+ $this->addChild($n);
+ }*/
+
+ function removeNode($id) {
+ $res = $this->getChildDataByID($id);
+ if($res != null) {
+ $res->delete_me();
+ $this->removeChild($id);
+ }
+ }
+
+ function updateNode($id) { // PROBABLY USELESS!
+ $res = $this->getChildDataByID($id);
+ if($res != null) {
+ $res->update();
+ }
+ }
+
+ function getPathID($path = "") {
+ if($path != "") {
+ $path = ";".$path;
+ }
+ $path = $this->getID().$path;
+ if($this->parent != null) {
+ return $this->parent->getPathID($path);
+ }
+
+ return $path;
+ }
+
+ function getElementByPath($pid) {
+ $tmp = explode(";",$pid);
+ if($tmp[0] == $this->getID()) {
+ if(sizeof($tmp) > 1) {
+ $c = $this->getChildDataByID($tmp[1]);
+ if($c != null) {
+ unset($tmp[0]);
+ return $c->getElementByPath(implode(";",$tmp));
+ }
+ return null;
+ }
+ else {
+ return $this;
+ }
+ }
+ return null;
+ }
function AdmAchievement($data,$parent) {
parent::__construct($data,$parent);
@@ -34,10 +83,10 @@
function update() {
global $DBc;
- $DBc->sqlQuery("UPDATE ach_achievement SET aa_category='".$this->getCategory()."',aa_parent=NULL,aa_tie_race=".mkn($this->getTieRace()).",aa_tie_cult=".mkn($this->getTieCult()).",aa_tie_civ=".mkn($this->getTieCiv()).",aa_image='".mysql_real_escape_string($this->getImage())."',aa_dev='".$this->getDev()."' WHERE aa_id='".$this->getID()."'");
+ $DBc->sqlQuery("UPDATE ach_achievement SET aa_category='".$this->getCategory()."',aa_parent=NULL,aa_tie_race=".mkn($this->getTieRace()).",aa_tie_cult=".mkn($this->getTieCult()).",aa_tie_civ=".mkn($this->getTieCiv()).",aa_image='".$DBc->sqlEscape($this->getImage())."',aa_dev='".$this->getDev()."' WHERE aa_id='".$this->getID()."'");
#MISSING: update lang entry
- $DBc->sqlQuery("INSERT INTO ach_achievement_lang (aal_achievement,aal_lang,aal_name,aal_template) VALUES ('".$this->getID()."','en','".mysql_real_escape_string($this->getName())."',".mkn($this->getTemplate()).") ON DUPLICATE KEY UPDATE aal_name='".mysql_real_escape_string($this->getName())."',aal_template=".mkn($this->getTemplate())."");
+ $DBc->sqlQuery("INSERT INTO ach_achievement_lang (aal_achievement,aal_lang,aal_name,aal_template) VALUES ('".$this->getID()."','en','".$DBc->sqlEscape($this->getName())."',".mkn($this->getTemplate()).") ON DUPLICATE KEY UPDATE aal_name='".$DBc->sqlEscape($this->getName())."',aal_template=".mkn($this->getTemplate())."");
}
function insert() {
@@ -45,11 +94,11 @@
$this->dev = 1;
- $DBc->sqlQuery("INSERT INTO ach_achievement (aa_category,aa_parent,aa_tie_race,aa_tie_cult,aa_tie_civ,aa_image,aa_dev) VALUES ('".$this->getCategory()."',NULL,".mkn($this->getTieRace()).",".mkn($this->getTieCult()).",".mkn($this->getTieCiv()).",'".mysql_real_escape_string($this->getImage())."','1')");
- $id = mysql_insert_id();
+ $DBc->sqlQuery("INSERT INTO ach_achievement (aa_category,aa_parent,aa_tie_race,aa_tie_cult,aa_tie_civ,aa_image,aa_dev) VALUES ('".$this->getCategory()."',NULL,".mkn($this->getTieRace()).",".mkn($this->getTieCult()).",".mkn($this->getTieCiv()).",'".$DBc->sqlEscape($this->getImage())."','1')");
+ $id = $DBc->insertID();
$this->setID($id);
- $DBc->sqlQuery("INSERT INTO ach_achievement_lang (aal_achievement,aal_lang,aal_name,aal_template) VALUES ('".$this->getID()."','en','".mysql_real_escape_string($this->getName())."',".mkn($this->getTemplate()).")");
+ $DBc->sqlQuery("INSERT INTO ach_achievement_lang (aal_achievement,aal_lang,aal_name,aal_template) VALUES ('".$this->getID()."','en','".$DBc->sqlEscape($this->getName())."',".mkn($this->getTemplate()).")");
}
diff --git a/code/web/app/app_achievements_admin/class/AdmAtom_class.php b/code/web/app/app_achievements_admin/class/AdmAtom_class.php
index 9ede36606..19c606d04 100644
--- a/code/web/app/app_achievements_admin/class/AdmAtom_class.php
+++ b/code/web/app/app_achievements_admin/class/AdmAtom_class.php
@@ -1,5 +1,56 @@
setParent($this);
+ $n->insert();
+ $this->addChild($n);
+ }
+
+ function removeNode($id) {
+ $res = $this->getChildDataByID($id);
+ if($res != null) {
+ $res->delete_me();
+ $this->removeChild($id);
+ }
+ }
+
+ function updateNode($id) { // PROBABLY USELESS!
+ $res = $this->getChildDataByID($id);
+ if($res != null) {
+ $res->update();
+ }
+ }
+
+ function getPathID($path = "") {
+ if($path != "") {
+ $path = ";".$path;
+ }
+ $path = $this->getID().$path;
+ if($this->parent != null) {
+ return $this->parent->getPathID($path);
+ }
+
+ return $path;
+ }
+
+ function getElementByPath($pid) {
+ $tmp = explode(";",$pid);
+ if($tmp[0] == $this->getID()) {
+ if(sizeof($tmp) > 1) {
+ $c = $this->getChildDataByID($tmp[1]);
+ if($c != null) {
+ unset($tmp[0]);
+ return $c->getElementByPath(implode(";",$tmp));
+ }
+ return null;
+ }
+ else {
+ return $this;
+ }
+ }
+ return null;
+ }
+
protected $objective;
protected $mandatory;
protected $ruleset;
@@ -23,15 +74,27 @@
}
function update() {
- #$DBc->sqlQuery("UPDATE ach_atom SET atom_mandatory='".."',atom_ruleset='".."',atom_ruleset_parsed='".."' WHERE atom_id='".$this->id."'");
+ global $DBc;
+
+ $DBc->sqlQuery("UPDATE ach_atom SET atom_mandatory='".$this->getMandatory()."',atom_ruleset='".$DBc->sqlEscape($this->getRuleset())."',atom_ruleset_parsed='".$DBc->sqlEscape($this->getRulesetParsed())."' WHERE atom_id='".$this->id."'");
}
function insert() {
- #$DBc->sqlQuery("INSERT INTO ach_atom (atom_objective,atom_mandatory,atom_ruleset,atom_ruleset_parsed) VALUES ('".."','".."','".."','".."')");
- $id = mysql_insert_id();
+ global $DBc;
+
+ $DBc->sqlQuery("INSERT INTO ach_atom (atom_objective,atom_mandatory,atom_ruleset,atom_ruleset_parsed) VALUES ('".$this->getObjective()."','".$this->getMandatory()."','".$DBc->sqlEscape($this->getRuleset())."','".$DBc->sqlEscape($this->getRulesetParsed())."')");
+ $id = $DBc->insertID();
$this->setID($id);
}
+ function getObjective() {
+ return $this->objective;
+ }
+
+ function setObjective($o) {
+ $this->objective = $o;
+ }
+
function setMandatory($ft) {
if($ft == true) {
$this->mandatory = 1;
@@ -58,73 +121,222 @@
return $this->ruleset;
}
- private function parse() {
- /*VALUE _money AS $money {
- CACHE blach AS $test
+ function getRulesetParsed() {
+ return $this->ruleset_parsed;
+ }
- if($money >= 10000 && $test == 0) {
- GRANT
- FINAL
- }
- else {
- CACHE blach SET $money
- }
- }
+ private function parse() {
+ /*
+VALUE _money AS $money {
+
+ CACHE blach AS $test;
+
+ if($money >= 10000 && $test == 0) {
+ RESET;
+ GRANT $money UNTIL TIMER:3600;
+ FINAL;
+ }
+ else {
+ CACHE blach SET $money;
+ }
+
+ SCRIPT wealth($money) AS $res;
+
+ if($res == "lol") {
+ DENY;
+ }
+}
+
+ENTITY _pos AS $pos {
+ SCRIPT inside($pos,"majestic_garden") AS $region;
+
+ if($region == true) {
+ GRANT;
+ }
+}
+*/
$res = $this->ruleset;
- #VALUE ([^ ]+) AS ([^ ]+) {#
+ #VALUE ([^ ]+) AS ([$][^ ]+) {#
$match = array();
- preg_match_all("#VALUE ([^ ]+) AS ([^ ]+) {#",$this->ruleset,$match);
+ preg_match_all("#VALUE ([^ ]+) AS ([$][^ ]+) {#",$this->ruleset,$match);
foreach($match[0] as $key=>$elem) {
$func = "_".md5(microtime());
$tmp = '$this->registerValue("'.$match[1][$key].'","'.$func.'");
- function '.$func.'('.$match[2][$key].',$_P,$_CB) {
- $_IDENT = "'.$match[1][$key].'";';
+function '.$func.'('.$match[2][$key].',$_P,$_CB) {
+ global $_CACHE;
+ $_IDENT = "'.$match[1][$key].'";';
//replace
$res = str_replace($elem,$tmp,$res);
}
- #ENTITY ([^ ]+) AS ([^ ]+) {#
+ #ENTITY ([^ ]+) AS ([$][^ ]+) {#
$match = array();
- preg_match_all("#ENTITY ([^ ]+) AS ([^ ]+) {#",$this->ruleset,$match);
+ preg_match_all("#ENTITY ([^ ]+) AS ([$][^ ]+) {#",$this->ruleset,$match);
foreach($match[0] as $key=>$elem) {
$func = "_".md5(microtime());
$tmp = '$this->registerEntity("'.$match[1][$key].'","'.$func.'");
- function '.$func.'('.$match[2][$key].',$_P,$_CB) {
- $_IDENT = "'.$match[1][$key].'";';
+function '.$func.'('.$match[2][$key].',$_P,$_CB) {
+ global $_CACHE;
+ $_IDENT = "'.$match[1][$key].'";';
//replace
$res = str_replace($elem,$tmp,$res);
}
- #EVENT ([^ ]+) AS ([^ ]+) {#
+ #EVENT ([^ ]+) AS ([$][^ ]+) {#
$match = array();
- preg_match_all("#EVENT ([^ ]+) AS ([^ ]+) {#",$this->ruleset,$match);
+ preg_match_all("#EVENT ([^ ]+) AS ([$][^ ]+) {#",$this->ruleset,$match);
foreach($match[0] as $key=>$elem) {
$func = "_".md5(microtime());
$tmp = '$this->registerEvent("'.$match[1][$key].'","'.$func.'");
- function '.$func.'('.$match[2][$key].',$_P,$_CB) {
- $_IDENT = "'.$match[1][$key].'";';
+function '.$func.'('.$match[2][$key].',$_P,$_CB) {
+ global $_CACHE;
+ $_IDENT = "'.$match[1][$key].'";';
//replace
$res = str_replace($elem,$tmp,$res);
}
- #CACHE ([^ ]+) AS ([^ ]+)#
+ #GRANT ([^;]*);#
+ $match = array();
+ preg_match_all("#GRANT ([^;]*);#",$this->ruleset,$match);
+ foreach($match[0] as $key=>$elem) {
+ $tmp = '$_P->grant('.$match[1][$key].');';
- #GRANT#
+ //replace
+ $res = str_replace($elem,$tmp,$res);
+ }
- #FINAL#
+ #GRANT;#
+ $match = array();
+ preg_match_all("#GRANT;#",$this->ruleset,$match);
+ foreach($match[0] as $key=>$elem) {
+ $tmp = '$_P->grant();';
- #CACHE ([^ ]+) SET ([^ ]+)#*/
+ //replace
+ $res = str_replace($elem,$tmp,$res);
+ }
+
+ #DENY;#
+ $match = array();
+ preg_match_all("#DENY;#",$this->ruleset,$match);
+ foreach($match[0] as $key=>$elem) {
+ $tmp = '$_P->deny();';
+
+ //replace
+ $res = str_replace($elem,$tmp,$res);
+ }
+
+ #UNLOCK;#
+ $match = array();
+ preg_match_all("#UNLOCK;#",$this->ruleset,$match);
+ foreach($match[0] as $key=>$elem) {
+ $tmp = '$_P->unlock();';
+
+ //replace
+ $res = str_replace($elem,$tmp,$res);
+ }
+
+ #RESET;#
+ $match = array();
+ preg_match_all("#RESET;#",$this->ruleset,$match);
+ foreach($match[0] as $key=>$elem) {
+ $tmp = '$_P->reset_();';
+
+ //replace
+ $res = str_replace($elem,$tmp,$res);
+ }
+
+ #UNLOCK_ALL;#
+ $match = array();
+ preg_match_all("#UNLOCK_ALL;#",$this->ruleset,$match);
+ foreach($match[0] as $key=>$elem) {
+ $tmp = '$_P->unlock_all();';
+
+ //replace
+ $res = str_replace($elem,$tmp,$res);
+ }
+
+ #RESET_ALL;#
+ $match = array();
+ preg_match_all("#RESET_ALL;#",$this->ruleset,$match);
+ foreach($match[0] as $key=>$elem) {
+ $tmp = '$_P->reset_all();';
+
+ //replace
+ $res = str_replace($elem,$tmp,$res);
+ }
+
+ #FINAL VALUE;#
+ $match = array();
+ preg_match_all("#FINAL VALUE;#",$this->ruleset,$match);
+ foreach($match[0] as $key=>$elem) {
+ $tmp = '$_P->unregisterValue($_IDENT,$_CB);';
+
+ //replace
+ $res = str_replace($elem,$tmp,$res);
+ }
+
+ #FINAL ENTITY;#
+ $match = array();
+ preg_match_all("#FINAL ENTITY;#",$this->ruleset,$match);
+ foreach($match[0] as $key=>$elem) {
+ $tmp = '$_P->unregisterEntity($_IDENT,$_CB);';
+
+ //replace
+ $res = str_replace($elem,$tmp,$res);
+ }
+ #FINAL EVENT;#
+ $match = array();
+ preg_match_all("#FINAL EVENT;#",$this->ruleset,$match);
+ foreach($match[0] as $key=>$elem) {
+ $tmp = '$_P->unregisterEvent($_IDENT,$_CB);';
+
+ //replace
+ $res = str_replace($elem,$tmp,$res);
+ }
+
+ #CACHE ([^ ]+) AS ([$][^ ]+);#
+ $match = array();
+ preg_match_all("#CACHE ([^ ]+) AS ([$][^ ]+);#",$this->ruleset,$match);
+ foreach($match[0] as $key=>$elem) {
+ $tmp = $match[2][$key].' = $_CACHE->getData('.$match[1][$key].');';
+
+ //replace
+ $res = str_replace($elem,$tmp,$res);
+ }
+
+ #CACHE ([^ ]+) SET ([$][^ ]+);#
+ $match = array();
+ preg_match_all("#CACHE ([^ ]+) SET ([$][^ ]+);#",$this->ruleset,$match);
+ foreach($match[0] as $key=>$elem) {
+ $tmp = '$_CACHE->writeData('.$match[1][$key].','.$match[2][$key].');';
+
+ //replace
+ $res = str_replace($elem,$tmp,$res);
+ }
+
+ #SCRIPT ([^ ]+) AS ([$][^ ]+);#
+ $match = array();
+ preg_match_all("#SCRIPT ([^\(]+)\(([^\)]*)\) AS ([$][^ ]+);#",$this->ruleset,$match);
+ foreach($match[0] as $key=>$elem) {
+ $tmp = '@include_once("script/'.$match[1][$key].'_script.php");
+ '.$match[3][$key].' = '.$match[1][$key].'('.$match[2][$key].');';
+
+ //replace
+ $res = str_replace($elem,$tmp,$res);
+ }
+
+ $this->ruleset_parsed = $res;
}
}
?>
\ No newline at end of file
diff --git a/code/web/app/app_achievements_admin/class/AdmCategory_class.php b/code/web/app/app_achievements_admin/class/AdmCategory_class.php
index cd0ff71a1..7a09fefab 100644
--- a/code/web/app/app_achievements_admin/class/AdmCategory_class.php
+++ b/code/web/app/app_achievements_admin/class/AdmCategory_class.php
@@ -1,6 +1,55 @@
setParent($this);
+ $n->insert();
+ $this->addChild($n);
+ }*/
+
+ function removeNode($id) {
+ $res = $this->getChildDataByID($id);
+ if($res != null) {
+ $res->delete_me();
+ $this->removeChild($id);
+ }
+ }
+
+ function updateNode($id) { // PROBABLY USELESS!
+ $res = $this->getChildDataByID($id);
+ if($res != null) {
+ $res->update();
+ }
+ }
+
+ function getPathID($path = "") {
+ if($path != "") {
+ $path = ";".$path;
+ }
+ $path = $this->getID().$path;
+ if($this->parent != null) {
+ return $this->parent->getPathID($path);
+ }
+
+ return $path;
+ }
+
+ function getElementByPath($pid) {
+ $tmp = explode(";",$pid);
+ if($tmp[0] == $this->getID()) {
+ if(sizeof($tmp) > 1) {
+ $c = $this->getChildDataByID($tmp[1]);
+ if($c != null) {
+ unset($tmp[0]);
+ return $c->getElementByPath(implode(";",$tmp));
+ }
+ return null;
+ }
+ else {
+ return $this;
+ }
+ }
+ return null;
+ }
function AdmCategory($id,$race,$cult = null,$civ = null) {
parent::__construct($id,$race,$cult,$civ);
diff --git a/code/web/app/app_achievements_admin/class/AdmMenuNode_class.php b/code/web/app/app_achievements_admin/class/AdmMenuNode_class.php
index 05064d28c..853700202 100644
--- a/code/web/app/app_achievements_admin/class/AdmMenuNode_class.php
+++ b/code/web/app/app_achievements_admin/class/AdmMenuNode_class.php
@@ -20,7 +20,9 @@
return true;
}
else {
- foreach($this->nodes as $elem) {
+ $iter = $this->getIterator();
+ while($iter->hasNext()) {
+ $elem = $iter->getNext();
$res = $elem->hasAchievements();
if($res == true) {
return true;
@@ -79,7 +81,7 @@
$DBc->sqlQuery("UPDATE ach_category SET ac_parent=".mkn($this->getParentID()).",ac_order='".$this->getOrder()."',ac_image=".mkn($this->getImage()).",ac_dev='".$this->getDev()."' WHERE ac_id='".$this->getID()."'");
#MISSING: update lang entry
- $DBc->sqlQuery("INSERT IGNORE INTO ach_category_lang (acl_category,acl_lang,acl_name) VALUES ('".$this->getID()."','".$_USER->getLang()."','".mysql_real_escape_string($this->getName())."') ON DUPLICATE KEY UPDATE acl_name='".mysql_real_escape_string($this->getName())."'");
+ $DBc->sqlQuery("INSERT IGNORE INTO ach_category_lang (acl_category,acl_lang,acl_name) VALUES ('".$this->getID()."','".$_USER->getLang()."','".$DBc->sqlEscape($this->getName())."') ON DUPLICATE KEY UPDATE acl_name='".$DBc->sqlEscape($this->getName())."'");
}
function insert() { // write $this to the database as a new entry
@@ -88,10 +90,10 @@
$this->setOrder($this->parent->getNextOrder());
$DBc->sqlQuery("INSERT INTO ach_category (ac_parent,ac_order,ac_image,ac_dev) VALUES (".mkn($this->getParentID()).",'".$this->getOrder()."',".mkn($this->getImage()).",'1')");
- $id = mysql_insert_id();
+ $id = $DBc->insertID();
$this->setID($id);
#MISSING: insert lang entry
- $DBc->sqlQuery("INSERT INTO ach_category_lang (acl_category,acl_lang,acl_name) VALUES ('".$this->getID()."','".$_USER->getLang()."','".mysql_real_escape_string($this->getName())."')");
+ $DBc->sqlQuery("INSERT INTO ach_category_lang (acl_category,acl_lang,acl_name) VALUES ('".$this->getID()."','".$_USER->getLang()."','".$DBc->sqlEscape($this->getName())."')");
}
@@ -147,7 +149,10 @@
}
$val = array();
- foreach($this->nodes as $elem) {
+ $iter = $this->getIterator();
+ while($iter->hasNext()) {
+ #foreach($this->nodes as $elem) {
+ $elem = $iter->getNext();
$val[] = $elem->getOrder();
}
diff --git a/code/web/app/app_achievements_admin/class/AdmMenu_class.php b/code/web/app/app_achievements_admin/class/AdmMenu_class.php
index f646d0d3f..8fbc961bf 100644
--- a/code/web/app/app_achievements_admin/class/AdmMenu_class.php
+++ b/code/web/app/app_achievements_admin/class/AdmMenu_class.php
@@ -1,13 +1,62 @@
setParent($this);
+ $n->insert();
+ $this->addChild($n);
+ }*/
+
+ /*function removeNode($id) {
+ $res = $this->getChildDataByID($id);
+ if($res != null) {
+ $res->delete_me();
+ $this->removeChild($id);
+ }
+ }*/
+
+ /*function updateNode($id) { // PROBABLY USELESS!
+ $res = $this->getChildDataByID($id);
+ if($res != null) {
+ $res->update();
+ }
+ }*/
+
+ function getPathID($path = "") {
+ if($path != "") {
+ $path = ";".$path;
+ }
+ $path = $this->getID().$path;
+ if($this->parent != null) {
+ return $this->parent->getPathID($path);
+ }
+
+ return $path;
+ }
+
+ function getElementByPath($pid) {
+ $tmp = explode(";",$pid);
+ if($tmp[0] == $this->getID()) {
+ if(sizeof($tmp) > 1) {
+ $c = $this->getChildDataByID($tmp[1]);
+ if($c != null) {
+ unset($tmp[0]);
+ return $c->getElementByPath(implode(";",$tmp));
+ }
+ return null;
+ }
+ else {
+ return $this;
+ }
+ }
+ return null;
+ }
function AdmMenu($open) {
parent::__construct($open);
#$this->drawTree();
- #$this->removeChild(0); // unset the auto-generated "summary" node
+ $this->removeChild(0); // unset the auto-generated "summary" node
}
protected function makeChild($d) { // override child generator to use admin classes
@@ -18,7 +67,8 @@
$res = $this->getNode($id);
if($res != null) {
$res->delete_me();
- $this->removeChild($id);
+ $tmp = $res->getParent();
+ $tmp->removeChild($id);
}
}
diff --git a/code/web/app/app_achievements_admin/class/AdmObjective_class.php b/code/web/app/app_achievements_admin/class/AdmObjective_class.php
index 82c301453..bec59b52b 100644
--- a/code/web/app/app_achievements_admin/class/AdmObjective_class.php
+++ b/code/web/app/app_achievements_admin/class/AdmObjective_class.php
@@ -1,13 +1,62 @@
setParent($this);
+ $n->insert();
+ $this->addChild($n);
+ }
+
+ function removeNode($id) {
+ $res = $this->getChildDataByID($id);
+ if($res != null) {
+ $res->delete_me();
+ $this->removeChild($id);
+ }
+ }
+
+ function updateNode($id) { // PROBABLY USELESS!
+ $res = $this->getChildDataByID($id);
+ if($res != null) {
+ $res->update();
+ }
+ }
+
+ function getPathID($path = "") {
+ if($path != "") {
+ $path = ";".$path;
+ }
+ $path = $this->getID().$path;
+ if($this->parent != null) {
+ return $this->parent->getPathID($path);
+ }
+
+ return $path;
+ }
+
+ function getElementByPath($pid) {
+ $tmp = explode(";",$pid);
+ if($tmp[0] == $this->getID()) {
+ if(sizeof($tmp) > 1) {
+ $c = $this->getChildDataByID($tmp[1]);
+ if($c != null) {
+ unset($tmp[0]);
+ return $c->getElementByPath(implode(";",$tmp));
+ }
+ return null;
+ }
+ else {
+ return $this;
+ }
+ }
+ return null;
+ }
function AdmObjective($data,$parent) {
parent::__construct($data,$parent);
global $DBc;
- $res = $DBc->sqlQuery("SELECT atom_id FROM ach_atom WHERE atom_objective='".$this->getID()."'");
+ $res = $DBc->sqlQuery("SELECT * FROM ach_atom WHERE atom_objective='".$this->getID()."'");
$sz = sizeof($res);
for($i=0;$i<$sz;$i++) {
$this->addChild($this->makeChild($res[$i]));
@@ -35,19 +84,19 @@
function update() {
global $DBc;
- $DBc->sqlQuery("UPDATE ach_objective SET ao_condition='".mysql_real_escape_string($this->getCondition())."',ao_value=".mkn($this->getValue()).",ao_display='".mysql_real_escape_string($this->getDisplay())."',ao_metalink=".mkn($this->getMetaImage())." WHERE ao_id='".$this->getID()."'");
+ $DBc->sqlQuery("UPDATE ach_objective SET ao_condition='".$DBc->sqlEscape($this->getCondition())."',ao_value=".mkn($this->getValue()).",ao_display='".$DBc->sqlEscape($this->getDisplay())."',ao_metalink=".mkn($this->getMetaImage())." WHERE ao_id='".$this->getID()."'");
- $DBc->sqlQuery("INSERT INTO ach_objective_lang (aol_objective,aol_lang,aol_name) VALUES ('".$this->getID()."','en','".mysql_real_escape_string($this->getName())."') ON DUPLICATE KEY UPDATE aol_name='".mysql_real_escape_string($this->getName())."'");
+ $DBc->sqlQuery("INSERT INTO ach_objective_lang (aol_objective,aol_lang,aol_name) VALUES ('".$this->getID()."','en','".$DBc->sqlEscape($this->getName())."') ON DUPLICATE KEY UPDATE aol_name='".$DBc->sqlEscape($this->getName())."'");
}
function insert() {
global $DBc;
- $DBc->sqlQuery("INSERT INTO ach_objective (ao_perk,ao_condition,ao_value,ao_display,ao_metalink) VALUES ('".$this->getPerk()."','".mysql_real_escape_string($this->getCondition())."',".mkn($this->getValue()).",'".mysql_real_escape_string($this->getDisplay())."',".mkn($this->getMetaImage()).")");
- $id = mysql_insert_id();
+ $DBc->sqlQuery("INSERT INTO ach_objective (ao_perk,ao_condition,ao_value,ao_display,ao_metalink) VALUES ('".$this->getPerk()."','".$DBc->sqlEscape($this->getCondition())."',".mkn($this->getValue()).",'".$DBc->sqlEscape($this->getDisplay())."',".mkn($this->getMetaImage()).")");
+ $id = $DBc->insertID();
$this->setID($id);
- $DBc->sqlQuery("INSERT INTO ach_objective_lang (aol_objective,aol_lang,aol_name) VALUES ('".$this->getID()."','en','".mysql_real_escape_string($this->getName())."')");
+ $DBc->sqlQuery("INSERT INTO ach_objective_lang (aol_objective,aol_lang,aol_name) VALUES ('".$this->getID()."','en','".$DBc->sqlEscape($this->getName())."')");
}
function setCondition($c) {
diff --git a/code/web/app/app_achievements_admin/class/AdmPerk_class.php b/code/web/app/app_achievements_admin/class/AdmPerk_class.php
index 73c446e40..8b0714961 100644
--- a/code/web/app/app_achievements_admin/class/AdmPerk_class.php
+++ b/code/web/app/app_achievements_admin/class/AdmPerk_class.php
@@ -1,6 +1,55 @@
setParent($this);
+ $n->insert();
+ $this->addChild($n);
+ }
+
+ function removeNode($id) {
+ $res = $this->getChildDataByID($id);
+ if($res != null) {
+ $res->delete_me();
+ $this->removeChild($id);
+ }
+ }
+
+ function updateNode($id) { // PROBABLY USELESS!
+ $res = $this->getChildDataByID($id);
+ if($res != null) {
+ $res->update();
+ }
+ }
+
+ function getPathID($path = "") {
+ if($path != "") {
+ $path = ";".$path;
+ }
+ $path = $this->getID().$path;
+ if($this->parent != null) {
+ return $this->parent->getPathID($path);
+ }
+
+ return $path;
+ }
+
+ function getElementByPath($pid) {
+ $tmp = explode(";",$pid);
+ if($tmp[0] == $this->getID()) {
+ if(sizeof($tmp) > 1) {
+ $c = $this->getChildDataByID($tmp[1]);
+ if($c != null) {
+ unset($tmp[0]);
+ return $c->getElementByPath(implode(";",$tmp));
+ }
+ return null;
+ }
+ else {
+ return $this;
+ }
+ }
+ return null;
+ }
protected $condition;
protected $condition_value;
@@ -35,9 +84,9 @@
function update() {
global $DBc;
- $DBc->sqlQuery("UPDATE ach_perk SET ap_parent=".mkn($this->getParentID()).",ap_value='".mysql_real_escape_string($this->getValue())."',ap_condition='".mysql_real_escape_string($this->getCondition())."',ap_condition_value=".mkn($this->getConditionValue()).",ap_dev='".$this->getDev()."',ap_porder='".$this->porder."' WHERE ap_id='".$this->getID()."'");
+ $DBc->sqlQuery("UPDATE ach_perk SET ap_parent=".mkn($this->getParentID()).",ap_value='".$DBc->sqlEscape($this->getValue())."',ap_condition='".$DBc->sqlEscape($this->getCondition())."',ap_condition_value=".mkn($this->getConditionValue()).",ap_dev='".$this->getDev()."',ap_porder='".$this->porder."' WHERE ap_id='".$this->getID()."'");
- $DBc->sqlQuery("INSERT INTO ach_perk_lang (apl_perk,apl_lang,apl_name,apl_template) VALUES ('".$this->getID()."','en','".mysql_real_escape_string($this->getName())."',".mkn($this->getTemplate()).") ON DUPLICATE KEY UPDATE apl_name='".mysql_real_escape_string($this->getName())."',apl_template=".mkn($this->getTemplate())."");
+ $DBc->sqlQuery("INSERT INTO ach_perk_lang (apl_perk,apl_lang,apl_name,apl_template) VALUES ('".$this->getID()."','en','".$DBc->sqlEscape($this->getName())."',".mkn($this->getTemplate()).") ON DUPLICATE KEY UPDATE apl_name='".$DBc->sqlEscape($this->getName())."',apl_template=".mkn($this->getTemplate())."");
}
function insert() {
@@ -45,11 +94,11 @@
$this->dev = 1;
- $DBc->sqlQuery("INSERT INTO ach_perk (ap_achievement,ap_parent,ap_value,ap_condition,ap_condition_value,ap_dev,ap_porder) VALUES ('".$this->getAchievement()."',".mkn($this->getParentID()).",'".mysql_real_escape_string($this->getValue())."','".mysql_real_escape_string($this->getCondition())."',".mkn($this->getConditionValue()).",'1','".$this->porder."')");
- $id = mysql_insert_id();
+ $DBc->sqlQuery("INSERT INTO ach_perk (ap_achievement,ap_parent,ap_value,ap_condition,ap_condition_value,ap_dev,ap_porder) VALUES ('".$this->getAchievement()."',".mkn($this->getParentID()).",'".$DBc->sqlEscape($this->getValue())."','".$DBc->sqlEscape($this->getCondition())."',".mkn($this->getConditionValue()).",'1','".$this->porder."')");
+ $id = $DBc->insertID();
$this->setID($id);
- $DBc->sqlQuery("INSERT INTO ach_perk_lang (apl_perk,apl_lang,apl_name,apl_template) VALUES ('".$this->getID()."','en','".mysql_real_escape_string($this->getName())."',".mkn($this->getTemplate()).")");
+ $DBc->sqlQuery("INSERT INTO ach_perk_lang (apl_perk,apl_lang,apl_name,apl_template) VALUES ('".$this->getID()."','en','".$DBc->sqlEscape($this->getName())."',".mkn($this->getTemplate()).")");
}
function setAchievement($a) {
@@ -92,29 +141,40 @@
$this->porder = $p;
}
- function setParentID($p) { #!! CUTTING KILLS NODES! HAVE TO BE REROUTED!
+ private function reOrder() {
+ //check if order is OK!
+
+ if($this->parent_id == null) {
+
+ }
+ else {
+
+ }
+ }
+
+ function setParentID($p) { #reordering must happen A) after insert B) when updating
if($p == null || $p == "null") {
//remove from ach list; insert as first!
$this->parent_id = null;
- $this->parent->removeChild($this->id);
- $iter = $this->parent->getIterator();
- $this->parent->addOpen($this,$iter->getNext());
+ #$this->parent->removeChild($this->id);
+ #$iter = $this->parent->getIterator();
+ #$this->parent->addOpen($this,$iter->getNext());
}
else {
//remove from ach list; insert after parent
- echo "--".$p."
";
+ #echo "--".$p."
";
$this->parent_id = $p;
- $this->parent->removeChild($this->id);
- $item = $this->parent->getChildByID($this->parent_id);
- $tmp = $item->getChild();
- if($tmp != null) {
- $this->parent->addOpen($this,$tmp->getID());
- }
- else {
- $this->parent->addOpen($this,null);
- }
+ #$this->parent->removeChild($this->id);
+ #$item = $this->parent->getChildByID($this->parent_id);
+ #$tmp = $item->getChild();
+ #if($tmp != null) {
+ # $this->parent->addOpen($this,$tmp->getID());
+ #}
+ #else {
+ # $this->parent->addOpen($this,null);
+ #}
}
}
}
diff --git a/code/web/app/app_achievements_admin/class/CSRAchievement_class.php b/code/web/app/app_achievements_admin/class/CSRAchievement_class.php
index 2bcd2ad56..8375e01b2 100644
--- a/code/web/app/app_achievements_admin/class/CSRAchievement_class.php
+++ b/code/web/app/app_achievements_admin/class/CSRAchievement_class.php
@@ -1,6 +1,68 @@
getID()."
";
+ if(is_numeric($path)) {
+ //it's me (id == numeric)
+ if($this->getID() == $path) {
+ $this->grant($player);
+ #echo "grant()
";
+ }
+ }
+ else {
+ //get child with the next level id and dispatch
+ $tmp = explode(";",$path);
+
+ $c = $this->getChildDataByID($tmp[1]);
+ #echo "...".$tmp[1];
+ if($c != null) { // check if it's really own child
+ unset($tmp[0]);
+ $c->grantNode(implode(";",$tmp),$player);
+ #echo "grantNode()
";
+ }
+ }
+ #echo "end
";
+ }
+
+ function denyNode($path,$player) {
+ if(is_numeric($path)) {
+ //it's me (id == numeric)
+ if($this->getID() == $path) {
+ $this->deny($player);
+ }
+ }
+ else {
+ //get child with the next level id and dispatch
+ $tmp = explode(";",$path);
+
+ if($tmp[0] == $this->getID()) { // it's my id!
+
+ $c = $this->getChildDataByID($tmp[1]);
+ if($c != null) { // check if it's really own child
+ unset($tmp[0]);
+ $c->denyNode(implode(";",$tmp),$player);
+ }
+ }
+ }
+ }
+
+ function getPath($path = "") {
+ if($path != "") {
+ $path = ";".$path;
+ }
+
+ $path = $this->getID().$path;
+
+ if($this->hasParent()) {
+ $path = $this->parent->getPath($path);
+ }
+
+ return $path;
+ }
+
+ private function hasParent() {
+ return ($this->parent != null);
+ }
function CSRAchievement($data,$parent) {
parent::__construct($data,$parent);
diff --git a/code/web/app/app_achievements_admin/class/CSRCategory_class.php b/code/web/app/app_achievements_admin/class/CSRCategory_class.php
index 6a118c6e3..650469c65 100644
--- a/code/web/app/app_achievements_admin/class/CSRCategory_class.php
+++ b/code/web/app/app_achievements_admin/class/CSRCategory_class.php
@@ -1,6 +1,68 @@
getID()."
";
+ if(is_numeric($path)) {
+ //it's me (id == numeric)
+ if($this->getID() == $path) {
+ $this->grant($player);
+ #echo "grant()
";
+ }
+ }
+ else {
+ //get child with the next level id and dispatch
+ $tmp = explode(";",$path);
+
+ $c = $this->getChildDataByID($tmp[1]);
+ #echo "...".$tmp[1];
+ if($c != null) { // check if it's really own child
+ unset($tmp[0]);
+ $c->grantNode(implode(";",$tmp),$player);
+ #echo "grantNode()
";
+ }
+ }
+ #echo "end
";
+ }
+
+ function denyNode($path,$player) {
+ if(is_numeric($path)) {
+ //it's me (id == numeric)
+ if($this->getID() == $path) {
+ $this->deny($player);
+ }
+ }
+ else {
+ //get child with the next level id and dispatch
+ $tmp = explode(";",$path);
+
+ if($tmp[0] == $this->getID()) { // it's my id!
+
+ $c = $this->getChildDataByID($tmp[1]);
+ if($c != null) { // check if it's really own child
+ unset($tmp[0]);
+ $c->denyNode(implode(";",$tmp),$player);
+ }
+ }
+ }
+ }
+
+ function getPath($path = "") {
+ if($path != "") {
+ $path = ";".$path;
+ }
+
+ $path = $this->getID().$path;
+
+ if($this->hasParent()) {
+ $path = $this->parent->getPath($path);
+ }
+
+ return $path;
+ }
+
+ private function hasParent() {
+ return ($this->parent != null);
+ }
function CSRCategory($id,$race,$cult = null,$civ = null) {
parent::__construct($id,$race,$cult,$civ);
diff --git a/code/web/app/app_achievements_admin/class/CSRObjective_class.php b/code/web/app/app_achievements_admin/class/CSRObjective_class.php
index d336a2ade..71531d227 100644
--- a/code/web/app/app_achievements_admin/class/CSRObjective_class.php
+++ b/code/web/app/app_achievements_admin/class/CSRObjective_class.php
@@ -1,6 +1,68 @@
getID()."
";
+ if(is_numeric($path)) {
+ //it's me (id == numeric)
+ if($this->getID() == $path) {
+ $this->grant($player);
+ #echo "grant()
";
+ }
+ }
+ else {
+ //get child with the next level id and dispatch
+ $tmp = explode(";",$path);
+
+ $c = $this->getChildDataByID($tmp[1]);
+ #echo "...".$tmp[1];
+ if($c != null) { // check if it's really own child
+ unset($tmp[0]);
+ $c->grantNode(implode(";",$tmp),$player);
+ #echo "grantNode()
";
+ }
+ }
+ #echo "end
";
+ }
+
+ function denyNode($path,$player) {
+ if(is_numeric($path)) {
+ //it's me (id == numeric)
+ if($this->getID() == $path) {
+ $this->deny($player);
+ }
+ }
+ else {
+ //get child with the next level id and dispatch
+ $tmp = explode(";",$path);
+
+ if($tmp[0] == $this->getID()) { // it's my id!
+
+ $c = $this->getChildDataByID($tmp[1]);
+ if($c != null) { // check if it's really own child
+ unset($tmp[0]);
+ $c->denyNode(implode(";",$tmp),$player);
+ }
+ }
+ }
+ }
+
+ function getPath($path = "") {
+ if($path != "") {
+ $path = ";".$path;
+ }
+
+ $path = $this->getID().$path;
+
+ if($this->hasParent()) {
+ $path = $this->parent->getPath($path);
+ }
+
+ return $path;
+ }
+
+ private function hasParent() {
+ return ($this->parent != null);
+ }
#private $nodes;
diff --git a/code/web/app/app_achievements_admin/class/CSRPerk_class.php b/code/web/app/app_achievements_admin/class/CSRPerk_class.php
index fcd8bd668..97f34ec36 100644
--- a/code/web/app/app_achievements_admin/class/CSRPerk_class.php
+++ b/code/web/app/app_achievements_admin/class/CSRPerk_class.php
@@ -1,6 +1,68 @@
getID()."
";
+ if(is_numeric($path)) {
+ //it's me (id == numeric)
+ if($this->getID() == $path) {
+ $this->grant($player);
+ #echo "grant()
";
+ }
+ }
+ else {
+ //get child with the next level id and dispatch
+ $tmp = explode(";",$path);
+
+ $c = $this->getChildDataByID($tmp[1]);
+ #echo "...".$tmp[1];
+ if($c != null) { // check if it's really own child
+ unset($tmp[0]);
+ $c->grantNode(implode(";",$tmp),$player);
+ #echo "grantNode()
";
+ }
+ }
+ #echo "end
";
+ }
+
+ function denyNode($path,$player) {
+ if(is_numeric($path)) {
+ //it's me (id == numeric)
+ if($this->getID() == $path) {
+ $this->deny($player);
+ }
+ }
+ else {
+ //get child with the next level id and dispatch
+ $tmp = explode(";",$path);
+
+ if($tmp[0] == $this->getID()) { // it's my id!
+
+ $c = $this->getChildDataByID($tmp[1]);
+ if($c != null) { // check if it's really own child
+ unset($tmp[0]);
+ $c->denyNode(implode(";",$tmp),$player);
+ }
+ }
+ }
+ }
+
+ function getPath($path = "") {
+ if($path != "") {
+ $path = ";".$path;
+ }
+
+ $path = $this->getID().$path;
+
+ if($this->hasParent()) {
+ $path = $this->parent->getPath($path);
+ }
+
+ return $path;
+ }
+
+ private function hasParent() {
+ return ($this->parent != null);
+ }
function CSRPerk($data,$parent) {
parent::__construct($data,$parent);
diff --git a/code/web/app/app_achievements_admin/include/adm_render_ach.php b/code/web/app/app_achievements_admin/include/adm_render_ach.php
index 133d3ed56..1639d5b66 100644
--- a/code/web/app/app_achievements_admin/include/adm_render_ach.php
+++ b/code/web/app/app_achievements_admin/include/adm_render_ach.php
@@ -53,12 +53,17 @@
}
function adm_render_category(&$cat) {
- $html = "";
+ $html = "";
if($_REQUEST['confirm'] == "delete") {
$tmp = $cat->getElementByPath($_REQUEST['id']);
if($tmp != null) {
- $html .= " |