Changeset 94

Timestamp:

16/10/08 19:03:47 (3 months ago)

Author:

royger

Message:

* Fixed Cookies #215
* Fixed error adding user #214
* Fixed empty form action #205
* Fixed autoload #191
* Added javascript event improvements by tn123 #187
* Fixed install problem on FreeBSD #212

Files:

• trunk/wtorrent/lib/cls/Web.cls.php (modified) (3 diffs)
• trunk/wtorrent/lib/inc/string.inc.php (modified) (3 diffs)
• trunk/wtorrent/lib/inc/utils.inc.php (modified) (1 diff)
• trunk/wtorrent/wt/cls/AddT.cls.php (modified) (2 diffs)
• trunk/wtorrent/wt/cls/Admin.cls.php (modified) (7 diffs)
• trunk/wtorrent/wt/js/ajax.js (modified) (2 diffs)
• trunk/wtorrent/wt/js/control.js (modified) (11 diffs)
• trunk/wtorrent/wt/js/display.js (deleted)
• trunk/wtorrent/wt/js/events.js (deleted)
• trunk/wtorrent/wt/tpl/admin.tpl.php (modified) (1 diff)
• trunk/wtorrent/wt/tpl/index.tpl.php (modified) (1 diff)
• trunk/wtorrent/wt/tpl/login.tpl.php (modified) (1 diff)

trunk/wtorrent/lib/cls/Web.cls.php

