From 0f907bbfa8ad7e3ec813b2ae59ba951d7c341927 Mon Sep 17 00:00:00 2001 From: Oldperl <44996956+oldperl@users.noreply.github.com> Date: Mon, 10 Oct 2016 15:13:19 +0000 Subject: [PATCH] PHP7 compability stuff, added db-tables for releasetool --- .../workflow/classes/class.workflow.php | 155 ++++--- .../workflow/classes/class.workflowitems.php | 395 ++++++++---------- data/config/production/cfg_sql.inc.php | 135 +++--- data/config/production/config.misc.php | 2 +- 4 files changed, 328 insertions(+), 359 deletions(-) diff --git a/conlite/plugins/workflow/classes/class.workflow.php b/conlite/plugins/workflow/classes/class.workflow.php index fb618c8..1b04ac4 100644 --- a/conlite/plugins/workflow/classes/class.workflow.php +++ b/conlite/plugins/workflow/classes/class.workflow.php @@ -1,4 +1,5 @@ _setItemClass("Workflow"); + $this->_setItemClass("Workflow"); + } + + function create() { + global $auth, $client, $lang; + $newitem = parent::createNewItem(); + $newitem->setField("created", date("Y-m-d H-i-s")); + $newitem->setField("idauthor", $auth->auth["uid"]); + $newitem->setField("idclient", $client); + $newitem->setField("idlang", $lang); + $newitem->store(); + + return ($newitem); } - function create () - { - global $auth, $client, $lang; - $newitem = parent::createNewItem(); - $newitem->setField("created", date("Y-m-d H-i-s")); - $newitem->setField("idauthor", $auth->auth["uid"]); - $newitem->setField("idclient", $client); - $newitem->setField("idlang", $lang); - $newitem->store(); - - return ($newitem); - } - /** * Deletes all corresponding informations to this workflow and delegate call to parent * @param integer $idWorkflow - id of workflow to delete @@ -83,38 +82,39 @@ class Workflows extends ItemCollection { function delete($idWorkflow) { global $cfg; $oDb = new DB_ConLite(); - + $aItemIdsDelete = array(); - $sSql = 'SELECT idworkflowitem FROM '.$cfg["tab"]["workflow_items"].' WHERE idworkflow = '. Contenido_Security::toInteger($idWorkflow) .';'; + $sSql = 'SELECT idworkflowitem FROM ' . $cfg["tab"]["workflow_items"] . ' WHERE idworkflow = ' . Contenido_Security::toInteger($idWorkflow) . ';'; $oDb->query($sSql); while ($oDb->next_record()) { array_push($aItemIdsDelete, Contenido_Security::escapeDB($oDb->f('idworkflowitem'), $oDb)); } - + $aUserSequencesDelete = array(); - $sSql = 'SELECT idusersequence FROM '.$cfg["tab"]["workflow_user_sequences"].' WHERE idworkflowitem in ('.implode(',', $aItemIdsDelete).');'; + $sSql = 'SELECT idusersequence FROM ' . $cfg["tab"]["workflow_user_sequences"] . ' WHERE idworkflowitem in (' . implode(',', $aItemIdsDelete) . ');'; $oDb->query($sSql); while ($oDb->next_record()) { array_push($aUserSequencesDelete, Contenido_Security::escapeDB($oDb->f('idusersequence'), $oDb)); } - - $sSql = 'DELETE FROM '.$cfg["tab"]["workflow_user_sequences"].' WHERE idworkflowitem in ('.implode(',', $aItemIdsDelete).');'; + + $sSql = 'DELETE FROM ' . $cfg["tab"]["workflow_user_sequences"] . ' WHERE idworkflowitem in (' . implode(',', $aItemIdsDelete) . ');'; $oDb->query($sSql); - - $sSql = 'DELETE FROM '.$cfg["tab"]["workflow_actions"].' WHERE idworkflowitem in ('.implode(',', $aItemIdsDelete).');'; + + $sSql = 'DELETE FROM ' . $cfg["tab"]["workflow_actions"] . ' WHERE idworkflowitem in (' . implode(',', $aItemIdsDelete) . ');'; $oDb->query($sSql); - - $sSql = 'DELETE FROM '.$cfg["tab"]["workflow_items"].' WHERE idworkflow = '.Contenido_Security::toInteger($idWorkflow).';'; + + $sSql = 'DELETE FROM ' . $cfg["tab"]["workflow_items"] . ' WHERE idworkflow = ' . Contenido_Security::toInteger($idWorkflow) . ';'; $oDb->query($sSql); - - $sSql = 'DELETE FROM '.$cfg["tab"]["workflow_allocation"].' WHERE idworkflow = '.Contenido_Security::toInteger($idWorkflow).';'; + + $sSql = 'DELETE FROM ' . $cfg["tab"]["workflow_allocation"] . ' WHERE idworkflow = ' . Contenido_Security::toInteger($idWorkflow) . ';'; $oDb->query($sSql); - - $sSql = 'DELETE FROM '.$cfg["tab"]["workflow_art_allocation"].' WHERE idusersequence in ('.implode(',', $aUserSequencesDelete).');'; + + $sSql = 'DELETE FROM ' . $cfg["tab"]["workflow_art_allocation"] . ' WHERE idusersequence in (' . implode(',', $aUserSequencesDelete) . ');'; $oDb->query($sSql); parent::delete($idWorkflow); } + } /** @@ -125,7 +125,7 @@ class Workflows extends ItemCollection { * @copyright four for business 2003 */ class Workflow extends Item { - + /** * Constructor * @@ -135,53 +135,46 @@ class Workflow extends Item { global $cfg; parent::__construct($cfg["tab"]["workflow"], "idworkflow"); } -} +} /* Helper functions */ -function getWorkflowForCat ($idcat) -{ - global $lang, $cfg; - - $idcatlang = getCatLang($idcat, $lang); - $workflows = new WorkflowAllocations; +function getWorkflowForCat($idcat) { + global $lang, $cfg; + + $idcatlang = getCatLang($idcat, $lang); + $workflows = new WorkflowAllocations; $workflows->select("idcatlang = '$idcatlang'"); - if ($obj = $workflows->next()) - { - /* Sanity: Check if the workflow still exists */ - $workflow = new Workflow; - - $res = $workflow->loadByPrimaryKey($obj->get("idworkflow")); - - if ($res == false) - { - return 0; - - } else { - return $obj->get("idworkflow"); - } + if ($obj = $workflows->next()) { + /* Sanity: Check if the workflow still exists */ + $workflow = new Workflow; + + $res = $workflow->loadByPrimaryKey($obj->get("idworkflow")); + + if ($res == false) { + return 0; + } else { + return $obj->get("idworkflow"); + } } } -function getCatLang ($idcat, $idlang) -{ - global $lang, $cfg; - $db = new DB_ConLite; - - /* Get the idcatlang */ - $sql = "SELECT idcatlang FROM " - .$cfg["tab"]["cat_lang"]. - " WHERE idlang = '". Contenido_Security::escapeDB($idlang, $db)."' AND - idcat = '".Contenido_Security::escapeDB($idcat, $db)."'"; - - $db->query($sql); - - if ($db->next_record()) - { - return ($db->f("idcatlang")); - } +function getCatLang($idcat, $idlang) { + global $lang, $cfg; + $db = new DB_ConLite; + + /* Get the idcatlang */ + $sql = "SELECT idcatlang FROM " + . $cfg["tab"]["cat_lang"] . + " WHERE idlang = '" . Contenido_Security::escapeDB($idlang, $db) . "' AND + idcat = '" . Contenido_Security::escapeDB($idcat, $db) . "'"; + + $db->query($sql); + + if ($db->next_record()) { + return ($db->f("idcatlang")); + } } - ?> \ No newline at end of file diff --git a/conlite/plugins/workflow/classes/class.workflowitems.php b/conlite/plugins/workflow/classes/class.workflowitems.php index d06d345..9e8fbfa 100644 --- a/conlite/plugins/workflow/classes/class.workflowitems.php +++ b/conlite/plugins/workflow/classes/class.workflowitems.php @@ -1,4 +1,5 @@ _setItemClass("WorkflowItem"); - } - + } + /** @deprecated [2011-03-15] Old constructor function for downwards compatibility */ - function WorkflowItems() - { + function WorkflowItems() { cWarning(__FILE__, __LINE__, "Deprecated method call, use __construct()"); $this->__construct(); } - function delete ($id) - { + function delete($id) { global $cfg; - $item = new WorkflowItem; - $item->loadByPrimaryKey($id); - $pos = $item->get("position"); - $idworkflow = $item->get("idworkflow"); - $oDb = new DB_ConLite(); - - $this->select("position > $pos AND idworkflow = '".Contenido_Security::escapeDB($idworkflow, $oDb)."'"); - while ($obj = $this->next()) - { - $obj->setPosition($obj->get("position")-1); - $obj->store(); - } - + $item = new WorkflowItem; + $item->loadByPrimaryKey($id); + $pos = $item->get("position"); + $idworkflow = $item->get("idworkflow"); + $oDb = new DB_ConLite(); + + $this->select("position > $pos AND idworkflow = '" . Contenido_Security::escapeDB($idworkflow, $oDb) . "'"); + while ($obj = $this->next()) { + $obj->setPosition($obj->get("position") - 1); + $obj->store(); + } + $aUserSequencesDelete = array(); - $sSql = 'SELECT idusersequence FROM '.$cfg["tab"]["workflow_user_sequences"].' WHERE idworkflowitem = '.$id.';'; + $sSql = 'SELECT idusersequence FROM ' . $cfg["tab"]["workflow_user_sequences"] . ' WHERE idworkflowitem = ' . $id . ';'; $oDb->query($sSql); while ($oDb->next_record()) { array_push($aUserSequencesDelete, Contenido_Security::escapeDB($oDb->f('idusersequence'), $oDb)); } - $sSql = 'DELETE FROM '.$cfg["tab"]["workflow_actions"].' WHERE idworkflowitem = '.Contenido_Security::escapeDB($id, $oDb).';'; + $sSql = 'DELETE FROM ' . $cfg["tab"]["workflow_actions"] . ' WHERE idworkflowitem = ' . Contenido_Security::escapeDB($id, $oDb) . ';'; $oDb->query($sSql); $this->updateArtAllocation($id, 1); - + if (count($aUserSequencesDelete) > 0) { - $sSql = 'DELETE FROM '.$cfg["tab"]["workflow_user_sequences"].' WHERE idusersequence in ('.implode(',', $aUserSequencesDelete).');'; + $sSql = 'DELETE FROM ' . $cfg["tab"]["workflow_user_sequences"] . ' WHERE idusersequence in (' . implode(',', $aUserSequencesDelete) . ');'; $oDb->query($sSql); } - } - - function updateArtAllocation ($idworkflowitem, $delete = false) { + } + + function updateArtAllocation($idworkflowitem, $delete = false) { global $idworkflow, $cfg; $oDb = new DB_ConLite(); - + $aUserSequences = array(); - $sSql = 'SELECT idusersequence FROM '.$cfg["tab"]["workflow_user_sequences"].' WHERE idworkflowitem = '.Contenido_Security::escapeDB($idworkflowitem, $oDb).';'; + $sSql = 'SELECT idusersequence FROM ' . $cfg["tab"]["workflow_user_sequences"] . ' WHERE idworkflowitem = ' . Contenido_Security::escapeDB($idworkflowitem, $oDb) . ';'; $oDb->query($sSql); while ($oDb->next_record()) { array_push($aUserSequences, Contenido_Security::escapeDB($oDb->f('idusersequence'), $oDb)); } - + $aIdArtLang = array(); if (count($aUserSequences) > 0) { - $sSql = 'SELECT idartlang FROM '.$cfg["tab"]["workflow_art_allocation"].' WHERE idusersequence in ('.implode(',', $aUserSequences).');'; + $sSql = 'SELECT idartlang FROM ' . $cfg["tab"]["workflow_art_allocation"] . ' WHERE idusersequence in (' . implode(',', $aUserSequences) . ');'; $oDb->query($sSql); while ($oDb->next_record()) { array_push($aIdArtLang, $oDb->f('idartlang')); } - $sSql = 'DELETE FROM '.$cfg["tab"]["workflow_art_allocation"].' WHERE idusersequence in ('.implode(',', $aUserSequences).');'; + $sSql = 'DELETE FROM ' . $cfg["tab"]["workflow_art_allocation"] . ' WHERE idusersequence in (' . implode(',', $aUserSequences) . ');'; $oDb->query($sSql); } - + if ($delete) { parent::delete($idworkflowitem); } - + foreach ($aIdArtLang as $iIdArtLang) { setUserSequence($iIdArtLang, $idworkflow); - } + } } - - - function swap ($idworkflow, $pos1, $pos2) - { - $this->select("idworkflow = '$idworkflow' AND position = '$pos1'"); - if (($item = $this->next()) === false) - { - $this->lasterror = i18n("Swapping items failed: Item doesn't exist", "workflow"); - return false; - } - - $pos1ID = $item->getField("idworkflowitem"); - $this->select("idworkflow = '$idworkflow' AND position = '$pos2'"); - if (($item = $this->next()) === false) - { - $this->lasterror = i18n("Swapping items failed: Item doesn't exist", "workflow"); - return false; - } - - $pos2ID = $item->getField("idworkflowitem"); - - $item = new WorkflowItem(); - $item->loadByPrimaryKey($pos1ID); - $item->setPosition($pos2); - $item->store(); - $item->loadByPrimaryKey($pos2ID); - $item->setPosition($pos1); - $item->store(); - + function swap($idworkflow, $pos1, $pos2) { + $this->select("idworkflow = '$idworkflow' AND position = '$pos1'"); + if (($item = $this->next()) === false) { + $this->lasterror = i18n("Swapping items failed: Item doesn't exist", "workflow"); + return false; + } + + $pos1ID = $item->getField("idworkflowitem"); + + $this->select("idworkflow = '$idworkflow' AND position = '$pos2'"); + if (($item = $this->next()) === false) { + $this->lasterror = i18n("Swapping items failed: Item doesn't exist", "workflow"); + return false; + } + + $pos2ID = $item->getField("idworkflowitem"); + + $item = new WorkflowItem(); + $item->loadByPrimaryKey($pos1ID); + $item->setPosition($pos2); + $item->store(); + $item->loadByPrimaryKey($pos2ID); + $item->setPosition($pos1); + $item->store(); + $this->updateArtAllocation($pos1ID); $this->updateArtAllocation($pos2ID); - return (true); - } - - function create ($idworkflow) - { - $workflows = new Workflows; - - $workflows->select("idworkflow = '$idworkflow'"); + return (true); + } + + function create($idworkflow) { + $workflows = new Workflows; + + $workflows->select("idworkflow = '$idworkflow'"); + + if ($workflows->next() === false) { + $this->lasterror = i18n("Can't add item to workflow: Workflow doesn't exist", "workflow"); + return false; + } + + $this->select("idworkflow = '$idworkflow'", "", "position DESC", "1"); + + $item = $this->next(); + + if ($item === false) { + $lastPos = 1; + } else { + $lastPos = $item->getField("position") + 1; + } + + $newItem = parent::createNewItem(); + if ($newItem->init($idworkflow, $lastPos) === false) { + $this->delete($newItem->getField("idworkflowitem")); + $this->lasterror = $newItem->lasterror; + return false; + } - if ($workflows->next() === false) - { - $this->lasterror = i18n("Can't add item to workflow: Workflow doesn't exist", "workflow"); - return false; - } - - $this->select("idworkflow = '$idworkflow'","","position DESC","1"); - - $item = $this->next(); - - if ($item === false) - { - $lastPos = 1; - } else { - $lastPos = $item->getField("position") + 1; - } - - $newItem = parent::createNewItem(); - if ($newItem->init($idworkflow, $lastPos) === false) - { - $this->delete($newItem->getField("idworkflowitem")); - $this->lasterror = $newItem->lasterror; - return false; - } - if ($item === false) { $this->updateArtAllocation(0); } - - return ($newItem); - } + + return ($newItem); + } + } /** @@ -205,125 +193,112 @@ class WorkflowItems extends ItemCollection { * @copyright four for business 2003 */ class WorkflowItem extends Item { - - /** + + /** * Constructor Function * @param string $table The table to use as information source */ - function __construct() - { - global $cfg; - - parent::__construct($cfg["tab"]["workflow_items"], "idworkflowitem"); - } + function __construct() { + global $cfg; + + parent::__construct($cfg["tab"]["workflow_items"], "idworkflowitem"); + } /** @deprecated [2011-03-15] Old constructor function for downwards compatibility */ - function WorkflowItem() - { + function WorkflowItem() { cWarning(__FILE__, __LINE__, "Deprecated method call, use __construct()"); $this->__construct(); } - function getStepRights () - { - $idwfi = $this->values["idworkflowitem"]; - $workflowActions = new WorkflowActions; - - $actions = WorkflowActions::getAvailableWorkflowActions(); - - foreach ($actions as $key => $value) - { - $rights[$key] = $workflowActions->get($idwfi, $key); - } - - return $rights; - } + function getStepRights() { + $idwfi = $this->values["idworkflowitem"]; + $workflowActions = new WorkflowActions; - /** + $actions = WorkflowActions::getAvailableWorkflowActions(); + + foreach ($actions as $key => $value) { + $rights[$key] = $workflowActions->get($idwfi, $key); + } + + return $rights; + } + + /** * Overridden setField function. * @param string $field Void field since we override the usual setField function * @param string $value Void field since we override the usual setField function - */ - function setField($field, $value) - { - if ($this->virgin == true) - { - $this->lasterror = i18n("No item loaded", "workflow"); - return false; - } - - if ($field == "idsequence") - { - die("You can't set the idsequence field using this method. Use 'create' in the WorkflowItems class."); - } - - if ($field == "idworkflow") - { - die("You can't set the workflow ID using this method. Use 'create' in the WorkflowItems class!"); - } - - if ($field == "position") - { - die("You can't set the position ID using this method. Use 'create' or 'swap' to create or move items!"); - } - - if ($field == "idtask" && $value != 0) - { - $taskCollection = new WorkflowTasks; - $taskCollection->select("idtask = '$value'"); - if ($taskCollection->next() === false) - { - $this->lasterror = i18n("Requested task doesn't exist, can't assign", "workflow"); - return false; - } - } + */ + function setField($field, $value, $bSafe = TRUE) { + if ($this->virgin == true) { + $this->lasterror = i18n("No item loaded", "workflow"); + return false; + } - parent::setField($field, $value, $bSafe); - } - - /** + if ($field == "idsequence") { + die("You can't set the idsequence field using this method. Use 'create' in the WorkflowItems class."); + } + + if ($field == "idworkflow") { + die("You can't set the workflow ID using this method. Use 'create' in the WorkflowItems class!"); + } + + if ($field == "position") { + die("You can't set the position ID using this method. Use 'create' or 'swap' to create or move items!"); + } + + if ($field == "idtask" && $value != 0) { + $taskCollection = new WorkflowTasks; + $taskCollection->select("idtask = '$value'"); + if ($taskCollection->next() === false) { + $this->lasterror = i18n("Requested task doesn't exist, can't assign", "workflow"); + return false; + } + } + + parent::setField($field, $value, $bSafe); + } + + /** * init initializes a new wf_items entry. Should - * only be called by the create function. + * only be called by the create function. * @param int $idworkflow The workflow to set the item to - */ - function init ($idworkflow, $idposition) - { - global $cfg; - - $workflows = new Workflows; - - $workflows->select("idworkflow = '$idworkflow'"); - - if ($workflows->next() === false) - { - $this->lasterror = i18n("Workflow doesn't exist", "workflow"); - return false; - } - - $workflowItems = new WorkflowItems; - $workflowItems->select("position = '$idposition' AND idworkflow = '$idworkflow'"); - if ($workflowItems->next()) - { - $this->lasterror = i18n("Position in this workflow already exists.", "workflow"); - return false; - } - - parent::setField("idworkflow", $idworkflow); - parent::setField("position", $idposition); - parent::store(); - return true; - } + */ + function init($idworkflow, $idposition) { + global $cfg; - /** + $workflows = new Workflows; + + $workflows->select("idworkflow = '$idworkflow'"); + + if ($workflows->next() === false) { + $this->lasterror = i18n("Workflow doesn't exist", "workflow"); + return false; + } + + $workflowItems = new WorkflowItems; + $workflowItems->select("position = '$idposition' AND idworkflow = '$idworkflow'"); + if ($workflowItems->next()) { + $this->lasterror = i18n("Position in this workflow already exists.", "workflow"); + return false; + } + + parent::setField("idworkflow", $idworkflow); + parent::setField("position", $idposition); + parent::store(); + return true; + } + + /** * setPosition Sets the position for an item. Should only be - * called by the "swap" function + * called by the "swap" function * @param int $idposition The new position ID - */ - function setPosition ($idposition) - { - parent::setField("position", $idposition); - parent::store(); - return true; - } + */ + function setPosition($idposition) { + parent::setField("position", $idposition); + parent::store(); + return true; + } + } + ?> \ No newline at end of file diff --git a/data/config/production/cfg_sql.inc.php b/data/config/production/cfg_sql.inc.php index 3101b46..d0e455e 100644 --- a/data/config/production/cfg_sql.inc.php +++ b/data/config/production/cfg_sql.inc.php @@ -34,71 +34,72 @@ if(!defined('CON_FRAMEWORK')) { global $cfg; -$cfg["tab"]["art"] = $cfg['sql']['sqlprefix']."_art"; -$cfg["tab"]["art_lang"] = $cfg['sql']['sqlprefix']."_art_lang"; -$cfg["tab"]["cat"] = $cfg['sql']['sqlprefix']."_cat"; -$cfg["tab"]["cat_art"] = $cfg['sql']['sqlprefix']."_cat_art"; -$cfg["tab"]["cat_tree"] = $cfg['sql']['sqlprefix']."_cat_tree"; -$cfg["tab"]["cat_lang"] = $cfg['sql']['sqlprefix']."_cat_lang"; -$cfg["tab"]["clients"] = $cfg['sql']['sqlprefix']."_clients"; -$cfg["tab"]["clients_lang"] = $cfg['sql']['sqlprefix']."_clients_lang"; -$cfg["tab"]["code"] = $cfg['sql']['sqlprefix']."_code"; -$cfg["tab"]["content"] = $cfg['sql']['sqlprefix']."_content"; -$cfg["tab"]["lang"] = $cfg['sql']['sqlprefix']."_lang"; -$cfg["tab"]["lay"] = $cfg['sql']['sqlprefix']."_lay"; -$cfg["tab"]["mod"] = $cfg['sql']['sqlprefix']."_mod"; -$cfg["tab"]["news"] = $cfg['sql']['sqlprefix']."_news"; -$cfg["tab"]["news_rcp"] = $cfg['sql']['sqlprefix']."_news_rcp"; -$cfg["tab"]["news_groups"] = $cfg['sql']['sqlprefix']."_news_groups"; -$cfg["tab"]["news_groupmembers"] = $cfg['sql']['sqlprefix']."_news_groupmembers"; -$cfg["tab"]["news_jobs"] = $cfg['sql']['sqlprefix']."_news_jobs"; -$cfg["tab"]["news_log"] = $cfg['sql']['sqlprefix']."_news_log"; -$cfg["tab"]["stat"] = $cfg['sql']['sqlprefix']."_stat"; -$cfg["tab"]["stat_archive"] = $cfg['sql']['sqlprefix']."_stat_archive"; -$cfg["tab"]["status"] = $cfg['sql']['sqlprefix']."_status"; -$cfg["tab"]["tpl"] = $cfg['sql']['sqlprefix']."_template"; -$cfg["tab"]["tpl_conf"] = $cfg['sql']['sqlprefix']."_template_conf"; -$cfg["tab"]["type"] = $cfg['sql']['sqlprefix']."_type"; -$cfg["tab"]["upl"] = $cfg['sql']['sqlprefix']."_upl"; -$cfg["tab"]["keywords"] = $cfg['sql']['sqlprefix']."_keywords"; -$cfg["tab"]["area"] = $cfg['sql']['sqlprefix']."_area"; -$cfg["tab"]["actions"] = $cfg['sql']['sqlprefix']."_actions"; -$cfg["tab"]["nav_main"] = $cfg['sql']['sqlprefix']."_nav_main"; -$cfg["tab"]["nav_sub"] = $cfg['sql']['sqlprefix']."_nav_sub"; -$cfg["tab"]["rights"] = $cfg['sql']['sqlprefix']."_rights"; -$cfg["tab"]["container"] = $cfg['sql']['sqlprefix']."_container"; -$cfg["tab"]["container_conf"] = $cfg['sql']['sqlprefix']."_container_conf"; -$cfg["tab"]["files"] = $cfg['sql']['sqlprefix']."_files"; -$cfg["tab"]["framefiles"] = $cfg['sql']['sqlprefix']."_frame_files"; -$cfg["tab"]["plugins"] = $cfg['sql']['sqlprefix']."_plugins"; -$cfg["tab"]["phplib_active_sessions"] = $cfg['sql']['sqlprefix']."_phplib_active_sessions"; -$cfg["tab"]["phplib_auth_user_md5"] = $cfg['sql']['sqlprefix']."_phplib_auth_user_md5"; -$cfg["tab"]["actionlog"] = $cfg['sql']['sqlprefix']."_actionlog"; -$cfg["tab"]["link"] = $cfg['sql']['sqlprefix']."_link"; -$cfg["tab"]["meta_type"] = $cfg['sql']['sqlprefix']."_meta_type"; -$cfg["tab"]["meta_tag"] = $cfg['sql']['sqlprefix']."_meta_tag"; -$cfg["tab"]["groups"] = $cfg['sql']['sqlprefix']."_groups"; -$cfg["tab"]["group_prop"] = $cfg['sql']['sqlprefix']."_group_prop"; -$cfg["tab"]["groupmembers"] = $cfg['sql']['sqlprefix']."_groupmembers"; -$cfg["tab"]["config"] = $cfg['sql']['sqlprefix']."_config"; -$cfg["tab"]["config_client"] = $cfg['sql']['sqlprefix']."_config_client"; -$cfg["tab"]["data"] = $cfg['sql']['sqlprefix']."_data"; -$cfg["tab"]["sequence"] = $cfg['sql']['sqlprefix']."_sequence"; -$cfg["tab"]["user_prop"] = $cfg['sql']['sqlprefix']."_user_prop"; -$cfg["tab"]["inuse"] = $cfg['sql']['sqlprefix']."_inuse"; -$cfg["tab"]["system_prop"] = $cfg['sql']['sqlprefix']."_system_prop"; -$cfg["tab"]["art_spec"] = $cfg['sql']['sqlprefix']."_art_spec"; -$cfg["tab"]["properties"] = $cfg['sql']['sqlprefix']."_properties"; -$cfg["tab"]["frontendusers"] = $cfg['sql']['sqlprefix']."_frontendusers"; -$cfg["tab"]["frontendgroups"] = $cfg['sql']['sqlprefix']."_frontendgroups"; -$cfg["tab"]["frontendgroupmembers"] = $cfg['sql']['sqlprefix']."_frontendgroupmembers"; -$cfg["tab"]["communications"] = $cfg['sql']['sqlprefix']."_communications"; -$cfg["tab"]["art_spec"] = $cfg['sql']['sqlprefix']."_art_spec"; -$cfg["tab"]["mod_translations"] = $cfg['sql']['sqlprefix']."_mod_translations"; -$cfg["tab"]["frontendpermissions"] = $cfg['sql']['sqlprefix']."_frontendpermissions"; -$cfg["tab"]["dbfs"] = $cfg['sql']['sqlprefix']."_dbfs"; -$cfg["tab"]["chartable"] = $cfg['sql']['sqlprefix']."_chartable"; -$cfg["tab"]["upl_meta"] = $cfg['sql']['sqlprefix']."_upl_meta"; -$cfg["tab"]["online_user"] = $cfg['sql']['sqlprefix']."_online_user"; -$cfg["tab"]["file_information"] = $cfg['sql']['sqlprefix']."_file_information"; +$cfg["tab"]["art"] = $cfg['sql']['sqlprefix']."_art"; +$cfg["tab"]["art_lang"] = $cfg['sql']['sqlprefix']."_art_lang"; +$cfg["tab"]["cat"] = $cfg['sql']['sqlprefix']."_cat"; +$cfg["tab"]["cat_art"] = $cfg['sql']['sqlprefix']."_cat_art"; +$cfg["tab"]["cat_tree"] = $cfg['sql']['sqlprefix']."_cat_tree"; +$cfg["tab"]["cat_lang"] = $cfg['sql']['sqlprefix']."_cat_lang"; +$cfg["tab"]["clients"] = $cfg['sql']['sqlprefix']."_clients"; +$cfg["tab"]["clients_lang"] = $cfg['sql']['sqlprefix']."_clients_lang"; +$cfg["tab"]["code"] = $cfg['sql']['sqlprefix']."_code"; +$cfg["tab"]["content"] = $cfg['sql']['sqlprefix']."_content"; +$cfg["tab"]["lang"] = $cfg['sql']['sqlprefix']."_lang"; +$cfg["tab"]["lay"] = $cfg['sql']['sqlprefix']."_lay"; +$cfg["tab"]["mod"] = $cfg['sql']['sqlprefix']."_mod"; +$cfg["tab"]["news"] = $cfg['sql']['sqlprefix']."_news"; +$cfg["tab"]["news_rcp"] = $cfg['sql']['sqlprefix']."_news_rcp"; +$cfg["tab"]["news_groups"] = $cfg['sql']['sqlprefix']."_news_groups"; +$cfg["tab"]["news_groupmembers"] = $cfg['sql']['sqlprefix']."_news_groupmembers"; +$cfg["tab"]["news_jobs"] = $cfg['sql']['sqlprefix']."_news_jobs"; +$cfg["tab"]["news_log"] = $cfg['sql']['sqlprefix']."_news_log"; +$cfg["tab"]["stat"] = $cfg['sql']['sqlprefix']."_stat"; +$cfg["tab"]["stat_archive"] = $cfg['sql']['sqlprefix']."_stat_archive"; +$cfg["tab"]["status"] = $cfg['sql']['sqlprefix']."_status"; +$cfg["tab"]["tpl"] = $cfg['sql']['sqlprefix']."_template"; +$cfg["tab"]["tpl_conf"] = $cfg['sql']['sqlprefix']."_template_conf"; +$cfg["tab"]["type"] = $cfg['sql']['sqlprefix']."_type"; +$cfg["tab"]["upl"] = $cfg['sql']['sqlprefix']."_upl"; +$cfg["tab"]["keywords"] = $cfg['sql']['sqlprefix']."_keywords"; +$cfg["tab"]["area"] = $cfg['sql']['sqlprefix']."_area"; +$cfg["tab"]["actions"] = $cfg['sql']['sqlprefix']."_actions"; +$cfg["tab"]["nav_main"] = $cfg['sql']['sqlprefix']."_nav_main"; +$cfg["tab"]["nav_sub"] = $cfg['sql']['sqlprefix']."_nav_sub"; +$cfg["tab"]["rights"] = $cfg['sql']['sqlprefix']."_rights"; +$cfg["tab"]["container"] = $cfg['sql']['sqlprefix']."_container"; +$cfg["tab"]["container_conf"] = $cfg['sql']['sqlprefix']."_container_conf"; +$cfg["tab"]["files"] = $cfg['sql']['sqlprefix']."_files"; +$cfg["tab"]["framefiles"] = $cfg['sql']['sqlprefix']."_frame_files"; +$cfg["tab"]["phplib_active_sessions"] = $cfg['sql']['sqlprefix']."_phplib_active_sessions"; +$cfg["tab"]["phplib_auth_user_md5"] = $cfg['sql']['sqlprefix']."_phplib_auth_user_md5"; +$cfg["tab"]["plugins"] = $cfg['sql']['sqlprefix']."_plugins"; +$cfg["tab"]["plugins_rel"] = $cfg['sql']['sqlprefix']."_plugins_rel"; +$cfg["tab"]["actionlog"] = $cfg['sql']['sqlprefix']."_actionlog"; +$cfg["tab"]["link"] = $cfg['sql']['sqlprefix']."_link"; +$cfg["tab"]["meta_type"] = $cfg['sql']['sqlprefix']."_meta_type"; +$cfg["tab"]["meta_tag"] = $cfg['sql']['sqlprefix']."_meta_tag"; +$cfg["tab"]["groups"] = $cfg['sql']['sqlprefix']."_groups"; +$cfg["tab"]["group_prop"] = $cfg['sql']['sqlprefix']."_group_prop"; +$cfg["tab"]["groupmembers"] = $cfg['sql']['sqlprefix']."_groupmembers"; +$cfg["tab"]["config"] = $cfg['sql']['sqlprefix']."_config"; +$cfg["tab"]["config_client"] = $cfg['sql']['sqlprefix']."_config_client"; +$cfg["tab"]["data"] = $cfg['sql']['sqlprefix']."_data"; +$cfg["tab"]["sequence"] = $cfg['sql']['sqlprefix']."_sequence"; +$cfg["tab"]["user_prop"] = $cfg['sql']['sqlprefix']."_user_prop"; +$cfg["tab"]["inuse"] = $cfg['sql']['sqlprefix']."_inuse"; +$cfg["tab"]["system_prop"] = $cfg['sql']['sqlprefix']."_system_prop"; +$cfg["tab"]["art_spec"] = $cfg['sql']['sqlprefix']."_art_spec"; +$cfg["tab"]["properties"] = $cfg['sql']['sqlprefix']."_properties"; +$cfg["tab"]["frontendusers"] = $cfg['sql']['sqlprefix']."_frontendusers"; +$cfg["tab"]["frontendgroups"] = $cfg['sql']['sqlprefix']."_frontendgroups"; +$cfg["tab"]["frontendgroupmembers"] = $cfg['sql']['sqlprefix']."_frontendgroupmembers"; +$cfg["tab"]["communications"] = $cfg['sql']['sqlprefix']."_communications"; +$cfg["tab"]["art_spec"] = $cfg['sql']['sqlprefix']."_art_spec"; +$cfg["tab"]["mod_translations"] = $cfg['sql']['sqlprefix']."_mod_translations"; +$cfg["tab"]["frontendpermissions"] = $cfg['sql']['sqlprefix']."_frontendpermissions"; +$cfg["tab"]["dbfs"] = $cfg['sql']['sqlprefix']."_dbfs"; +$cfg["tab"]["chartable"] = $cfg['sql']['sqlprefix']."_chartable"; +$cfg["tab"]["upl_meta"] = $cfg['sql']['sqlprefix']."_upl_meta"; +$cfg["tab"]["online_user"] = $cfg['sql']['sqlprefix']."_online_user"; +$cfg["tab"]["file_information"] = $cfg['sql']['sqlprefix']."_file_information"; ?> diff --git a/data/config/production/config.misc.php b/data/config/production/config.misc.php index cf1d9c3..ec3728f 100644 --- a/data/config/production/config.misc.php +++ b/data/config/production/config.misc.php @@ -134,7 +134,7 @@ $cfg['AvailableCharsets'] = array( */ /* Don't display errors */ -@ini_set("display_errors",true); +@ini_set("display_errors",false); /* Log errors to a file */ @ini_set("log_errors",true);