formating and svn-admin
Dieser Commit ist enthalten in:
Oldperl
Ursprung
450ad630b5
Commit
65bfeccfd4
|
|
@ -1,4 +1,5 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* Project:
|
||||
* Contenido Content Management System
|
||||
|
|
@ -40,7 +41,6 @@
|
|||
* }}
|
||||
*
|
||||
*/
|
||||
|
||||
if (!defined('CON_FRAMEWORK')) {
|
||||
die('Illegal call');
|
||||
}
|
||||
|
|
@ -77,7 +77,6 @@ if (class_exists("DB_ConLite")) {
|
|||
$db_str2 = new DB_ConLite();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Creates a new category tree (root category item).
|
||||
*
|
||||
|
|
@ -204,7 +203,6 @@ function strNewTree($catname, $catalias = '', $bVisible = 0, $bPublic = 1, $iIdt
|
|||
createRightsForElement("str", $tmp_newid, $tmp_lang);
|
||||
createRightsForElement("con", $tmp_newid, $tmp_lang);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/* Search for default template */
|
||||
|
|
@ -222,7 +220,6 @@ function strNewTree($catname, $catalias = '', $bVisible = 0, $bPublic = 1, $iIdt
|
|||
while ($cat = $catCollection->next()) {
|
||||
$cat->assignTemplate($idtpl);
|
||||
}
|
||||
|
||||
} else {
|
||||
//2008-06-25 timo.trautmann also set default template if it is selcted by user and there is no default template
|
||||
if ($iIdtplcfg > 0) {
|
||||
|
|
@ -239,7 +236,6 @@ function strNewTree($catname, $catalias = '', $bVisible = 0, $bPublic = 1, $iIdt
|
|||
return ($tmp_newid);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Creates a new category.
|
||||
*
|
||||
|
|
@ -358,7 +354,6 @@ function strNewCategory($tmp_parentid, $catname, $remakeTree = true, $catalias =
|
|||
$db->query($sql);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// set correct rights for element
|
||||
|
|
@ -403,7 +398,6 @@ function strNewCategory($tmp_parentid, $catname, $remakeTree = true, $catalias =
|
|||
return($tmp_newid);
|
||||
}
|
||||
|
||||
|
||||
function strOrderedPostTreeList($idcat, $poststring) {
|
||||
global $db;
|
||||
global $client;
|
||||
|
|
@ -422,7 +416,6 @@ function strOrderedPostTreeList($idcat, $poststring) {
|
|||
return $poststring;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Remakes the category tree structure in category tree table.
|
||||
*
|
||||
|
|
@ -479,7 +472,6 @@ function strRemakeTreeTable() {
|
|||
'postid' => $db->f('postid')
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
$iNextTreeId = $db->nextid($cfg["tab"]["cat_tree"]);
|
||||
|
|
@ -495,13 +487,13 @@ function strRemakeTreeTable() {
|
|||
$db->nextid('cat_tree');
|
||||
dbUpdateSequence($cfg["tab"]["sequence"], $cfg["tab"]["cat_tree"], $db);
|
||||
$db->unlock($cfg["tab"]["cat_tree"]);
|
||||
|
||||
}
|
||||
|
||||
function sort_pre_post($arr) {
|
||||
$firstElement = null;
|
||||
foreach ($arr as $row) {
|
||||
if ($row['preid'] == 0) $firstElement = $row['idcat'];
|
||||
if ($row['preid'] == 0)
|
||||
$firstElement = $row['idcat'];
|
||||
}
|
||||
|
||||
$curId = $firstElement;
|
||||
|
|
@ -514,7 +506,6 @@ function sort_pre_post($arr) {
|
|||
return $array;
|
||||
}
|
||||
|
||||
|
||||
function recCats($aCats, $sInsertQuery, &$iNextTreeId, &$aAllCats, $iLevel = 0) {
|
||||
if (is_array($aCats)) {
|
||||
$aCats = sort_pre_post($aCats);
|
||||
|
|
@ -530,7 +521,6 @@ function recCats ($aCats, $sInsertQuery, &$iNextTreeId, &$aAllCats, $iLevel = 0)
|
|||
return $sInsertQuery;
|
||||
}
|
||||
|
||||
|
||||
function strNextDeeper($tmp_idcat, $ignore_lang = false) {
|
||||
global $cfg, $db_str, $lang;
|
||||
|
||||
|
|
@ -558,7 +548,6 @@ function strNextDeeper($tmp_idcat, $ignore_lang = false) {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Checks, if passed category cotains any articles
|
||||
*
|
||||
|
|
@ -584,7 +573,6 @@ function strHasArticles($tmp_idcat) {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
function strNextPost($tmp_idcat) {
|
||||
global $db;
|
||||
global $cfg;
|
||||
|
|
@ -671,8 +659,6 @@ function strRemakeTreeTableFindNext($tmp_idcat,$tmp_level) {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
Hotfix recursive call more than 200 times exit script on hosteurope Timo.Trautmann
|
||||
* */
|
||||
|
|
@ -711,7 +697,6 @@ function strNextDeeperAll($tmp_idcat, $ignore_lang = false) {
|
|||
return $aCats;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Renders the category tree a HTML table
|
||||
*
|
||||
|
|
@ -743,7 +728,6 @@ function strShowTreeTable() {
|
|||
echo "</table>";
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Renames a category
|
||||
*
|
||||
|
|
@ -790,7 +774,6 @@ function strRenameCategory($idcat, $lang, $newcategoryname, $newcategoryalias) {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Sets the visible status of the category and its childs
|
||||
*
|
||||
|
|
@ -822,7 +805,6 @@ function strMakeVisible ($idcat, $lang, $visible) {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Sets the public status of the category and its childs
|
||||
*
|
||||
|
|
@ -848,7 +830,6 @@ function strMakePublic($idcat, $lang, $public) {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
function strDeeperCategoriesArray($idcat_start) {
|
||||
global $db;
|
||||
global $client;
|
||||
|
|
@ -872,7 +853,6 @@ function strDeeperCategoriesArray($idcat_start) {
|
|||
return $catstring;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Deletes the category and its template configurations.
|
||||
*
|
||||
|
|
@ -983,7 +963,6 @@ function strDeleteCategory($idcat) {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Moves a category upwards.
|
||||
*
|
||||
|
|
@ -1044,7 +1023,6 @@ function strMoveUpCategory($idcat) {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Moves a category downwards.
|
||||
*
|
||||
|
|
@ -1119,7 +1097,6 @@ function strMoveDownCategory($idcat) {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Moves a subtree to another destination.
|
||||
*
|
||||
|
|
@ -1192,7 +1169,6 @@ function strMoveSubtree($idcat, $parentid_new) {
|
|||
} else {
|
||||
// We recoded this function to prevent crashing the cat tree
|
||||
// when a user copies a tree and forget to set the target category
|
||||
|
||||
// Copy transaction now is only performed by setting the target
|
||||
$movesubtreeidcat = $idcat;
|
||||
}
|
||||
|
|
@ -1201,7 +1177,6 @@ function strMoveSubtree($idcat, $parentid_new) {
|
|||
$sess->freeze();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Checks if category is movable.
|
||||
*
|
||||
|
|
@ -1217,7 +1192,6 @@ function strMoveCatTargetallowed($idcat, $source) {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Synchronizes a category from one language to another language.
|
||||
*
|
||||
|
|
@ -1322,7 +1296,6 @@ function strSyncCategory($idcatParam, $sourcelang, $targetlang, $bMultiple = fal
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Checks if category has a start article
|
||||
*
|
||||
|
|
@ -1345,7 +1318,6 @@ function strHasStartArticle($idcat, $idlang) {
|
|||
return false;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Copies the category and it's existing articles into another category.
|
||||
*
|
||||
|
|
@ -1436,7 +1408,6 @@ function strCopyCategory($idcat, $destidcat, $remakeTree = true, $bUseCopyLabel
|
|||
return ($newidcat);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Copies the categorytree (category and its childs) to an another category.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@ $cfg['native_i18n'] = false;
|
|||
*/
|
||||
|
||||
/* Don't display errors */
|
||||
@ini_set("display_errors", false);
|
||||
@ini_set("display_errors", true);
|
||||
|
||||
/* Log errors to a file */
|
||||
@ini_set("log_errors", true);
|
||||
|
|
@ -148,7 +148,7 @@ $cfg['native_i18n'] = false;
|
|||
@ini_set("error_log", $cfg['path']['conlite_logs'] . "errorlog.txt");
|
||||
|
||||
/* Report all errors except warnings */
|
||||
if ($cfg["develop"]["show_errors"] && $_SERVER['SERVER_NAME'] == "localhost") {
|
||||
if ($cfg["develop"]["show_errors"] && $_SERVER['SERVER_NAME'] == "local.dceserver.de") {
|
||||
error_reporting(E_ALL);
|
||||
} else {
|
||||
if ($cfg["develop"]["show_deprecated"]) {
|
||||
|
|
|
|||
Laden…
In neuem Issue referenzieren