Changeset 1754

Timestamp:

09/20/2008 07:29:43 PM (4 months ago)

Author:

driehle

Message:

continuing cleanup, adjusted (hopefully) all code to use new php clases

Location:

branches/1.5/lib

Files:

• Jlog/Bbcode.php (modified) (5 diffs)
• Jlog/Categories.php (modified) (9 diffs)
• Jlog/Comments.php (modified) (8 diffs)
• Jlog/Db.php (modified) (3 diffs)
• Jlog/Db/Query.php (modified) (1 diff)
• Jlog/Feeds.php (modified) (4 diffs)
• Jlog/Functions.php (modified) (6 diffs)
• Jlog/Language.php (added)
• Jlog/Plugin (added)
• Jlog/Plugin/Basic.php (added)
• Jlog/Plugin/Manager.php (moved) (moved from branches/1.5/lib/Jlog/Plugins.php) (2 diffs)
• Jlog/Update.php (modified) (2 diffs)
• Jlog/YearLinks.php (modified) (3 diffs)
• Pear (added)
• Pear/HttpRequest.php (moved) (moved from branches/1.5/lib/Jlog/HttpRequest.php)
• bootstrap.php (modified) (3 diffs)

branches/1.5/lib/Jlog/Bbcode.php

@@ -71 +71 @@
             else return true;
         }
-                $title = empty($attributes["title"]) ? "" : " title='".$attributes["title"]."'";
+        $title = empty($attributes["title"]) ? "" : " title='".$attributes["title"]."'";
     
         if (isset($attributes['class']) AND isset($attributes['caption'])) $class_caption = " class='img ".htmlspecialchars($attributes['class'])."'";
@@ -99 +99 @@
         
         $bbcode = new StringParser_BBCode ();
-        $bbcode->addFilter (STRINGPARSER_FILTER_PRE, 'convertlinebreaks');
-        $bbcode->addFilter (STRINGPARSER_FILTER_POST, 'special_character');
+        $bbcode->addFilter (STRINGPARSER_FILTER_PRE, array(&$this, 'convertlinebreaks'));
+        $bbcode->addFilter (STRINGPARSER_FILTER_POST, array(&$this, 'special_character'));
         
         $bbcode->addParser (array ('block', 'inline', 'link', 'listitem'), 'htmlspecialchars');
@@ -119 +119 @@
                                 'block', array('block', 'listitem'), array('inline', 'link'));
         