@@ -17 +17 @@
-
-Original class done by David Marco Martinez
-
-
+
-abstract class Web
-{
@@ -166 +165 @@
-        public function getURL()
-        {
-_SERVER
+this->_server
-        }
-        /**
@@ -322 +321 @@
-                $this->message[] = $message; 
-        }
-
-        abstract protected function construct( );
-}

trunk/wtorrent/lib/inc/string.inc.php

@@ -52 +52 @@
-        if (!get_magic_quotes_gpc())
-        {
-
+ $var
-        }
-        return _unescape_internal($var);
@@ -58 +58 @@
-function html( $str )
-{
-�'�
+Ò', '—'
-        return preg_replace( '/[^\x00-\x7F]/e', '"&#".ord("$0").";"', $str );
-
@@ -99 +99 @@
-        '}' => '}',
-        '~' => '~',
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
-�
+Ä
+Ç
+å
+é
+ë
+í
+ì
+î
+ï
+ñ
+ó
+ò
+ô
+ö
+õ
+ú
+ü
+°
+¢
+£
+§
+•
+¶
+ß
+®
+©
+™
+´
+¨
+≠
+Æ
+Ø
+∞
+±
+≤
+≥
+¥
+µ
+∂
+∑
+∏
+π
+∫
+ª
+º
+Ω
+æ
+ø
+¿'
+¡'
+¬'
+√'
+ƒ'
+≈'
+∆'
+«'
+»'
+…'
+ '
+À'
+Ã'
+Õ'
+Œ'
+œ'
+–'
+—'
+“'
+”'
+‘'
+’'
+÷'
+◊'
+ÿ'
+Ÿ'
+⁄'
+€'
+‹'
+›'
+fi'
+fl'
+‡' 
+·' 
+‚' 
+„' 
+‰' 
+Â' 
+Ê' 
+Á' 
+Ë' 
+È' 
+Í' 
+Î' 
+Ï' 
+Ì' 
+Ó' 
+Ô' 
+' =
+Ò' =
+Ú' =
+Û' =
+Ù' =
+ı' =
+ˆ' =
+˜' =
+¯' =>
+˘' =>
+˙' =>
+˚' =>
+¸' => 
+˝' => 
+˛
+ˇ
+å
+ú
+ä
+ö
+ü
+à
+ò
+ñ
+ó
+ë
+í
+Ç
+ì
+î
+Ñ
+Ü
+á
+â
+ã
+õ
-}
-?>

trunk/wtorrent/lib/inc/utils.inc.php

@@ -27 +27 @@
-function autoload( )
-{
-        //$str  = 'if( file_exists( \'../lib/cls/\'.$file ) ) require_once( \'../lib/cls/\'.$file );';
-        $str  = 'if( false );';
-        foreach( func_get_args( ) as $dir )
-
-
+
+
+
-        $cmd =
-        'function __autoload( $cls )

trunk/wtorrent/wt/cls/AddT.cls.php

@@ -18 +18 @@
-class AddT extends rtorrent
-{
-
-        public function construct()
-        {
@@ -145 +144 @@
-                $purl = parse_url( $url );
-                return implode(
- 
+
-                        $this->_db->queryColumnAll(
-id, value, hostnam
+valu
-                                $this->getIdUser(),
-                                "%{$purl['host']}%"

trunk/wtorrent/wt/cls/Admin.cls.php

@@ -22 +22 @@
-                if(isset($this->_request['adduser'])) $this->addUser($this->_request['user'], $this->_request['passwd'], $this->_request['admin'], $this->_request['default_dir'], $this->_request['force_dir']);
-                if(isset($this->_request['delete'])) $this->deleteUsers($this->_request['users']);
-
+
-                if(!$this->setClient())
-                        return false;
-
+
-                if(isset($this->_request['ch_dw'])) $this->setDownLimit($this->_request['down_rate']);
-                if(isset($this->_request['ch_up'])) $this->setUploadLimit($this->_request['up_rate']);
@@ -43 +43 @@
-
-        public function showUsers()
-    
+       
-                return $this->_db->queryAll('SELECT user, id, admin, dir, force_dir FROM tor_passwd');
-    
-    
-    
+       
+       
+       
-                if (!count($users) > 0)
-                {
@@ -56 +56 @@
-                $this->_db->modifyMany('DELETE FROM tor_passwd WHERE id = ?', $list);
-                $this->addMessage($this->_str['info_users_deleted']);
-    
-    
-    
+       
+       
+       
-                if (empty($user) || empty($passwd))
-   
+
-                        $this->addMessage($this->_str['err_users_add']);
-                        return;
@@ -67 +67 @@
-                $admin = $admin == 'on' ? 1 : 0;
-                $force_dir = $force_dir == 'on' ? 1 : 0;
-
-
+
-                        $user,
-                        md5($passwd),
@@ -74 +73 @@
-                        $dir,
-                        $force_dir
-
+       
-                $this->addMessage($this->_str['info_users_added']);
-    
-    
-    
-    
-    
-    
-    
-    
+       
+       
+       
+       
+       
+       
+       
+       
-                $result = $this->client->send($message);
-                //print_r($result);
@@ -90 +89 @@
-                else
-                        $this->addMessage($this->_str['err_down_limit']);       
-    
-    
-    
-    
+       
+       
+       
+       
-                $result = $this->client->send($message);
-                if($result->errno == 0)
@@ -99 +98 @@
-                else
-                        $this->addMessage($this->_str['err_up_limit']); 
-    
+       
-}

trunk/wtorrent/wt/js/ajax.js

@@ -77 +77 @@
-                }
-                this.lastMain = originalRequest.request.options.parameters;
-
-
-
-
+
-                postAjax();
-        },
@@ -90 +87 @@
-                $(id).removeClassName('loading');
-                this.display.openTorrent(id);
-
+
+
+
+
-        },
-        /* Reload main frame */

trunk/wtorrent/wt/js/control.js

@@ -5 +5 @@
-                this.display = new DisplayActions(effects);
-                this.events = new EventHandler();
-
+
+
+
+
+
+
+
+
+
+
+
-                /* Add all events listeners */
-                /* Torrent event listening */
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        },
-        /* Event handlers */
@@ -36 +73 @@
-                                /* The tab is empty, prepare content to load */
-                                var showLoad = this.ajax.showLoadTorrent.bind(this.ajax, id);
-loadPriorityTorrent.bind(this.events, this.torrentPriorityHandler.bindAsEventListener(this)
+bindAllHandlers(this.events
-                                var showResponse = this.ajax.showResponseTorrent.bind(this.ajax, id, afterFinish);
-                                var url = 'cls=General&tpl=details&hash=' + id;
@@ -86 +123 @@
-        },
-        confirmTorrentAction: function(el, message) {
-var torrent_names = '';
-var t;
+
+// make me an array
-                if(!Object.isArray(el)) 
-                {
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        },
-        /* Buttons handler */
@@ -140 +185 @@
-                /* Do the call */
-                this.ajax.load('messages', url, showLoad, showResponse);
-ajax.
+
-        },
-        /* View tabs handler */
@@ -173 +218 @@
-                var url = 'cls=' + cls + '&tpl=details&hash=' + id;
-                var showLoad = this.ajax.showLoadTorrent.bind(this.ajax, id);
-bindTorrentTab.bind(this.events, this.torrentPriorityHandler.bindAsEventListener(this), this.torrentFilesHandler.bindAsEventListener(this), this.torrentTrackersHandler.bindAsEventListener(this)
+rebindAllHandlers.bind(this.events
-                var showResponse = this.ajax.showResponseTorrent.bind(this.ajax, id, afterFinish);
-                this.ajax.load('tab' + id, url, showLoad, showResponse);
@@ -228 +273 @@
-                var showResponse = this.ajax.showResponseMessages.bind(this.ajax);
-                this.ajax.load('messages', url, showLoad, showResponse);
-ajax.
+
-        },
-        /* Torrent Priority Handler */
@@ -243 +288 @@
-                var url = 'cls=General&tpl=details&hash=' + id;
-                var showLoad = this.ajax.showLoadTorrent.bind(this.ajax, id);
-bindTorrentTab.bind(this.events, this.torrentPriorityHandler.bindAsEventListener(this), this.torrentFilesHandler.bindAsEventListener(this), this.torrentTrackersHandler.bindAsEventListener(this)
+rebindAllHandlers(this.events
-                var showResponse = this.ajax.showResponseTorrent.bind(this.ajax, id, afterFinish);
-                this.ajax.load('tab' + id, url, showLoad, showResponse);
@@ -253 +298 @@
-                if(el.hasClassName('filesPriority'))
-                {
-
-
-
-
-
-
-
+
+
+
-                        var param2 = ids.join('~');     
-                        var param1 = $('sf' + id).options[$('sf' + id).selectedIndex].value;
-
-                        var url = 'cls=commands&tpl=commands&command=files&param=' + id + '&param1=' + param1 + '&param2=' + param2;
@@ -270 +310 @@
-                        var url = 'cls=Files&tpl=details&hash=' + id;
-                        var showLoad = this.ajax.showLoadTorrent.bind(this.ajax, id);
-
-
+
-                        this.ajax.load('tab' + id, url, showLoad, showResponse);
-                }
@@ -310 +349 @@
-                        var url = 'cls=Tracker&tpl=details&hash=' + id;
-                        var showLoad = this.ajax.showLoadTorrent.bind(this.ajax, id);
-
-
+
-                        this.ajax.load('tab' + id, url, showLoad, showResponse);
-                }
@@ -332 +370 @@
-                if(el.hasClassName('asc'))
-                {
-
+
+
-                }
-                if(el.hasClassName('des'))
-                {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-});
+
+var EventHandler = Class.create({
+        _bindings: {},
+        /* Initial binding */
+        initialize: function() {
+        },
+        bindHandler: function(cls, type, handler) {
+                if (!(cls in this._bindings)) {
+                        this._bindings[cls] = {};
+                }
+                if (!(type in this._bindings[cls])) {
+                        this._bindings[cls][type] = [];
+                }
+                this._bindings[cls][type].push(handler);
+                this.rebindHandlers(cls);
+        },
+        rebindHandlers: function(cls) {
+                var elts = $$(cls);
+                if (!elts.length) {
+                        return;
+                }
+                if (!(cls in this._bindings)) {
+                        return;
+                }
+                var bindings = this._bindings[cls];
+                for (var type in bindings) {
+                        bindings[type].each(
+                                function(h) {
+                                        elts.each(
+                                                function(e) {
+                                                        e.stopObserving(type, h);
+                                                        e.observe(type, h);
+                                                }
+                                        );
+                                }
+                        );
+                }
+                                        
+        },
+        rebindAllHandlers: function() {
+                for (var cls in this._bindings) {
+                        this.rebindHandlers(cls);
+                }
+        }
+});
+
+var DisplayActions = Class.create({
+        /* Use scriptaculous or not */
+        initialize: function(effects) {
+                if(effects == null)
+                {
+                        this.effects = true;
+                } else {
+                        this.effects = effects;
+                }
+        },
+        /* Toggle torrent frame */
+        toggleTorrent: function(id) {
+                if(this.effects)
+                {
+                        new Effect.toggle('ttab' + id, 'blind', {duration:0.5});
+                } else {
+                        $('ttab' + id).toggle();
+                }
+        },
+        /* Open torrent info */
+        openTorrent: function(id) {
+                if(this.effects)
+                {
+                        new Effect.BlindDown('ttab' + id, {duration:0.5});
+                } else {
+                        $('ttab' + id).show();
+                }
+        },
+        /* Close torrent info */
+        closeTorrent: function(id) {
+                if(this.effects)
+                {
+                        new Effect.BlindUp('ttab' + id, {duration:0.5});
+                } else {
+                        $('ttab' + id).hide();
+                }
+        }
+});

trunk/wtorrent/wt/tpl/admin.tpl.php

@@ -28 +28 @@
-        </form>
-        <br />
-
+{$web->getURL()}
-                {include file="common/title.tpl.php" text=$str.add_user}
-                <div style="text-align: left; float: none; display: block; padding-left: 40px; margin-bottom: 10px;">

trunk/wtorrent/wt/tpl/index.tpl.php

@@ -10 +10 @@
-        <script src="{$DIR_JS}scriptaculous/scriptaculous.js?load=effects" type="text/javascript" charset="utf-8"></script>
-        <script src="{$DIR_JS}prototip.js" type="text/javascript" charset="utf-8"></script>
-        {*<script src="{$DIR_JS}javasc.js" type="text/javascript" charset="utf-8"></script>*}
-        <script src="{$DIR_JS}control.js" type="text/javascript" charset="utf-8"></script>
-        <script src="{$DIR_JS}ajax.js" type="text/javascript" charset="utf-8"></script>
-        <script src="{$DIR_JS}display.js" type="text/javascript" charset="utf-8"></script>
-        <script src="{$DIR_JS}events.js" type="text/javascript" charset="utf-8"></script>
-        <script src="{$DIR_JS}func.js" type="text/javascript" charset="utf-8"></script>
-  {include file="loading.tpl.php" assign="loading"}

trunk/wtorrent/wt/tpl/login.tpl.php

@@ -4 +4 @@
-<div id="login_m">
-  <div id="login">
-
+{$web->getURL()}
-      <p id="login-username">
-        <label for="userf">{$str.user}:</label>