- notify('SendPing', array('blogid' => $blogid));
-
- ?>
-
-
-
@@ -1919,7 +1793,7 @@ class ADMIN {
isAdmin()) { ?>
-
+
getDisplayName());
}
@@ -1965,20 +1839,26 @@ class ADMIN {
- getLanguage())
- echo " selected='selected'";
+ echo "getLanguage() )
+ {
+ echo " selected=\"selected\"";
+ }
echo ">$name ";
}
}
closedir($dirhandle);
-
+
?>
@@ -2025,20 +1905,23 @@ class ADMIN {
// check if allowed
($member->getID() == $memberid) or $member->isAdmin() or $this->disallow();
- $name = trim(strip_tags(postVar('name')));
- $realname = trim(strip_tags(postVar('realname')));
- $password = postVar('password');
- $repeatpassword = postVar('repeatpassword');
- $email = strip_tags(postVar('email'));
+ $name = trim(strip_tags(postVar('name')));
+ $realname = trim(strip_tags(postVar('realname')));
+ $password = postVar('password');
+ $repeatpassword = postVar('repeatpassword');
+ $email = strip_tags(postVar('email'));
$url = strip_tags(postVar('url'));
- // Sometimes user didn't prefix the URL with http://, this cause a malformed URL. Let's fix it.
- if (!eregi("^https?://", $url))
- $url = "http://".$url;
-
- $admin = postVar('admin');
- $canlogin = postVar('canlogin');
- $notes = strip_tags(postVar('notes'));
+ # replaced eregi() below with preg_match(). ereg* functions are deprecated in PHP 5.3.0
+ # original eregi: !eregi("^https?://", $url)
+ // begin if: sometimes user didn't prefix the URL with http:// or https://, this cause a malformed URL. Let's fix it.
+ if (!preg_match('#^https?://#', $url) )
+ {
+ $url = "http://" . $url;
+ }
+ $admin = postVar('admin');
+ $canlogin = postVar('canlogin');
+ $notes = strip_tags(postVar('notes'));
$deflang = postVar('deflang');
$mem = MEMBER::createFromID($memberid);
@@ -2056,6 +1939,15 @@ class ADMIN {
if ($password && (strlen($password) < 6))
$this->error(_ERROR_PASSWORDTOOSHORT);
+
+ if ($password) {
+ $pwdvalid = true;
+ $pwderror = '';
+ $manager->notify('PrePasswordSet',array('password' => $password, 'errormessage' => &$pwderror, 'valid' => &$pwdvalid));
+ if (!$pwdvalid) {
+ $this->error($pwderror);
+ }
+ }
}
if (!isValidMailAddress($email))
@@ -2070,12 +1962,12 @@ class ADMIN {
// check if there will remain at least one site member with both the logon and admin rights
// (check occurs when taking away one of these rights from such a member)
- if ( (!$admin && $mem->isAdmin() && $mem->canLogin())
+ if ( (!$admin && $mem->isAdmin() && $mem->canLogin())
|| (!$canlogin && $mem->isAdmin() && $mem->canLogin())
)
{
$r = sql_query('SELECT * FROM '.sql_table('member').' WHERE madmin=1 and mcanlogin=1');
- if (mysql_num_rows($r) < 2)
+ if (sql_num_rows($r) < 2)
$this->error(_ERROR_ATLEASTONEADMIN);
}
@@ -2100,7 +1992,7 @@ class ADMIN {
$mem->setCanLogin($canlogin);
}
- $autosave = postVar ('autosave');
+ $autosave = postVar ('autosave');
$mem->setAutosave($autosave);
$mem->write();
@@ -2275,7 +2167,7 @@ class ADMIN {
* @author dekarma
*/
function action_activatesetpwd() {
-
+
$key = postVar('key');
// clean up old activation keys
@@ -2292,17 +2184,25 @@ class ADMIN {
if (!$mem)
return $this->_showActivationPage($key, _ERROR_ACTIVATE);
- $password = postVar('password');
- $repeatpassword = postVar('repeatpassword');
+ $password = postVar('password');
+ $repeatpassword = postVar('repeatpassword');
if ($password != $repeatpassword)
return $this->_showActivationPage($key, _ERROR_PASSWORDMISMATCH);
if ($password && (strlen($password) < 6))
return $this->_showActivationPage($key, _ERROR_PASSWORDTOOSHORT);
-
+
+ if ($password) {
+ $pwdvalid = true;
+ $pwderror = '';
+ global $manager;
+ $manager->notify('PrePasswordSet',array('password' => $password, 'errormessage' => &$pwderror, 'valid' => &$pwdvalid));
+ if (!$pwdvalid) {
+ return $this->_showActivationPage($key,$pwderror);
+ }
+ }
$error = '';
- global $manager;
$manager->notify('ValidateForm', array('type' => 'activation', 'member' => $mem, 'error' => &$error));
if ($error != '')
return $this->_showActivationPage($key, $error);
@@ -2364,7 +2264,7 @@ class ADMIN {
- notify('PreDeleteTeamMember', array('member' => &$tmem, 'blogid' => $blogid));
@@ -2481,14 +2381,14 @@ class ADMIN {
// (check for at least two admins before deletion)
$query = 'SELECT * FROM '.sql_table('team') . ' WHERE tblog='.$blogid.' and tadmin=1';
$r = sql_query($query);
- if (mysql_num_rows($r) < 2)
+ if (sql_num_rows($r) < 2)
return _ERROR_ATLEASTONEBLOGADMIN;
}
$query = 'DELETE FROM '.sql_table('team')." WHERE tblog=$blogid and tmember=$memberid";
sql_query($query);
- $manager->notify('PostDeleteTeamMember', array('member' => &$mem, 'blogid' => $blogid));
+ $manager->notify('PostDeleteTeamMember', array('member' => &$tmem, 'blogid' => $blogid));
return '';
}
@@ -2510,7 +2410,7 @@ class ADMIN {
// don't allow when there is only one admin at this moment
if ($mem->isBlogAdmin($blogid)) {
$r = sql_query('SELECT * FROM '.sql_table('team') . " WHERE tblog=$blogid and tadmin=1");
- if (mysql_num_rows($r) == 1)
+ if (sql_num_rows($r) == 1)
$this->error(_ERROR_ATLEASTONEBLOGADMIN);
}
@@ -2551,11 +2451,11 @@ class ADMIN {
- Members currently on your team:
+
mname) . ' (' . htmlspecialchars($o->mrealname). ')');
echo implode(',', $aMemberNames);
?>
@@ -2625,7 +2525,7 @@ class ADMIN {
input_yesno('reqemail',$blog->emailRequired(),72); ?>
-
+
@@ -2642,15 +2542,6 @@ class ADMIN {
/>
- 0) {
- ?>
-
- input_yesno('sendping',$blog->sendPing(),85); ?>
-
-
@@ -2757,13 +2648,13 @@ class ADMIN {
if (!isValidCategoryName($cname))
$this->error(_ERROR_BADCATEGORYNAME);
- $query = 'SELECT * FROM '.sql_table('category') . ' WHERE cname=\'' . addslashes($cname).'\' and cblog=' . intval($blogid);
+ $query = 'SELECT * FROM '.sql_table('category') . ' WHERE cname=\'' . sql_real_escape_string($cname).'\' and cblog=' . intval($blogid);
$res = sql_query($query);
- if (mysql_num_rows($res) > 0)
+ if (sql_num_rows($res) > 0)
$this->error(_ERROR_DUPCATEGORYNAME);
- $blog =& $manager->getBlog($blogid);
- $newCatID = $blog->createNewCategory($cname, $cdesc);
+ $blog =& $manager->getBlog($blogid);
+ $newCatID = $blog->createNewCategory($cname, $cdesc);
$this->action_blogsettings();
}
@@ -2786,7 +2677,7 @@ class ADMIN {
$member->blogAdminRights($blogid) or $this->disallow();
$res = sql_query('SELECT * FROM '.sql_table('category')." WHERE cblog=$blogid AND catid=$catid");
- $obj = mysql_fetch_object($res);
+ $obj = sql_fetch_object($res);
$cname = $obj->cname;
$cdesc = $obj->cdesc;
@@ -2847,14 +2738,14 @@ class ADMIN {
if (!isValidCategoryName($cname))
$this->error(_ERROR_BADCATEGORYNAME);
- $query = 'SELECT * FROM '.sql_table('category').' WHERE cname=\'' . addslashes($cname).'\' and cblog=' . intval($blogid) . " and not(catid=$catid)";
+ $query = 'SELECT * FROM '.sql_table('category').' WHERE cname=\'' . sql_real_escape_string($cname).'\' and cblog=' . intval($blogid) . " and not(catid=$catid)";
$res = sql_query($query);
- if (mysql_num_rows($res) > 0)
+ if (sql_num_rows($res) > 0)
$this->error(_ERROR_DUPCATEGORYNAME);
$query = 'UPDATE '.sql_table('category').' SET'
- . " cname='" . addslashes($cname) . "',"
- . " cdesc='" . addslashes($cdesc) . "'"
+ . " cname='" . sql_real_escape_string($cname) . "',"
+ . " cdesc='" . sql_real_escape_string($cdesc) . "'"
. " WHERE catid=" . $catid;
sql_query($query);
@@ -2897,7 +2788,7 @@ class ADMIN {
// check if catid is the only category left for blogid
$query = 'SELECT catid FROM '.sql_table('category').' WHERE cblog=' . $blogid;
$res = sql_query($query);
- if (mysql_num_rows($res) == 1)
+ if (sql_num_rows($res) == 1)
$this->error(_ERROR_DELETELASTCATEGORY);
@@ -2946,8 +2837,6 @@ class ADMIN {
$catid = intval($catid);
- $manager->notify('PreDeleteCategory', array('catid' => $catid));
-
$blogid = getBlogIDFromCatID($catid);
if (!$member->blogAdminRights($blogid))
@@ -2969,9 +2858,11 @@ class ADMIN {
// check if catid is the only category left for blogid
$query = 'SELECT catid FROM '.sql_table('category').' WHERE cblog=' . $blogid;
$res = sql_query($query);
- if (mysql_num_rows($res) == 1)
+ if (sql_num_rows($res) == 1)
return _ERROR_DELETELASTCATEGORY;
+ $manager->notify('PreDeleteCategory', array('catid' => $catid));
+
// change category for all items to the default category
$query = 'UPDATE '.sql_table('item')." SET icat=$destcatid WHERE icat=$catid";
sql_query($query);
@@ -3032,7 +2923,7 @@ class ADMIN {
// update comments table (cblog)
$query = 'SELECT inumber FROM '.sql_table('item').' WHERE icat='.$catid;
$items = sql_query($query);
- while ($oItem = mysql_fetch_object($items)) {
+ while ($oItem = sql_fetch_object($items)) {
sql_query('UPDATE '.sql_table('comment').' SET cblog='.$destblogid.' WHERE citem='.$oItem->inumber);
}
@@ -3067,16 +2958,16 @@ class ADMIN {
$blog =& $manager->getBlog($blogid);
- $notify = trim(postVar('notify'));
- $shortname = trim(postVar('shortname'));
- $updatefile = trim(postVar('update'));
+ $notify = trim(postVar('notify'));
+ $shortname = trim(postVar('shortname'));
+ $updatefile = trim(postVar('update'));
- $notifyComment = intPostVar('notifyComment');
- $notifyVote = intPostVar('notifyVote');
- $notifyNewItem = intPostVar('notifyNewItem');
+ $notifyComment = intPostVar('notifyComment');
+ $notifyVote = intPostVar('notifyVote');
+ $notifyNewItem = intPostVar('notifyNewItem');
if ($notifyComment == 0) $notifyComment = 1;
- if ($notifyVote == 0) $notifyVote = 1;
+ if ($notifyVote == 0) $notifyVote = 1;
if ($notifyNewItem == 0) $notifyNewItem = 1;
$notifyType = $notifyComment * $notifyVote * $notifyNewItem;
@@ -3111,7 +3002,6 @@ class ADMIN {
$blog->setDefaultSkin(intPostVar('defskin'));
$blog->setDescription(trim(postVar('desc')));
$blog->setPublic(postVar('public'));
- $blog->setPingUserland(postVar('sendping'));
$blog->setConvertBreaks(intPostVar('convertbreaks'));
$blog->setAllowPastPosting(intPostVar('allowpastposting'));
$blog->setDefaultCategory(intPostVar('defcat'));
@@ -3284,7 +3174,7 @@ class ADMIN {
/* unlink comments from memberid */
if ($memberid) {
- $query = 'UPDATE ' . sql_table('comment') . ' SET cmember="0", cuser="'. addslashes($mem->getDisplayName())
+ $query = 'UPDATE ' . sql_table('comment') . ' SET cmember="0", cuser="'. sql_real_escape_string($mem->getDisplayName())
.'" WHERE cmember='.$memberid;
sql_query($query);
}
@@ -3365,7 +3255,7 @@ class ADMIN {
. ' FROM '.sql_table('skin_desc');
$template['name'] = 'defskin';
$template['tabindex'] = 50;
- $template['selected'] = $CONF['BaseSkin']; // set default selected skin to be globally defined base skin
+ $template['selected'] = $CONF['BaseSkin']; // set default selected skin to be globally defined base skin
showlist($query,'select',$template);
?>
@@ -3399,11 +3289,11 @@ class ADMIN {
// Only Super-Admins can do this
$member->isAdmin() or $this->disallow();
- $bname = trim(postVar('name'));
- $bshortname = trim(postVar('shortname'));
+ $bname = trim(postVar('name'));
+ $bshortname = trim(postVar('shortname'));
$btimeoffset = postVar('timeoffset');
- $bdesc = trim(postVar('desc'));
- $bdefskin = postVar('defskin');
+ $bdesc = trim(postVar('desc'));
+ $bdefskin = postVar('defskin');
if (!isValidShortName($bshortname))
$this->error(_ERROR_BADSHORTBLOGNAME);
@@ -3414,7 +3304,7 @@ class ADMIN {
$manager->notify(
'PreAddBlog',
array(
- 'name' => &$bname,
+ 'name' => &$bname,
'shortname' => &$bshortname,
'timeoffset' => &$btimeoffset,
'description' => &$bdesc,
@@ -3424,21 +3314,25 @@ class ADMIN {
// add slashes for sql queries
- $bname = addslashes($bname);
- $bshortname = addslashes($bshortname);
- $btimeoffset = addslashes($btimeoffset);
- $bdesc = addslashes($bdesc);
- $bdefskin = addslashes($bdefskin);
+ $bname = sql_real_escape_string($bname);
+ $bshortname = sql_real_escape_string($bshortname);
+ $btimeoffset = sql_real_escape_string($btimeoffset);
+ $bdesc = sql_real_escape_string($bdesc);
+ $bdefskin = sql_real_escape_string($bdefskin);
// create blog
$query = 'INSERT INTO '.sql_table('blog')." (bname, bshortname, bdesc, btimeoffset, bdefskin) VALUES ('$bname', '$bshortname', '$bdesc', '$btimeoffset', '$bdefskin')";
sql_query($query);
- $blogid = mysql_insert_id();
- $blog =& $manager->getBlog($blogid);
+ $blogid = sql_insert_id();
+ $blog =& $manager->getBlog($blogid);
// create new category
- sql_query('INSERT INTO '.sql_table('category')." (cblog, cname, cdesc) VALUES ($blogid, _EBLOGDEFAULTCATEGORY_NAME, _EBLOGDEFAULTCATEGORY_DESC)");
- $catid = mysql_insert_id();
+ $catdefname = (defined('_EBLOGDEFAULTCATEGORY_NAME') ? _EBLOGDEFAULTCATEGORY_NAME : 'General');
+ $catdefdesc = (defined('_EBLOGDEFAULTCATEGORY_DESC') ? _EBLOGDEFAULTCATEGORY_DESC : 'Items that do not fit in other categories');
+ $sql = 'INSERT INTO %s (cblog, cname, cdesc) VALUES (%d, "%s", "%s")';
+ sql_query(sprintf($sql, sql_table('category'), $blogid, $catdefname, $catdefdesc));
+// sql_query('INSERT INTO '.sql_table('category')." (cblog, cname, cdesc) VALUES ($blogid, _EBLOGDEFAULTCATEGORY_NAME, _EBLOGDEFAULTCATEGORY_DESC)");
+ $catid = sql_insert_id();
// set as default category
$blog->setDefaultCategory($catid);
@@ -3448,10 +3342,15 @@ class ADMIN {
$memberid = $member->getID();
$query = 'INSERT INTO '.sql_table('team')." (tmember, tblog, tadmin) VALUES ($memberid, $blogid, 1)";
sql_query($query);
-
-
- $blog->additem($blog->getDefaultCategory(),_EBLOG_FIRSTITEM_TITLE,_EBLOG_FIRSTITEM_BODY,'',$blogid, $memberid,$blog->getCorrectTime(),0,0,0);
-
+
+ $itemdeftitle = (defined('_EBLOG_FIRSTITEM_TITLE') ? _EBLOG_FIRSTITEM_TITLE : 'First Item');
+ $itemdefbody = (defined('_EBLOG_FIRSTITEM_BODY') ? _EBLOG_FIRSTITEM_BODY : 'This is the first item in your weblog. Feel free to delete it.');
+
+ $blog->additem($blog->getDefaultCategory(),$itemdeftitle,$itemdefbody,'',$blogid, $memberid,$blog->getCorrectTime(),0,0,0);
+ //$blog->additem($blog->getDefaultCategory(),_EBLOG_FIRSTITEM_TITLE,_EBLOG_FIRSTITEM_BODY,'',$blogid, $memberid,$blog->getCorrectTime(),0,0,0);
+
+
+
$manager->notify(
'PostAddBlog',
array(
@@ -3462,10 +3361,10 @@ class ADMIN {
$manager->notify(
'PostAddCategory',
array(
- 'blog' => &$blog,
- 'name' => _EBLOGDEFAULTCATEGORY_NAME,
+ 'blog' => &$blog,
+ 'name' => _EBLOGDEFAULTCATEGORY_NAME,
'description' => _EBLOGDEFAULTCATEGORY_DESC,
- 'catid' => $catid
+ 'catid' => $catid
)
);
@@ -3476,13 +3375,13 @@ class ADMIN {
-
-
+
+
-
+
-
+
<?php
$CONF['Self'] = '.php ';
@@ -3528,7 +3427,7 @@ selector();
- pagefoot();
+ pagefoot();
}
@@ -3540,8 +3439,8 @@ selector();
$member->blogAdminRights($blogid) or $this->disallow();
- $burl = requestVar('url');
- $blogid = intRequestVar('blogid');
+ $burl = requestVar('url');
+ $blogid = intRequestVar('blogid');
$blog =& $manager->getBlog($blogid);
$blog->setURL(trim($burl));
@@ -3569,7 +3468,7 @@ selector();
- addTicketHidden() ?>
- $skinfile) {
+ $skinfile) {
$html = htmlspecialchars($skinfile);
echo '',$skinname,' ';
}
@@ -3588,7 +3487,7 @@ selector();
-
@@ -3616,9 +3515,9 @@ selector();
- sdnumber;
echo ' ';
echo '',htmlspecialchars($skinObj->sdname),' ';
@@ -3630,7 +3529,7 @@ selector();
// show list of templates
$res = sql_query('SELECT * FROM '.sql_table('template_desc'));
- while ($templateObj = mysql_fetch_object($res)) {
+ while ($templateObj = sql_fetch_object($res)) {
$id = 'templateexp' . $templateObj->tdnumber;
echo ' ';
echo '',htmlspecialchars($templateObj->tdname),' ';
@@ -3666,7 +3565,7 @@ selector();
include_once($DIR_LIBS . 'skinie.php');
$skinFileRaw= postVar('skinfile');
- $mode = postVar('mode');
+ $mode = postVar('mode');
$importer =& new SKINIMPORT();
@@ -3688,7 +3587,7 @@ selector();
// clashes
$skinNameClashes = $importer->checkSkinNameClashes();
$templateNameClashes = $importer->checkTemplateNameClashes();
- $hasNameClashes = (count($skinNameClashes) > 0) || (count($templateNameClashes) > 0);
+ $hasNameClashes = (count($skinNameClashes) > 0) || (count($templateNameClashes) > 0);
if ($error) $this->error($error);
@@ -3747,7 +3646,7 @@ selector();
include_once($DIR_LIBS . 'skinie.php');
$skinFileRaw= postVar('skinfile');
- $mode = postVar('mode');
+ $mode = postVar('mode');
$allowOverwrite = intPostVar('overwrite');
@@ -3788,7 +3687,7 @@ selector();
'._AND.' ',$importer->getTemplateNames())?>
- pagefoot();
+ pagefoot();
}
@@ -3881,7 +3780,7 @@ selector();
$member->isAdmin() or $this->disallow();
$extrahead = '';
- $extrahead .= '';
+ $extrahead .= '';
$this->pagehead($extrahead);
@@ -3896,7 +3795,7 @@ selector();
''
- "._MESSAGE.": $msg";
+ "._MESSAGE.": $msg";
?>
@@ -4003,7 +3902,7 @@ selector();
$this->_templateEditRow($template, $pfdesc, $pffield, '',++$tab,0);
}
}
-?>
+?>
@@ -4025,11 +3924,12 @@ selector();
*/
function _templateEditRow(&$template, $description, $name, $help = '', $tabindex = 0, $big = 0) {
static $count = 1;
+ if (!isset($template[$name])) $template[$name] = '';
?>
- error(_ERROR_DUPTEMPLATENAME);
- $name = addslashes($name);
- $desc = addslashes($desc);
+ $name = sql_real_escape_string($name);
+ $desc = sql_real_escape_string($desc);
// 1. Remove all template parts
$query = 'DELETE FROM '.sql_table('template').' WHERE tdesc=' . $templateid;
@@ -4119,8 +4019,8 @@ selector();
* @todo document this
*/
function addToTemplate($id, $partname, $content) {
- $partname = addslashes($partname);
- $content = addslashes($content);
+ $partname = sql_real_escape_string($partname);
+ $content = sql_real_escape_string($content);
$id = intval($id);
@@ -4129,8 +4029,8 @@ selector();
$query = 'INSERT INTO '.sql_table('template')." (tdesc, tpartname, tcontent) "
. "VALUES ($id, '$partname', '$content')";
- sql_query($query) or exit(_ADMIN_SQLDIE_QUERYERROR . mysql_error());
- return mysql_insert_id();
+ sql_query($query) or exit(_ADMIN_SQLDIE_QUERYERROR . sql_error());
+ return sql_insert_id();
}
/**
@@ -4241,7 +4141,7 @@ selector();
// 3. create clone
// go through parts of old template and add them to the new one
$res = sql_query('SELECT tpartname, tcontent FROM '.sql_table('template').' WHERE tdesc=' . $templateid);
- while ($o = mysql_fetch_object($res)) {
+ while ($o = sql_fetch_object($res)) {
$this->addToTemplate($newid, $o->tpartname, $o->tcontent);
}
@@ -4362,12 +4262,12 @@ selector();
echo ' ' . "\r\n";
echo '' . "\r\n";
- if ($res && mysql_num_rows($res) > 0) {
+ if ($res && sql_num_rows($res) > 0) {
echo '';
@@ -4406,7 +4306,7 @@ selector();
- pagefoot();
+ pagefoot();
}
/**
@@ -4472,7 +4372,7 @@ selector();
'getName()) ?>':
- "._MESSAGE.": $msg";
+ "._MESSAGE.": $msg";
?>
@@ -4503,7 +4403,7 @@ selector();
- error(_ERROR_SKINDEFDELETE . htmlspecialchars($o->bname));
$this->pagehead();
@@ -4604,7 +4504,7 @@ selector();
// don't allow deletion of default skins for blogs
$query = 'SELECT bname FROM '.sql_table('blog').' WHERE bdefskin=' . $skinid;
$r = sql_query($query);
- if ($o = mysql_fetch_object($r))
+ if ($o = sql_fetch_object($r))
$this->error(_ERROR_SKINDEFDELETE .$o->bname);
$manager->notify('PreDeleteSkin', array('skinid' => $skinid));
@@ -4741,7 +4641,7 @@ selector();
$query = "SELECT stype FROM " . sql_table('skin') . " WHERE sdesc = " . $skinid;
$res = sql_query($query);
- while ($row = mysql_fetch_assoc($res)) {
+ while ($row = sql_fetch_assoc($res)) {
$this->skinclonetype($skin, $newid, $row['stype']);
}
@@ -4756,7 +4656,7 @@ selector();
$newid = intval($newid);
$content = $skin->getContent($type);
if ($content) {
- $query = 'INSERT INTO '.sql_table('skin')." (sdesc, scontent, stype) VALUES ($newid,'". addslashes($content)."', '". addslashes($type)."')";
+ $query = 'INSERT INTO '.sql_table('skin')." (sdesc, scontent, stype) VALUES ($newid,'". sql_real_escape_string($content)."', '". sql_real_escape_string($type)."')";
sql_query($query);
}
}
@@ -4835,15 +4735,21 @@ selector();
- $name";
}
}
@@ -4885,7 +4791,7 @@ selector();
input_yesno('DisableJsTools',$CONF['DisableJsTools'],10075); */?>
- ",_SETTINGS_JSTOOLBAR_NONE,"";
$extra = ($CONF['DisableJsTools'] == 2) ? 'selected="selected"' : '';
echo "",_SETTINGS_JSTOOLBAR_SIMPLE," ";
@@ -4911,14 +4817,14 @@ selector();
input_yesno('DebugVars',$CONF['DebugVars'],10078);
-
+
?>
-
- " . _WARNING_NOTADIR . " ";
if (!is_readable($DIR_MEDIA))
echo "" . _WARNING_NOTREADABLE . " ";
@@ -5060,39 +4966,39 @@ selector();
// save settings
- $this->updateConfig('DefaultBlog', postVar('DefaultBlog'));
- $this->updateConfig('BaseSkin', postVar('BaseSkin'));
- $this->updateConfig('IndexURL', postVar('IndexURL'));
- $this->updateConfig('AdminURL', postVar('AdminURL'));
+ $this->updateConfig('DefaultBlog', postVar('DefaultBlog'));
+ $this->updateConfig('BaseSkin', postVar('BaseSkin'));
+ $this->updateConfig('IndexURL', postVar('IndexURL'));
+ $this->updateConfig('AdminURL', postVar('AdminURL'));
$this->updateConfig('PluginURL', postVar('PluginURL'));
- $this->updateConfig('SkinsURL', postVar('SkinsURL'));
+ $this->updateConfig('SkinsURL', postVar('SkinsURL'));
$this->updateConfig('ActionURL', postVar('ActionURL'));
- $this->updateConfig('Language', postVar('Language'));
- $this->updateConfig('AdminEmail', postVar('AdminEmail'));
+ $this->updateConfig('Language', postVar('Language'));
+ $this->updateConfig('AdminEmail', postVar('AdminEmail'));
$this->updateConfig('SessionCookie', postVar('SessionCookie'));
$this->updateConfig('AllowMemberCreate',postVar('AllowMemberCreate'));
- $this->updateConfig('AllowMemberMail', postVar('AllowMemberMail'));
+ $this->updateConfig('AllowMemberMail', postVar('AllowMemberMail'));
$this->updateConfig('NonmemberMail', postVar('NonmemberMail'));
- $this->updateConfig('ProtectMemNames', postVar('ProtectMemNames'));
- $this->updateConfig('SiteName', postVar('SiteName'));
+ $this->updateConfig('ProtectMemNames', postVar('ProtectMemNames'));
+ $this->updateConfig('SiteName', postVar('SiteName'));
$this->updateConfig('NewMemberCanLogon',postVar('NewMemberCanLogon'));
- $this->updateConfig('DisableSite', postVar('DisableSite'));
- $this->updateConfig('DisableSiteURL', postVar('DisableSiteURL'));
+ $this->updateConfig('DisableSite', postVar('DisableSite'));
+ $this->updateConfig('DisableSiteURL', postVar('DisableSiteURL'));
$this->updateConfig('LastVisit', postVar('LastVisit'));
- $this->updateConfig('MediaURL', postVar('MediaURL'));
- $this->updateConfig('AllowedTypes', postVar('AllowedTypes'));
- $this->updateConfig('AllowUpload', postVar('AllowUpload'));
+ $this->updateConfig('MediaURL', postVar('MediaURL'));
+ $this->updateConfig('AllowedTypes', postVar('AllowedTypes'));
+ $this->updateConfig('AllowUpload', postVar('AllowUpload'));
$this->updateConfig('MaxUploadSize', postVar('MaxUploadSize'));
- $this->updateConfig('MediaPrefix', postVar('MediaPrefix'));
- $this->updateConfig('AllowLoginEdit', postVar('AllowLoginEdit'));
- $this->updateConfig('DisableJsTools', postVar('DisableJsTools'));
- $this->updateConfig('CookieDomain', postVar('CookieDomain'));
- $this->updateConfig('CookiePath', postVar('CookiePath'));
- $this->updateConfig('CookieSecure', postVar('CookieSecure'));
- $this->updateConfig('URLMode', postVar('URLMode'));
- $this->updateConfig('CookiePrefix', postVar('CookiePrefix'));
+ $this->updateConfig('MediaPrefix', postVar('MediaPrefix'));
+ $this->updateConfig('AllowLoginEdit', postVar('AllowLoginEdit'));
+ $this->updateConfig('DisableJsTools', postVar('DisableJsTools'));
+ $this->updateConfig('CookieDomain', postVar('CookieDomain'));
+ $this->updateConfig('CookiePath', postVar('CookiePath'));
+ $this->updateConfig('CookieSecure', postVar('CookieSecure'));
+ $this->updateConfig('URLMode', postVar('URLMode'));
+ $this->updateConfig('CookiePrefix', postVar('CookiePrefix'));
$this->updateConfig('DebugVars', postVar('DebugVars'));
- $this->updateConfig('DefaultListSize', postVar('DefaultListSize'));
+ $this->updateConfig('DefaultListSize', postVar('DefaultListSize'));
// load new config and redirect (this way, the new language will be used is necessary)
// note that when changing cookie settings, this redirect might cause the user
@@ -5105,7 +5011,7 @@ selector();
/**
* Give an overview over the used system
- */
+ */
function action_systemoverview() {
global $member, $nucleus, $CONF;
@@ -5127,7 +5033,7 @@ selector();
echo "\t\t" . ' ' . phpversion() . " \n";
echo "\t \n";
echo "\t\t" . '' . _ADMIN_SYSTEMOVERVIEW_MYSQLVERSION . " \n";
- echo "\t\t" . '' . mysql_get_server_info() . ' (' . mysql_get_client_info() . ')' . " \n";
+ echo "\t\t" . '' . sql_get_server_info() . ' (' . sql_get_client_info() . ')' . " \n";
echo "\t ";
echo "
\n";
@@ -5144,7 +5050,7 @@ selector();
$mqr = get_magic_quotes_runtime() ? 'On' : 'Off';
echo "\t\t" . ' ' . $mqr . " \n";
echo "\t