RemoteCP Panel

Merge lp:~vierbergenlars/remotecp-panel/remote_session into lp:remotecp-panel/1.x

  1. remote_session
  2. Merge into 1.x
Proposed by Lars Vierbergen
Status: Merged
Approved by: Lars Vierbergen
Approved revision: 66
Merged at revision: 64
Proposed branch: lp:~vierbergenlars/remotecp-panel/remote_session
Merge into: lp:remotecp-panel/1.x
Diff against target: 860 lines
To merge this branch: bzr merge lp:~vierbergenlars/remotecp-panel/remote_session
Reviewer Review Type Date Requested Status
Lars Vierbergen Approve
Review via email: mp+47936@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Lars Vierbergen (vierbergenlars) :
review: Approve
lp:~vierbergenlars/remotecp-panel/remote_session updated
66. By Lars Vierbergen

Bug fixes in the remote_session class

Revision history for this message
Lars Vierbergen (vierbergenlars) wrote :

There are errors

review: Needs Fixing
Revision history for this message
Lars Vierbergen (vierbergenlars) wrote :

Ok now. The class is ready

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'add_file_header.php'
2--- add_file_header.php 2011-01-22 16:12:26 +0000
3+++ add_file_header.php 2011-01-30 18:46:29 +0000
4@@ -1,4 +1,5 @@
5-<?php //@./add_file_header.php
6+<?php //@./add_file_header.php ?>
7+<?php
8 function folder($dir) {
9 $dh=opendir($dir);
10 while($file=readdir($dh)) {
11@@ -6,7 +7,7 @@
12 if(substr($file,-4)=='.php') {
13 $filec=file($dir.'/'.$file);
14 if(preg_match('+<'.'?php /'.'/@(.*)+',$filec[0])) continue;
15- file_put_contents($dir.'/'.$file,'<'.'?php /'.'/@'.$dir.'/'.$file.' ?'.'>'.file_get_contents($dir.'/'.$file));
16+ file_put_contents($dir.'/'.$file,'<'.'?php /'.'/@'.$dir.'/'.$file.' ?'.'>'."\n".file_get_contents($dir.'/'.$file));
17 }
18 else if(is_dir($dir.'/'.$file)) {
19 folder($dir.'/'.$file);
20
21=== modified file 'inc/API_keys/keycheck.php'
22--- inc/API_keys/keycheck.php 2011-01-22 16:12:26 +0000
23+++ inc/API_keys/keycheck.php 2011-01-30 18:46:29 +0000
24@@ -1,4 +1,5 @@
25-<?php //@./inc/API_keys/keycheck.php
26+<?php //@./inc/API_keys/keycheck.php ?>
27+<?php
28 /**
29 * keycheck.php
30 * RCP API key checker class
31
32=== modified file 'inc/API_keys/testcheck.php'
33--- inc/API_keys/testcheck.php 2011-01-22 16:12:26 +0000
34+++ inc/API_keys/testcheck.php 2011-01-30 18:46:29 +0000
35@@ -1,4 +1,5 @@
36-<?php //@./inc/API_keys/testcheck.php
37+<?php //@./inc/API_keys/testcheck.php ?>
38+<?php
39 require('keycheck.php');
40 $api_key=new api_key_check(new MySQLi('localhost','root','','dev'),'api_keys');
41 var_dump($api_key->checkkey($_GET['apikey'],$_SERVER['REMOTE_ADDR']));
42\ No newline at end of file
43
44=== modified file 'inc/accountlevels.php'
45--- inc/accountlevels.php 2011-01-28 18:25:59 +0000
46+++ inc/accountlevels.php 2011-01-30 18:46:29 +0000
47@@ -1,4 +1,5 @@
48-<?php //@./inc/accountlevels.php
49+<?php //@./inc/accountlevels.php ?>
50+<?php
51 /**
52 * inc/accountlevels.php
53 * Some basic site and permission checking
54
55=== modified file 'inc/errorhandler.php'
56--- inc/errorhandler.php 2011-01-22 16:12:26 +0000
57+++ inc/errorhandler.php 2011-01-30 18:46:29 +0000
58@@ -1,4 +1,5 @@
59-<?php //@./inc/errorhandler.php
60+<?php //@./inc/errorhandler.php ?>
61+<?php
62 function debugErrorHandler($enum,$estring,$efile,$eline,$context) {
63 $error_mapping=array(
64 E_ERROR=>'Fatal error',
65
66=== modified file 'inc/httpmysql/httpmysql.php'
67--- inc/httpmysql/httpmysql.php 2011-01-22 16:12:26 +0000
68+++ inc/httpmysql/httpmysql.php 2011-01-30 18:46:29 +0000
69@@ -1,4 +1,5 @@
70-<?php //@./inc/httpmysql/httpmysql.php
71+<?php //@./inc/httpmysql/httpmysql.php ?>
72+<?php
73 /**
74 * inc/httpmysql/httpmysql.php
75 * The class file to access MySQL through HTTP
76
77=== modified file 'inc/httpmysql/httpmysql_silent.php'
78--- inc/httpmysql/httpmysql_silent.php 2011-01-22 16:12:26 +0000
79+++ inc/httpmysql/httpmysql_silent.php 2011-01-30 18:46:29 +0000
80@@ -1,4 +1,5 @@
81-<?php //@./inc/httpmysql/httpmysql_silent.php
82+<?php //@./inc/httpmysql/httpmysql_silent.php ?>
83+<?php
84 /**
85 * inc/httpmysql/httpmysql.php
86 * The class file to access MySQL through HTTP
87
88=== modified file 'inc/mysqlfs/mysqlfs.php'
89--- inc/mysqlfs/mysqlfs.php 2011-01-22 16:12:26 +0000
90+++ inc/mysqlfs/mysqlfs.php 2011-01-30 18:46:29 +0000
91@@ -1,4 +1,5 @@
92-<?php //@./inc/mysqlfs/mysqlfs.php
93+<?php //@./inc/mysqlfs/mysqlfs.php ?>
94+<?php
95 class mysqlfs {
96 public $group=0;
97 public $user=NULL;
98
99=== added directory 'inc/remote_session'
100=== added file 'inc/remote_session/session.php'
101--- inc/remote_session/session.php 1970-01-01 00:00:00 +0000
102+++ inc/remote_session/session.php 2011-01-30 18:46:29 +0000
103@@ -0,0 +1,35 @@
104+<?php //@./inc/remote_session/session.php ?>
105+<?php
106+class remote_session {
107+ private $database;
108+ public $userlevel;
109+ public $dbkey=substr($_SERVER['PATH_INFO'],1,32); //Set the database key
110+ private $username;
111+ private $authenticated
112+
113+ function __construct() {
114+ global $local_connection,$session;
115+ $this->database=$local_connection;
116+ $this->username=$session->username;
117+ if($this->init()) $this->authenticated=true;
118+ else $this->authenticated=false;
119+ }
120+ private function init() {
121+ $q0=$this->database->query('SELECT * FROM `remote_databases_assignments` WHERE `key`='$\''.$this->dbkey.'\' AND `username`=\''.$this->username.'\'');
122+ if($q0->num_rows!=1) return false;
123+ $r0=$q0->fetch_assoc();
124+ $this->userlevel=$r0['level'];
125+ return true;
126+ }
127+ function isAdmin() {
128+ return ($this->userlevel==9);
129+ }
130+ function isSiteCreator() {
131+ return ($this->userlevel>=2);
132+ }
133+ function authenticated() {
134+ return $this->authenticated;
135+ }
136+}
137+
138+$remote_session=new remote_session;
139\ No newline at end of file
140
141=== modified file 'inc/remotedbauth.php'
142--- inc/remotedbauth.php 2011-01-30 12:37:32 +0000
143+++ inc/remotedbauth.php 2011-01-30 18:46:29 +0000
144@@ -1,4 +1,5 @@
145-<?php //@./inc/remotedbauth.php
146+<?php //@./inc/remotedbauth.php ?>
147+<?php
148 /**
149 * Lookup and authentication of the remote database
150 */
151@@ -25,4 +26,6 @@
152 $remote_connection=NULL;
153 define("RDB",false);
154 }
155+
156+if(RDB) require_once('inc/remote_session/session.php'); //Load the remote session handler
157 ?>
158\ No newline at end of file
159
160=== modified file 'inc/sitemgmt/constants.php'
161--- inc/sitemgmt/constants.php 2011-01-22 16:12:26 +0000
162+++ inc/sitemgmt/constants.php 2011-01-30 18:46:29 +0000
163@@ -1,4 +1,5 @@
164-<?php //@./inc/sitemgmt/constants.php
165+<?php //@./inc/sitemgmt/constants.php ?>
166+<?php
167 /**
168 * Constants.php
169 *
170
171=== modified file 'inc/sitemgmt/database.php'
172--- inc/sitemgmt/database.php 2011-01-22 16:12:26 +0000
173+++ inc/sitemgmt/database.php 2011-01-30 18:46:29 +0000
174@@ -1,4 +1,5 @@
175-<?php //@./inc/sitemgmt/database.php
176+<?php //@./inc/sitemgmt/database.php ?>
177+<?php
178 /**
179 * Database.php
180 *
181
182=== modified file 'inc/sitemgmt/form.php'
183--- inc/sitemgmt/form.php 2011-01-22 16:12:26 +0000
184+++ inc/sitemgmt/form.php 2011-01-30 18:46:29 +0000
185@@ -1,4 +1,5 @@
186-<?php //@./inc/sitemgmt/form.php
187+<?php //@./inc/sitemgmt/form.php ?>
188+<?php
189 /**
190 * Form.php
191 *
192
193=== modified file 'inc/sitemgmt/mailer.php'
194--- inc/sitemgmt/mailer.php 2011-01-22 16:12:26 +0000
195+++ inc/sitemgmt/mailer.php 2011-01-30 18:46:29 +0000
196@@ -1,4 +1,5 @@
197-<?php //@./inc/sitemgmt/mailer.php
198+<?php //@./inc/sitemgmt/mailer.php ?>
199+<?php
200 /**
201 * Mailer.php
202 *
203
204=== modified file 'inc/sitemgmt/process.php'
205--- inc/sitemgmt/process.php 2011-01-22 16:12:26 +0000
206+++ inc/sitemgmt/process.php 2011-01-30 18:46:29 +0000
207@@ -1,4 +1,5 @@
208-<?php //@./inc/sitemgmt/process.php
209+<?php //@./inc/sitemgmt/process.php ?>
210+<?php
211 /**
212 * Process.php
213 *
214
215=== modified file 'inc/sitemgmt/register.php'
216--- inc/sitemgmt/register.php 2011-01-22 16:12:26 +0000
217+++ inc/sitemgmt/register.php 2011-01-30 18:46:29 +0000
218@@ -1,4 +1,5 @@
219-<?php //@./inc/sitemgmt/register.php
220+<?php //@./inc/sitemgmt/register.php ?>
221+<?php
222 /**
223 * Register.php
224 *
225
226=== modified file 'inc/sitemgmt/session.php'
227--- inc/sitemgmt/session.php 2011-01-30 12:37:32 +0000
228+++ inc/sitemgmt/session.php 2011-01-30 18:46:29 +0000
229@@ -1,4 +1,5 @@
230-<?php //@./inc/sitemgmt/session.php
231+<?php //@./inc/sitemgmt/session.php ?>
232+<?php
233 /**
234 * Session.php
235 *
236
237=== modified file 'inc/sitemgmt/view_active.php'
238--- inc/sitemgmt/view_active.php 2011-01-22 16:12:26 +0000
239+++ inc/sitemgmt/view_active.php 2011-01-30 18:46:29 +0000
240@@ -1,4 +1,5 @@
241-<?php //@./inc/sitemgmt/view_active.php
242+<?php //@./inc/sitemgmt/view_active.php ?>
243+<?php
244 if(!defined('TBL_ACTIVE_USERS')) {
245 die("Error processing page");
246 }
247
248=== modified file 'inc/sqlsess/sqlsess.php'
249--- inc/sqlsess/sqlsess.php 2011-01-22 16:12:26 +0000
250+++ inc/sqlsess/sqlsess.php 2011-01-30 18:46:29 +0000
251@@ -1,4 +1,5 @@
252-<?php //@./inc/sqlsess/sqlsess.php
253+<?php //@./inc/sqlsess/sqlsess.php ?>
254+<?php
255 /**
256 * inc/sqlsess/sqlsess.php
257 * Stores sessions in a MySQL table with
258
259=== modified file 'index.php'
260--- index.php 2011-01-22 16:12:26 +0000
261+++ index.php 2011-01-30 18:46:29 +0000
262@@ -1,4 +1,5 @@
263-<?php //@./index.php header('Location: panel.php'); /*require_once('inc/sitemgmt/session.php');
264+<?php //@./index.php ?>
265+<?php
266 if($session->logged_in) {$_GET['next']=str_replace("-","=",str_replace(" ","&",$_GET['next']));
267 header('Location: panel.php?'.$_GET['next']); }
268 else {header('Location: login.php?next='.$_GET['next']); }
269
270=== modified file 'panel.php'
271--- panel.php 2011-01-30 12:37:32 +0000
272+++ panel.php 2011-01-30 18:46:29 +0000
273@@ -1,4 +1,5 @@
274-<?php //@./panel.php
275+<?php //@./panel.php ?>
276+<?php
277 define('__DEBUG__',true);
278 /**
279 * panel.php - Main script
280
281=== modified file 'r.auth.php'
282--- r.auth.php 2011-01-24 20:01:42 +0000
283+++ r.auth.php 2011-01-30 18:46:29 +0000
284@@ -1,4 +1,5 @@
285-<?php //@./r.auth.php
286+<?php //@./r.auth.php ?>
287+<?php
288 /**
289 * r.auth.php
290 * Handles the remote authentication of users through HTTP.
291
292=== modified file 'r.phplogin.php'
293--- r.phplogin.php 2011-01-22 16:12:26 +0000
294+++ r.phplogin.php 2011-01-30 18:46:29 +0000
295@@ -1,4 +1,5 @@
296-<?php //@./r.phplogin.php
297+<?php //@./r.phplogin.php ?>
298+<?php
299 /**
300 * r.phplogin.php
301 * Handles the login of users logged in
302
303=== modified file 'scripts/account_scripts.js.php'
304--- scripts/account_scripts.js.php 2011-01-19 18:02:42 +0000
305+++ scripts/account_scripts.js.php 2011-01-30 18:46:29 +0000
306@@ -1,4 +1,5 @@
307-<?php //@./scripts/account_scripts.js.php ?>var account={
308+<?php //@./scripts/account_scripts.js.php ?>
309+var account={
310 testPassword: function(elem) {
311 /*
312 ** Created by: Jeff Todnem (http://www.todnem.com/)
313
314=== modified file 'scripts/admin_scripts.js.php'
315--- scripts/admin_scripts.js.php 2011-01-30 11:18:23 +0000
316+++ scripts/admin_scripts.js.php 2011-01-30 18:46:29 +0000
317@@ -1,4 +1,4 @@
318-<?php //@./scripts/admin_scripts.js.php ?>// scripts/admin_scripts.js
319+<?php //@./scripts/admin_scripts.js.php ?>
320 var admin= {
321 edit_level: {
322 func: function(user,cont){
323
324=== modified file 'scripts/create_site_scripts.js.php'
325--- scripts/create_site_scripts.js.php 2011-01-30 12:00:12 +0000
326+++ scripts/create_site_scripts.js.php 2011-01-30 18:46:29 +0000
327@@ -1,4 +1,4 @@
328-<?php //@./scripts/create_site_scripts.js.php ?>// scripts/create_site_scripts.js
329+<?php //@./scripts/create_site_scripts.js.php ?>
330 var create_site={
331 send: function(form) {
332 _post='sub='+form.sub.value;
333
334=== modified file 'scripts/db_scripts.js.php'
335--- scripts/db_scripts.js.php 2011-01-30 12:37:32 +0000
336+++ scripts/db_scripts.js.php 2011-01-30 18:46:29 +0000
337@@ -1,4 +1,4 @@
338-<?php //@./scripts/db_scripts.js.php ?>// scripts/db_scripts.js
339+<?php //@./scripts/db_scripts.js.php ?>
340 var db= {
341 create: {
342 send: function(elem) {
343
344=== modified file 'scripts/filemanager_scripts.js.php'
345--- scripts/filemanager_scripts.js.php 2011-01-19 18:02:42 +0000
346+++ scripts/filemanager_scripts.js.php 2011-01-30 18:46:29 +0000
347@@ -1,4 +1,4 @@
348-<?php //@./scripts/filemanager_scripts.js.php ?>// scripts/filemanager_scripts.js
349+<?php //@./scripts/filemanager_scripts.js.php ?>
350 $.getScript(URL_SCRIPTS+'/../php.js/dirname.js'); //Get dirname util
351 filemanager={
352 new:function(site,elem) {
353
354=== modified file 'scripts/parse_js.php'
355--- scripts/parse_js.php 2011-01-22 16:12:26 +0000
356+++ scripts/parse_js.php 2011-01-30 18:46:29 +0000
357@@ -1,4 +1,5 @@
358-<?php //@./scripts/parse_js.php
359+<?php //@./scripts/parse_js.php ?>
360+<?php
361 /**
362 * scripts/parse_js.php
363 */
364
365=== modified file 'scripts/permanent/ajax.js.php'
366--- scripts/permanent/ajax.js.php 2011-01-22 16:12:26 +0000
367+++ scripts/permanent/ajax.js.php 2011-01-30 18:46:29 +0000
368@@ -1,4 +1,4 @@
369-<?php //@./scripts/permanent/ajax.js.php ?>//scripts/permanent/ajax.js
370+<?php //@./scripts/permanent/ajax.js.php ?>
371
372 var ajax={
373 obj:function(){
374
375=== modified file 'scripts/permanent/messages.js.php'
376--- scripts/permanent/messages.js.php 2011-01-19 18:02:42 +0000
377+++ scripts/permanent/messages.js.php 2011-01-30 18:46:29 +0000
378@@ -1,4 +1,4 @@
379-<?php //@./scripts/permanent/messages.js.php ?>//scripts/permanent/messages.js
380+<?php //@./scripts/permanent/messages.js.php ?>
381
382 var message_count=0;
383 var message={
384
385=== modified file 'scripts/permanent/prototypes.js.php'
386--- scripts/permanent/prototypes.js.php 2011-01-19 18:02:42 +0000
387+++ scripts/permanent/prototypes.js.php 2011-01-30 18:46:29 +0000
388@@ -1,4 +1,4 @@
389-<?php //@./scripts/permanent/prototypes.js.php ?>//scripts/permanent/prototypes.js
390+<?php //@./scripts/permanent/prototypes.js.php ?>
391
392 //String reversal
393 String.prototype.strReverse = function() {
394
395=== modified file 'sitelogin.php'
396--- sitelogin.php 2011-01-22 16:12:26 +0000
397+++ sitelogin.php 2011-01-30 18:46:29 +0000
398@@ -1,4 +1,5 @@
399-<?php //@./sitelogin.php require_once('inc/sitemgmt/session.php');
400+<?php //@./sitelogin.php ?>
401+<?php
402 if(isset($_GET['reload'])) { header('Location: http://'.$_GET['domain'].'/resetpage.php'); exit;}
403 if($session->logged_in&&!$_GET['logged_in']) { header('Location: sessiontransfer.php?domain='.$_GET['domain']); exit;}
404 else if($session->logged_in) { ?><a href="panel.php" target=_blank>Controlepaneel</a><br>
405
406=== modified file 'static/images/icons/Silk/index.php'
407--- static/images/icons/Silk/index.php 2011-01-22 16:12:26 +0000
408+++ static/images/icons/Silk/index.php 2011-01-30 18:46:29 +0000
409@@ -1,4 +1,5 @@
410-<?php //@./static/images/icons/Silk/index.php
411+<?php //@./static/images/icons/Silk/index.php ?>
412+<?php
413 $h=opendir('.');
414 echo "<table>";
415 while($n=readdir($h)) {
416
417=== modified file 'system/admin-admin.php'
418--- system/admin-admin.php 2011-01-22 10:46:24 +0000
419+++ system/admin-admin.php 2011-01-30 18:46:29 +0000
420@@ -1,4 +1,5 @@
421-<?php //@./system/admin-admin.php ?><!-- HEADERS >
422+<?php //@./system/admin-admin.php ?>
423+<!-- HEADERS >
424 <AJAX_SCRIPTLOC>admin_scripts.js</AJAX_SCRIPTLOC>
425 <AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>
426 < HEADERS --><?php
427
428=== modified file 'system/auth/login.php'
429--- system/auth/login.php 2011-01-22 10:46:24 +0000
430+++ system/auth/login.php 2011-01-30 18:46:29 +0000
431@@ -1,4 +1,5 @@
432-<?php //@./system/auth/login.php ?><!-- HEADERS >
433+<?php //@./system/auth/login.php ?>
434+<!-- HEADERS >
435 <AJAX_SCRIPTLOC>NULL</AJAX_SCRIPTLOC>
436 <AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>
437 < HEADERS --><?php
438
439=== modified file 'system/auth/logoff.php'
440--- system/auth/logoff.php 2011-01-22 10:46:24 +0000
441+++ system/auth/logoff.php 2011-01-30 18:46:29 +0000
442@@ -1,4 +1,5 @@
443-<?php //@./system/auth/logoff.php ?><!-- HEADERS >
444+<?php //@./system/auth/logoff.php ?>
445+<!-- HEADERS >
446 <AJAX_SCRIPTLOC>NULL</AJAX_SCRIPTLOC>
447 <AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>
448 < HEADERS --><?php
449
450=== modified file 'system/create_site.php'
451--- system/create_site.php 2011-01-28 18:25:59 +0000
452+++ system/create_site.php 2011-01-30 18:46:29 +0000
453@@ -1,4 +1,5 @@
454-<?php //@./system/create_site.php ?><!-- HEADERS >
455+<?php //@./system/create_site.php ?>
456+<!-- HEADERS >
457 <AJAX_SCRIPTLOC>create_site_scripts.js</AJAX_SCRIPTLOC>
458 <AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>
459 < HEADERS --><?php
460
461=== modified file 'system/database.php'
462--- system/database.php 2011-01-30 12:38:51 +0000
463+++ system/database.php 2011-01-30 18:46:29 +0000
464@@ -1,4 +1,5 @@
465-<?php //@./system/database.php ?><!-- HEADERS >
466+<?php //@./system/database.php ?>
467+<!-- HEADERS >
468 <AJAX_SCRIPTLOC>db_scripts.js</AJAX_SCRIPTLOC>
469 <AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>
470 < HEADERS --><?php
471
472=== modified file 'system/desktop.php'
473--- system/desktop.php 2011-01-30 12:37:32 +0000
474+++ system/desktop.php 2011-01-30 18:46:29 +0000
475@@ -1,4 +1,5 @@
476-<?php //@./system/desktop.php ?><!-- HEADERS >
477+<?php //@./system/desktop.php ?>
478+<!-- HEADERS >
479 <AJAX_SCRIPTLOC>NULL</AJAX_SCRIPTLOC>
480 <AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>
481 < HEADERS -->
482
483=== modified file 'system/get_sys_users.php'
484--- system/get_sys_users.php 2011-01-22 10:46:24 +0000
485+++ system/get_sys_users.php 2011-01-30 18:46:29 +0000
486@@ -1,4 +1,5 @@
487-<?php //@./system/get_sys_users.php ?><!-- HEADERS >
488+<?php //@./system/get_sys_users.php ?>
489+<!-- HEADERS >
490 <AJAX_SCRIPTLOC>NULL</AJAX_SCRIPTLOC>
491 <AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>
492 < HEADERS --><?php
493
494=== modified file 'system/login.php'
495--- system/login.php 2011-01-22 10:46:24 +0000
496+++ system/login.php 2011-01-30 18:46:29 +0000
497@@ -1,4 +1,5 @@
498-<?php //@./system/login.php ?><!-- HEADERS >
499+<?php //@./system/login.php ?>
500+<!-- HEADERS >
501 <AJAX_SCRIPTLOC>NULL</AJAX_SCRIPTLOC>
502 <AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>
503 < HEADERS --><?php
504
505=== modified file 'system/logs.php'
506--- system/logs.php 2011-01-22 10:46:24 +0000
507+++ system/logs.php 2011-01-30 18:46:29 +0000
508@@ -1,4 +1,5 @@
509-<?php //@./system/logs.php ?><!-- HEADERS >
510+<?php //@./system/logs.php ?>
511+<!-- HEADERS >
512 <AJAX_SCRIPTLOC>NULL</AJAX_SCRIPTLOC>
513 <AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>
514 < HEADERS -->
515
516=== modified file 'system/mail.php'
517--- system/mail.php 2011-01-22 10:46:24 +0000
518+++ system/mail.php 2011-01-30 18:46:29 +0000
519@@ -1,4 +1,5 @@
520-<?php //@./system/mail.php ?><!-- HEADERS >
521+<?php //@./system/mail.php ?>
522+<!-- HEADERS >
523 <AJAX_SCRIPTLOC>NULL</AJAX_SCRIPTLOC>
524 <AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>
525 < HEADERS --><?php
526
527=== modified file 'system/plugins/api.php'
528--- system/plugins/api.php 2011-01-22 16:12:26 +0000
529+++ system/plugins/api.php 2011-01-30 18:46:29 +0000
530@@ -1,4 +1,5 @@
531-<?php //@./system/plugins/api.php
532+<?php //@./system/plugins/api.php ?>
533+<?php
534 class addons {
535 static function installed($ref) {
536 global $remote_connection;
537
538=== modified file 'system/plugins/cms/api.php'
539--- system/plugins/cms/api.php 2011-01-22 16:12:26 +0000
540+++ system/plugins/cms/api.php 2011-01-30 18:46:29 +0000
541@@ -1,4 +1,5 @@
542-<?php //@./system/plugins/cms/api.php
543+<?php //@./system/plugins/cms/api.php ?>
544+<?php
545 class cms {
546 static function get_pages() {
547 global $remote_connection;
548
549=== modified file 'system/plugins/cms/default.php'
550--- system/plugins/cms/default.php 2011-01-22 16:12:26 +0000
551+++ system/plugins/cms/default.php 2011-01-30 18:46:29 +0000
552@@ -1,4 +1,5 @@
553-<?php //@./system/plugins/cms/default.php ?><!-- HEADERS >
554+<?php //@./system/plugins/cms/default.php ?>
555+<!-- HEADERS >
556 <AJAX_SCRIPTLOC>a_cms_scripts.js</AJAX_SCRIPTLOC>
557 <AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>
558 < HEADERS --><?php
559
560=== modified file 'system/plugins/cms/scripts.php'
561--- system/plugins/cms/scripts.php 2011-01-30 11:18:23 +0000
562+++ system/plugins/cms/scripts.php 2011-01-30 18:46:29 +0000
563@@ -1,4 +1,4 @@
564-<?php //@./system/plugins/cms/scripts.php ?>// scripts/cms_scripts.js
565+<?php //@./system/plugins/cms/scripts.php ?>
566 var cms={
567 page: {
568 edit_title: {
569
570=== modified file 'system/plugins/col1/api.php'
571--- system/plugins/col1/api.php 2011-01-22 16:12:26 +0000
572+++ system/plugins/col1/api.php 2011-01-30 18:46:29 +0000
573@@ -1,4 +1,5 @@
574-<?php //@./system/plugins/col1/api.php
575+<?php //@./system/plugins/col1/api.php ?>
576+<?php
577 class col1 {
578 static function gets() {
579 global $remote_connection;
580
581=== modified file 'system/plugins/col1/default.php'
582--- system/plugins/col1/default.php 2011-01-22 10:46:24 +0000
583+++ system/plugins/col1/default.php 2011-01-30 18:46:29 +0000
584@@ -1,4 +1,5 @@
585-<?php //@./system/plugins/col1/default.php ?><!-- HEADERS >
586+<?php //@./system/plugins/col1/default.php ?>
587+<!-- HEADERS >
588 <AJAX_SCRIPTLOC>a_col1_scripts.js</AJAX_SCRIPTLOC>
589 <AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>
590 < HEADERS --><?php
591
592=== modified file 'system/plugins/col1/scripts.php'
593--- system/plugins/col1/scripts.php 2011-01-30 11:18:23 +0000
594+++ system/plugins/col1/scripts.php 2011-01-30 18:46:29 +0000
595@@ -1,4 +1,4 @@
596-<?php //@./system/plugins/col1/scripts.php ?>// scripts/col1_scripts.js
597+<?php //@./system/plugins/col1/scripts.php ?>
598 var col1={
599 edit_title: {
600 func: function(site,id,cont){
601
602=== modified file 'system/plugins/col3/api.php'
603--- system/plugins/col3/api.php 2011-01-22 16:12:26 +0000
604+++ system/plugins/col3/api.php 2011-01-30 18:46:29 +0000
605@@ -1,4 +1,5 @@
606-<?php //@./system/plugins/col3/api.php
607+<?php //@./system/plugins/col3/api.php ?>
608+<?php
609 class col3 {
610 static function gets() {
611 global $remote_connection;
612
613=== modified file 'system/plugins/col3/default.php'
614--- system/plugins/col3/default.php 2011-01-22 10:46:24 +0000
615+++ system/plugins/col3/default.php 2011-01-30 18:46:29 +0000
616@@ -1,4 +1,5 @@
617-<?php //@./system/plugins/col3/default.php ?><!-- HEADERS >
618+<?php //@./system/plugins/col3/default.php ?>
619+<!-- HEADERS >
620 <AJAX_SCRIPTLOC>a_col3_scripts.js</AJAX_SCRIPTLOC>
621 <AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>
622 < HEADERS --><?php
623
624=== modified file 'system/plugins/col3/scripts.php'
625--- system/plugins/col3/scripts.php 2011-01-30 11:18:23 +0000
626+++ system/plugins/col3/scripts.php 2011-01-30 18:46:29 +0000
627@@ -1,4 +1,4 @@
628-<?php //@./system/plugins/col3/scripts.php ?>// scripts/col3_scripts.js
629+<?php //@./system/plugins/col3/scripts.php ?>
630 var col3={
631 edit_title: {
632 func: function(site,id,cont){
633
634=== modified file 'system/plugins/default.php'
635--- system/plugins/default.php 2011-01-30 11:18:23 +0000
636+++ system/plugins/default.php 2011-01-30 18:46:29 +0000
637@@ -1,4 +1,5 @@
638-<?php //@./system/plugins/default.php ?><!-- HEADERS >
639+<?php //@./system/plugins/default.php ?>
640+<!-- HEADERS >
641 <AJAX_SCRIPTLOC>a__scripts.js</AJAX_SCRIPTLOC>
642 <AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>
643 < HEADERS --><?php
644
645=== modified file 'system/plugins/filemanager/default.php'
646--- system/plugins/filemanager/default.php 2011-01-22 16:12:26 +0000
647+++ system/plugins/filemanager/default.php 2011-01-30 18:46:29 +0000
648@@ -1,4 +1,5 @@
649-<?php //@./system/plugins/filemanager/default.php
650+<?php //@./system/plugins/filemanager/default.php ?>
651+<?php
652 /**
653 * system/plugins/filemanager.php - RemoteCP (?control=addons&aref=filemanager)
654 * Filemanager (SQLFS)
655
656=== modified file 'system/plugins/filemanager/scripts.php'
657--- system/plugins/filemanager/scripts.php 2011-01-22 10:46:24 +0000
658+++ system/plugins/filemanager/scripts.php 2011-01-30 18:46:29 +0000
659@@ -1,4 +1,4 @@
660-<?php //@./system/plugins/filemanager/scripts.php ?>// scripts/filemanager_scripts.js
661+<?php //@./system/plugins/filemanager/scripts.php ?>
662 $.getScript(URL_SCRIPTS+'/../php.js/dirname.js'); //Get dirname util
663 filemanager={
664 new:function(site,elem) {
665
666=== modified file 'system/plugins/init.php'
667--- system/plugins/init.php 2011-01-28 18:25:59 +0000
668+++ system/plugins/init.php 2011-01-30 18:46:29 +0000
669@@ -1,1 +1,2 @@
670-<?php //@./system/plugins/init.php
671require_once('system/plugins/api.php');
672$dh=opendir('system/plugins');
673$PLUGINS=array();
674while($file=readdir($dh)) {
675 if($file=='..') continue;
676 if(is_dir('system/plugins/'.$file))
677 $PLUGINS[]=$file;
678}
679foreach($PLUGINS as $plugin) {
680 if(addons::installed($plugin)&&file_exists('system/plugins/'.$plugin.'/api.php'))
681 require_once('system/plugins/'.$plugin.'/api.php');
682}
683\ No newline at end of file
684+<?php //@./system/plugins/init.php ?>
685+<?php
686require_once('system/plugins/api.php');
687$dh=opendir('system/plugins');
688$PLUGINS=array();
689while($file=readdir($dh)) {
690 if($file=='..') continue;
691 if(is_dir('system/plugins/'.$file))
692 $PLUGINS[]=$file;
693}
694foreach($PLUGINS as $plugin) {
695 if(addons::installed($plugin)&&file_exists('system/plugins/'.$plugin.'/api.php'))
696 require_once('system/plugins/'.$plugin.'/api.php');
697}
698\ No newline at end of file
699
700=== modified file 'system/plugins/scripts.php'
701--- system/plugins/scripts.php 2011-01-30 12:00:12 +0000
702+++ system/plugins/scripts.php 2011-01-30 18:46:29 +0000
703@@ -1,4 +1,4 @@
704-<?php //@./scripts/site_control_scripts.js.php ?>// scripts/site_control_scripts.js
705+<?php //@./system/plugins/scripts.php ?>
706 var addons= {
707 addons: {
708 install: function(site,ref) {
709
710=== modified file 'system/register.php'
711--- system/register.php 2011-01-22 10:46:24 +0000
712+++ system/register.php 2011-01-30 18:46:29 +0000
713@@ -1,4 +1,5 @@
714-<?php //@./system/register.php ?><!-- HEADERS >
715+<?php //@./system/register.php ?>
716+<!-- HEADERS >
717 <AJAX_SCRIPTLOC>NULL</AJAX_SCRIPTLOC>
718 <AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>
719 < HEADERS --><?php if(!isset($_POST['user'])) {
720
721=== modified file 'system/user_props.php'
722--- system/user_props.php 2011-01-22 10:46:24 +0000
723+++ system/user_props.php 2011-01-30 18:46:29 +0000
724@@ -1,4 +1,5 @@
725-<?php //@./system/user_props.php ?><!-- HEADERS >
726+<?php //@./system/user_props.php ?>
727+<!-- HEADERS >
728 <AJAX_SCRIPTLOC>account_scripts.js</AJAX_SCRIPTLOC>
729 <AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>
730 < HEADERS --><?php
731
732=== modified file 'tinymce/jscripts/tiny_mce/plugins/spellchecker/classes/EnchantSpell.php'
733--- tinymce/jscripts/tiny_mce/plugins/spellchecker/classes/EnchantSpell.php 2011-01-22 16:12:26 +0000
734+++ tinymce/jscripts/tiny_mce/plugins/spellchecker/classes/EnchantSpell.php 2011-01-30 18:46:29 +0000
735@@ -1,4 +1,5 @@
736-<?php //@./tinymce/jscripts/tiny_mce/plugins/spellchecker/classes/EnchantSpell.php
737+<?php //@./tinymce/jscripts/tiny_mce/plugins/spellchecker/classes/EnchantSpell.php ?>
738+<?php
739 /**
740 * $Id: editor_plugin_src.js 201 2007-02-12 15:56:56Z spocke $
741 *
742
743=== modified file 'tinymce/jscripts/tiny_mce/plugins/spellchecker/classes/GoogleSpell.php'
744--- tinymce/jscripts/tiny_mce/plugins/spellchecker/classes/GoogleSpell.php 2011-01-22 16:12:26 +0000
745+++ tinymce/jscripts/tiny_mce/plugins/spellchecker/classes/GoogleSpell.php 2011-01-30 18:46:29 +0000
746@@ -1,4 +1,5 @@
747-<?php //@./tinymce/jscripts/tiny_mce/plugins/spellchecker/classes/GoogleSpell.php
748+<?php //@./tinymce/jscripts/tiny_mce/plugins/spellchecker/classes/GoogleSpell.php ?>
749+<?php
750 /**
751 * $Id: editor_plugin_src.js 201 2007-02-12 15:56:56Z spocke $
752 *
753
754=== modified file 'tinymce/jscripts/tiny_mce/plugins/spellchecker/classes/PSpell.php'
755--- tinymce/jscripts/tiny_mce/plugins/spellchecker/classes/PSpell.php 2011-01-22 16:12:26 +0000
756+++ tinymce/jscripts/tiny_mce/plugins/spellchecker/classes/PSpell.php 2011-01-30 18:46:29 +0000
757@@ -1,4 +1,5 @@
758-<?php //@./tinymce/jscripts/tiny_mce/plugins/spellchecker/classes/PSpell.php
759+<?php //@./tinymce/jscripts/tiny_mce/plugins/spellchecker/classes/PSpell.php ?>
760+<?php
761 /**
762 * $Id: editor_plugin_src.js 201 2007-02-12 15:56:56Z spocke $
763 *
764
765=== modified file 'tinymce/jscripts/tiny_mce/plugins/spellchecker/classes/PSpellShell.php'
766--- tinymce/jscripts/tiny_mce/plugins/spellchecker/classes/PSpellShell.php 2011-01-22 16:12:26 +0000
767+++ tinymce/jscripts/tiny_mce/plugins/spellchecker/classes/PSpellShell.php 2011-01-30 18:46:29 +0000
768@@ -1,4 +1,5 @@
769-<?php //@./tinymce/jscripts/tiny_mce/plugins/spellchecker/classes/PSpellShell.php
770+<?php //@./tinymce/jscripts/tiny_mce/plugins/spellchecker/classes/PSpellShell.php ?>
771+<?php
772 /**
773 * $Id: editor_plugin_src.js 201 2007-02-12 15:56:56Z spocke $
774 *
775
776=== modified file 'tinymce/jscripts/tiny_mce/plugins/spellchecker/classes/SpellChecker.php'
777--- tinymce/jscripts/tiny_mce/plugins/spellchecker/classes/SpellChecker.php 2011-01-22 16:12:26 +0000
778+++ tinymce/jscripts/tiny_mce/plugins/spellchecker/classes/SpellChecker.php 2011-01-30 18:46:29 +0000
779@@ -1,4 +1,5 @@
780-<?php //@./tinymce/jscripts/tiny_mce/plugins/spellchecker/classes/SpellChecker.php
781+<?php //@./tinymce/jscripts/tiny_mce/plugins/spellchecker/classes/SpellChecker.php ?>
782+<?php
783 /**
784 * $Id: editor_plugin_src.js 201 2007-02-12 15:56:56Z spocke $
785 *
786
787=== modified file 'tinymce/jscripts/tiny_mce/plugins/spellchecker/classes/utils/JSON.php'
788--- tinymce/jscripts/tiny_mce/plugins/spellchecker/classes/utils/JSON.php 2011-01-22 16:12:26 +0000
789+++ tinymce/jscripts/tiny_mce/plugins/spellchecker/classes/utils/JSON.php 2011-01-30 18:46:29 +0000
790@@ -1,4 +1,5 @@
791-<?php //@./tinymce/jscripts/tiny_mce/plugins/spellchecker/classes/utils/JSON.php
792+<?php //@./tinymce/jscripts/tiny_mce/plugins/spellchecker/classes/utils/JSON.php ?>
793+<?php
794 /**
795 * $Id: JSON.php 40 2007-06-18 11:43:15Z spocke $
796 *
797
798=== modified file 'tinymce/jscripts/tiny_mce/plugins/spellchecker/classes/utils/Logger.php'
799--- tinymce/jscripts/tiny_mce/plugins/spellchecker/classes/utils/Logger.php 2011-01-22 16:12:26 +0000
800+++ tinymce/jscripts/tiny_mce/plugins/spellchecker/classes/utils/Logger.php 2011-01-30 18:46:29 +0000
801@@ -1,4 +1,5 @@
802-<?php //@./tinymce/jscripts/tiny_mce/plugins/spellchecker/classes/utils/Logger.php
803+<?php //@./tinymce/jscripts/tiny_mce/plugins/spellchecker/classes/utils/Logger.php ?>
804+<?php
805 /**
806 * $Id: Logger.class.php 10 2007-05-27 10:55:12Z spocke $
807 *
808
809=== modified file 'tinymce/jscripts/tiny_mce/plugins/spellchecker/config.php'
810--- tinymce/jscripts/tiny_mce/plugins/spellchecker/config.php 2011-01-22 16:12:26 +0000
811+++ tinymce/jscripts/tiny_mce/plugins/spellchecker/config.php 2011-01-30 18:46:29 +0000
812@@ -1,4 +1,5 @@
813-<?php //@./tinymce/jscripts/tiny_mce/plugins/spellchecker/config.php
814+<?php //@./tinymce/jscripts/tiny_mce/plugins/spellchecker/config.php ?>
815+<?php
816 /**
817 * config.php
818 *
819
820=== modified file 'tinymce/jscripts/tiny_mce/plugins/spellchecker/includes/general.php'
821--- tinymce/jscripts/tiny_mce/plugins/spellchecker/includes/general.php 2011-01-22 16:12:26 +0000
822+++ tinymce/jscripts/tiny_mce/plugins/spellchecker/includes/general.php 2011-01-30 18:46:29 +0000
823@@ -1,4 +1,5 @@
824-<?php //@./tinymce/jscripts/tiny_mce/plugins/spellchecker/includes/general.php
825+<?php //@./tinymce/jscripts/tiny_mce/plugins/spellchecker/includes/general.php ?>
826+<?php
827 /**
828 * general.php
829 *
830
831=== modified file 'tinymce/jscripts/tiny_mce/plugins/spellchecker/rpc.php'
832--- tinymce/jscripts/tiny_mce/plugins/spellchecker/rpc.php 2011-01-22 16:12:26 +0000
833+++ tinymce/jscripts/tiny_mce/plugins/spellchecker/rpc.php 2011-01-30 18:46:29 +0000
834@@ -1,4 +1,5 @@
835-<?php //@./tinymce/jscripts/tiny_mce/plugins/spellchecker/rpc.php
836+<?php //@./tinymce/jscripts/tiny_mce/plugins/spellchecker/rpc.php ?>
837+<?php
838 /**
839 * $Id: rpc.php 915 2008-09-03 08:45:28Z spocke $
840 *
841
842=== modified file 'trans/browser_lang.php'
843--- trans/browser_lang.php 2011-01-22 16:12:26 +0000
844+++ trans/browser_lang.php 2011-01-30 18:46:29 +0000
845@@ -1,4 +1,5 @@
846-<?php //@./trans/browser_lang.php
847+<?php //@./trans/browser_lang.php ?>
848+<?php
849 /**
850 * trans/browser_lang.php
851 * Get the browser language
852
853=== modified file 'trans/convert.php'
854--- trans/convert.php 2011-01-22 16:12:26 +0000
855+++ trans/convert.php 2011-01-30 18:46:29 +0000
856@@ -1,4 +1,5 @@
857-<?php //@./trans/convert.php
858+<?php //@./trans/convert.php ?>
859+<?php
860
861 /**
862 * Copyright (C) 2008, Iulian Ilea (http://iulian.net), all rights reserved.
863
864=== modified file 'trans/parselng.php'
865--- trans/parselng.php 2011-01-22 16:12:26 +0000
866+++ trans/parselng.php 2011-01-30 18:46:29 +0000
867@@ -1,4 +1,5 @@
868-<?php //@./trans/parselng.php
869+<?php //@./trans/parselng.php ?>
870+<?php
871 /**
872 * parselng.php
873 */
874
875=== modified file 'trans/trans.php'
876--- trans/trans.php 2011-01-22 16:12:26 +0000
877+++ trans/trans.php 2011-01-30 18:46:29 +0000
878@@ -1,4 +1,5 @@
879-<?php //@./trans/trans.php
880+<?php //@./trans/trans.php ?>
881+<?php
882 /**
883 * trans/trans.php
884 */

Subscribers

People subscribed via source and target branches

to all changes: