Changeset 1731

Timestamp:

07/07/2008 09:00:38 PM (5 months ago)

Author:

jeena

Message:

Jlog does not need cookies to work in the admincenter anymore

Files:

• trunk/admin/blog.func.php (modified) (8 diffs)
• trunk/admin/categories.php (modified) (7 diffs)
• trunk/admin/change.php (modified) (1 diff)
• trunk/admin/comments.php (modified) (6 diffs)
• trunk/admin/index.php (modified) (4 diffs)
• trunk/admin/login.php (modified) (4 diffs)
• trunk/admin/media/upload-picture.php (modified) (2 diffs)
• trunk/admin/media/upload-teaser.php (modified) (2 diffs)
• trunk/admin/new.php (modified) (2 diffs)
• trunk/admin/plugin.php (modified) (2 diffs)
• trunk/admin/settings.php (modified) (1 diff)
• trunk/index.php (modified) (2 diffs)
• trunk/plugins/CommentCloser.jplug.php (modified) (1 diff)
• trunk/scripts/categories.class.php (modified) (2 diffs)
• trunk/scripts/comments.php (modified) (1 diff)
• trunk/scripts/general.func.php (modified) (1 diff)
• trunk/scripts/javascripts.js (modified) (1 diff)
• trunk/scripts/prepend.inc.php (modified) (1 diff)
• trunk/setup.php (modified) (2 diffs)

trunk/admin/blog.func.php

