Changeset 1682
- Timestamp:
- 02/07/2008 09:51:10 PM (10 months ago)
- Files:
-
- trunk/admin/login.php (modified) (3 diffs)
- trunk/admin/media/select-picture.php (modified) (1 diff)
- trunk/admin/media/select-teaser.php (modified) (1 diff)
- trunk/admin/media/upload-picture.php (modified) (1 diff)
- trunk/admin/media/upload-teaser.php (modified) (1 diff)
- trunk/lang/lang.de.inc.php (modified) (1 diff)
- trunk/log.php (modified) (3 diffs)
- trunk/scripts/general.func.php (modified) (1 diff)
- trunk/scripts/jlogPlugins.class.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/admin/login.php
r1659 r1682 14 14 $post = strip($_POST); 15 15 16 if ($_SERVER['REQUEST_METHOD'] == 'POST') { 16 ### Plugin Hook 17 $dispatch_login = $plugins->callHook('dispatchLogin', true); 18 19 if ($_SERVER['REQUEST_METHOD'] == 'POST' AND $dispatch_login) { 17 20 session_start(); 18 21 $passwort = $post['password']; … … 27 30 else header('HTTP/1.1 303 See Other'); 28 31 } 29 if($path === $url) $url = $path."new.php"; 32 if($path === $url) $url = $path."new.php"; 30 33 if(!empty($url)) $path = $url; 31 34 header('Location: http://'.$hostname.$path); … … 51 54 '; 52 55 56 ### Plugin Hook 57 $c["main"] = $plugins->callHook('loginForm', $c["main"]); 58 59 53 60 require_once(JLOG_BASEPATH.'scripts'.DIRECTORY_SEPARATOR.'do_template.php'); 54 61 echo $body; trunk/admin/media/select-picture.php
r1583 r1682 13 13 <h1><?php echo $l['admin']['pic_choose_old'] ?></h1> 14 14 <?php 15 // Bildernamen f ür blog in ein Array schreiben15 // Bildernamen fÃŒr blog in ein Array schreiben 16 16 $dir = JLOG_BASEPATH.'img'.DIRECTORY_SEPARATOR; 17 17 trunk/admin/media/select-teaser.php
r1624 r1682 12 12 <h1><?php echo $l['admin']['pic_choose_old_teaser'] ?></h1> 13 13 <?php 14 // Bildernamen f ür blog in ein Array schreiben14 // Bildernamen fÃŒr blog in ein Array schreiben 15 15 $dir = JLOG_BASEPATH.'img'.DIRECTORY_SEPARATOR; 16 16 $handle = opendir ($dir); trunk/admin/media/upload-picture.php
r1624 r1682 20 20 if (isset($_FILES['probe']) && ! $_FILES['probe']['error']) // Alternativ: and $_FILES['probe']['size'] 21 21 { 22 // Überprüfungen:22 // ÃberprÃŒfungen: 23 23 unset($errors); 24 24 $e = substr($_FILES['probe']['name'], -4); trunk/admin/media/upload-teaser.php
r1624 r1682 19 19 if (isset($_FILES['probe']) && ! $_FILES['probe']['error']) // Alternativ: and $_FILES['probe']['size'] 20 20 { 21 // Überprüfungen:21 // ÃberprÃŒfungen: 22 22 unset($errors); 23 23 $e = substr($_FILES['probe']['name'], -4); trunk/lang/lang.de.inc.php
r1664 r1682 87 87 88 88 "language" => "de-de", 89 "locale" => array('de_DE ', 'de_DE@euro', 'de', 'deu_deu', 'german', 'ge', 'de-DE', 'de_DE.ISO8859-1', 'de_DE.ISO8859-15', 'de_DE.ISO_8859-15', 'de_DE.ISO_8859-15'),89 "locale" => array('de_DE.UTF-8', 'de_DE.UTF-8@euro', 'de_DE'), 90 90 "date_format" => "%d. %B %Y um %H:%M Uhr", 91 91 "date_format_comment" => "%d.%m.%Y", trunk/log.php
r1674 r1682 180 180 $com_form['email'] = empty($com_form['email']) ? "no-reply@".$urlarray['host'] : $com_form['email']; 181 181 $mail['topic'] = $l['admin']['comments_mailsubject']." - ".$blogentry['topic']; 182 $mail['headers'] = "From: "; 182 $mail['headers'] = "MIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n"; 183 $mail['headers'] .= "From: "; 183 184 if(!empty($com_form['name'])) $mail['headers'] .= str_replace(array("\n", "\r"), "", $com_form['name']); 184 185 else $mail['headers'] .= $l['admin']['comments_anonym']; … … 186 187 $mail['headers'] .= "\r\nX-Mailer: PHP/".phpversion(); 187 188 188 $mail['text'] = $l['admin']['comments_mail_txt']." »".$blogentry['topic']."«\n- -\n";189 $mail['text'] = $l['admin']['comments_mail_txt']." »".$blogentry['topic']."«\n- -\n"; 189 190 if(!empty($com_form['name'])) $mail['text'] .= $com_form['name']; 190 191 else $mail['text'] .= $l['admin']['comments_anonym']; … … 202 203 203 204 $mail['topic'] = $l['comments_mailsubject']." - ".$blogentry['topic']; 204 $mail['headers'] = "From: ".JLOG_WEBSITE." <".JLOG_EMAIL.">\r\n" 205 $mail['headers'] = "MIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n"; 206 $mail['headers'] .= "From: ".JLOG_WEBSITE." <".JLOG_EMAIL.">\r\n" 205 207 ."X-Mailer: PHP/".phpversion(); 206 208 207 $mail['all_text'] = $l['comments_mail_txt']." »".$blogentry['topic']."«\n- -\n";209 $mail['all_text'] = $l['comments_mail_txt']." »".$blogentry['topic']."«\n- -\n"; 208 210 if(!empty($com_form['name'])) $mail['all_text'] .= $com_form['name']; 209 211 else $mail['all_text'] .= $l['comments_anonym']; trunk/scripts/general.func.php
r1675 r1682 275 275 <a href="logout.php">'.$l['admin']['menu_logout'].'</a> 276 276 </p>'; 277 278 ### Plugin Hook 279 $o = $plugins->callHook('adminMenu', $o); 280 277 281 return $o; 278 282 } trunk/scripts/jlogPlugins.class.php
r1663 r1682 5 5 6 6 /* Hooks */ 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 7 function hook_body ($t) { return $t; } // string body 8 function hook_commentForm ($t) { return $t; } // string with comment form output + array with form data 9 function hook_adminContent ($t) { return $t; } // string content 10 function hook_newComment ($t) { return $t; } // array form data 11 function hook_updateComment ($t) { return $t; } // array form data 12 function hook_deleteComment ($t) { return $t; } // string comment id 13 function hook_showComment ($t) { return $t; } // string comment output 14 function hook_onUpdate ($t) { return $t; } // array with all rss feeds and sub 15 function hook_doEntry ($t) { return $t; } // string with entry + array with data from database + string count comments + string section 16 function hook_doTeaser ($t) { return $t; } // string with entry + array with data from database + string count comments + string pre + string post 17 function hook_bbcode ($t) { return $t; } // bbcode object 18 function hook_bbcomments ($t) { return $t; } // bbcomments object 19 function hook_adminForm ($t) { return $t; } // admin formular 20 function hook_insertEntry ($t) { return $t; } // int id + array with form data 21 function hook_updateEntry ($t) { return $t; } // int id + array with form data 22 function hook_permalink ($t) { return $t; } // string permalink + string date + string url + string section 23 function hook_xmlrpcPermalink ($t) { return $t; } // string url 24 24 function hook_countComments ($t) { return $t; } // array with id and count 25 25 function hook_adminMail ($t) { return $t; } // array with mail + array blogentry 26 26 function hook_commentorMail ($t) { return $t; } // array with mail + array blogentry 27 27 function hook_commentAdminList($t) { return $t; } // string with actual tr + array with comment data 28 28 function hook_previewComment ($t) { return $t; } // same as newComment 29 function hook_dispatchLogin ($t) { return $t; } // 30 function hook_loginForm ($t) { return $t; } // 31 function hook_adminMenu ($t) { return $t; } // string with the admin menu html 29 32 } 30 33