-        $bbcode->addCode ('url', 'usecontent?', array($this, 'do_bbcode_url'), array ('usecontent_param' => 'default'),
+        $bbcode->addCode ('url', 'usecontent?', array(&$this, 'do_bbcode_url'), array ('usecontent_param' => 'default'),
                           'link', array ('listitem', 'block', 'inline'), array ('link'));
         
-        $bbcode->addCode ('img', 'usecontent', array($this, 'do_bbcode_img'), array (),
+        $bbcode->addCode ('img', 'usecontent', array(&$this, 'do_bbcode_img'), array (),
                           'image', array ('listitem', 'block', 'inline', 'link'), array ());
         
-        $bbcode->addCode ('html', 'usecontent', array($this, 'do_bbcode_html'), array (),
+        $bbcode->addCode ('html', 'usecontent', array(&$this, 'do_bbcode_html'), array (),
                           'html', array ('listitem', 'block', 'inline', 'link'), array ('image'));
         
@@ -165 +165 @@
         // BBCode for comments
         $bbcomments = new StringParser_BBCode ();
-        $bbcomments->addFilter (STRINGPARSER_FILTER_PRE, 'convertlinebreaks');
-        $bbcomments->addFilter (STRINGPARSER_FILTER_POST, 'special_character');
+        $bbcomments->addFilter (STRINGPARSER_FILTER_PRE, array(&$this, 'convertlinebreaks'));
+        $bbcomments->addFilter (STRINGPARSER_FILTER_POST, array(&$this, 'special_character'));
         
         $bbcomments->addParser (array ('block', 'inline', 'link'), 'htmlspecialchars');
@@ -176 +176 @@
         $bbcomments->addCode ('i', 'simple_replace', null, array ('start_tag' => '<em>', 'end_tag' => '</em>'),
                           'inline', array ('block', 'inline', 'link'), array ());
-        $bbcomments->addCode ('url', 'usecontent?', array($this, 'do_bbcode_url'), array ('usecontent_param' => 'default'),
+        $bbcomments->addCode ('url', 'usecontent?', array(&$this, 'do_bbcode_url'), array ('usecontent_param' => 'default'),
                           'link', array ('block', 'inline'), array ('link'));
         $bbcomments->addCode ('quote', 'simple_replace', null, array('start_tag' => '<blockquote>', 'end_tag' => '</blockquote>'),

branches/1.5/lib/Jlog/Categories.php

@@ -6 +6 @@
 
     var $categories = array();
-    var $l = array();
-
-    function Categories($l) {
-        $this->l = $l;
+    var $l = null;
+
+    function Jlog_Categories() {
+        global $JLOG;
+        $this->l = &$JLOG['language'];
     
         $this->get_categories();
@@ -74 +75 @@
     
         if(count($this->categories) > 0) {
-            $output = "     <p><label for='categories'>".$this->l['admin']['categories']."</label><br />\n"
+            $output = "     <p><label for='categories'>".$this->l->_('admin.categories')."</label><br />\n"
                         ."      <select id='categories' name='categories[]' size='4' multiple='multiple'>\n"
-                        ."       <option value='no_categories'>".$this->l['admin']['no_categories']."</option>\n";
+                        ."       <option value='no_categories'>".$this->l->_('admin.no_categories')."</option>\n";
     
            foreach($this->categories AS $id => $data) {
@@ -107 +108 @@
             }
         }
-        if(isset($output)) return " <span title='".$this->l['content_cat_linklist']."' class='catlinklist'>&raquo; ".$output."</span>";
+        if(isset($output)) return " <span title='".$this->l->_('content_cat_linklist')."' class='catlinklist'>&raquo; ".$output."</span>";
     }
     
@@ -123 +124 @@
     
     function link($id) {
-        if(JLOG_CLEAN_URL) return "<a title='".$this->l['content_cat_link']."' href='".JLOG_PATH."/cat/".$this->categories[$id]['url']."/'>".$this->categories[$id]['name']."</a>";
-        else return "<a title='".$this->l['content_cat_link']."' href='".JLOG_PATH."/archive.php?cat=".$this->categories[$id]['url']."'>".$this->categories[$id]['name']."</a>";
+        if(JLOG_CLEAN_URL) return "<a title='".$this->l->_('content_cat_link')."' href='".JLOG_PATH."/cat/".$this->categories[$id]['url']."/'>".$this->categories[$id]['name']."</a>";
+        else return "<a title='".$this->l->_('content_cat_link')."' href='".JLOG_PATH."/archive.php?cat=".$this->categories[$id]['url']."'>".$this->categories[$id]['name']."</a>";
     }
     
@@ -131 +132 @@
         <table>
          <tr>
-          <th>".$this->l['admin']['change']."</th>
-          <th>".$this->l['admin']['delete']."</th>
-          <th>".$this->l['admin']['cat_name']."</th>
+          <th>".$this->l->_('admin.change')."</th>
+          <th>".$this->l->_('admin.delete')."</th>
+          <th>".$this->l->_('admin.cat_name')."</th>
          </tr>";
     
@@ -139 +140 @@
             $output .= "
          <tr>
-          <td><a href='".add_session_id_to_url("?action=change&amp;id=".$id)."'><img src='".JLOG_PATH."/img/JLOG_edit.png' alt='".$this->l['admin']['change']."' /></a></td>
-          <td><a href='".add_session_id_to_url("?action=trash&amp;id=".$id)."'><img src='".JLOG_PATH."/img/JLOG_trash.png' alt='".$this->l['admin']['delete']."' /></a></td>
+          <td><a href='".add_session_id_to_url("?action=change&amp;id=".$id)."'><img src='".JLOG_PATH."/img/JLOG_edit.png' alt='".$this->l->_('admin.change')."' /></a></td>
+          <td><a href='".add_session_id_to_url("?action=trash&amp;id=".$id)."'><img src='".JLOG_PATH."/img/JLOG_trash.png' alt='".$this->l->_('admin.delete')."' /></a></td>
           <td>".$this->link($id)."</td>
          </tr>\n";
@@ -154 +155 @@
         <form id='entryform' action='?action=".$action."' method='POST'>
          <fieldset><legend>".$legend."</legend>
-         <p><label for='name'>".$this->l['admin']['cat_name']."</label><br />
+         <p><label for='name'>".$this->l->_('admin.cat_name')."</label><br />
           <input id='name' name='name' class='long' maxlength='255' size='60' type='text' value='".$form_input['name']."' /></p>
-         <p><label for='url'>".$this->l['admin']['cat_url']."</label><br />
+         <p><label for='url'>".$this->l->_('admin.cat_url')."</label><br />
           <input id='url' name='url' class='long' maxlength='100' size='60' type='text' value='".$form_input['url']."' />
           <input name='id' type='hidden' value='".$form_input['id']."' /></p>
-         <p><label for='description'>".$this->l['admin']['cat_description']."</label><br />
+         <p><label for='description'>".$this->l->_('admin.cat_description')."</label><br />
           <textarea id='description' name='description' class='short'>".$form_input['description']."</textarea></p>
-         <p><input type='submit' name='form_submit' value='".$this->l['admin']['submit']."' />
-          <a href='".add_session_id_to_url("categories.php")."'>".$this->l['admin']['cancel']."</a>
+         <p><input type='submit' name='form_submit' value='".$this->l->_('admin.submit')."' />
+          <a href='".add_session_id_to_url("categories.php")."'>".$this->l->_('admin.cancel')."</a>
           ".add_session_id_input_tag()."</p>
         </fieldset>
@@ -235 +236 @@
     
     function validate($form_input) {
-        if(empty($form_input['name'])) $errors[] = $this->l['admin']['cat_noname'];
-
-        if(empty($form_input['url'])) $errors[] = $this->l['admin']['no_url'];
-        elseif(!preg_match("/^[a-z0-9\-_\.,]+$/", $form_input['url'])) $errors[] = $this->l['admin']['false_url_letters'];
+        if(empty($form_input['name'])) $errors[] = $this->l->_('admin.cat_noname');
+
+        if(empty($form_input['url'])) $errors[] = $this->l->_('admin.no_url');
+        elseif(!preg_match("/^[a-z0-9\-_\.,]+$/", $form_input['url'])) $errors[] = $this->l->_('admin.false_url_letters');
         else {
             $sql = "SELECT id FROM ".JLOG_DB_CATEGORIES." WHERE url = '".escape_for_mysql($form_input['url'])."';";
@@ -253 +254 @@
             if($check_url->numRows() > 0) {
                 $c = $check_url->fetch();
-                if($c['id'] != $form_input['id']) $errors[] = $this->l['admin']['cat_duplicate'];
+                if($c['id'] != $form_input['id']) $errors[] = $this->l->_('admin.cat_duplicate');
             }
         }

branches/1.5/lib/Jlog/Comments.php

@@ -3 +3 @@
 class Jlog_Comments
 {
+    var $l = null;
+    
+    function Jlog_Comments()
+    {
+        global $JLOG;
+        $this->l = &$JLOG['language'];
+    }
+    
     function com_form_output($com_form) {
-        global $l, $plugins;
         $com_form = array_htmlspecialchars($com_form);
         if(!isset($com_form['content'])) $com_form['content'] = "";
@@ -10 +17 @@
         $output = "
         <form method='post' action='#entryform' id='entryform'>
-        <fieldset><legend>".$l['comments_entryform']."</legend>
+        <fieldset><legend>".$this->l->_('comments_entryform')."</legend>
         <p class='xmp'>
-         <span>".$l['comments_bbcode']."
+         <span>".$this->l->_('comments_bbcode')."
           <a onclick=\"jlog_learnbb('".JLOG_PATH."'); return false;\" href='".JLOG_PATH."/learn_bb.php'>BBcode</a>?
          </span>
@@ -20 +27 @@
         <p>
          <input class='userdata' type='text' name='name' value='".$com_form['name']."'
-          onfocus=\"if(this.value &amp;&amp; this.value=='".$l['comments_name']."')this.value=''\"
-          onblur=\"if(this.value=='') this.value='".$l['comments_name']."'\" />
+          onfocus=\"if(this.value &amp;&amp; this.value=='".$this->l->_('comments_name')."')this.value=''\"
+          onblur=\"if(this.value=='') this.value='".$this->l->_('comments_name')."'\" />
          <input class='userdata' type='text' name='city' value='".$com_form['city']."'
-          onfocus=\"if(this.value &amp;&amp; this.value=='".$l['comments_city']."')this.value=''\"
-          onblur=\"if(this.value=='') this.value='".$l['comments_city']."'\" /><br />
+          onfocus=\"if(this.value &amp;&amp; this.value=='".$this->l->_('comments_city')."')this.value=''\"
+          onblur=\"if(this.value=='') this.value='".$this->l->_('comments_city')."'\" /><br />
          <input class='userdata' type='text' name='email' value='".$com_form['email']."'
-          onfocus=\"if(this.value &amp;&amp; this.value=='".$l['comments_email']."')this.value=''\"
-          onblur=\"if(this.value=='') this.value='".$l['comments_email']."'\" />
+          onfocus=\"if(this.value &amp;&amp; this.value=='".$this->l->_('comments_email')."')this.value=''\"
+          onblur=\"if(this.value=='') this.value='".$this->l->_('comments_email')."'\" />
          <input class='userdata' type='text' name='homepage' value='".$com_form['homepage']."' />
         </p>
@@ -33 +40 @@
          <input type='checkbox' id='mail_by_comment' name='mail_by_comment' ";
         if(isset($com_form['mail_by_comment']) AND $com_form['mail_by_comment'] == 1) $output .= "checked='checked'";
-        $output .= " value='1' /> <label for='mail_by_comment'>".$l['comments_mail_by_comment']."</label>&nbsp;";
+        $output .= " value='1' /> <label for='mail_by_comment'>".$this->l->_('comments_mail_by_comment')."</label>&nbsp;";
         if(defined('JLOG_ADMIN')) $output .= "\n     <input type='hidden' value='".$com_form['id']."' name='id' />\n";
         else {
             $output .= "   <input type='checkbox' id='cookie' name='cookie' ";
             if(isset($com_form['cookie']) AND $com_form['cookie'] == 1) $output .= "checked='checked'";
-            $output .= " value='1' /> <label for='cookie'>".$l['comments_save_data']."</label>\n";
+            $output .= " value='1' /> <label for='cookie'>".$this->l->_('comments_save_data')."</label>\n";
         }
         $output .= "     <input type='hidden' value='".$com_form['sid']."' name='sid' />
         </p>
         <p>
-         <input class='send' type='submit' name='form_submitted' value='".$l['comments_preview']."' onclick=\"this.form.action = '#preview'\" />
-         <input class='send' type='submit' name='form_submitted' value='".$l['comments_send']."' />";
+         <input class='send' type='submit' name='form_submitted' value='".$this->l->_('comments_preview')."' onclick=\"this.form.action = '#preview'\" />
+         <input class='send' type='submit' name='form_submitted' value='".$this->l->_('comments_send')."' />";
         
         if(defined("JLOG_ADMIN")) $output .= add_session_id_input_tag();
@@ -61 +68 @@
     
     function com_javascript_variables() {
-        global $l;
         return "
         <script type='text/javascript'>
-        jlog_l_comments_show = '".$l['comments_show']."';
-        jlog_l_comments_hide = '".$l['comments_hide']."';
-        jlog_l_comments_bold = '".$l['comments_bold']."';
-        jlog_l_comments_italic = '".$l['comments_italic']."';
-        jlog_l_comments_quote = '".$l['comments_quote']."';
-        jlog_l_comments_url = '".$l['comments_url']."';
-        jlog_l_comments_plz_format_txt = '".$l['comments_plz_format_txt']."';
-        jlog_l_comments_url_href = '".$l['comments_url_href']."';
-        jlog_l_comments_url_node = '".$l['comments_url_node']."';
+        jlog_l_comments_show = '".$this->l->_('comments_show')."';
+        jlog_l_comments_hide = '".$this->l->_('comments_hide')."';
+        jlog_l_comments_bold = '".$this->l->_('comments_bold')."';
+        jlog_l_comments_italic = '".$this->l->_('comments_italic')."';
+        jlog_l_comments_quote = '".$this->l->_('comments_quote')."';
+        jlog_l_comments_url = '".$this->l->_('comments_url')."';
+        jlog_l_comments_plz_format_txt = '".$this->l->_('comments_plz_format_txt')."';
+        jlog_l_comments_url_href = '".$this->l->_('comments_url_href')."';
+        jlog_l_comments_url_node = '".$this->l->_('comments_url_node')."';
         </script>
         "; 
@@ -78 +84 @@
     
     function com_check_errors($com_form) {
-        global $l;
-        if(empty($com_form['sid'])) $errors[] = $l['comments_no_sid'];
-        if(isset($com_form['email']) AND $com_form['email'] != "" AND !preg_match("/^[^@]+@.+\.\D{2,6}$/", $com_form['email']) AND $com_form['email'] != $l['comments_email']) $errors[] = $l['comments_false_mail'];
-        if(empty($com_form['content'])) $errors[] = $l['comments_notext'];
+        if(empty($com_form['sid'])) $errors[] = $this->l->_('comments_no_sid');
+        if(isset($com_form['email']) AND $com_form['email'] != "" AND !preg_match("/^[^@]+@.+\.\D{2,6}$/", $com_form['email']) AND $com_form['email'] != $this->l->_('comments_email')) $errors[] = $this->l->_('comments_false_mail');
+        if(empty($com_form['content'])) $errors[] = $this->l->_('comments_notext');
         if(isset($errors)) return $errors;
     }
     
     function com_clean_data($data) {
-        global $l;
-        if(empty($data['name']) OR $data['name'] == $l['comments_name']) $data['name'] = "";
-        if(empty($data['city']) OR $data['city'] == $l['comments_city']) $data['city'] = "";
-        if(empty($data['email']) OR $data['email'] == $l['comments_email']) $data['email'] = "";
-        if(empty($data['homepage']) OR $data['homepage'] == $l['comments_homepage']) $data['homepage'] = "";
+        if(empty($data['name']) OR $data['name'] == $this->l->_('comments_name')) $data['name'] = "";
+        if(empty($data['city']) OR $data['city'] == $this->l->_('comments_city')) $data['city'] = "";
+        if(empty($data['email']) OR $data['email'] == $this->l->_('comments_email')) $data['email'] = "";
+        if(empty($data['homepage']) OR $data['homepage'] == $this->l->_('comments_homepage')) $data['homepage'] = "";
         
         if(empty($data['date'])) $data['date'] = time();
@@ -126 +130 @@
         $comment = "
         <li id='c".$data['id']."'>
-        <p class='meta'><a class='permalink' title='".$l['comments_permalink']."' href='#c".$data['id']."'>".$nr."</a> <cite>";
+        <p class='meta'><a class='permalink' title='".$this->l->_('comments_permalink')."' href='#c".$data['id']."'>".$nr."</a> <cite>";
         if(!empty($meta['homepage'])) $comment .= "<a title='".$meta['homepage']."' href='".$meta['homepage']."'>";
         if(!empty($meta['name'])) $comment .= $meta['name'];
-        else $comment .= $l['comments_anonym'];
+        else $comment .= $this->l->_('comments_anonym');
         if(!empty($meta['homepage'])) $comment .= "</a>";
         $comment .= "</cite>";
-        if(!empty($meta['city'])) $comment .= " ".$l['comments_from']." ".$meta['city'];
-        $comment .= " ".$l['comments_posted']." ".strftime(JLOG_DATE_COMMENT, $data['date']).":</p>\n".$bbcomments->parse($data['content'])."</li>";
+        if(!empty($meta['city'])) $comment .= " ".$this->l->_('comments_from')." ".$meta['city'];
+        $comment .= " ".$this->l->_('comments_posted')." ".strftime(JLOG_DATE_COMMENT, $data['date']).":</p>\n".$bbcomments->parse($data['content'])."</li>";
         
         ### Plugin Hook
@@ -140 +144 @@
         return $comment;
     }
+    
+    function registerGlobal()
+    {
+        global $JLOG;
+        $JLOG['comments'] = &$this;
+    }
 }
 

branches/1.5/lib/Jlog/Db.php

@@ -7 +7 @@
     {
         global $JLOG;
+        $l = &$JLOG['language'];
         
         // connect to database
         $connect = @mysql_connect(JLOG_DB_URL, JLOG_DB_USER, JLOG_DB_PWD);
         if ($connect == FALSE) {
-          mail(JLOG_EMAIL, $l['admin']['e_db'], $l['admin']['e_db_is']."\n".mysql_error());
-          die("<strong>".$l['db_error']."</strong><br />".$l['plz_try_again'].".");
+          mail(JLOG_EMAIL, $l->_('admin.e_db'), $l->_('admin.e_db_is')."\n".mysql_error());
+          die("<strong>".$l->_('db_error')."</strong><br />".$l->_('plz_try_again').".");
         }
         // select our database
         $select = @mysql_select_db(JLOG_DB);
         if ($connect == FALSE) {
-          mail(JLOG_EMAIL, $l['admin']['e_db'], $l['admin']['e_db_is']."\n".mysql_error());
-          die("<strong>".$l['db_error']."</strong><br />".$l['plz_try_again'].".");
+          mail(JLOG_EMAIL, $l->_('admin.e_db'), $l->_('admin.e_db_is')."\n".mysql_error());
+          die("<strong>".$l->_('db_error')."</strong><br />".$l->_('plz_try_again').".");
         }
         // do some settings
         @mysql_query("SET NAMES utf8");
         @mysql_query("SET sql_mode=''");
+    }
         
+    function registerGlobal()
+    {
+        global $JLOG;
         $JLOG['db'] = &$this;
     }
         
-        
     // escape input for mysql
-    function escape_for_mysql($_data) {
+    function escape($_data) {
         if (is_array($_data)) foreach($_data as $key => $val) $_data[$key] = escape_for_mysql($val);
         else $_data = mysql_escape_string($_data);
@@ -38 +42 @@
         $sql = "DELETE FROM ".$table." WHERE id = '".$id."' LIMIT 1";
             
-        require_once('Jlog/Db/Query.php');
-        $trash = new Jlog_Db_Query($sql);
+        $trash = $this->query($sql);
         if($trash->error()) {
             echo "<pre>\n";
@@ -48 +51 @@
         return true;
     }
+    
+    function query($sql)
+    {
+        require_once('Jlog/Db/Query.php');
+        return new Jlog_Db_Query($sql);
+    }
 }
 

branches/1.5/lib/Jlog/Db/Query.php

@@ -1 +1 @@
 <?php
+
 // call database class
-    class Query {
+class Jlog_Db_Query 
+{
     // Variablen
-     var $_sql = "";
-     var $_result = 0;
-     var $_errno = 0;
-     var $_error = "";
+    var $_sql = "";
+    var $_result = 0;
+    var $_errno = 0;
+    var $_error = "";
 
-       //Konstruktor
-        function Query($sql)
-        {
+    //Konstruktor
+    function Jlog_Db_Query($sql)
+    {
         // Query in der Klasse speichern
-                $this->_sql = trim($sql);
-                $this->_result = mysql_query($this->_sql);
-          if(!$this->_result) {
+        $this->_sql = trim($sql);
+        $this->_result = mysql_query($this->_sql);
+        if(!$this->_result) {
             $this->_errno = mysql_errno();
             $this->_error = mysql_error();
-          }       
-        }
+        }        
+    }
 
-       //Methoden
-        function error()
-        {
-        // Result-ID in einer tmp-Variablen speichern
-         $tmp = $this->_result;
-        // Variable in boolean umwandeln
-         $tmp = (bool)$tmp;
-        // Variable invertieren
-         $tmp = !$tmp;
-        // und zurÃŒckgeben
-         return $tmp;
-        }
+    //Methoden
+    function error()
+    {
+        return ($this->_result === false);
+    }
 
-        function getError() {
-         if($this->error()) {
+    function getError() {
+        if($this->error()) {
             $str  = "request:\n".$this->_sql."\n";
             $str .= "response:\n".$this->_error."\n";
             $str .= "Errorcode: ".$this->_errno;
-         } 
-         else $str = "No error.";
-         return $str;
-        }
-        function getErrno() {
-         return $this->_errno;
-        }
+        } 
+        else $str = "No error.";
+        return $str;
+    }
+    
+    function getErrno() {
+        return $this->_errno;
+    }
 
-        function fetch() {
-         if($this->error()) {
+    function fetch() {
+        if($this->error()) {
             echo "An Error has occurred, please check your MySQL-Query.";
             $return = null;
-         } 
-         else $return = mysql_fetch_assoc($this->_result);
-         return $return;
+        } 
+        else $return = mysql_fetch_assoc($this->_result);
+        return $return;
+    }
+
+    function numRows() {
+        if($this->error()) {
+            $return = -1;
         }
+        else $return = mysql_num_rows($this->_result);
+        return $return;
+    }
+    
+    function free() {
+        // Speicher freimachen
+        mysql_free_result($this->_result);
+    }
+}
 
-        function numRows() {
-         if($this->error()) {
-            $return = -1;
-         }
-         else $return = mysql_num_rows($this->_result);
-         return $return;
-        }
-        
-        function free() {
-        // Speicher freimachen
-         mysql_free_result($this->_result);
-        }
-
-    }
-?>
+// eof

branches/1.5/lib/Jlog/Feeds.php

@@ -14 +14 @@
     function update()
     {
+        global $JLOG;
+        $l = &$JLOG['language'];
+        
         $now_date = getdate();
         $data = array('rss' => '', 'rss_full' => '', 'sub' => '');
@@ -43 +46 @@
               <link>".htmlspecialchars(JLOG_PATH)."</link>
               <description>".htmlspecialchars(JLOG_DESCRIPTION)."</description>
-              <language>".$l['language']."</language>
+              <language>".$l->_('language')."</language>
               <lastBuildDate>".date('r')."</lastBuildDate>
               <docs>http://blogs.law.harvard.edu/tech/rss</docs>
@@ -63 +66 @@
                 if(isset($cc[$row['id']]) AND $cc[$row['id']] != 0) {
                     $tmp_comments = " <a class='comments' title='"
-                                  . $l['content_comments_title']."' href='"
+                                  . $l->_('content_comments_title')."' href='"
                                   . blog($row['date'], $row['url'])."#comments'>("
                                   . $cc[$row['id']].")</a>";
@@ -129 +132 @@
             if (is_writable($filename)) {
                 if (!$handle = fopen($filename, 'w')) {
-                    $errors[] .= $l['admin']['can_not_open']." ($filename)";
+                    $errors[] .= $l->_('admin.can_not_open')." ($filename)";
                 }
                 if (!fwrite($handle, $data[$d])) {
-                    $errors[] .= $l['admin']['can_not_write']." ($filename)";
+                    $errors[] .= $l->_('admin.can_not_write')." ($filename)";
                 }
                 fclose($handle);