@@ -10 +10 @@
-    else {
-        $f = escape_for_mysql($form_input);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if($form_input['section'] == 'page') {
-            $sql = "SELECT id FROM ".JLOG_DB_CONTENT." WHERE url = '".$f['url']."';";
@@ -40 +53 @@
-     if(strlen(trim($form_input['teaserpic']) > 0) AND !is_file(JLOG_BASEPATH.'img'.DIRECTORY_SEPARATOR."t_".$form_input['teaserpic'])) {
-        $errors[] = $l['admin']['false_teaserpic'];
-
-
-
-
-
-
-
+
+
+
-    
-    if(strlen(trim($form_input['teaser'])) < 1) $errors[] = $l['admin']['no_teaser'];
-    if(strlen(trim($form_input['content'])) < 1) $errors[] = $l['admin']['no_content'];
+    
- return $errors;
-}
@@ -83 +93 @@
-          <input id='teaserpiconblog' name='teaserpiconblog' type='checkbox' value='1' ".$form_input['teaserpiconblog_check']." /> <label for='teaserpiconblog'>".$l['admin']['show_tpic_on_archive']."</label>
-          <script type='text/javascript'>
-label><input type='button' name='teaserupload' value='".$l['admin']['pic_upload']."' onclick='jlog_wopen(\\\"upload-teaser\\\");' /><input type='button' name='teaserchose' value='".$l['admin']['pic_choose']."' onclick='jlog_wopen(\\\"select-teaser\\\");' /></label
+input type='button' name='teaserupload' value='".$l['admin']['pic_upload']."' onclick='jlog_wopen(\\\"".add_session_id_to_url("media/upload-teaser.php")."\\\");' /><input type='button' name='teaserchose' value='".$l['admin']['pic_choose']."' onclick='jlog_wopen(\\\"".add_session_id_to_url("media/select-teaser.php")."\\\");' /
-          </script>
-         </p>
@@ -93 +103 @@
-    <fieldset><legend>".$l['admin']['contentdata']."</legend>
-     <script type='text/javascript'>
-p><label for='content'>".$l['admin']['contentpic_choose']."</label><br /><input name='imgupload' type='button' value='".$l['admin']['pic_upload']."' onclick='jlog_wopen(\\\"upload-picture\\\");' /><input name='imgselect' type='button' value='".$l['admin']['pic_choose']."' onclick='jlog_wopen(\\\"select-picture\\\");' /></p
+br /><label for='content'>".$l['admin']['contentpic_choose']."</label><br /><input name='imgupload' type='button' value='".$l['admin']['pic_upload']."' onclick='jlog_wopen(\\\"".add_session_id_to_url("media/upload-picture.php")."\\\");' /><input name='imgselect' type='button' value='".$l['admin']['pic_choose']."' onclick='jlog_wopen(\\\"".add_session_id_to_url("media/select-picture.php")."\\\");' /
-     </script>
-    <p><label for='content'>".$l['admin']['content']." (".$l['admin']['howto_bbcode'].")</label><br /><br id='bbcode' />
@@ -102 +112 @@
-       <input type='hidden' name='id' value='".$form_input['id']."' />
-       <input type='hidden' name='date' value='".$form_input['date']."' />
+       ".add_session_id_input_tag()."
-    </p>
-    </fieldset>
@@ -159 +170 @@
-                '".$form_input['url']."',
-                '".$form_input['section']."',
-    
+
-                '".$form_input['teaser']."',
-                '".$form_input['teaserpic']."',
@@ -204 +215 @@
-global $l, $categories;
-
-
-
-
-
+
-
-    $blog = new Query($sql);
@@ -301 +309 @@
- return $l['admin']['postleted'];
-}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/admin/categories.php

@@ -3 +3 @@
- define("JLOG_ADMIN", true);
- require_once('..'.DIRECTORY_SEPARATOR.'scripts'.DIRECTORY_SEPARATOR.'prepend.inc.php');
+ require(JLOG_BASEPATH.'admin'.DIRECTORY_SEPARATOR.'blog.func.php');
+
- $get = strip($_GET);
- $form_input = strip($_POST);
@@ -16 +18 @@
-                                        $categories->new_cat($form_input);
-                                        $categories->get_categories();
-?action=new
+".add_session_id_to_url("?action=new")."
-                                                                         ".$categories->output_whole_list_admin();
-                                }
-                                else {
-                                        $c['main'] .= error_output($errors);
-$action = 
+
-                                }
-                        }
-$action = 
+
-                        break;
-
@@ -36 +38 @@
-                                else {
-                                        $c['main'] .= error_output($errors);
-$action = 
+
-                                }
-                        }
@@ -45 +47 @@
-                                $form_input['description'] = $categories->get($get['id'], 'description');
-                                
-$action = 
+
-                        }
-                        break;
@@ -54 +56 @@
-                                $categories->get_categories();
-                                $c['main'] .= "<p>".$l['admin']['cat_trash_ok']."
-categories.php
+".add_session_id_to_url("categories.php")."
-                        }
-                        else {
@@ -62 +64 @@
-                                                <p><input type='submit' name='form_submit' value='".$l['admin']['yes']."' />
-                                                   <input type='hidden' name='id' value='".$get['id']."' />
-
+
+
-                                               </form>";
-                        }
@@ -68 +71 @@
-                
-                default:
-?action=new
+".add_session_id_to_url("?action=new")."
-                                                          ".$categories->output_whole_list_admin();
-        }

trunk/admin/change.php

@@ -16 +16 @@
- include_once(JLOG_BASEPATH.'scripts'.DIRECTORY_SEPARATOR.'update.php');
-}
-trash
+"trash"
- $c['main'] .= "
-   <form method='post' id='entryform' action='".$_SERVER['PHP_SELF']."?id=".$get['id']."&amp;action=trash' accept-charset='UTF-8'>
-         <p>".$l['admin']['rearly_delete']." <input class='send' type='submit' name='trash' value='".$l['admin']['yes']."' />
+          ".add_session_id_input_tag()."
-          <a href='".JLOG_PATH."/admin/'>".$l['admin']['no']."</a></p>
-   </form>";

trunk/admin/comments.php

