This commit is contained in:
Ulrich Block 2014-01-21 19:43:53 +01:00
parent a5a43cc62d
commit 3aec9c62a6
3 changed files with 17 additions and 12 deletions

View File

@ -504,9 +504,10 @@ if (isset($admin_id) and $ui->st('img', 'get')) {
$text = imagecolorallocate($bild, 0, 0, 0);
$font = 20;
$a = 2;
$x = floor($bildbreite/strlen($captcha))-0;
for($b = 0; $b < strlen($captcha); $b++) {
$c = mt_rand(2, $bildhoehe-20);
$x = floor($bildbreite / strlen($captcha))-0;
$captchaLength = strlen($captcha);
for($b = 0; $b < $captchaLength; $b++) {
$c = mt_rand(0,2);
imagestring ($bild, $font, $a, $c, $captcha{$b}, $text);
$a = $a + $x;
}

View File

@ -189,11 +189,11 @@ if ($ui->smallletters('w',2, 'get') == 'da' or (!$ui->smallletters('w',2, 'get')
foreach ($query3->fetchAll(PDO::FETCH_ASSOC) as $row3) {
if ($row['displayContent'] == 'Y' and $row['limitDisplay'] == 'Y' and $row2['twitter'] == 'N'){
$text = substr($row3['content'],0, $row['maxChars']);
$text = substr($row3['content'], 0, $row['maxChars']);
} else if ($row['displayContent'] == 'Y' and $row['limitDisplay'] == 'N' and $row2['twitter'] == 'N'){
$text = $row3['content'];
} else if ($row['displayContent'] == 'N' and $row['limitDisplay'] == 'Y' and $row2['twitter'] == 'N'){
$text = substr($row3['description'],0, $row['maxChars']);
$text = substr($row3['description'], 0, $row['maxChars']);
} else {
$text = $row3['description'];
}
@ -215,16 +215,16 @@ if ($ui->smallletters('w',2, 'get') == 'da' or (!$ui->smallletters('w',2, 'get')
foreach ($query2->fetchAll(PDO::FETCH_ASSOC) as $row2) {
if ($row['displayContent'] == 'Y' and $row['limitDisplay'] == 'Y' and $row2['twitter'] == 'N'){
$text = substr(preg_replace('/<(.*?)>/','',preg_replace('/<*?[^<>]*?>(.*?)<\/*?>/','$1', $row2['content'],-1),-1),0, $row['maxChars']);
$text = substr(preg_replace('/<(.*?)>/', '', preg_replace('/<*?[^<>]*?>(.*?)<\/*?>/','$1', $row2['content'], -1), -1), 0, $row['maxChars']);
} else if ($row['displayContent'] == 'Y' and $row['limitDisplay'] == 'N' and $row2['twitter'] == 'N'){
$text = $row2['content'];
} else if ($row['displayContent'] == 'N' and $row['limitDisplay'] == 'Y' and $row2['twitter'] == 'N'){
$text = substr(preg_replace('/<(.*?)>/','',preg_replace('/<*?[^<>]*?>(.*?)<\/*?>/','$1', $row2['description'],-1),-1),0, $row['maxChars']);
$text = substr(preg_replace('/<(.*?)>/', '', preg_replace('/<*?[^<>]*?>(.*?)<\/*?>/', '$1', $row2['description'], -1), -1), 0, $row['maxChars']);
} else {
$text = $row2['description'];
}
$url = ($row2['twitter'] == 'N') ? $row2['feedUrl'] : 'https://twitter.com/'.$row2['loginName'];
$url = ($row2['twitter'] == 'N') ? $row2['feedUrl'] : 'https://twitter.com/' . $row2['loginName'];
$title = $row2['title'];
if (strlen($row2['title']) <= 1) {

View File

@ -158,12 +158,16 @@ if ($easywiModules['my'] === true) {
if ($easywiModules['ro'] === true) {
$what_to_be_included_array['rh'] = 'root_dedicated.php';
$what_to_be_included_array['rd'] = 'root_dhcp.php';
$what_to_be_included_array['rp'] = 'root_pxe.php';
$what_to_be_included_array['vh'] = 'root_virtual_hosts.php';
$what_to_be_included_array['vs'] = 'root_virtual_server.php';
$what_to_be_included_array['ot'] = 'roots_os_templates.php';
$what_to_be_included_array['tf'] = 'traffic.php';
if ($reseller_id == 0) {
$what_to_be_included_array['rd'] = 'root_dhcp.php';
$what_to_be_included_array['rp'] = 'root_pxe.php';
$what_to_be_included_array['ot'] = 'roots_os_templates.php';
$what_to_be_included_array['vh'] = 'root_virtual_hosts.php';
$what_to_be_included_array['sn'] = 'roots_subnets.php';
}
}
if ($easywiModules['ti'] === true) {