@@ -4 +4 @@
-define("JLOG_COMMENTS", true); 
-require_once('..'.DIRECTORY_SEPARATOR.'scripts'.DIRECTORY_SEPARATOR.'prepend.inc.php');
+require(JLOG_BASEPATH.'admin'.DIRECTORY_SEPARATOR.'blog.func.php');
-
-$get = strip($_GET); 
@@ -24 +25 @@
-elseif ($get['action'] == 'trash' AND empty($data['trash'])) { 
-$c['main'] .= " 
-".$_SERVER['PHP_SELF']."
+comments.php
-     <p>".$l['admin']['kill_c_sure']." 
-
-
+
+
+
-   </form>"; 
-    
@@ -49 +51 @@
-
-  $l["comments_comment_topic"]   = $l['admin']["comments_comment_topic"]; 
-  
+
-  $l["comments_name"]            = $l['admin']["comments_name"]; 
-  $l["comments_city"]            = $l['admin']["comments_city"]; 
@@ -112 +114 @@
-               die(); 
-            }
-comments.php
+".add_session_id_to_url("comments.php")."
-            include_once(JLOG_BASEPATH.'scripts'.DIRECTORY_SEPARATOR.'update.php'); 
-        }
@@ -142 +144 @@
-}
-else { 
-JLOG_PATH."/admin/comments.php"
+add_session_id_to_url(JLOG_PATH."/admin/comments.php")
-
-  $c['main'] .= " 
@@ -190 +192 @@
-       $comment = " 
-      <tr> 
-?id=".$daten['id']."&amp;action=change
-?id=".$daten['id']."&amp;action=trash
+".add_session_id_to_url("?id=".$daten['id']."&amp;action=change")."
+".add_session_id_to_url("?id=".$daten['id']."&amp;action=trash")."
-       <td><a href='".blog($daten['reference_date'], $daten['url'])."#c".$daten['id']."'>".$daten['id']."</a></td> 
-       <td>".$email_a.$daten['name'].$email_b."</td> 

trunk/admin/index.php

@@ -3 +3 @@
- define("JLOG_ADMIN", true);
- require_once('..'.DIRECTORY_SEPARATOR.'scripts'.DIRECTORY_SEPARATOR.'prepend.inc.php');
+ require(JLOG_BASEPATH.'admin'.DIRECTORY_SEPARATOR.'blog.func.php');
-
- $get = strip($_GET);
-JLOG_PATH."/admin/"
+add_session_id_to_url(JLOG_PATH."/admin/")
-
-    if(isset($get['show']) AND $get['show'] == 'page') {
-index.php?show=weblog
+".add_session_id_to_url("?show=weblog")."
-        $where = "section = 'page'";
-    }
-    else {
-?show=page
+".add_session_id_to_url("?show=page")."
-        $where = "YEAR(date) = '".escape_for_mysql($yl->get_selected_year())
-                  ."' AND section = 'weblog'";
@@ -25 +26 @@
- $c['main'] .= output_admin_menu()." 
- <h2>".$l['admin']['admin_headline']."</h2>
-new.php
+".add_session_id_to_url("new.php")."
-  <p>".$l['admin']['section_show'].": ".$show_section."</p>".$year_menu."
-  <table>
@@ -55 +56 @@
-     $list = "
-    <tr>
-change.php?id=".$daten['id']
-change.php?id=".$daten['id']
+".add_session_id_to_url("change.php?id=".$daten['id'])
+".add_session_id_to_url("change.php?id=".$daten['id'])
-     <td>".strftime(JLOG_DATE_SUBCURRENT, $daten['date'])."</td>
-     <td>".htmlspecialchars($daten['topic'], ENT_QUOTES)."</td>
@@ -71 +72 @@
-require(JLOG_BASEPATH.'scripts'.DIRECTORY_SEPARATOR.'do_template.php');
-echo $body;
-
+
+

trunk/admin/login.php

@@ -10 +10 @@
- define("JLOG_LOGIN", true);
- require_once('..'.DIRECTORY_SEPARATOR.'scripts'.DIRECTORY_SEPARATOR.'prepend.inc.php');
+ require(JLOG_BASEPATH.'admin'.DIRECTORY_SEPARATOR.'blog.func.php');
+
- $false_password = "";
- $get = strip($_GET);
@@ -26 +28 @@
-                if ( md5( $passwort ) == JLOG_ADMIN_PASSWORD) {
-                $_SESSION['logged_in'] = true;
+                
-                if ($_SERVER['SERVER_PROTOCOL'] == 'HTTP/1.1') {
-                        if (php_sapi_name() == 'cgi') header('Status: 303 See Other');
-                        else header('HTTP/1.1 303 See Other');
-                }
-
+
+
-                        if(!empty($url)) $path = $url;
-
+
+
-                        exit;
-                }
@@ -38 +43 @@
-                        $false_password = "  <p class='error'>".$l['admin']['login_false_pw']."</p>\n";
-                }
+  }
+  else {
+      setcookie("cookieallowed", "true", time() + 180);
-  }
-      
@@ -48 +56 @@
-      <input class="userdata" id="password" type="password" name="password" />
-      <input style="display: none;" name="username" type="text" value="do-not-change" /></p>
-   <p>'.$l['admin']['login_cookies'].'</p>
-   <p><input type="hidden" name="url" value="'.(!empty($get['url']) ? $get['url'] : $post['url']).'" />
-      <input type="submit" value="'.$l['admin']['login_send'].'" /></p>

trunk/admin/media/upload-picture.php

@@ -3 +3 @@
- define("JLOG_ADMIN", true);
- require_once('..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'scripts'.DIRECTORY_SEPARATOR.'prepend.inc.php');
+ require_once('..'.DIRECTORY_SEPARATOR.'blog.func.php');
-
- $max_file_size = 300000;
@@ -77 +78 @@
- <form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post" enctype="multipart/form-data" accept-charset="UTF-8">
-  <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $max_file_size ?>">
+  <?php echo add_session_id_input_tag() ?>
-  <input type="file" name="probe" /><br><br>
-  <input type="submit" value="<?php echo $l['admin']['pic_upload'] ?>">

trunk/admin/media/upload-teaser.php

@@ -3 +3 @@
- define("JLOG_ADMIN", true);
- require_once('..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'scripts'.DIRECTORY_SEPARATOR.'prepend.inc.php');
+ require_once('..'.DIRECTORY_SEPARATOR.'blog.func.php');
-
- $max_file_size = 60000;
@@ -81 +82 @@
- <form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post" enctype="multipart/form-data" accept-charset="UTF-8">
-  <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $max_file_size ?>">
+  <?php echo add_session_id_input_tag() ?>
-  <input type="file" name="probe" /><br><br>
-  <input type="submit" value="<?php echo $l['admin']['pic_upload'] ?>">

trunk/admin/new.php

@@ -9 +9 @@
- $c['main'] .= "<h2>".$l['admin']['new_post']."</h2>";
- $form_input = strip($_POST);
-time(
+strftime("%Y-%m-%d %H:%M:%s"
-
-if($_POST['form_submitted'] == $l['admin']['preview']) {
@@ -100 +100 @@
-  if(isset($response)) return '<li>'.$url['host'].' '.$response.'</li>';
-}
-
+
+

trunk/admin/plugin.php

@@ -3 +3 @@
- define("JLOG_ADMIN", true);
- require_once('..'.DIRECTORY_SEPARATOR.'scripts'.DIRECTORY_SEPARATOR.'prepend.inc.php');
+ require(JLOG_BASEPATH.'admin'.DIRECTORY_SEPARATOR.'blog.func.php');
-
-  $get = strip($_GET);
@@ -18 +19 @@
-                if(substr($file, -10) === '.jplug.php') {
-                    $pluginName = substr($file, 0, -10);
-?jplug=".$pluginName
+".add_session_id_to_url("?jplug=".$pluginName)
-                }
-            }

trunk/admin/settings.php

@@ -5 +5 @@
- require(JLOG_BASEPATH.'scripts'.DIRECTORY_SEPARATOR.'url_syntax.php');
- require(JLOG_BASEPATH.'scripts'.DIRECTORY_SEPARATOR.'settings.class.php');
+ require(JLOG_BASEPATH.'admin'.DIRECTORY_SEPARATOR.'blog.func.php');
-
- $c['meta']['title'] = $l['admin']['m_title'];

trunk/index.php

@@ -81 +81 @@
-if($number_of > JLOG_MAX_BLOG_BIG + JLOG_MAX_BLOG_ORGINAL) $c['main'] .= "\n  <ul class='entries'>";
-
-ￜ
+À
-$linklist = false;
-while ($cd = $blog->fetch()) {
@@ -101 +101 @@
-  <p class='archivelink'>".$l['content_archive']." <a href='".archive()."'>".$l['content_archivelink']."</a>.</p>";
-
-ￜ
+Ì
-require(JLOG_BASEPATH.'scripts'.DIRECTORY_SEPARATOR.'do_template.php');
-echo $body;
-
+
+

trunk/plugins/CommentCloser.jplug.php

@@ -87 +87 @@
-                        $output .= "\">{$this->_unit_desc[$i]}</option>";
-                }
-
+
+
+
-                $output .= <<<EOT
-        </select>
-automatisch
-<input type="submit" name="commclose_do" value="schlie&#223;en" />.</p>

trunk/scripts/categories.class.php

@@ -127 +127 @@
-            $output .= "
-         <tr>
-?action=change&amp;id=".$id
-?action=trash&amp;id=".$id
+".add_session_id_to_url("?action=change&amp;id=".$id)
+".add_session_id_to_url("?action=trash&amp;id=".$id)
-          <td>".$this->link($id)."</td>
-         </tr>\n";
@@ -150 +150 @@
-          <textarea id='description' name='description' class='short'>".$form_input['description']."</textarea></p>
-         <p><input type='submit' name='form_submit' value='".$this->l['admin']['submit']."' />
-
+
+
-        </fieldset>
-        </form>";

trunk/scripts/comments.php

@@ -42 +42 @@
-    <p>
-     <input class='send' type='submit' name='form_submitted' value='".$l['comments_preview']."' onclick=\"this.form.action = '#preview'\" />
-
+
+
+
+
+
-    </p>
-    </fieldset>

trunk/scripts/general.func.php

@@ -266 +266 @@
-}
-
-// output the administration menu
-function output_admin_menu() {
-global $l, $plugins;
-        $o = '<p id="admin-menu">
- <a href="./">'.$l['admin']['menu_home'].'</a> |
- <a href="categories.php">'.$l['admin']['menu_categories'].'</a> |
- <a href="comments.php">'.$l['admin']['menu_comments'].'</a> |
- <a href="settings.php">'.$l['admin']['menu_settings'].'</a> |
- <a href="plugin.php">'.$l['admin']['menu_plugins'].'</a> |
- <a href="logout.php">'.$l['admin']['menu_logout'].'</a>
-</p>';
-
-        ### Plugin Hook
-        $o = $plugins->callHook('adminMenu', $o);
-        
- return $o;
-}
-
-function my_serialize_cfg($arg) {   

trunk/scripts/javascripts.js

@@ -231 +231 @@
-
-/* Open popup to upload pictures in admincenter */
-
-
+
- winpops=window.open(popurl,'','width=350,height=350,scrollbars=yes');
-}

trunk/scripts/prepend.inc.php

@@ -25 +25 @@
-
-// load settings and version information
-
+// 
-require_once(dirname(__FILE__).DIRECTORY_SEPARATOR."..".DIRECTORY_SEPARATOR."personal".DIRECTORY_SEPARATOR."settings.inc.php");
-require_once(JLOG_BASEPATH."scripts".DIRECTORY_SEPARATOR."version.inc.php");

trunk/setup.php

@@ -30 +30 @@
-  $languages[] = $matches[1];
- }
-
+
+
+
+
+
- define('JLOG_LANGUAGE', $lang);
- 
@@ -310 +314 @@
-    return $cur_l;
-  }
-
-?>