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

Proposed by Lars Vierbergen
Status: Merged
Approved by: Lars Vierbergen
Approved revision: 24
Merged at revision: 21
Proposed branch: lp:~vierbergenlars/remotecp-panel/translate
Merge into: lp:remotecp-panel/1.x
Diff against target: 2958 lines (+711/-501)
30 files modified
cpanel-incs/admin-admin.php (+44/-31)
cpanel-incs/create_site.php (+14/-14)
cpanel-incs/database.php (+49/-42)
cpanel-incs/desktop.php (+7/-8)
cpanel-incs/get_sys_users.php (+1/-1)
cpanel-incs/logs.php (+6/-6)
cpanel-incs/mail.php (+54/-60)
cpanel-incs/plugins/.php (+6/-6)
cpanel-incs/plugins/cms.php (+40/-43)
cpanel-incs/plugins/col1.php (+7/-7)
cpanel-incs/plugins/col3.php (+7/-7)
cpanel-incs/plugins/filemanager.php (+54/-56)
cpanel-incs/plugins/news.php (+13/-13)
cpanel-incs/plugins/slideshow.php (+13/-13)
cpanel-incs/register.php (+24/-4)
inc/sitemgmt/constants.php (+2/-2)
inc/sitemgmt/database.php (+1/-1)
inc/sitemgmt/session.php (+35/-51)
lang/set.php (+1/-0)
panel.php (+9/-10)
scripts/cms_scripts.js (+39/-39)
scripts/col1_scripts.js (+15/-16)
scripts/col3_scripts.js (+15/-16)
scripts/create_site_scripts.js (+2/-2)
scripts/db_scripts.js (+2/-2)
scripts/filemanager_scripts.js (+6/-6)
scripts/news_scripts.js (+9/-9)
scripts/site_control_scripts.js (+15/-19)
scripts/slideshow_scripts.js (+16/-17)
trans/main.pot (+205/-0)
To merge this branch: bzr merge lp:~vierbergenlars/remotecp-panel/translate
Reviewer Review Type Date Requested Status
Lars Vierbergen Approve
Review via email: mp+45904@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Lars Vierbergen (vierbergenlars) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cpanel-incs/admin-admin.php'
2--- cpanel-incs/admin-admin.php 2010-12-06 17:50:35 +0000
3+++ cpanel-incs/admin-admin.php 2011-01-11 19:52:14 +0000
4@@ -2,8 +2,6 @@
5 <AJAX_SCRIPTLOC>admin_scripts.js</AJAX_SCRIPTLOC>
6 <AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>
7 < HEADERS --><?php
8-if(isset($_GET['getscript'])) { include('admin_scripts.js'); exit; }
9-
10 if(!$session->isAdmin()){ exit; }
11 if($_GET['function']=="edit_level") {
12 if($_GET['user']!=$session->username) {
13@@ -61,12 +59,12 @@
14 return;
15 }
16 if($num_rows == 0){
17- echo "No content";
18+ echo $t->_("No content");
19 return;
20 }
21 /* Display table contents */
22 echo "<table border=\"1\" cellspacing=\"0\" cellpadding=\"3\" width=\"340\">\n";
23- echo "<tr><th>".T_USER_USERNAME."</th><th>".T_USER_ADMIN_USERTABLE_LEVEL."</th><th>".T_USER_ADMIN_USERTABLE_MAIL."</th><th>Actie</th></tr>\n";
24+ echo "<tr><th>".$t->_('Username')."</th><th>".$t->_('Lv.')."</th><th>".$t->_('E-mail address')."</th><th>".$t->_('Actions')."</th></tr>\n";
25 while($user=$result->fetch_assoc()) {
26 $uname = $user["username"];
27 $ulevel = $user["userlevel"];
28@@ -74,14 +72,14 @@
29 $time = $user["timestamp"];
30
31 echo "<tr><td>$uname";
32- if($user["banned"]) { echo "[BANNED]"; }
33+ if($user["banned"]) { echo "<img src='".URL_IMG."/Silk/lock.png' alt='".$t->_('Banned')."' title='".$t->_('User banned')."'>"; }
34 echo "</td><td";
35 if($uname!=$session->username) { echo " ondblclick='admin.edit_level.expand(\"$uname\",this);'";}
36 echo ">$ulevel</td><td>$email</td><td>";
37 if($uname!=$session->username){
38- echo "<a onclick='admin.delete(\"$uname\");'>Wissen</a>";
39- if($user["banned"]) { echo " <a onclick='admin.unban(\"$uname\")'>Unban</a>"; }
40- else {echo " <a onclick='admin.ban(\"$uname\");'>Bannen</a>";}
41+ echo "<a onclick='admin.delete(\"$uname\");'><img src='".URL_IMG."/Silk/user_delete.png' alt='".$t->_('Delete')."' title='".$t->_('Delete user')."'></a>";
42+ if($user["banned"]) { echo " <a onclick='admin.unban(\"$uname\")'><img src='".URL_IMG."/Silk/lock_open.png' alt='".$t->_('Unban')."' title='".$t->_('Allow the user back on the system')."'></a>"; }
43+ else {echo " <a onclick='admin.ban(\"$uname\");'><img src='".URL_IMG."/Silk/lock.png' alt='".$t->_('Ban')."' title='".$t->_('Block the user from the system')."'></a>";}
44 }
45 echo "</td></tr>\n";
46 }
47@@ -90,30 +88,45 @@
48
49
50 ?>
51-<fieldset>
52-<?php include(PHP_ROOT."/inc/sitemgmt/register.php"); ?>
53+<fieldset><legend><?php echo $t->_('Register new user'); ?></legend>
54+<?php include("register.php"); ?>
55 </fieldset>
56-<fieldset><legend><?php echo T_USER_ADMIN_USERTABLE ?></legend>
57+<fieldset><legend><?php echo $t->_('Users'); ?></legend>
58 <?php
59-displayUsers();
60+ $q = "SELECT * "
61+ ."FROM ".TBL_USERS." ORDER BY userlevel DESC,username";
62+ $result = $database->query($q);
63+ /* Error occurred, return given name by default */
64+ $num_rows = $result->num_rows;
65+ if(!$result || ($num_rows < 0)){
66+ echo "LOADING FAILED";
67+
68+ }
69+ if($num_rows == 0){
70+ echo $t->_("No content");
71+ }
72+ /* Display table contents */
73+ echo "<table border=\"1\" cellspacing=\"0\" cellpadding=\"3\" width=\"340\">\n";
74+ echo "<tr><th>".$t->_('Username')."</th><th>".$t->_('Lv.')."</th><th>".$t->_('E-mail address')."</th><th>".$t->_('Actions')."</th></tr>\n";
75+ while($user=$result->fetch_assoc()) {
76+ $uname = $user["username"];
77+ $ulevel = $user["userlevel"];
78+ $email = $user["email"];
79+ $time = $user["timestamp"];
80+
81+ echo "<tr><td>$uname";
82+ if($user["banned"]) { echo "<img src='".URL_IMG."/Silk/lock.png' alt='".$t->_('Banned')."' title='".$t->_('User banned')."'>"; }
83+ echo "</td><td";
84+ if($uname!=$session->username) { echo " ondblclick='admin.edit_level.expand(\"$uname\",this);'";}
85+ echo ">$ulevel</td><td>$email</td><td>";
86+ if($uname!=$session->username){
87+ echo "<a onclick='admin.delete(\"$uname\");'><img src='".URL_IMG."/Silk/user_delete.png' alt='".$t->_('Delete')."' title='".$t->_('Delete user')."'></a>";
88+ if($user["banned"]) { echo " <a onclick='admin.unban(\"$uname\")'><img src='".URL_IMG."/Silk/lock_open.png' alt='".$t->_('Unban')."' title='".$t->_('Allow the user back on the system')."'></a>"; }
89+ else {echo " <a onclick='admin.ban(\"$uname\");'><img src='".URL_IMG."/Silk/lock.png' alt='".$t->_('Ban')."' title='".$t->_('Block the user from the system')."'></a>";}
90+ }
91+ echo "</td></tr>\n";
92+ }
93+ echo "</table><br>\n";
94 ?>
95- </fieldset>
96- <fieldset>
97- <legend><?php echo T_USER_ADMIN_USERINACT ?></legend>
98-<?php echo T_USER_ADMIN_USERINACT_WARNING ?><br>
99-<form action="admin-adminprocess.php" method="POST">
100-<label for="del_time"><?php echo T_USER_ADMIN_USERINACT_DAYS ?>:</label>
101-<select id="del_time" name="inactdays">
102-<option value="3">3
103-<option value="7">7
104-<option value="14">14
105-<option value="30">30
106-<option value="100">100
107-<option value="365">365
108-</select>
109-<br>
110-<input type="hidden" name="subdelinact" value="1">
111-<input type="submit" value="<?php echo T_USER_ADMIN_USERINACT_SUBMIT ?>" class="button">
112-</form>
113- </fieldset>
114+</fieldset>
115 <?php } ?>
116\ No newline at end of file
117
118=== modified file 'cpanel-incs/create_site.php'
119--- cpanel-incs/create_site.php 2010-12-25 22:00:55 +0000
120+++ cpanel-incs/create_site.php 2011-01-11 19:52:14 +0000
121@@ -33,7 +33,7 @@
122 $x[]=$remote_connection->query("CREATE TABLE IF NOT EXISTS `{$site_ref}_addons` (`name` varchar(30) NOT NULL,`reference` varchar(30) NOT NULL,`status` int(1) NOT NULL default '0',`ulevel` int(1) NOT NULL default '9',`editable` int(1) NOT NULL default '1') ENGINE=MyISAM DEFAULT CHARSET=latin1");
123 $remote_connection->query("TRUNCATE TABLE `{$site_ref}_addons`"); //Clean table
124 $q=$remote_connection->query('SELECT * FROM `_system_` WHERE `key`=\'addons\''); //Get installed addons
125- $prepared_q="INSERT INTO `{$site_ref}_addons` (`name`, `reference`, `status`, `ulevel`, `editable`) VALUES ('CMS', 'cms', 1, 9, 0),('Kolom &quot;Login&quot;', 'col1', 1, 9, 0),('Kolom &quot;Nieuws&quot;', 'col3', 1, 9, 0),('Bestandsbeheerder', 'filemanager', 1, 9, 0)";
126+ $prepared_q="INSERT INTO `{$site_ref}_addons` (`name`, `reference`, `status`, `ulevel`, `editable`) VALUES ('CMS', 'cms', 1, 9, 0),('Column1', 'col1', 1, 9, 0),('Column 3', 'col3', 1, 9, 0),('File manager', 'filemanager', 1, 9, 0)";
127 $q=$q->fetch_assoc();
128 $addons=doubleExplode('&','=',$q['value']);
129 foreach($addons as $name=>$addon) {
130@@ -41,27 +41,27 @@
131 }
132 $x[]=$remote_connection->query($prepared_q); //Dump addons into table
133 //Create col1 table
134- $x[]=$remote_connection->query("CREATE TABLE IF NOT EXISTS `{$site_ref}_a_col1` ( `id` int(11) NOT NULL auto_increment, `order` int(5) NOT NULL, `title` varchar(30) NOT NULL, `content` text NOT NULL, `plugin-reference` varchar(30) default NULL, `access` int(1) NOT NULL default '0' COMMENT '0=iedereen;1=leden;2=niemand', PRIMARY KEY (`id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1");
135+ $x[]=$remote_connection->query("CREATE TABLE IF NOT EXISTS `{$site_ref}_a_col1` ( `id` int(11) NOT NULL auto_increment, `order` int(5) NOT NULL, `title` varchar(30) NOT NULL, `content` text NOT NULL, `plugin-reference` varchar(30) default NULL, `access` int(1) NOT NULL default '0' ,PRIMARY KEY (`id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1");
136 $remote_connection->query("TRUNCATE TABLE `{$site_ref}_a_col1`"); //Clean table
137 //Dump col1 contents into table
138 $x[]=$remote_connection->query("INSERT INTO `{$site_ref}_a_col1` (`id`, `order`, `title`, `content`, `plugin-reference`, `access`) VALUES(1, 1, 'Login', '', 'login', 0)");
139 //Create col3 table
140- $x[]=$remote_connection->query("CREATE TABLE IF NOT EXISTS `{$site_ref}_a_col3` ( `id` int(11) NOT NULL auto_increment, `order` int(5) NOT NULL, `title` varchar(30) NOT NULL, `content` text NOT NULL, `plugin-reference` varchar(30) default NULL, `access` int(1) NOT NULL default '0' COMMENT '0=iedereen;1=leden;2=niemand', PRIMARY KEY (`id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1");
141+ $x[]=$remote_connection->query("CREATE TABLE IF NOT EXISTS `{$site_ref}_a_col3` ( `id` int(11) NOT NULL auto_increment, `order` int(5) NOT NULL, `title` varchar(30) NOT NULL, `content` text NOT NULL, `plugin-reference` varchar(30) default NULL, `access` int(1) NOT NULL default '0', PRIMARY KEY (`id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1");
142 $remote_connection->query("TRUNCATE TABLE `{$site_ref}_a_col3`"); //Clean table
143 //Dump col3 contents into table
144 //No contents
145 //Create pageindex table
146- $x[]=$remote_connection->query("CREATE TABLE IF NOT EXISTS `{$site_ref}_pageindex` ( `id` int(5) NOT NULL auto_increment, `type` int(1) NOT NULL default '0' COMMENT '0=Pagina; 1=Link; 2=Systeem pagina; 3=Systeem link', `page_order` int(5) NOT NULL, `page_title` text collate latin1_general_ci NOT NULL, `link` text collate latin1_general_ci NOT NULL, `access` int(1) NOT NULL default '0' COMMENT '0=iedereen;1=leden;2=niemand', `visible` int(11) NOT NULL default '1' COMMENT '0=onzichtbaar;1=zichtbaar', PRIMARY KEY (`id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci");
147+ $x[]=$remote_connection->query("CREATE TABLE IF NOT EXISTS `{$site_ref}_pageindex` ( `id` int(5) NOT NULL auto_increment, `type` int(1) NOT NULL default '0', `page_order` int(5) NOT NULL, `page_title` text collate latin1_general_ci NOT NULL, `link` text collate latin1_general_ci NOT NULL, `access` int(1) NOT NULL default '0' , `visible` int(11) NOT NULL default '1', PRIMARY KEY (`id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci");
148 $remote_connection->query("TRUNCATE TABLE `{$site_ref}_pageindex`"); //Clean table
149 //Dump pageindex contents into table
150 $x[]=$remote_connection->query("INSERT INTO `{$site_ref}_pageindex` (`id`, `type`, `page_order`, `page_title`, `link`, `access`, `visible`) VALUES(1, 2, 1, 'Home', '', 0, 1)");
151 //Create pages tables
152- $x[]=$remote_connection->query("CREATE TABLE IF NOT EXISTS `{$site_ref}_pages` ( `id` int(11) NOT NULL auto_increment, `page_id` int(5) NOT NULL, `type` int(1) NOT NULL default '0' COMMENT '0=default;1=system', `section_order` int(11) NOT NULL default '1', `section_title` text collate latin1_general_ci NOT NULL, `section_main` text collate latin1_general_ci NOT NULL, PRIMARY KEY (`id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci");
153+ $x[]=$remote_connection->query("CREATE TABLE IF NOT EXISTS `{$site_ref}_pages` ( `id` int(11) NOT NULL auto_increment, `page_id` int(5) NOT NULL, `type` int(1) NOT NULL default '0', `section_order` int(11) NOT NULL default '1', `section_title` text collate latin1_general_ci NOT NULL, `section_main` text collate latin1_general_ci NOT NULL, PRIMARY KEY (`id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci");
154 $remote_connection->query("TRUNCATE TABLE `{$site_ref}_pages`"); //Clean table
155 //Dump pages contents into table
156 //No contents
157 //Create MySQLfs index table
158- $x[]=$remote_connection->query("CREATE TABLE IF NOT EXISTS `{$site_ref}_fs` (`path` varchar(900) NOT NULL,`filename` varchar(100) NOT NULL,`rights` int(3) unsigned zerofill NOT NULL DEFAULT '777',`owner` varchar(30) DEFAULT NULL COMMENT 'Owner of the file (username)',`group` int(1) unsigned NOT NULL DEFAULT '9' COMMENT 'Group access (site access control number [0-9])',`time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,`type` enum('d','f') NOT NULL,`mime` varchar(100) NOT NULL DEFAULT 'application/octet-stream',`size` int(11) unsigned NOT NULL DEFAULT '0',`mfi` int(11) unsigned NOT NULL AUTO_INCREMENT,UNIQUE KEY `path` (`path`,`filename`),UNIQUE KEY `mfi` (`mfi`)) ENGINE=MyISAM");
159+ $x[]=$remote_connection->query("CREATE TABLE IF NOT EXISTS `{$site_ref}_fs` (`path` varchar(900) NOT NULL,`filename` varchar(100) NOT NULL,`rights` int(3) unsigned zerofill NOT NULL DEFAULT '777',`owner` varchar(30) DEFAULT NULL,`group` int(1) unsigned NOT NULL DEFAULT '9',`time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,`type` enum('d','f') NOT NULL,`mime` varchar(100) NOT NULL DEFAULT 'application/octet-stream',`size` int(11) unsigned NOT NULL DEFAULT '0',`mfi` int(11) unsigned NOT NULL AUTO_INCREMENT,UNIQUE KEY `path` (`path`,`filename`),UNIQUE KEY `mfi` (`mfi`)) ENGINE=MyISAM");
160 //Dump MySQLfs primary folder
161 $x[]=$remote_connection->query("INSERT INTO `{$site_ref}_fs` (`path`, `filename`, `rights`, `owner`, `group`, `time`, `type`, `mime`, `size`, `mfi`) VALUES('', '', 777, NULL, 0, '2010-11-19 18:35:35', 'd', 'application/octet-stream', 0, 1);");
162 //Create MySQLfs data table
163@@ -77,8 +77,8 @@
164 ?>
165 <form onsubmit='create_site.send(this); return false;' method='POST'>
166 <fieldset>
167- <legend>Algemeen</legend>
168- <label>Domeinnaam: <input name='sub'>.</label>
169+ <legend><?php echo $t->_('General'); ?></legend>
170+ <label><?php echo $t->_('Domain'); ?>: <input name='sub'>.</label>
171 <select name='domain'>
172 <?php $q=$remote_connection->query('SELECT * FROM `_system_` WHERE `key`=\'domains\'');
173 $q=$q->fetch_assoc();
174@@ -90,7 +90,7 @@
175
176 </select>
177 <br>
178- <label>Stijl:
179+ <label><?php echo $t->_('Style'); ?>:
180 <select name='style'><?php
181 $q=$remote_connection->query('SELECT * FROM `_system_` WHERE `key`=\'styles\'');
182 $q=$q->fetch_assoc();
183@@ -104,11 +104,11 @@
184 </label>
185 </fieldset>
186 <fieldset>
187- <legend>Inhoud</legend>
188- <label>Site titel: <input name='title'></label><br>
189- <label>Site slogan: <input name='slogan'></label><br>
190- <label>Taal: Nederlands <input type='hidden' name='language' value='nl'></label><br>
191- <label>Auteur: <input name='author'></label>
192+ <legend><?php echo $t->_('Content'); ?></legend>
193+ <label><?php echo $t->_('Site title'); ?>: <input name='title'></label><br>
194+ <label><?php echo $t->_('Site slogan'); ?>: <input name='slogan'></label><br>
195+ <label><?php echo $t->_('Language'); ?>: Nederlands <input type='hidden' name='language' value='nl'></label><br>
196+ <label><?php echo $t->_('Author'); ?>: <input name='author'></label>
197 </fieldset>
198 <input type="Submit">
199 </form>
200
201=== modified file 'cpanel-incs/database.php'
202--- cpanel-incs/database.php 2010-12-25 21:16:51 +0000
203+++ cpanel-incs/database.php 2011-01-11 19:52:14 +0000
204@@ -8,7 +8,8 @@
205 * and to administer this.
206 */
207 function help($iname) {
208- return "<a onclick='db.create.question(\"$iname\");'><img src='".URL_IMG."/Silk/help.png' alt='?' title='Help'></a>";
209+ global $t;
210+ return "<a onclick='db.create.question(\"$iname\");'><img src='".URL_IMG."/Silk/help.png' alt='?' title='".$t->_('Help')."'></a>";
211 }
212 if(!RDB&&!isset($_GET['function'])) { //We are not in a remote database
213 if(!isset($_GET['function'])) $_GET['function']="create";
214@@ -18,28 +19,28 @@
215 echo "
216 <form method='POST' onsubmit='db.create.send(this); return false'>
217 <fieldset>
218- <legend>Verbinding</legend>
219- <label><input name='conn_type' type='radio' value='0' onclick='$(this.parentNode.parentNode.getElementsByTagName(\"fieldset\")[0]).show(\"slow\");$(this.parentNode.parentNode.getElementsByTagName(\"fieldset\")[1]).hide(\"slow\")' checked>Normaal</label> <label><input name='conn_type' type='radio' value='1' onclick='$(this.parentNode.parentNode.getElementsByTagName(\"fieldset\")[1]).show(\"slow\");$(this.parentNode.parentNode.getElementsByTagName(\"fieldset\")[0]).hide(\"slow\")'>HttpMySQL</label> ".help('conn_type')."<br>
220+ <legend>".$t->_('Connection')."</legend>
221+ <label><input name='conn_type' type='radio' value='0' onclick='$(this.parentNode.parentNode.getElementsByTagName(\"fieldset\")[0]).show(\"slow\");$(this.parentNode.parentNode.getElementsByTagName(\"fieldset\")[1]).hide(\"slow\")' checked>".$t->_('Normal')."</label> <label><input name='conn_type' type='radio' value='1' onclick='$(this.parentNode.parentNode.getElementsByTagName(\"fieldset\")[1]).show(\"slow\");$(this.parentNode.parentNode.getElementsByTagName(\"fieldset\")[0]).hide(\"slow\")'>".$t->_('HTTPMySQL')."</label> ".help('conn_type')."<br>
222 <fieldset>
223- <legend>MySQL</legend>
224- <label>MySQL host: <input name='conn_0_host' type='text'></label> ".help('conn_0_host')."<br>
225- <label>MySQL gebruiker: <input name='conn_0_user' type='text'></label><br>
226- <label>MySQL wachtwoord: <input name='conn_0_pass' type='password'></label><br>
227- <label>MySQL database: <input name='conn_0_db' type='text'></label>
228+ <legend>".$t->_('MySQL')."</legend>
229+ <label>".$t->_('MySQL host').": <input name='conn_0_host' type='text'></label> ".help('conn_0_host')."<br>
230+ <label>".$t->_('MySQL username').": <input name='conn_0_user' type='text'></label><br>
231+ <label>".$t->_('MySQL password').": <input name='conn_0_pass' type='password'></label><br>
232+ <label>".$t->_('MySQL database').": <input name='conn_0_db' type='text'></label>
233 </fieldset>
234 <fieldset style='display: none'>
235- <legend>HttpMySQL</legend>
236- <label>Domeinnaam: <input name='conn_1_host' type='text'></label> ".help('conn_1_host')."<br>
237- <label>Pad naar query.php: <input name='conn_1_db' type='text'></label>/query.php ".help('conn_1_db')."<br>
238- <label>Gebruiker: <input name='conn_1_user' type='text'></label> ".help('conn_1_user')."<br>
239- <label>Wachtwoord: <input name='conn_1_pass' type='password'></label> ".help('conn_1_pass')."<br>
240+ <legend>".$t->_('HTTPMySQL')."</legend>
241+ <label>".$t->_('Domain').": <input name='conn_1_host' type='text'></label> ".help('conn_1_host')."<br>
242+ <label>".$t->_('Path to query.php').": <input name='conn_1_db' type='text'></label>/query.php ".help('conn_1_db')."<br>
243+ <label>".$t->_('Username').": <input name='conn_1_user' type='text'></label> ".help('conn_1_user')."<br>
244+ <label>".$t->_('Password').": <input name='conn_1_pass' type='password'></label> ".help('conn_1_pass')."<br>
245 </fieldset>
246 </fieldset>
247 <fieldset>
248- <legend>RemoteCP API</legend>
249- <label>IP-adres: <input name='api_ip' type='text' onchange='db.create.check_ip(this)'></label> ".help('api_ip')."<br>
250+ <legend>".$t->_('RemoteCP API')."</legend>
251+ <label>".$t->_('IP-address').": <input name='api_ip' type='text' onchange='db.create.check_ip(this)'></label> ".help('api_ip')."<br>
252 </fieldset>
253- <input type='submit' value='verzenden'>
254+ <input type='submit' value='".$t->_('Add database')."'>
255 </form>
256 ";
257 }
258@@ -47,15 +48,15 @@
259 $_ERRORS=array();
260 if($_POST['conn_type']==0) {
261 $db_test=@mysql_connect($_POST['conn_host'],$_POST['conn_user'],$_POST['conn_pass']);
262- if(!@mysql_select_db($_POST['conn_db'],$db_test)) $_ERRORS[]='MySQL verbindings fout.';
263+ if(!@mysql_select_db($_POST['conn_db'],$db_test)) $_ERRORS[]=$t->_('MySQL connection error');
264 }
265 else {
266 include('inc/httpmysql/httpmysql_silent.php');
267 $db_test=@new HTTPMySQL("http://{$_POST['conn_user']}:{$_POST['conn_pass']}@{$_POST['conn_host']}/{$_POST['conn_db']}/query.php");
268- if(!$db_test->ping())$_ERRORS[]='HTTPMySQL verbindingsfout.';
269+ if(!$db_test->ping())$_ERRORS[]=$t->_('HTTPMySQL connection error');
270 }
271 if(filter_var($_POST['api_ip'], FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {
272- $_ERRORS[]='Ongeldig IP-adres';
273+ $_ERRORS[]=$t->_('Invalid IP-address');
274 }
275 if(count($_ERRORS)!=0) {
276 echo "false|";
277@@ -77,44 +78,50 @@
278 $name=$_GET['name'];
279 switch($_GET['name']) {
280 case 'conn_type':
281- echo "<h1>Verbinding</h1>";
282- echo "<p>Hoe wilt u verbinding maken met uw database?</p>
283- <p>U kiest best voor 'Normaal' wanneer u kan kiezen welke sites toegang kunnen krijgen tot uw database (Waarschijnlijk onder de naam 'Remote MySQL' of 'Remote database access')</p>
284- <p>U kiest best voor 'HTTPMySQL' als uw provider deze optie niet heeft. Dit is echter iets trager en vereist meer rekenkracht van uw server.</p>";
285+ echo "<h1>".$t->_('Connection')."</h1>";
286+ echo $t->_('<p>How should RemoteCP connect to your database?</p><p>Normal mode is preferred, but you have to be able to allow remote hosts to connect to your MySQL server. (Probably named \'Remote MySQL\' or \'Remote database access\')</p><p>When it is not possible to choose sites who are allowed to connect to your database, you have to choose \'HTTPMySQL\'. However, this is a bit slower and requires more processing power on your server.</p>');
287+ // "<p>Hoe wilt u verbinding maken met uw database?</p>
288+ // <p>U kiest best voor 'Normaal' wanneer u kan kiezen welke sites toegang kunnen krijgen tot uw database (Waarschijnlijk onder de naam 'Remote MySQL' of 'Remote database access')</p>
289+ // <p>U kiest best voor 'HTTPMySQL' als uw provider deze optie niet heeft. Dit is echter iets trager en vereist meer rekenkracht van uw server.</p>";
290 break;
291 case 'conn_0_host':
292 echo "<script>var db ={ create: {question: function(formname) { window.open('?control=database&function=help&name='+formname,'database_help','resizable=no,width=800,height=200')}}}</script>";
293- echo "<h1>MySQL host</h1>";
294- echo "<p>De machine waarop uw server draait</p>
295- <p>Als deze 'localhost' of '127.0.0.1' is volgens uw documentatie moet u hier uw domeinnaam ".help('conn_1_host')." ingeven.</p>";
296+ echo "<h1>".$t->_('MySQL host')."</h1>";
297+ echo sprintf($t->_('<p>The machine that runs the MySQL server</p><p>If this is \'localhost\' or \'127.0.0.1\' according to your documentation, you should enter your domainname %s here.'),help('conn_1_host'));
298+ // "<p>De machine waarop uw server draait</p>
299+ // <p>Als deze 'localhost' of '127.0.0.1' is volgens uw documentatie moet u hier uw domeinnaam ".help('conn_1_host')." ingeven.</p>";
300 break;
301 case 'conn_1_host':
302- echo "<h1>Domeinnaam</h1>";
303- echo "<p>Uw domeinnaam is hetgene wat u intypt om naar uw website te gaan.</p>
304- <p>Het staat achter http:// en voor de eerste slash. (Bv: http://<u>remotecp.co.cc</u>/1-Home/, dan is het onderlijnde gedeelte de domeinnaam).</p>";
305+ echo "<h1>".$t->_('Domain')."</h1>";
306+ echo $t->_('<p>Your domain is what you type to visit your website</p><p>It is placed behind http:// and before the first slash. (E.g.: <tt>http://<u>remotecp.co.cc</u>/1-Home/</tt>, <tt>remotecp.co.cc</tt> is the domain).</p>');
307+ // "<p>Uw domeinnaam is hetgene wat u intypt om naar uw website te gaan.</p>
308+ // <p>Het staat achter http:// en voor de eerste slash. (Bv: http://<u>remotecp.co.cc</u>/1-Home/, dan is het onderlijnde gedeelte de domeinnaam).</p>";
309 break;
310 case 'conn_1_db':
311 echo "<script>var db ={ create: {question: function(formname) { window.open('?control=database&function=help&name='+formname,'database_help','resizable=no,width=800,height=200')}}}</script>";
312- echo "<h1>Pad naar query.php</h1>";
313- echo "<p>Het pad naar het bestand query.php op uw server.</p>
314- <p>Het pad is het gedeelte na de domeinnaam ".help('conn_1_host').". Voor uw gemak hebben we '/query.php' al aan het einde toegevoegd. Dit mag u dus ook weglaten van het pad.</p>";
315+ echo "<h1>".$t->_('Path to query.php')."</h1>";
316+ echo sprintf($t->_('<p>The path to the file query.php on your server.</p><p>The path is the part after the domain %s. For your convenience, whe have already appended \'/query.php\'. So, you must also omit that from the path.</p>'),help('conn_1_host'));
317+ // "<p>Het pad naar het bestand query.php op uw server.</p>
318+ // <p>Het pad is het gedeelte na de domeinnaam ".help('conn_1_host').". Voor uw gemak hebben we '/query.php' al aan het einde toegevoegd. Dit mag u dus ook weglaten van het pad.</p>";
319 break;
320 case 'conn_1_user':
321- echo "<h1>Gebruiker</h1>";
322- echo "<p>Welke gebruikersnaam is nodig om aan te melden op 'query.php'?</p>
323- <p>U moet het bestand query.php beveiligen met een gebruikersnaam en een wachtwoord om ongeoorloofde wijzigingen te vermijden. Welke gebruikersnaam hebt u hiervoor gebruikt?</p>";
324+ echo "<h1>".$t->_('Username')."</h1>";
325+ echo $t->_('<p>What username is required to access \'query.php\'?</p><p>You should secure query.php with an username and password combination to avoid unallowed changes to your websites. What username did you use for that purpose?</p>');
326+ // "<p>Welke gebruikersnaam is nodig om aan te melden op 'query.php'?</p>
327+ // <p>U moet het bestand query.php beveiligen met een gebruikersnaam en een wachtwoord om ongeoorloofde wijzigingen te vermijden. Welke gebruikersnaam hebt u hiervoor gebruikt?</p>";
328 break;
329 case 'conn_1_pass':
330- echo "<h1>Wachtwoord</h1>";
331- echo "<p>Welk wachtwoord is nodig om aan te melden op 'query.php'?</p>
332- <p>U moet het bestand query.php beveiligen met een gebruikersnaam en een wachtwoord om ongeoorloofde wijzigingen te vermijden. Welke gebruikersnaam hebt u hiervoor gebruikt?</p>";
333+ echo "<h1>".$t->_('Password')."</h1>";
334+ echo $t->_('<p>What password is required to access \'query.php\'?</p><p>You should secure query.php with an username and password combination to avoid unallowed changes to your websites. What password did you use for that purpose?</p>');
335+ // "<p>Welk wachtwoord is nodig om aan te melden op 'query.php'?</p>
336+ // <p>U moet het bestand query.php beveiligen met een gebruikersnaam en een wachtwoord om ongeoorloofde wijzigingen te vermijden. Welke wachtwoord hebt u hiervoor gebruikt?</p>";
337 break;
338 case 'api_ip':
339 echo "<script>var db ={ create: {question: function(formname) { window.open('?control=database&function=help&name='+formname,'database_help','resizable=no,width=800,height=200')}}}</script>";
340- echo "<h1>IP-adres</h1>";
341- echo "<p>Wat is het ip-adres van uw server?</p>
342- <p>Een ip-adres hebt is een unieke code van 4 maal getallen van 0 tot 255, gescheiden door een punt. (Bv: <u>69.175.113.125</u>)</p>
343- <p>Om achter het IP-adres van uw server te komen opent u een opdrachtprompt-venster (Onder Bureau-accesoires) en typt u <tt>ping &lt;domeinnaam".help('conn_1_host')."&gt;</tt>. De eerste regel is ongeveer <tt>Pingen naar remotecp.co.cc [<u>199.27.134.101</u>] met 32 bytes aan gegevens:</tt>. Het onderlijnde gedeelte is het IP-adres van uw server.</p>";
344+ echo "<h1>".$t->_('IP-address')."</h1>";
345+ echo sprintf($t->_('<p>What is the IP-address belonging to your server?</p><p>An IP address is a unique identifier of 4 times a number from 0 to 255, separated by a point. (E.g.:<tt><u>69.175.113.125</u></tt>)</p><p>To find the IP address of your server open a Command Prompt window (Folder Accessories) and type <tt>ping &lt;domain %s &gt; </tt>. The first rule is roughly <tt> remotecp.co.cc Pinging [<u>199.27.134.101</u>] with 32 bytes of data: </tt>. The underlined part is the IP address of your server. </p>'),help('conn_1_host'));
346+ // "<p>Wat is het ip-adres van uw server?</p><p>Een ip-adres hebt is een unieke code van 4 maal getallen van 0 tot 255, gescheiden door een punt. (Bv: <u>69.175.113.125</u>)</p>
347+ // <p>Om achter het IP-adres van uw server te komen opent u een opdrachtprompt-venster (Onder Bureau-accesoires) en typt u <tt>ping &lt;domeinnaam".help('conn_1_host')."&gt;</tt>. De eerste regel is ongeveer <tt>Pingen naar remotecp.co.cc [<u>199.27.134.101</u>] met 32 bytes aan gegevens:</tt>. Het onderlijnde gedeelte is het IP-adres van uw server.</p>";
348 }
349
350 }
351\ No newline at end of file
352
353=== modified file 'cpanel-incs/desktop.php'
354--- cpanel-incs/desktop.php 2010-12-25 22:00:55 +0000
355+++ cpanel-incs/desktop.php 2011-01-11 19:52:14 +0000
356@@ -1,24 +1,23 @@
357 <!-- HEADERS >
358 <AJAX_SCRIPTLOC>NULL</AJAX_SCRIPTLOC>
359 <AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>
360-< HEADERS --><?php if(isset($_GET['getscript'])) { exit; } ?>
361-<p>
362-| <a onclick="openLoc('Account','?control=userinfo&user=<?php echo $session->username; ?>','tabs-account')">Account</a> ||
363-<?php if($session->isAdmin()) {?> <a onclick="openLoc('Logs','?control=logs','tabs-logs');">Logboeken</a> || <?php } ?>
364-<a onclick="openLoc('Berichten','?control=mail','tabs-mail');">Berichten</a> |
365+< HEADERS --><p>
366+| <a onclick="openLoc('<?php echo $t->_('Account'); ?>','?control=userinfo&user=<?php echo $session->username; ?>','tabs-account')"><?php echo $t->_('Account'); ?></a> ||
367+<?php if($session->isAdmin()) {?> <a onclick="openLoc('<?php echo $t->_('Logs'); ?>','?control=logs','tabs-logs');"><?php echo $t->_('Logbooks'); ?></a> || <?php } ?>
368+<a onclick="openLoc('<?php echo $t->_('Messages'); ?>','?control=mail','tabs-mail');"><?php echo $t->_('Messages'); ?></a> |
369 <?php if($session->isAdmin()) { ?>
370-| <a onclick="openLoc('Administratie','?control=admin','tabs-admin');">Administratie</a> |
371+| <a onclick="openLoc('<?php echo $t->_('Administration'); ?>','?control=admin','tabs-admin');"><?php echo $t->_('Administration'); ?></a> |
372 <?php } ?>
373 <hr><?php if(!RDB) {
374 $q=$local_connection->query("SELECT * FROM `remote_databases_assignments` WHERE `username`='$session->username'");
375 while($databases=$q->fetch_assoc()) {
376 $db=$local_connection->query("SELECT * FROM `remote_databases` WHERE `key`='$databases[key]'"); $dbinfo=$db->fetch_assoc(); ?>| <a onclick="window.open('panel.php/<?php echo $databases['key']; ?>/');"><?php echo $dbinfo['user'].'@'.$dbinfo['host'].'/'.$dbinfo['database']; ?></a> |<?php
377 }
378- echo '| <a onclick="openLoc(\'Database toevoegen\',\'?control=database\',\'add_db\');">Nieuwe database</a> |';
379+ echo '| <a onclick="openLoc(\''.$t->_('Add database').'\',\'?control=database\',\'add_db\');">'.$t->_('Add database').'</a> |';
380 }
381 else {
382 $q=$remote_connection->query('SELECT * FROM sites WHERE username="'.$session->username.'"');
383 while($sites=$q->fetch_assoc()) { ?>| <a onclick="openLoc('<?php echo getSiteInfo($sites['ref'],'SITE_TITLE'); ?>','?control=addons&site=<?php echo $sites['ref']; ?>','<?php echo $sites['ref']; ?>_ctrls_main');"><?php echo getSiteInfo($sites['ref'],'SITE_TITLE'); ?></a> |<?php }
384- echo "| <a onclick=\"openLoc('Nieuwe site','?control=create_site','new_site');\">Nieuwe site</a> |";
385+ echo "| <a onclick=\"openLoc('".$t->_('New site')."','?control=create_site','new_site');\">".$t->_('New site')."</a> |";
386 } ?>
387 </p>
388\ No newline at end of file
389
390=== modified file 'cpanel-incs/get_sys_users.php'
391--- cpanel-incs/get_sys_users.php 2010-12-06 17:50:35 +0000
392+++ cpanel-incs/get_sys_users.php 2011-01-11 19:52:14 +0000
393@@ -33,7 +33,7 @@
394 });
395 });
396 </script>
397-<label for='username'>Gebruikersnaam: </label><input id='username'>
398+<label for='username'><?php echo $t->_('Username'); ?>: </label><input id='username'>
399 <?php
400 }
401 ?>
402\ No newline at end of file
403
404=== modified file 'cpanel-incs/logs.php'
405--- cpanel-incs/logs.php 2010-12-06 17:50:35 +0000
406+++ cpanel-incs/logs.php 2011-01-11 19:52:14 +0000
407@@ -1,7 +1,7 @@
408 <!-- HEADERS >
409 <AJAX_SCRIPTLOC>NULL</AJAX_SCRIPTLOC>
410 <AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>
411-< HEADERS --><?php if(isset($_GET['getscript'])) { exit; } ?>
412+< HEADERS -->
413 <?php if(!$session->isAdmin()) { exit; }
414 if(isset($_GET['flag'])&&is_numeric($_GET['flag'])) { $local_connection->query('UPDATE serv_log SET flag=1 WHERE id='.$_GET["flag"]); }
415 if(isset($_GET['unflag'])&&is_numeric($_GET['unflag'])) { $local_connection->query('UPDATE serv_log SET flag=0 WHERE id='.$_GET["unflag"]); }
416@@ -12,10 +12,10 @@
417 $selector="WHERE ".$_GET['type']."='".$_GET['value']."'";
418 }
419 $logs=$local_connection->query('SELECT * FROM serv_log '.$selector.' ORDER BY id DESC LIMIT '.$start_row.',20');?>
420-<?php if(isset($_GET['type'])) { echo "Zoeken voor: ".$_GET['type']."=".$_GET['value']; ?>
421- <a onclick='openLoc("","?control=logs","tabs-logs")'>Reset zoekparameters</a>
422+<?php if(isset($_GET['type'])) { echo sprintf($t->_('Search for: %s'),$_GET['type']."=".$_GET['value']); ?>
423+ <a onclick='openLoc("","?control=logs","tabs-logs")'><?php echo $t->_('Reset search');?></a>
424 <?php } ?>
425-<table><thead><tr><th>Code</th><th>Datum</th><th>Gebruiker</th><th>IP</th><th>URL</th><th>Bericht</th><th>Markeren</th></thead><tbody>
426+<table><thead><tr><th><?php echo $t->_('Code'); ?></th><th><?php echo $t->_('Date'); ?></th><th><?php echo $t->_('User'); ?></th><th><?php echo $t->_('IP'); ?></th><th><?php echo $t->_('URL'); ?></th><th><?php echo $t->_('Message'); ?></th><th><?php echo $t->_('Flag'); ?></th></thead><tbody>
427 <?php while($entry=$logs->fetch_assoc()) { ?>
428-<tr<?php if($entry['flag']=="1") { ?> style="background-color: yellow"<?php } echo "><td><a onclick='openLoc(\"\",\"?control=logs&type=type&value=".$entry['type']."\",\"tabs-logs\")'>".$entry['type']."</a></td><td>".$entry['date']."</td><td><a onclick='openLoc(\"\",\"?control=logs&type=user&value=".$entry['user']."\",\"tabs-logs\")'>".$entry['user']."</a></td><td><a onclick='openLoc(\"\",\"?control=logs&type=ip&value=".$entry['ip']."\",\"tabs-logs\")'>".$entry['ip']."</a></td><td><a onclick='openLoc(\"\",\"?control=logs&type=url&value=".$entry['url']."\",\"tabs-logs\")'>".$entry['url']."</a></td><td>".$entry['message']."</td>"; ?><td><?php if($entry['flag']=="0") { ?><a onclick="openLoc('','?control=logs&page=<?php echo $_GET['page']; ?>&flag=<?php echo $entry['id']; ?>','tabs-logs')">Markeren</a><?php } else { ?><a onclick="openLoc('','?control=logs&page=<?php echo $_GET['page']; ?>&unflag=<?php echo $entry['id']; ?>','tabs-logs')">Markering opheffen</a><?php } ?></td></tr>
429-<?php } ?></tbody><tfoot><tr><td><a onclick="openLoc('','?control=logs<?php if(isset($_GET['type'])&&isset($_GET['value'])) { echo "&type=".$_GET['type']."&value=".$_GET['value']; }?>&page=<?php echo $_GET['page']-1; ?>','tabs-logs');">Vorige</a></td><td>Tijden GMT+1</td><td colspan="4">Huidige tijd: <?php echo date('d-m-Y H:i:s',$session->time); ?> || Logger &copy; Copyright 2010 lnhost.co.cc</td><td><a onclick="openLoc('','?control=logs<?php if(isset($_GET['type'])&&isset($_GET['value'])) { echo "&type=".$_GET['type']."&value=".$_GET['value']; }?>&page=<?php echo $_GET['page']+1; ?>','tabs-logs');">Volgende</a></td</tr></tfoot>
430\ No newline at end of file
431+<tr<?php if($entry['flag']=="1") { ?> style="background-color: yellow"<?php } echo "><td><a onclick='openLoc(\"\",\"?control=logs&type=type&value=".$entry['type']."\",\"tabs-logs\")'>".$entry['type']."</a></td><td>".$entry['date']."</td><td><a onclick='openLoc(\"\",\"?control=logs&type=user&value=".$entry['user']."\",\"tabs-logs\")'>".$entry['user']."</a></td><td><a onclick='openLoc(\"\",\"?control=logs&type=ip&value=".$entry['ip']."\",\"tabs-logs\")'>".$entry['ip']."</a></td><td><a onclick='openLoc(\"\",\"?control=logs&type=url&value=".$entry['url']."\",\"tabs-logs\")'>".$entry['url']."</a></td><td>".$entry['message']."</td>"; ?><td><?php if($entry['flag']=="0") { ?><a onclick="openLoc('','?control=logs&page=<?php echo $_GET['page']; ?>&flag=<?php echo $entry['id']; ?>','tabs-logs')"><?php echo $t->_('Flag'); ?></a><?php } else { ?><a onclick="openLoc('','?control=logs&page=<?php echo $_GET['page']; ?>&unflag=<?php echo $entry['id']; ?>','tabs-logs')"><?php echo $t->_('Unflag'); ?></a><?php } ?></td></tr>
432+<?php } ?></tbody><tfoot><tr><td><a onclick="openLoc('','?control=logs<?php if(isset($_GET['type'])&&isset($_GET['value'])) { echo "&type=".$_GET['type']."&value=".$_GET['value']; }?>&page=<?php echo $_GET['page']-1; ?>','tabs-logs');"><?php echo $t->_('Previous'); ?></a></td><td><?php echo $t->_('All times %s'); ?></td><td colspan="4"><?php echo $t->_('Current time'); ?>: <?php echo date('d-m-Y H:i:s',$session->time); ?></td><td><a onclick="openLoc('','?control=logs<?php if(isset($_GET['type'])&&isset($_GET['value'])) { echo "&type=".$_GET['type']."&value=".$_GET['value']; }?>&page=<?php echo $_GET['page']+1; ?>','tabs-logs');"><?php echo $t->_('Next'); ?></a></td></tr></tfoot>
433\ No newline at end of file
434
435=== modified file 'cpanel-incs/mail.php'
436--- cpanel-incs/mail.php 2010-12-06 17:50:35 +0000
437+++ cpanel-incs/mail.php 2011-01-11 19:52:14 +0000
438@@ -334,14 +334,14 @@
439
440 // Tell the user it was successful
441
442- echo "<script language='JavaScript'>alert('Bericht verzonden'); self.close();</script>"; exit;
443+ echo "<script language='JavaScript'>alert('".addslashes($t->_('Message sent.'))."'); self.close();</script>"; exit;
444
445 } else {
446
447 // Tell user something went wrong if the return was false
448 $_GET['p']="compose";
449
450- echo "<script language='JavaScript'>alert('Bericht niet verzonden\nMisschien bestaat de gebruiker niet');</script>";
451+ echo "<script language='JavaScript'>alert('".addslashes($t->_('Message couldn\'t be sent. Maybe the receiver doesn\'t exist.'))."');</script>";
452
453 }
454
455@@ -420,15 +420,15 @@
456
457 ?>
458
459-<a onclick="openLoc('','?control=mail&p=new','tabs-mail');">Postvak in</a>
460-
461-<a onclick="openLoc('','?control=mail&p=send','tabs-mail');">Verzonden</a>
462-
463-<a onclick="openLoc('','?control=mail&p=read','tabs-mail');">Archief</a>
464-
465-<a onclick="openLoc('','?control=mail&p=deleted','tabs-mail');">Prullenbak</a>
466-
467-<a onclick="window.open('?control=mail&p=compose');">Nieuw bericht</a>
468+<a onclick="openLoc('','?control=mail&p=new','tabs-mail');"><?php echo $t->_('Unread'); ?></a>
469+
470+<a onclick="openLoc('','?control=mail&p=send','tabs-mail');"><?php echo $t->_('Send'); ?></a>
471+
472+<a onclick="openLoc('','?control=mail&p=read','tabs-mail');"><?php echo $t->_('Archive'); ?></a>
473+
474+<a onclick="openLoc('','?control=mail&p=deleted','tabs-mail');"><?php echo $t->_('Deleted'); ?></a>
475+
476+<a onclick="window.open('?control=mail&p=compose');"><?php echo $t->_('New message'); ?></a>
477
478
479 <br /><br />
480@@ -446,11 +446,11 @@
481
482 <tr>
483
484- <td>Afzender</td>
485-
486- <td>Titel</td>
487-
488- <td>Datum</td>
489+ <td><?php echo $t->_('Sender'); ?></td>
490+
491+ <td><?php echo $t->_('Title'); ?></td>
492+
493+ <td><?php echo $t->_('Date'); ?></td>
494
495 </tr>
496
497@@ -484,7 +484,7 @@
498
499 // else... tell the user that there are no new messages
500
501- echo "<tr><td colspan='3'><strong>Geen nieuwe berichten</strong></td></tr>";
502+ echo "<tr><td colspan='3'><strong>".$t->_('No new messages')."</strong></td></tr>";
503
504 }
505
506@@ -506,13 +506,13 @@
507
508 <tr>
509
510- <td>Ontvanger</td>
511-
512- <td>Titel</td>
513-
514- <td>Status</td>
515-
516- <td>Datum</td>
517+ <td><?php echo $t->_('Receiver'); ?></td>
518+
519+ <td><?php echo $t->_('Title'); ?></td>
520+
521+ <td><?php echo $t->_('Status'); ?></td>
522+
523+ <td><?php echo $t->_('Date'); ?></td>
524
525 </tr>
526
527@@ -542,25 +542,19 @@
528
529 if($pm->messages[$i]['to_deleted'] && !$pm->messages[$i]['to_viewed']) {
530
531- echo "Gewist zonder te lezen";
532+ echo $t->_('Deleted without reading');
533
534 // if a message got deleted AND viewed
535
536- } elseif($pm->messages[$i]['to_deleted'] && $pm->messages[$i]['to_viewed']) {
537-
538- echo "Gelezen en gewist";
539-
540- // if a message got not deleted but viewed
541-
542- } elseif(!$pm->messages[$i]['to_deleted'] && $pm->messages[$i]['to_viewed']) {
543-
544- echo "Gelezen";
545-
546+ } elseif($pm->messages[$i]['to_viewed']) {
547+
548+ echo $t->_('Read');
549+
550 } else {
551
552 // not viewed and not deleted
553
554- echo "Nog niet gelezen";
555+ echo $t->_('Not yet read');
556
557 }
558
559@@ -580,7 +574,7 @@
560
561 // else... tell the user that there are no new messages
562
563- echo "<tr><td colspan='4'><strong>Geen verzonden berichten</strong></td></tr>";
564+ echo "<tr><td colspan='4'><strong>".$t->_('No send messages')."</strong></td></tr>";
565
566 }
567
568@@ -602,11 +596,11 @@
569
570 <tr>
571
572- <td>Afzender</td>
573-
574- <td>Titel</td>
575-
576- <td>Datum</td>
577+ <td><?php echo $t->_('Sender'); ?></td>
578+
579+ <td><?php echo $t->_('Title'); ?></td>
580+
581+ <td><?php echo $t->_('Date'); ?></td>
582
583 </tr>
584
585@@ -640,7 +634,7 @@
586
587 // else... tell the user that there are no new messages
588
589- echo "<tr><td colspan='4'><strong>Geen gelezen berichten</strong></td></tr>";
590+ echo "<tr><td colspan='4'><strong>".$t->_('No read messages')."</strong></td></tr>";
591
592 }
593
594@@ -662,11 +656,11 @@
595
596 <tr>
597
598- <td>Afzender</td>
599-
600- <td>Titel</td>
601-
602- <td>Datum</td>
603+ <td><?php echo $t->_('Sender'); ?></td>
604+
605+ <td><?php echo $t->_('Title'); ?></td>
606+
607+ <td><?php echo $t->_('Date'); ?></td>
608
609 </tr>
610
611@@ -700,7 +694,7 @@
612
613 // else... tell the user that there are no new messages
614
615- echo "<tr><td colspan='4'><strong>Prullenbak is leeg</strong></td></tr>";
616+ echo "<tr><td colspan='4'><strong>".$t->_('Recycle bin is empty')."</strong></td></tr>";
617
618 }
619
620@@ -730,7 +724,7 @@
621
622 <tr>
623
624- <td>From:</td>
625+ <td><?php echo $t->_('From'); ?>:</td>
626
627 <td><?php echo $pm->messages[0]['from']; ?></td>
628
629@@ -740,7 +734,7 @@
630
631 <tr>
632
633- <td>Date:</td>
634+ <td><?php echo $t->_('Date'); ?>:</td>
635
636 <td><?php echo $pm->messages[0]['created']; ?></td>
637
638@@ -750,7 +744,7 @@
639
640 <tr>
641
642- <td>Subject:</td>
643+ <td><?php echo $t->_('Subject'); ?>:</td>
644
645 <td colspan="3"><?php echo $pm->messages[0]['title']; ?></td>
646
647@@ -771,7 +765,7 @@
648 <input type='hidden' name='rsubject' value='Re: <?php echo $pm->messages[0]['title']; ?>' />
649 <input type="hidden" name="rid" value="<?php echo $pm->messages[0]['id']; ?>">
650
651- <input type='button' name='reply' value='Beantwoorden' onclick="window.open('?control=mail&reply&rid=<?php echo $pm->messages[0]['id'];?>');"/>
652+ <input type='button' name='reply' value='<?php echo $t->_('Answer'); ?>' onclick="window.open('?control=mail&reply&rid=<?php echo $pm->messages[0]['id'];?>');"/>
653
654 </form>
655
656@@ -779,7 +773,7 @@
657
658 <input type='hidden' name='did' value='<?php echo $pm->messages[0]['id']; ?>' />
659
660- <input type='button' name='delete' value='Wissen' onclick="success=ajax.post('?control=mail','delete=1&did=<?php echo $pm->messages[0]['id']; ?>');if(success=='true'){$(this.parentNode).prepend(message.info('Bericht gewist'));} else if(success=='false') {$(this.parentNode).prepend(message.error('Fout bij bericht wissen'));} else {$(this.parentNode).prepend(success);}"/>
661+ <input type='button' name='delete' value='<?php echo $t->_('Delete'); ?>' onclick="success=ajax.post('?control=mail','delete=1&did=<?php echo $pm->messages[0]['id']; ?>');if(success=='true'){$(this.parentNode).prepend(message.info('<?php echo $t->_('Message deleted'); ?>'));} else if(success=='false') {$(this.parentNode).prepend(message.error('<?php echo $t->_('Error while deleting message'); ?>'));} else {$(this.parentNode).prepend(success);}"/>
662
663 </form>
664
665@@ -794,7 +788,7 @@
666 <script type="text/javascript">
667 tinyMCE.init({
668 // General options
669- language: "nl",
670+ language: "<?php echo USER_LNG; ?>",
671
672 mode : "exact",
673 elements : "message",
674@@ -818,18 +812,18 @@
675 </script>
676 <form name="mail-new" method="post" action="?control=mail">
677 <?php $pm->getmessage($_GET['rid']); ?>
678-<strong>To:</strong><br />
679+<strong><?php echo $t->_('To'); ?>:</strong><br />
680
681 <input type='text' readonly name='to' id="mail-new-to" onclick="openusers(this)" value='<?php if(isset($_POST['to'])) { echo $_POST['to']; } else if(isset($_GET['reply'])) { echo $pm->messages[0]['from']; } ?>' /><br />
682
683-<strong>Subject:</strong><br />
684+<strong><?php echo $t->_('Subject'); ?>:</strong><br />
685
686 <input type='text' name='subject' value='<?php if(isset($_POST['subject'])) { echo $_POST['subject']; } else if(isset($_GET['reply'])) { echo $pm->messages[0]['title']; } ?>' /><br />
687
688-<strong>Message:</strong><br />
689-<textarea name='message' style="width: 100%"><?php if(isset($_POST['message'])) { echo $_POST['message']; } else if(isset($_GET['reply'])) { ?> <p>Op <?php echo $pm->messages[0]['created']; ?> schreef <?php echo $pm->messages[0]['from']; ?>: </p><div style="margin-left: 5px; color: green;"><?php echo $pm->render($pm->messages[0]['message']);?></div><?php } ?></textarea><br />
690+<strong><?php echo $t->_('Message'); ?>:</strong><br />
691+<textarea name='message' style="width: 100%"><?php if(isset($_POST['message'])) { echo $_POST['message']; } else if(isset($_GET['reply'])) { ?> <p><?php echo sprintf($t->_('On %1$s, %2$s wrote:'),$pm->messages[0]['created'],$pm->messages[0]['from']); ?>: </p><div style="margin-left: 5px; color: green;"><?php echo $pm->render($pm->messages[0]['message']);?></div><?php } ?></textarea><br />
692
693-<input type='submit' name='newmessage' value='Send'>
694+<input type='submit' name='newmessage' value='<?php echo $t->_('Send'); ?>'>
695
696 </form>
697 <?php } ?>
698
699=== modified file 'cpanel-incs/plugins/.php'
700--- cpanel-incs/plugins/.php 2011-01-08 15:14:28 +0000
701+++ cpanel-incs/plugins/.php 2011-01-11 19:52:14 +0000
702@@ -85,20 +85,20 @@
703 <?php } ?>
704 <?php if($userlevel==9) {
705 $q=$remote_connection->query('SELECT * FROM `'.$site.'_addons` WHERE `editable`=1'); ?>
706-<table><tr><th>Naam</th><th>Actie</th></tr>
707+<table><tr><th><?php $t->_('Name'); ?></th><th><?php $t->_('Action'); ?></th></tr>
708 <?php while($addons=$q->fetch_assoc()) { ?>
709- <tr><td><?php echo $addons['name']; ?></td><td><?php if($addons['status']==0) {?><a onclick="addons.addons.install('<?php echo $site; ?>','<?php echo $addons['reference']; ?>');"><img src="<?php echo URL_IMG ?>/Silk/script_add.png" alt="Aanzetten" title="Addon aanzetten"></a><?php } else { ?><a onclick="addons.addons.uninstall('<?php echo $site; ?>','<?php echo $addons['reference']; ?>');"><img src="<?php echo URL_IMG ?>/Silk/script_delete.png" alt="Uitzetten" title="Addon uitzetten"></a><?php } ?></td></tr>
710+ <tr><td><?php echo $addons['name']; ?></td><td><?php if($addons['status']==0) {?><a onclick="addons.addons.install('<?php echo $site; ?>','<?php echo $addons['reference']; ?>');"><img src="<?php echo URL_IMG ?>/Silk/script_add.png" alt="<?php echo $t->_('On'); ?>" title="<?php echo $t->_('Turn addon on'); ?>"></a><?php } else { ?><a onclick="addons.addons.uninstall('<?php echo $site; ?>','<?php echo $addons['reference']; ?>');"><img src="<?php echo URL_IMG ?>/Silk/script_delete.png" alt="<?php echo $t->_('Off'); ?>" title="<?php echo $t->_('Turn addon off'); ?>"></a><?php } ?></td></tr>
711 <?php } ?>
712 </table>
713 <?php
714
715 $q=$remote_connection->query('SELECT * FROM `sites` WHERE `ref`="'.$site.'"') ?>
716-<table><tr><th>Gebruiker</th><th>Niveau</th><th>Titel</th><th>Wissen</th></tr>
717+<table><tr><th><?php echo $t->_('User'); ?></th><th><?php echo $t->_('Lv.'); ?></th><th><?php echo $t->_('Title'); ?></th><th><?php echo $t->_('Delete'); ?></th></tr>
718 <?php while($users=$q->fetch_assoc()) { ?>
719- <tr><td><?php echo $users['username']; ?></td><td<?php if($users['username']!=$session->username) {?> ondblclick='addons.user.editlvl.expand("<?php echo $site; ?>","<?php echo $users['username']; ?>",this)'<?php } ?>><?php echo $users['userlevel'] ?></td><td ondblclick='addons.user.edittitle.expand("<?php echo $site;?>","<?php echo $users['username']; ?>",this)'><?php echo $users['title']; ?></td><td><?php if($users['username']!=$session->username) {?><a onclick='addons.user.delete("<?php echo $site; ?>","<?php echo $users['username']; ?>")'>Wissen</a><?php } ?></td></tr>
720+ <tr><td><img src="<?php echo URL_IMG; ?>/Silk/user.png"> <?php echo $users['username']; ?></td><td<?php if($users['username']!=$session->username) {?> ondblclick='addons.user.editlvl.expand("<?php echo $site; ?>","<?php echo $users['username']; ?>",this)'<?php } ?>><?php echo $users['userlevel'] ?></td><td ondblclick='addons.user.edittitle.expand("<?php echo $site;?>","<?php echo $users['username']; ?>",this)'><?php echo $users['title']; ?></td><td><?php if($users['username']!=$session->username) {?><a onclick='addons.user.delete("<?php echo $site; ?>","<?php echo $users['username']; ?>")'><img src="<?php echo URL_IMG; ?>/Silk/delete.png" alt="<?php echo $t->_('Delete'); ?>" title="<?php echo $t->_('Revoke user privileges'); ?>"></a><?php } ?></td></tr>
721 <?php } ?>
722-<tr><td colspan='4'><input type='text' onclick='openusers(this)'> <a onclick='addons.user.add("<?php echo $site; ?>",this);'>Verzenden</a></td></tr>
723+<tr><td colspan='3'><img src="<?php echo URL_IMG; ?>/Silk/user_add.png" alt="+" title="<?php echo $t->_('Add user'); ?>"> <input type='text' onclick='openusers(this)'></td><td><a onclick='addons.user.add("<?php echo $site; ?>",this);'><img src="<?php echo URL_IMG; ?>/Silk/add.png" alt="<?php echo $t->_('Add'); ?>" title="<?php echo $t->_('Add new user'); ?>"></a></td></tr>
724 </table>
725
726-<a onclick='addons.site.delete("<?php echo $site; ?>");'>Site wissen</a>
727+<img src="<?php echo URL_IMG; ?>/Silk/layout_delete.png" alt="<?php echo $t->_('Delete site'); ?>" title="<?php echo $t->_('Delete all site content and the site itself'); ?>"> <a onclick='addons.site.delete("<?php echo $site; ?>");'><?php echo $t->_('Delete site'); ?></a>
728 <?php } ?>
729\ No newline at end of file
730
731=== modified file 'cpanel-incs/plugins/cms.php'
732--- cpanel-incs/plugins/cms.php 2010-12-06 17:50:35 +0000
733+++ cpanel-incs/plugins/cms.php 2011-01-11 19:52:14 +0000
734@@ -13,66 +13,66 @@
735 if(!hasSiteAddonLevel()) {$session->log('403','Site access denied ('.$site.')'); exit;} //Kill & log non-siteadmins (ze zouden hier nooit mogen geweest zijn :)
736 if(!isset($_GET['function'])) { $_GET['function']="list"; }
737 if($_GET['function']=="list") {
738- $query = $remote_connection->query('SELECT * FROM '.$site.'_pageindex ORDER BY page_order ASC'); ?>
739- <table><tr><th></th><th colspan="2">Titel</th><th title="HTML link referentie">Link</th><th>Acties</th></tr>
740+ $query = $remote_connection->query('SELECT * FROM `'.$site.'_pageindex` ORDER BY `page_order` ASC'); ?>
741+ <table><tr><th></th><th colspan="2"><?php echo $t->_('Title'); ?></th><th title="<?php $t->_("Link path"); ?>"><?php $t->_("Link"); ?></th><th><?php $t->_("Actions"); ?></th></tr>
742 <?php while ($pages = $query->fetch_assoc()) { ?>
743- <tr><td <?php if($pages['type']=='0'||$pages['type']=='2') { ?> ondblclick="cms.page.edit_rights.expand('<?php echo $site; ?>','<?php echo $pages['id']; ?>',this,'<?php echo $pages['access']; ?>')"><img src="<?php echo URL_IMG; ?>/Silk/bullet_<?php if($pages['access']==0) { ?>green<?php } else if($pages['access']==1) { ?>orange<?php } else if($pages['access']==2) { ?>red<?php } ?>.png"><?php } else { ?>><img src="<?php echo URL_IMG; ?>/Silk/link.png"><?php } ?></td><td colspan="2" ondblclick="cms.page.edit_title.expand('<?php echo $site; ?>','<?php echo $pages['id']; ?>',this)"><?php echo $pages['page_title']; ?></td><td<?php if($pages['type']=='0'||$pages['type']=='2') { ?>>/<?php echo $pages['id'].'-'.preg_replace('/[^a-zA-Z0-9]/','_',$pages['page_title']);?><?php } else { ?> ondblclick="cms.page.edit_link.expand('<?php echo $site; ?>','<?php echo $pages['id']; ?>',this)"><?php echo $pages['link']; ?><?php }?></td><td><?php if($pages['type']=='0'||$pages['type']=='1') { ?><a onclick="cms.page.delete('<?php echo $site; ?>','<?php echo $pages['id'] ?>');"><img src="<?php echo URL_IMG; ?>/Silk/delete.png" alt="Wissen" title="Pagina wissen"></a> <?php } ?><a onclick="cms.page.edit_order.down('<?php echo $site; ?>','<?php echo $pages['id'];?>',this);"><img src="<?php echo URL_IMG ?>/Silk/arrow_down.png" alt="Beneden" title="Pagina naar beneden verplaatsen"></a> <a onclick="cms.page.edit_order.up('<?php echo $site; ?>','<?php echo $pages['id']; ?>');"><img src="<?php echo URL_IMG ?>/Silk/arrow_up.png" alt="Boven" title="Pagina naar boven verplaatsen"></a> <a onclick="cms.page.visiblity.<?php if($pages['visible']){ echo "off";} else { echo "on";} ?>('<?php echo $site; ?>','<?php echo $pages['id']; ?>');"><img src="<?php echo URL_IMG; ?>/Silk/lightbulb<?php if(!$pages['visible']) { echo "_off";} ?>.png" alt="<?php if(!$pages['visible']) { echo "on";} ?>zichtbaar" title="Pagina <?php if(!$pages['visible']) { echo "on";} ?>zichtbaar maken"></a></td></tr>
744+ <tr><td <?php if($pages['type']=='0'||$pages['type']=='2') { ?> ondblclick="cms.page.edit_rights.expand('<?php echo $site; ?>','<?php echo $pages['id']; ?>',this,'<?php echo $pages['access']; ?>')"><img src="<?php echo URL_IMG; ?>/Silk/bullet_<?php if($pages['access']==0) { ?>green<?php } else if($pages['access']==1) { ?>orange<?php } else if($pages['access']==2) { ?>red<?php } ?>.png"><?php } else { ?>><img src="<?php echo URL_IMG; ?>/Silk/link.png"><?php } ?></td><td colspan="2" ondblclick="cms.page.edit_title.expand('<?php echo $site; ?>','<?php echo $pages['id']; ?>',this)"><?php echo $pages['page_title']; ?></td><td<?php if($pages['type']=='0'||$pages['type']=='2') { ?>>/<?php echo $pages['id'].'-'.preg_replace('/[^a-zA-Z0-9]/','_',$pages['page_title']);?><?php } else { ?> ondblclick="cms.page.edit_link.expand('<?php echo $site; ?>','<?php echo $pages['id']; ?>',this)"><?php echo $pages['link']; ?><?php }?></td><td><?php if($pages['type']=='0'||$pages['type']=='1') { ?><a onclick="cms.page.delete('<?php echo $site; ?>','<?php echo $pages['id'] ?>');"><img src="<?php echo URL_IMG; ?>/Silk/delete.png" alt="<?php echo $t->_('Delete'); ?>" title="<?php echo $t->_('Delete page'); ?>"></a> <?php } ?><a onclick="cms.page.edit_order.down('<?php echo $site; ?>','<?php echo $pages['id'];?>',this);"><img src="<?php echo URL_IMG ?>/Silk/arrow_down.png" alt="<?php echo $t->_('Down'); ?>" title="<?php echo $t->_('Move the page down'); ?>"></a> <a onclick="cms.page.edit_order.up('<?php echo $site; ?>','<?php echo $pages['id']; ?>');"><img src="<?php echo URL_IMG ?>/Silk/arrow_up.png" alt="<?php echo $t->_('Up'); ?>" title="<?php echo $t->_('Move the page up'); ?>"></a> <a onclick="cms.page.visiblity.<?php if($pages['visible']){ echo "off";} else { echo "on";} ?>('<?php echo $site; ?>','<?php echo $pages['id']; ?>');"><img src="<?php echo URL_IMG; ?>/Silk/lightbulb<?php if(!$pages['visible']) { echo "_off";} ?>.png" alt="<?php if($pages['visible']) { echo $t->_('Visible');} else { echo $t->_('Invisible');} ?>" title="<?php if($pages['visible']) { echo $t->_('Make page invisible');} else { echo $t->_('Make page visible');} ?>"></a></td></tr>
745 <?php if($pages['type']=='0'||$pages['type']=='2') {
746- $query2 = $remote_connection->query('SELECT * FROM '.$site.'_pages WHERE page_id='.$pages['id'].' ORDER BY section_order ASC');
747+ $query2 = $remote_connection->query('SELECT * FROM `'.$site.'_pages` WHERE `page_id`='.$pages['id'].' ORDER BY `section_order` ASC');
748 while ($sections = $query2->fetch_assoc()) {?>
749- <tr><td>&nbsp;</td><td><img src="<?php echo URL_IMG; ?>/Silk/bullet_black.png"></td><td ondblclick="cms.section.edit_title.expand('<?php echo $site; ?>','<?php echo $sections['id']; ?>',this)"><?php echo $sections['section_title']; ?></td><td>/<?php echo $pages['id'].'-'.preg_replace('/[^a-zA-Z0-9]/','_',$pages['page_title']).'/#'.preg_replace('/[^a-zA-Z0-9]/','_',$sections['section_title']); ?></td><td><a onclick="cms.section.delete('<?php echo $site; ?>','<?php echo $sections['id'] ?>');"><?php if($sections['type']==0) { ?><img src="<?php echo URL_IMG; ?>/Silk/delete.png" alt="Wissen" title="Sectie wissen"></a> <?php } ?><a onclick="cms.section.edit_order.down('<?php echo $site; ?>','<?php echo $sections['id'];?>',this);"><img src="<?php echo URL_IMG ?>/Silk/arrow_down.png" alt="Beneden" title="Sectie naar beneden verplaatsen"></a> <a onclick="cms.section.edit_order.up('<?php echo $site; ?>','<?php echo $sections['id']; ?>');"><img src="<?php echo URL_IMG ?>/Silk/arrow_up.png" alt="Boven" title="Sectie naar boven verplaatsen"></a> <?php if($sections['type']==0) { ?><a onclick="cms.section.open_mce('<?php echo $site; ?>','<?php echo $sections['id']; ?>');"><img src="<?php echo URL_IMG; ?>/Silk/pencil.png" alt="Bewerken" title="Sectie bewerken"></a> <?php } ?><a onclick="cms.section.switch_page.expand('<?php echo $site; ?>','<?php echo $sections['id']; ?>','<?php echo $pages['id']; ?>',this)"><img src="<?php echo URL_IMG; ?>/Silk/arrow_switch.png" alt="Andere pagina" title="Sectie verplaatsen naar een andere pagina"></a></td></tr>
750+ <tr><td>&nbsp;</td><td><img src="<?php echo URL_IMG; ?>/Silk/bullet_black.png"></td><td ondblclick="cms.section.edit_title.expand('<?php echo $site; ?>','<?php echo $sections['id']; ?>',this)"><?php echo $sections['section_title']; ?></td><td>/<?php echo $pages['id'].'-'.preg_replace('/[^a-zA-Z0-9]/','_',$pages['page_title']).'/#'.preg_replace('/[^a-zA-Z0-9]/','_',$sections['section_title']); ?></td><td><a onclick="cms.section.delete('<?php echo $site; ?>','<?php echo $sections['id'] ?>');"><?php if($sections['type']==0) { ?><img src="<?php echo URL_IMG; ?>/Silk/delete.png" alt="<?php echo $t->_('Delete'); ?>" title="<?php echo $t->_('Delete section'); ?>"></a> <?php } ?><a onclick="cms.section.edit_order.down('<?php echo $site; ?>','<?php echo $sections['id'];?>',this);"><img src="<?php echo URL_IMG ?>/Silk/arrow_down.png" alt="<?php echo $t->_('Down'); ?>" title="<?php echo $t->_('Move section down'); ?>"></a> <a onclick="cms.section.edit_order.up('<?php echo $site; ?>','<?php echo $sections['id']; ?>');"><img src="<?php echo URL_IMG ?>/Silk/arrow_up.png" alt="<?php echo $t->_('Up'); ?>" title="<?php echo $t->_('Move section up'); ?>"></a> <?php if($sections['type']==0) { ?><a onclick="cms.section.open_mce('<?php echo $site; ?>','<?php echo $sections['id']; ?>');"><img src="<?php echo URL_IMG; ?>/Silk/pencil.png" alt="<?php echo $t->_('Edit'); ?>" title="<?php echo $t->_('Edit section content'); ?>"></a> <?php } ?><a onclick="cms.section.switch_page.expand('<?php echo $site; ?>','<?php echo $sections['id']; ?>','<?php echo $pages['id']; ?>',this)"><img src="<?php echo URL_IMG; ?>/Silk/arrow_switch.png" alt="<?php echo $t->_('Other page'); ?>" title="<?php echo $t->_('Move this section to another page'); ?>"></a></td></tr>
751 <?php } ?>
752- <tr onclick="cms.section.add('<?php echo $site; ?>',<?php echo $pages['id']; ?>)" class="<?php echo $site; ?>_cms_page_<?php echo $pages['id']?>_sections cms_page_sections"><td>&nbsp;</td><td><img src="<?php echo URL_IMG; ?>/Silk/bullet_add.png" alt=""></td><td colspan="3">Nieuwe sectie op deze pagina</td></tr>
753+ <tr onclick="cms.section.add('<?php echo $site; ?>',<?php echo $pages['id']; ?>)" class="<?php echo $site; ?>_cms_page_<?php echo $pages['id']?>_sections cms_page_sections"><td>&nbsp;</td><td><img src="<?php echo URL_IMG; ?>/Silk/bullet_add.png" alt=""></td><td colspan="3"><?php echo $t->_('Add a section to this page'); ?></td></tr>
754 <?php } }?>
755- <tr onclick="cms.page.add('<?php echo $site; ?>')"><td><img src="<?php echo URL_IMG; ?>/Silk/bullet_add.png" alt=""></td><td colspan="4">Nieuwe pagina</td></tr>
756- <tr onclick="cms.page.add_link('<?php echo $site; ?>')"><td><img src="<?php echo URL_IMG; ?>/Silk/link_add.png" alt=""></td><td colspan="4">Nieuwe link</td></tr>
757+ <tr onclick="cms.page.add('<?php echo $site; ?>')"><td><img src="<?php echo URL_IMG; ?>/Silk/bullet_add.png" alt=""></td><td colspan="4"><?php echo $t->_('Add page'); ?></td></tr>
758+ <tr onclick="cms.page.add_link('<?php echo $site; ?>')"><td><img src="<?php echo URL_IMG; ?>/Silk/link_add.png" alt=""></td><td colspan="4"><?php echo $t->_('Add link'); ?></td></tr>
759 </table>
760 <?php }
761 else if($_GET['function']=="delete") {
762 if($_GET['type']=="page" && $_GET['id']!=1) {
763- $query0=$remote_connection->query('DELETE FROM '.$site.'_pages WHERE page_id='.$_GET['id']);
764+ $query0=$remote_connection->query('DELETE FROM `'.$site.'_pages` WHERE `page_id`='.$_GET['id']);
765 if(!$query0) {
766 echo "false";
767 exit; //DO NOT execute page delete query (else memory waste!)
768 }
769- $q= $remote_connection->query('DELETE FROM '.$site.'_pageindex WHERE id='.$_GET['id']);
770+ $q= $remote_connection->query('DELETE FROM `'.$site.'_pageindex` WHERE `id`='.$_GET['id']);
771 //Rearrange order
772- $res=$remote_connection->query('SELECT * FROM '.$site.'_pageindex ORDER BY page_order ASC');
773+ $res=$remote_connection->query('SELECT * FROM `'.$site.'_pageindex` ORDER BY `page_order` ASC');
774 $order=0;
775 while($nul=$res->fetch_assoc()) {
776 $order++;
777- $remote_connection->query('UPDATE '.$site.'_pageindex SET page_order='.$order.' WHERE id='.$nul['id']);
778+ $remote_connection->query('UPDATE `'.$site.'_pageindex` SET page_order='.$order.' WHERE `id`='.$nul['id']);
779 }
780 if($q) { echo "true"; } else { echo "false"; }
781 }
782 else if($_GET['type']=="section") {
783- $res=$remote_connection->query('SELECT * FROM '.$site.'_pages WHERE id='.$_GET['id']);
784+ $res=$remote_connection->query('SELECT * FROM `'.$site.'_pages` WHERE `id`='.$_GET['id']);
785 $page=$res->fetch_assoc();
786 $page=$page['page_id'];
787- $q= $remote_connection->query('DELETE FROM '.$site.'_pages WHERE id='.$_GET['id']);
788+ $q= $remote_connection->query('DELETE FROM `'.$site.'_pages` WHERE `id`='.$_GET['id']);
789 //Rearrange order
790- $res=$remote_connection->query('SELECT * FROM '.$site.'_pages WHERE page_id='.$page.' ORDER BY section_order ASC');
791+ $res=$remote_connection->query('SELECT * FROM `'.$site.'_pages` WHERE `page_id`='.$page.' ORDER BY `section_order` ASC');
792 $order=0;
793 while($nul=$res->fetch_assoc()) {
794 $order++;
795- $remote_connection->query('UPDATE '.$site.'_pages SET section_order='.$order.' WHERE id='.$nul['id']);
796+ $remote_connection->query('UPDATE `'.$site.'_pages` SET `section_order`='.$order.' WHERE `id`='.$nul['id']);
797 }
798 if($q) { echo "true"; } else { echo "false"; }
799 }
800 }
801 else if($_GET['function']=="edit_title") {
802 if($_GET['type']=="page") {
803- $q= $remote_connection->query('UPDATE '.$site.'_pageindex SET page_title="'.$_GET['title'].'" WHERE id='.$_GET['id']);
804+ $q= $remote_connection->query('UPDATE `'.$site.'_pageindex` SET `page_title`="'.$_GET['title'].'" WHERE `id`='.$_GET['id']);
805 if($q) { echo "true"; } else { echo "false"; }
806 }
807 else if($_GET['type']=="section") {
808- $q= $remote_connection->query('UPDATE '.$site.'_pages SET section_title="'.$_GET['title'].'" WHERE id='.$_GET['id']);
809+ $q= $remote_connection->query('UPDATE `'.$site.'_pages` SET `section_title`="'.$_GET['title'].'" WHERE `id`='.$_GET['id']);
810 if($q) { echo "true"; } else { echo "false"; }
811 }
812 }
813 else if($_GET['function']=="move") {
814 if($_GET['type']=="page") {
815- $query0=$remote_connection->query('SELECT * FROM '.$site.'_pageindex WHERE id='.$_GET['id']);
816+ $query0=$remote_connection->query('SELECT * FROM `'.$site.'_pageindex` WHERE `id`='.$_GET['id']);
817 if(!$query0) { echo "false"; exit; } //KILL bij query fout (vermijd foute update)
818 $res0=$query0->fetch_assoc();
819 $old_pos=$res0['page_order'];
820@@ -86,11 +86,11 @@
821 echo "false";
822 exit; //DO NOT execute query
823 }
824- $query1=$remote_connection->query('UPDATE '.$site.'_pageindex SET page_order = IF( page_order ='.$old_pos.', '.$new_pos.', '.$old_pos.' ) WHERE page_order IN ( '.$old_pos.', '.$new_pos.' )');
825+ $query1=$remote_connection->query('UPDATE `'.$site.'_pageindex` SET `page_order` = IF( `page_order` ='.$old_pos.', '.$new_pos.', '.$old_pos.' ) WHERE `page_order` IN ( '.$old_pos.', '.$new_pos.' )');
826 if($query1) { echo "true"; } else { echo "false"; }
827 }
828 else if($_GET['type']=="section") {
829- $query0=$remote_connection->query('SELECT * FROM '.$site.'_pages WHERE id='.$_GET['id']);
830+ $query0=$remote_connection->query('SELECT * FROM `'.$site.'_pages` WHERE `id`='.$_GET['id']);
831 if(!$query0) { echo "false"; exit; } //KILL bij query fout (vermijd foute update)
832 $res0=$query0->fetch_assoc();
833 $old_pos=$res0['section_order'];
834@@ -104,13 +104,13 @@
835 echo "false";
836 exit; //DO NOT execute query
837 }
838- $query1=$remote_connection->query('UPDATE '.$site.'_pages SET section_order = IF( section_order ='.$old_pos.', '.$new_pos.', '.$old_pos.' ) WHERE section_order IN ( '.$old_pos.', '.$new_pos.' )');
839+ $query1=$remote_connection->query('UPDATE `'.$site.'_pages` SET `section_order` = IF( `section_order` ='.$old_pos.', '.$new_pos.', '.$old_pos.' ) WHERE `section_order` IN ( '.$old_pos.', '.$new_pos.' )');
840 if($query1) { echo "true"; } else { echo "false"; }
841 }
842 }
843 else if($_GET['function']=="new") {
844 if($_GET['type']=="page") {
845- $query0=$remote_connection->query('SELECT * FROM '.$site.'_pageindex ORDER BY page_order DESC');
846+ $query0=$remote_connection->query('SELECT * FROM `'.$site.'_pageindex` ORDER BY `page_order` DESC');
847 if(!$query0) {
848 echo "false";
849 exit; //DO NOT execute query, error with first request.
850@@ -118,22 +118,22 @@
851 $res0=$query0->fetch_assoc();
852 $order_last=$res0['page_order'];
853 $new_order_last=$order_last+1;
854- $q=$remote_connection->query('INSERT INTO '.$site.'_pageindex VALUES(NULL,0,'.$new_order_last.',"Nieuwe pagina","",0,1)');
855+ $q=$remote_connection->query('INSERT INTO `'.$site.'_pageindex` VALUES(NULL,0,'.$new_order_last.',"'.$t->_('New page').'","",0,1)');
856 if($q) { echo "true"; } else { echo "false"; }
857 }
858 else if($_GET['type']=="section") {
859- $query0=$remote_connection->query('SELECT * FROM '.$site.'_pages WHERE page_id='.$_GET['page'].' ORDER BY section_order DESC');
860+ $query0=$remote_connection->query('SELECT * FROM `'.$site.'_pages` WHERE `page_id`='.$_GET['page'].' ORDER BY `section_order` DESC');
861 $res0=$query0->fetch_assoc();
862 $order_last=$res0['section_order'];
863 if(!$query0) {
864 $order_last=0; //No sections?
865 }
866 $new_order_last=$order_last+1;
867- $q=$remote_connection->query('INSERT INTO '.$site.'_pages VALUES(NULL, '.$_GET['page'].',0,'.$new_order_last.',"Nieuwe sectie", "")');
868+ $q=$remote_connection->query('INSERT INTO `'.$site.'_pages` VALUES(NULL, '.$_GET['page'].',0,'.$new_order_last.',"'.$t->_('New section').'", "")');
869 if($q) { echo "true"; } else { echo "false"; }
870 }
871 else if($_GET['type']=="link") {
872- $query0=$remote_connection->query('SELECT * FROM '.$site.'_pageindex ORDER BY page_order DESC');
873+ $query0=$remote_connection->query('SELECT * FROM `'.$site.'_pageindex` ORDER BY `page_order` DESC');
874 if(!$query0) {
875 echo "false";
876 exit; //DO NOT execute query, error with first request.
877@@ -141,13 +141,13 @@
878 $res0=$query0->fetch_assoc();
879 $order_last=$res0['page_order'];
880 $new_order_last=$order_last+1;
881- $q=$remote_connection->query('INSERT INTO '.$site.'_pageindex VALUES(NULL, 1, '.$new_order_last.',"Nieuwe link","#",0,1)');
882+ $q=$remote_connection->query('INSERT INTO `'.$site.'_pageindex` VALUES(NULL, 1, '.$new_order_last.',"'.$t->_('New link').'","#",0,1)');
883 if($q) { echo "true"; } else { echo "false"; }
884 }
885 }
886 else if($_GET['function']=="switch_page") {
887 if(isset($_GET['getpages'])) {
888- $query=$remote_connection->query('SELECT * FROM '.$site.'_pageindex WHERE type=2 OR type=0');
889+ $query=$remote_connection->query('SELECT * FROM `'.$site.'_pageindex` WHERE `type`=2 OR `type`=0');
890 while($pages=$query->fetch_assoc()) {
891 if($_GET['currentpage']!=$pages['id']) {
892 echo '<option value="'.$pages['id'].'">'.$pages['page_title'].'</option>';
893@@ -158,53 +158,51 @@
894 }
895 }
896 else {
897- $query0=$remote_connection->query('SELECT * FROM '.$site.'_pages WHERE page_id='.$_GET['newpage'].' ORDER BY section_order DESC');
898+ $query0=$remote_connection->query('SELECT * FROM `'.$site.'_pages` WHERE `page_id`='.$_GET['newpage'].' ORDER BY `section_order` DESC');
899 $res0=$query0->fetch_assoc();
900 $order_last=$res0['section_order'];
901 $new_order_last=$order_last+1;
902- $query1=$remote_connection->query('UPDATE '.$site.'_pages SET page_id='.$_GET['newpage'].', section_order='.$new_order_last.' WHERE id='.$_GET['id']);
903+ $query1=$remote_connection->query('UPDATE `'.$site.'_pages` SET `page_id`='.$_GET['newpage'].', `section_order`='.$new_order_last.' WHERE `id`='.$_GET['id']);
904 if($query1) { echo "true"; }
905 else { echo "false"; }
906 }
907 }
908 else if($_GET['function']=="edit_link") {
909 $_GET['newlink']=urldecode($_GET['newlink']);
910- $query=$remote_connection->query('UPDATE '.$site.'_pageindex SET link="'.$_GET['newlink'].'" WHERE id='.$_GET['id']);
911+ $query=$remote_connection->query('UPDATE `'.$site.'_pageindex` SET `link`="'.$_GET['newlink'].'" WHERE `id`='.$_GET['id']);
912 if($query) { echo "true"; }
913 else { echo "false"; }
914 }
915 else if($_GET['function']=="edit_rights") {
916- $query=$remote_connection->query('UPDATE '.$site.'_pageindex SET access='.$_GET['rights'].' WHERE id='.$_GET['id']);
917+ $query=$remote_connection->query('UPDATE `'.$site.'_pageindex` SET `access`='.$_GET['rights'].' WHERE `id`='.$_GET['id']);
918 if($query) { echo "true"; }
919 else { echo "false"; }
920 }
921 else if($_GET['function']=="visiblity") {
922 if($_GET['v']=="on") {
923- $query=$remote_connection->query('UPDATE '.$site.'_pageindex SET visible=1 WHERE id='.$_GET['id']);
924+ $query=$remote_connection->query('UPDATE `'.$site.'_pageindex` SET `visible`=1 WHERE `id`='.$_GET['id']);
925 if($query) { echo "true"; }
926 else { echo "false"; }
927 }
928 if($_GET['v']=="off") {
929- $query=$remote_connection->query('UPDATE '.$site.'_pageindex SET visible=0 WHERE id='.$_GET['id']);
930+ $query=$remote_connection->query('UPDATE `'.$site.'_pageindex` SET `visible`=0 WHERE `id`='.$_GET['id']);
931 if($query) { echo "true"; }
932 else { echo "false"; }
933 }
934 }
935 else if($_GET['function']=="mce") {
936 if(isset($_GET['save'])) {
937- if($remote_connection->query('UPDATE '.$site.'_pages SET section_main="'.str_replace('"','\'',$_POST['section_main']).'" WHERE id='.$_GET['id']))
938- { echo '<script language="JavaScript">alert("Opgeslaan");</script>'; }
939- else { echo '<script language="JavaScript">alert("Fout bij het opslaan");</script>'; }
940+ if($remote_connection->query('UPDATE `'.$site.'_pages` SET `section_main`="'.str_replace('"','\'',$_POST['section_main']).'" WHERE `id`='.$_GET['id']))
941+ { echo '<script language="JavaScript">alert("'.$t->_('Saved').'");</script>'; }
942+ else { echo '<script language="JavaScript">alert("'.$t->_('Error while saving').'");</script>'; }
943 }
944- $edit_data=$remote_connection->query('SELECT * FROM '.$site.'_pages WHERE id='.$_GET['id'])->fetch_assoc();?>
945-<!DOCTYPE >
946-<html><head><title>LoginNet CP::CMS (<?php echo $site; ?>)::Bewerk <?php echo $edit_data['section_title']; ?></title>
947+ $edit_data=$remote_connection->query('SELECT * FROM `'.$site.'_pages` WHERE `id`='.$_GET['id'])->fetch_assoc();?>
948 <script language="JavaScript" src="<?php echo URL_TINYMCE; ?>/tiny_mce/tiny_mce.js"></script>
949 <script type="text/javascript">
950
951 tinyMCE.init({
952 // General options
953- language: "nl",
954+ language: "<?php echo $session->userinfo['lang']; ?>",
955 mode : "textareas",
956 theme : "advanced",
957 skin : "o2k7",
958@@ -227,5 +225,4 @@
959 <form action="?control=addons&site=<?php echo $site; ?>&aref=cms&function=mce&id=<?php echo $_GET['id']; ?>&save=true" method="POST">
960 <textarea name="section_main" id="section_main" style="width: 100%; height: 100%"><?php echo $edit_data['section_main']; ?></textarea>
961 </form>
962-</body></html>
963 <?php }
964\ No newline at end of file
965
966=== modified file 'cpanel-incs/plugins/col1.php'
967--- cpanel-incs/plugins/col1.php 2010-12-06 17:50:35 +0000
968+++ cpanel-incs/plugins/col1.php 2011-01-11 19:52:14 +0000
969@@ -14,11 +14,11 @@
970 if(!isset($_GET['function'])) {$_GET['function']="list"; }
971 if($_GET['function']=="list") {
972 $query = $remote_connection->query('SELECT * FROM `'.$site.'_a_col1` ORDER BY `order` ASC'); ?>
973- <table><tr><th></th><th>Titel</th><th>Acties</th></tr>
974+ <table><tr><th></th><th><?php echo $t->_('Title'); ?></th><th><?php echo $t->_('Actions'); ?></th></tr>
975 <?php while($section=$query->fetch_assoc()) {?>
976- <tr><td<?php if($section['plugin-reference']==NULL) { ?> ondblclick="col1.edit_rights.expand('<?php echo $site; ?>','<?php echo $section['id']; ?>',this,'<?php echo $section['access']; ?>')"><img src="<?php echo URL_IMG; ?>/Silk/bullet_<?php if($section['access']==0) { ?>green<?php } else if($section['access']==1) { ?>orange<?php } else if($section['access']==2) { ?>red<?php } ?>.png"> <?php } else { ?>><img src="<?php echo URL_IMG; ?>/Silk/bullet_black.png" alt=""><?php } ?></td><td ondblclick="col1.edit_title.expand('<?php echo $site; ?>','<?php echo $section['id']; ?>',this)"><?php echo $section['title']; ?></td><td><?php if($section['plugin-reference']==NULL) { ?><a onclick="col1.delete('<?php echo $site; ?>','<?php echo $section['id'] ?>');"><img src="<?php echo URL_IMG; ?>/Silk/delete.png" alt="Wissen" title="Sectie wissen"></a> <?php } ?><a onclick="col1.edit_order.down('<?php echo $site; ?>','<?php echo $section['id'];?>',this);"><img src="<?php echo URL_IMG ?>/Silk/arrow_down.png" alt="Beneden" title="Sectie naar beneden verplaatsen"></a> <a onclick="col1.edit_order.up('<?php echo $site; ?>','<?php echo $section['id']; ?>');"><img src="<?php echo URL_IMG ?>/Silk/arrow_up.png" alt="Boven" title="Sectie naar boven verplaatsen"></a><?php if($section['plugin-reference']==NULL) { ?> <a onclick="col1.open_mce('<?php echo $site; ?>','<?php echo $section['id']; ?>');"><img src="<?php echo URL_IMG; ?>/Silk/pencil.png" alt="Bewerken" title="Sectie bewerken"></a><?php } ?></td></tr>
977+ <tr><td<?php if($section['plugin-reference']==NULL) { ?> ondblclick="col1.edit_rights.expand('<?php echo $site; ?>','<?php echo $section['id']; ?>',this,'<?php echo $section['access']; ?>')"><img src="<?php echo URL_IMG; ?>/Silk/bullet_<?php if($section['access']==0) { ?>green<?php } else if($section['access']==1) { ?>orange<?php } else if($section['access']==2) { ?>red<?php } ?>.png"> <?php } else { ?>><img src="<?php echo URL_IMG; ?>/Silk/bullet_black.png" alt=""><?php } ?></td><td ondblclick="col1.edit_title.expand('<?php echo $site; ?>','<?php echo $section['id']; ?>',this)"><?php echo $section['title']; ?></td><td><?php if($section['plugin-reference']==NULL) { ?><a onclick="col1.delete('<?php echo $site; ?>','<?php echo $section['id'] ?>');"><img src="<?php echo URL_IMG; ?>/Silk/delete.png" alt="<?php echo $t->_('Delete'); ?>" title="<?php echo $t->_('Delete section'); ?>"></a> <?php } ?><a onclick="col1.edit_order.down('<?php echo $site; ?>','<?php echo $section['id'];?>',this);"><img src="<?php echo URL_IMG ?>/Silk/arrow_down.png" alt="<?php echo $t->_('Down'); ?>" title="<?php echo $t->_('Move section down'); ?>"></a> <a onclick="col1.edit_order.up('<?php echo $site; ?>','<?php echo $section['id']; ?>');"><img src="<?php echo URL_IMG ?>/Silk/arrow_up.png" alt="<?php echo $t->_('Up'); ?>" title="<?php echo $t->_('Move section up'); ?>"></a><?php if($section['plugin-reference']==NULL) { ?> <a onclick="col1.open_mce('<?php echo $site; ?>','<?php echo $section['id']; ?>');"><img src="<?php echo URL_IMG; ?>/Silk/pencil.png" alt="<?php echo $t->_('Edit'); ?>" title="<?php echo $t->_('Edit section content'); ?>"></a><?php } ?></td></tr>
978 <?php } ?>
979- <tr onclick="col1.add('<?php echo $site; ?>')"><td><img src="<?php echo URL_IMG; ?>/Silk/bullet_add.png" alt=""></td><td colspan="2">Nieuwe sectie</td></tr>
980+ <tr onclick="col1.add('<?php echo $site; ?>')"><td><img src="<?php echo URL_IMG; ?>/Silk/bullet_add.png" alt=""></td><td colspan="2"><?php echo $t->_('Add section'); ?></td></tr>
981 </table>
982 <?php }
983 else if($_GET['function']=="delete") {
984@@ -67,8 +67,8 @@
985 else if($_GET['function']=="mce") {
986 if(isset($_GET['save'])) {
987 if($remote_connection->query('UPDATE `'.$site.'_a_col1` SET `content`="'.str_replace('"','\'',$_POST['section_main']).'" WHERE `id`='.$_GET['id']))
988- { echo '<script language="JavaScript">alert("Opgeslaan");</script>'; }
989- else { echo '<script language="JavaScript">alert("Fout bij het opslaan");</script>'; }
990+ { echo '<script language="JavaScript">alert("'.$t->_('Saved').'");</script>'; }
991+ else { echo '<script language="JavaScript">alert("'.$t->_('Error while saving').'");</script>'; }
992 }
993 $edit_data=$remote_connection->query('SELECT * FROM `'.$site.'_a_col1` WHERE `id`='.$_GET['id'])->fetch_assoc();?>
994 <script language="JavaScript" src="<?php echo URL_TINYMCE; ?>/tiny_mce/tiny_mce.js"></script>
995@@ -76,7 +76,7 @@
996
997 tinyMCE.init({
998 // General options
999- language: "nl",
1000+ language: "<?php echo $session->userinfo['lang']; ?>",
1001 mode : "textareas",
1002 theme : "advanced",
1003 skin : "o2k7",
1004@@ -97,7 +97,7 @@
1005 </script>
1006 </head><body>
1007 <form action="?control=addons&site=<?php echo $site; ?>&aref=col1&&function=mce&id=<?php echo $_GET['id']; ?>&save=true" method="POST">
1008-<textarea name="section_main" `id`="section_main" style="w`id`th: 100%; height: 100%"><?php echo $edit_data['content']; ?></textarea>
1009+<textarea name="section_main" `id`="section_main" style="width: 100%; height: 100%"><?php echo $edit_data['content']; ?></textarea>
1010 </form>
1011 <?php }
1012 ?>
1013\ No newline at end of file
1014
1015=== modified file 'cpanel-incs/plugins/col3.php'
1016--- cpanel-incs/plugins/col3.php 2010-12-06 17:50:35 +0000
1017+++ cpanel-incs/plugins/col3.php 2011-01-11 19:52:14 +0000
1018@@ -14,11 +14,11 @@
1019 if(!isset($_GET['function'])) {$_GET['function']="list"; }
1020 if($_GET['function']=="list") {
1021 $query = $remote_connection->query('SELECT * FROM `'.$site.'_a_col3` ORDER BY `order` ASC'); ?>
1022- <table><tr><th></th><th>Titel</th><th>Acties</th></tr>
1023+ <table><tr><th></th><th><?php echo $t->_('Title'); ?></th><th><?php echo $t->_('Actions'); ?></th></tr>
1024 <?php while($section=$query->fetch_assoc()) {?>
1025- <tr><td<?php if($section['plugin-reference']==NULL) { ?> ondblclick="col3.edit_rights.expand('<?php echo $site; ?>','<?php echo $section['id']; ?>',this,'<?php echo $section['access']; ?>')"><img src="<?php echo URL_IMG; ?>/Silk/bullet_<?php if($section['access']==0) { ?>green<?php } else if($section['access']==1) { ?>orange<?php } else if($section['access']==2) { ?>red<?php } ?>.png"> <?php } else { ?>><img src="<?php echo URL_IMG; ?>/Silk/bullet_black.png" alt=""><?php } ?></td><td ondblclick="col3.edit_title.expand('<?php echo $site; ?>','<?php echo $section['id']; ?>',this)"><?php echo $section['title']; ?></td><td><?php if($section['plugin-reference']==NULL) { ?><a onclick="col3.delete('<?php echo $site; ?>','<?php echo $section['id'] ?>');"><img src="<?php echo URL_IMG; ?>/Silk/delete.png" alt="Wissen" title="Sectie wissen"></a> <?php } ?><a onclick="col3.edit_order.down('<?php echo $site; ?>','<?php echo $section['id'];?>',this);"><img src="<?php echo URL_IMG ?>/Silk/arrow_down.png" alt="Beneden" title="Sectie naar beneden verplaatsen"></a> <a onclick="col3.edit_order.up('<?php echo $site; ?>','<?php echo $section['id']; ?>');"><img src="<?php echo URL_IMG ?>/Silk/arrow_up.png" alt="Boven" title="Sectie naar boven verplaatsen"></a><?php if($section['plugin-reference']==NULL) { ?> <a onclick="col3.open_mce('<?php echo $site; ?>','<?php echo $section['id']; ?>');"><img src="<?php echo URL_IMG; ?>/Silk/pencil.png" alt="Bewerken" title="Sectie bewerken"></a><?php } ?></td></tr>
1026+ <tr><td<?php if($section['plugin-reference']==NULL) { ?> ondblclick="col3.edit_rights.expand('<?php echo $site; ?>','<?php echo $section['id']; ?>',this,'<?php echo $section['access']; ?>')"><img src="<?php echo URL_IMG; ?>/Silk/bullet_<?php if($section['access']==0) { ?>green<?php } else if($section['access']==1) { ?>orange<?php } else if($section['access']==2) { ?>red<?php } ?>.png"> <?php } else { ?>><img src="<?php echo URL_IMG; ?>/Silk/bullet_black.png" alt=""><?php } ?></td><td ondblclick="col3.edit_title.expand('<?php echo $site; ?>','<?php echo $section['id']; ?>',this)"><?php echo $section['title']; ?></td><td><?php if($section['plugin-reference']==NULL) { ?><a onclick="col3.delete('<?php echo $site; ?>','<?php echo $section['id'] ?>');"><img src="<?php echo URL_IMG; ?>/Silk/delete.png" alt="<?php echo $t->_('Delete'); ?>" title="<?php echo $t->_('Delete section'); ?>"></a> <?php } ?><a onclick="col3.edit_order.down('<?php echo $site; ?>','<?php echo $section['id'];?>',this);"><img src="<?php echo URL_IMG ?>/Silk/arrow_down.png" alt="<?php echo $t->_('Down'); ?>" title="<?php echo $t->_('Move section down'); ?>"></a> <a onclick="col3.edit_order.up('<?php echo $site; ?>','<?php echo $section['id']; ?>');"><img src="<?php echo URL_IMG ?>/Silk/arrow_up.png" alt="<?php echo $t->_('Up'); ?>" title="<?php echo $t->_('Move section up'); ?>"></a><?php if($section['plugin-reference']==NULL) { ?> <a onclick="col3.open_mce('<?php echo $site; ?>','<?php echo $section['id']; ?>');"><img src="<?php echo URL_IMG; ?>/Silk/pencil.png" alt="<?php echo $t->_('Edit'); ?>" title="<?php echo $t->_('Edit section content'); ?>"></a><?php } ?></td></tr>
1027 <?php } ?>
1028- <tr onclick="col3.add('<?php echo $site; ?>')"><td><img src="<?php echo URL_IMG; ?>/Silk/bullet_add.png" alt=""></td><td colspan="2">Nieuwe sectie</td></tr>
1029+ <tr onclick="col3.add('<?php echo $site; ?>')"><td><img src="<?php echo URL_IMG; ?>/Silk/bullet_add.png" alt=""></td><td colspan="2"><?php echo $t->_('Add section'); ?></td></tr>
1030 </table>
1031 <?php }
1032 else if($_GET['function']=="delete") {
1033@@ -67,8 +67,8 @@
1034 else if($_GET['function']=="mce") {
1035 if(isset($_GET['save'])) {
1036 if($remote_connection->query('UPDATE `'.$site.'_a_col3` SET `content`="'.str_replace('"','\'',$_POST['section_main']).'" WHERE `id`='.$_GET['id']))
1037- { echo '<script language="JavaScript">alert("Opgeslaan");</script>'; }
1038- else { echo '<script language="JavaScript">alert("Fout bij het opslaan");</script>'; }
1039+ { echo '<script language="JavaScript">alert("'.$t->_('Saved').'");</script>'; }
1040+ else { echo '<script language="JavaScript">alert("'.$t->_('Error while saving').'");</script>'; }
1041 }
1042 $edit_data=$remote_connection->query('SELECT * FROM `'.$site.'_a_col3` WHERE `id`='.$_GET['id'])->fetch_assoc();?>
1043 <script language="JavaScript" src="<?php echo URL_TINYMCE; ?>/tiny_mce/tiny_mce.js"></script>
1044@@ -76,7 +76,7 @@
1045
1046 tinyMCE.init({
1047 // General options
1048- language: "nl",
1049+ language: "<?php echo $session->userinfo['lang']; ?>",
1050 mode : "textareas",
1051 theme : "advanced",
1052 skin : "o2k7",
1053@@ -97,7 +97,7 @@
1054 </script>
1055 </head><body>
1056 <form action="?control=addons&site=<?php echo $site; ?>&aref=col3&&function=mce&id=<?php echo $_GET['id']; ?>&save=true" method="POST">
1057-<textarea name="section_main" `id`="section_main" style="w`id`th: 100%; height: 100%"><?php echo $edit_data['content']; ?></textarea>
1058+<textarea name="section_main" `id`="section_main" style="width: 100%; height: 100%"><?php echo $edit_data['content']; ?></textarea>
1059 </form>
1060 <?php }
1061 ?>
1062\ No newline at end of file
1063
1064=== modified file 'cpanel-incs/plugins/filemanager.php'
1065--- cpanel-incs/plugins/filemanager.php 2011-01-10 19:33:10 +0000
1066+++ cpanel-incs/plugins/filemanager.php 2011-01-11 19:52:14 +0000
1067@@ -6,6 +6,15 @@
1068 * COPYRIGHT: remotecp.co.cc
1069 * COPYRIGHT 2010 remotecp.co.cc
1070 */
1071+function term() {
1072+ global $buffer,$seval;
1073+ $buffer=ob_get_contents();
1074+ ob_clean();
1075+ echo "<!-- HEADERS >
1076+<AJAX_SCRIPTLOC>filemanager_scripts.js</AJAX_SCRIPTLOC>
1077+<AJAX_SCRIPTEVAL>$seval</AJAX_SCRIPTEVAL>
1078+< HEADERS -->$buffer";
1079+}
1080 ob_start();
1081 if(!hasSiteAddonLevel()) {$session->log('403','Site access denied ('.$site.')'); exit;} //Kill & log non-siteadmins (ze zouden hier nooit mogen geweest zijn :)
1082 $session->log('200','File access granted ('.$site.')');
1083@@ -25,19 +34,19 @@
1084 if($_GET['action']=="delete") {
1085 if($mysqlfs->is_dir($_GET['path'])) {
1086 if($mysqlfs->rmdir($_GET['path'])) {
1087- echo "Map gewist";
1088+ echo $t->_('Directory deleted');
1089 }
1090 else {
1091- echo "Fout bij map wissen";
1092+ echo $t->_('Error deleting directory');
1093 }
1094
1095 }
1096 else {
1097 if($mysqlfs->unlink($_GET['path'])) {
1098- echo "Bestand gewist";
1099+ echo $t->_('File deleted');
1100 }
1101 else {
1102- echo "Fout bij bestand wissen";
1103+ echo $t->_('Error deleting file');
1104 }
1105 }
1106 $_GET['path']=dirname($_GET['path']);
1107@@ -50,13 +59,13 @@
1108 echo "true";
1109 }
1110 else {
1111- echo "false|Fout bij map aanmaken";
1112+ echo "false|".$t->_('Error creating folder');
1113 }
1114 }
1115 else {
1116- echo "false|Map bestaat al";
1117+ echo "false|".$t->_('Folder already exists');
1118 }
1119- goto term;
1120+ term();return;
1121 }
1122 else {
1123 if(!$mysqlfs->file_exists($_GET['path'].'/'.$_GET['name'])) {
1124@@ -64,13 +73,13 @@
1125 echo "true";
1126 }
1127 else {
1128- echo "false|Fout bij bestand aanmaken";
1129+ echo "false|".$t->_('Error creating file');
1130 }
1131 }
1132 else {
1133- echo "false|Bestand bestaat al";
1134+ echo "false|".$t->_('File already exists');
1135 }
1136- goto term;
1137+ term();return;
1138 }
1139 }
1140 if($_GET['action']=="edit") {
1141@@ -80,14 +89,14 @@
1142 echo "true";
1143 }
1144 else {
1145- echo "false|Fout bij bestand opslaan";
1146+ echo "false|".$t->_('Error saving the file');
1147 }
1148- goto term;
1149+ term();return;
1150 }
1151 echo "
1152 <form action='?control=addons&site={$site}&aref=filemanager&action=edit&path={$mysqlfs->simplify_path($_GET['path'])}' method='POST' onsubmit='return false;'>
1153 <textarea name='content' style='width: 100%;height: 90%'>".htmlentities($mysqlfs->file_get_contents($_GET['path']))."</textarea>
1154- <input type='submit' style='width: 50%;height: 10%' onclick='filemanager.edit(\"$site\",\"{$mysqlfs->simplify_path($_GET['path'])}\",this); return false;'><input type='submit' style='width: 50%;height: 10%' name='abort' value='Terug' onclick='filemanager.edit_abort(\"$site\",\"{$mysqlfs->simplify_path($_GET['path'])}\")'>
1155+ <input type='submit' style='width: 50%;height: 10%' onclick='filemanager.edit(\"$site\",\"{$mysqlfs->simplify_path($_GET['path'])}\",this); return false;' value='".$t->_('Save')."'><input type='submit' style='width: 50%;height: 10%' name='abort' value='".$t->_('Back')."' onclick='filemanager.edit_abort(\"$site\",\"{$mysqlfs->simplify_path($_GET['path'])}\")'>
1156 </form>
1157 ";
1158 $show_dir=false;
1159@@ -95,8 +104,8 @@
1160 }
1161 else {
1162 if(!isset($_GET['abort'])) {
1163- echo "false|Het opgegeven pad is geen bestand!";
1164- goto term;
1165+ echo "false|".$t->_('The path given is not a file');
1166+ term();return;
1167 }
1168 else {
1169 $_GET['path']=dirname($_GET['path']);
1170@@ -110,27 +119,27 @@
1171 echo "true";
1172 }
1173 else {
1174- echo "false|Fout bij bestand chmodden";
1175+ echo "false|".$t->_('Error chmodding file');
1176 }
1177- goto term;
1178+ term();return;
1179 }
1180 else {
1181 echo "
1182 <form action='?control=addons&site={$site}&aref=filemanager&action=chmod&path={$mysqlfs->simplify_path($_GET['path'])}' method='POST' onsubmit='filemanager.chmod(\"$site\",\"{$mysqlfs->simplify_path($_GET['path'])}\",this); return false;'>
1183 <div>
1184 <table>
1185- <thead><tr><th></th><th>Lezen</th><th>Schrijven</th><th>Uitvoeren</th></tr></thead>
1186+ <thead><tr><th></th><th>".$t->_('Read')."</th><th>".$t->_('Write')."</th><th>".$t->_('Execute')."</th></tr></thead>
1187 <tbody>";
1188 $mod=$mysqlfs->getinfo($_GET['path'],'rights');
1189 for($i=0;$i<=2;$i++) {
1190 if($i==0) {
1191- $name='Eigenaar';
1192+ $name=$t->_('Owner');
1193 }
1194 elseif($i==1) {
1195- $name='Groep';
1196+ $name=$t->_('Group');
1197 }
1198 else {
1199- $name='Anderen';
1200+ $name=$t->_('World');
1201 }
1202 $umod=$mod[$i];
1203 $read=false; $write=false; $exec=false;
1204@@ -147,14 +156,11 @@
1205 }
1206 echo "<tr><th>{$name}:</th><td><input type='checkbox' onclick='filemanager.chmod_chk.input(this.parentNode.parentNode.parentNode.parentNode.parentNode.parentNode.getElementsByTagName(\"input\")[9].value);filemanager.chmod_chk.change($i,4,this.checked);this.parentNode.parentNode.parentNode.parentNode.parentNode.parentNode.getElementsByTagName(\"input\")[9].focus()' ".($read?'checked':'')."></td><td><input type='checkbox' onclick='filemanager.chmod_chk.input(this.parentNode.parentNode.parentNode.parentNode.parentNode.parentNode.getElementsByTagName(\"input\")[9].value);filemanager.chmod_chk.change($i,2,this.checked);this.parentNode.parentNode.parentNode.parentNode.parentNode.parentNode.getElementsByTagName(\"input\")[9].focus()' ".($write?'checked':'')."></td><td><input type='checkbox' onclick='filemanager.chmod_chk.input(this.parentNode.parentNode.parentNode.parentNode.parentNode.parentNode.getElementsByTagName(\"input\")[9].value);filemanager.chmod_chk.change($i,1,this.checked);this.parentNode.parentNode.parentNode.parentNode.parentNode.parentNode.getElementsByTagName(\"input\")[9].focus()' ".($exec?'checked':'')."></td></tr>";
1207 }
1208-/*<tr><th>Eigenaar:</th><td><input type='checkbox' onclick='filemanager.chmod_chk.input(this.parentNode.parentNode.parentNode.parentNode.parentNode.parentNode.getElementsByTagName(\"input\")[9].value);filemanager.chmod_chk.change(0,4,this.checked);this.parentNode.parentNode.parentNode.parentNode.parentNode.parentNode.getElementsByTagName(\"input\")[9].focus()'></td><td><input type='checkbox' onclick='filemanager.chmod_chk.input(this.parentNode.parentNode.parentNode.parentNode.parentNode.parentNode.getElementsByTagName(\"input\")[9].value);filemanager.chmod_chk.change(0,2,this.checked);this.parentNode.parentNode.parentNode.parentNode.parentNode.parentNode.getElementsByTagName(\"input\")[9].focus()'></td><td><input type='checkbox' onclick='filemanager.chmod_chk.input(this.parentNode.parentNode.parentNode.parentNode.parentNode.parentNode.getElementsByTagName(\"input\")[9].value);filemanager.chmod_chk.change(0,1,this.checked);this.parentNode.parentNode.parentNode.parentNode.parentNode.parentNode.getElementsByTagName(\"input\")[9].focus()'></td></tr>
1209- <tr><th>Groep:</th><td><input type='checkbox' onclick='filemanager.chmod_chk.input(this.parentNode.parentNode.parentNode.parentNode.parentNode.parentNode.getElementsByTagName(\"input\")[9].value);filemanager.chmod_chk.change(1,4,this.checked);this.parentNode.parentNode.parentNode.parentNode.parentNode.parentNode.getElementsByTagName(\"input\")[9].focus()'></td><td><input type='checkbox' onclick='filemanager.chmod_chk.input(this.parentNode.parentNode.parentNode.parentNode.parentNode.parentNode.getElementsByTagName(\"input\")[9].value);filemanager.chmod_chk.change(1,2,this.checked);this.parentNode.parentNode.parentNode.parentNode.parentNode.parentNode.getElementsByTagName(\"input\")[9].focus()'></td><td><input type='checkbox' onclick='filemanager.chmod_chk.input(this.parentNode.parentNode.parentNode.parentNode.parentNode.parentNode.getElementsByTagName(\"input\")[9].value);filemanager.chmod_chk.change(1,1,this.checked);this.parentNode.parentNode.parentNode.parentNode.parentNode.parentNode.getElementsByTagName(\"input\")[9].focus()'></td></tr>
1210- <tr><th>Anderen:</th><td><input type='checkbox' onclick='filemanager.chmod_chk.input(this.parentNode.parentNode.parentNode.parentNode.parentNode.parentNode.getElementsByTagName(\"input\")[9].value);filemanager.chmod_chk.change(2,4,this.checked);this.parentNode.parentNode.parentNode.parentNode.parentNode.parentNode.getElementsByTagName(\"input\")[9].focus()'></td><td><input type='checkbox' onclick='filemanager.chmod_chk.input(this.parentNode.parentNode.parentNode.parentNode.parentNode.parentNode.getElementsByTagName(\"input\")[9].value);filemanager.chmod_chk.change(2,2,this.checked);this.parentNode.parentNode.parentNode.parentNode.parentNode.parentNode.getElementsByTagName(\"input\")[9].focus()'></td><td><input type='checkbox' onclick='filemanager.chmod_chk.input(this.parentNode.parentNode.parentNode.parentNode.parentNode.parentNode.getElementsByTagName(\"input\")[9].value);filemanager.chmod_chk.change(2,1,this.checked);this.parentNode.parentNode.parentNode.parentNode.parentNode.parentNode.getElementsByTagName(\"input\")[9].focus()'></td></tr>*/
1211 echo "</tbody>
1212 </table>
1213 </div>
1214 <input type='text' value='{$mysqlfs->getinfo($_GET['path'],'rights')}' name='mod' onfocus='filemanager.chmod_chk.output(this);filemanager.chmod_chk.checkbx(this)' onblur='filemanager.chmod_chk.input(this.value);filemanager.chmod_chk.checkbx(this)'>
1215- <input type='submit'>
1216+ <input type='submit' value='".$t->_('Chmod')."'>
1217 </form>
1218 ";
1219 $seval.=";filemanager.chmod_chk.input('{$mysqlfs->getinfo($_GET['path'],'rights')}');";
1220@@ -168,15 +174,15 @@
1221 echo "true";
1222 }
1223 else {
1224- echo "false|Fout bij bestand chownen";
1225+ echo "false|".$t->_('Error chowning file');
1226 }
1227- goto term;
1228+ term();return;
1229 }
1230 else {
1231 echo "
1232 <form action='?control=addons&site={$site}&aref=filemanager&action=chown&path={$mysqlfs->simplify_path($_GET['path'])}' method='POST' onsubmit='filemanager.chown(\"$site\",\"{$mysqlfs->simplify_path($_GET['path'])}\",this); return false;'>
1233 <input type='text' value='{$mysqlfs->getinfo($_GET['path'],'owner')}' name='user'>
1234- <input type='submit'>
1235+ <input type='submit' value='".$t->_('Chown')."'>
1236 </form>
1237 ";
1238 }
1239@@ -189,15 +195,15 @@
1240 echo "true";
1241 }
1242 else {
1243- echo "false|Fout bij bestand chgrpen";
1244+ echo "false|".$t->_('Error chgrping file');
1245 }
1246- goto term;
1247+ term();return;
1248 }
1249 else {
1250 echo "
1251 <form action='?control=addons&site={$site}&aref=filemanager&action=chgrp&path={$mysqlfs->simplify_path($_GET['path'])}' method='POST' onsubmit='filemanager.chgrp(\"$site\",\"{$mysqlfs->simplify_path($_GET['path'])}\",this); return false;'>
1252 <input type='text' value='{$mysqlfs->getinfo($_GET['path'],'group')}' name='grp'>
1253- <input type='submit'>
1254+ <input type='submit' value='".$t->_('Chgrp')."'>
1255 </form>
1256 ";
1257 }
1258@@ -212,14 +218,14 @@
1259 if($_FILES['file']['error'] == 0) {
1260 // Move uploaded file
1261 if($mysqlfs->move_uploaded_file($_FILES['file']['tmp_name'],$_GET['path'].'/'.$_FILES['file']['name'])) {
1262- echo "Bestand geupload";
1263+ echo $t->_('File uploaded');
1264 }
1265 else {
1266- echo "Fout bij gegevens wegschrijven";
1267+ echo $t->_('Error writing data');
1268 }
1269 }
1270 else {
1271- echo 'Fout bij bestand verzenden';
1272+ echo $t->_('Error sending file');
1273 }
1274 }
1275 echo "');</script>";
1276@@ -231,15 +237,15 @@
1277 echo "true";
1278 }
1279 else {
1280- echo "false|Fout bij bestand verplaatsen";
1281+ echo "false|".$t->_('Error renaming file');
1282 }
1283- goto term;
1284+ term();return;
1285 }
1286 else {
1287 echo "
1288 <form action='?control=addons&site={$site}&aref=filemanager&action=rename&path={$mysqlfs->simplify_path($_GET['path'])}' method='POST' onsubmit='filemanager.rename(\"$site\",\"{$mysqlfs->simplify_path($_GET['path'])}\",this); return false;'>
1289 <input type='text' value='{$_GET['path']}' name='newname'>
1290- <input type='submit'>
1291+ <input type='submit' value='".$t->_('Rename')."'>
1292 </form>
1293 ";
1294 }
1295@@ -252,15 +258,15 @@
1296 echo "true";
1297 }
1298 else {
1299- echo "false|Fout bij bestand kopi&euml;ren";
1300+ echo "false|".$t->_('Error copying file');
1301 }
1302- goto term;
1303+ term();return;
1304 }
1305 else {
1306 echo "
1307 <form action='?control=addons&site={$site}&aref=filemanager&action=copy&path={$mysqlfs->simplify_path($_GET['path'])}' method='POST' onsubmit='filemanager.copy(\"$site\",\"{$mysqlfs->simplify_path($_GET['path'])}\",this); return false;'>
1308 <input type='text' value='{$_GET['path']}' name='dest'>
1309- <input type='submit'>
1310+ <input type='submit' value='".$t->_('Copy')."'>
1311 </form>
1312 ";
1313 }
1314@@ -295,40 +301,32 @@
1315 }
1316 if($show_dir) {
1317 $dir=$mysqlfs->readdir_full($_GET['path']);
1318- echo "<h1>Index of /{$mysqlfs->simplify_path($_GET['path'])}</h1>";
1319+ echo "<h1>".$t->_('Index of')." /{$mysqlfs->simplify_path($_GET['path'])}</h1>";
1320 echo "
1321 <form action='?' method='GET' onsubmit='filemanager.new(\"$site\",this); return false;'>
1322 <input type='hidden' name='path' value='{$mysqlfs->simplify_path($_GET['path'])}'>
1323 <select name='type'>
1324- <option value='d'>Map</option>
1325- <option value='f'>Bestand</option>
1326+ <option value='d'>".$t->_('Folder')."</option>
1327+ <option value='f'>".$t->_('File')."</option>
1328 </select>
1329 <input type='text' name='name' value=''>
1330- <input type='submit' value='Aanmaken'>
1331+ <input type='submit' value='".$t->_('Create')."'>
1332 </form>
1333 ";
1334 echo "
1335 <form action='?control=addons&site={$site}&aref=filemanager&action=upload&path={$mysqlfs->simplify_path($_GET['path'])}' method='POST' enctype='multipart/form-data' target='{$site}_ajax_upl_ifrm'>
1336 <input type='file' name='file'>
1337- <input type='submit' value='Upload' onclick='filemanager.upload.start(this)'>
1338+ <input type='submit' value='".$t->_('Upload')."' onclick='filemanager.upload.start(this)'>
1339 </form>
1340 <iframe name='{$site}_ajax_upl_ifrm' style='display: none'></iframe>
1341 ";
1342- echo "<table><thead><tr><th>Name</th><th>Rechten</th><th>Owner</th><th>Group</th><th>Bewerkt</th><th>Grootte</th><th>Acties</th></tr><tr><th colspan='5'><hr></th></tr></thead><tbody>";
1343+ echo "<table><thead><tr><th>".$t->_('Name')."</th><th>".$t->_('Rights')."</th><th>".$t->_('Owner')."</th><th>".$t->_('Group')."</th><th>".$t->_('Last edited')."</th><th>".$t->_('Size')."</th><th>".$t->_('Actions')."</th></tr><tr><th colspan='7'><hr></th></tr></thead><tbody>";
1344 foreach($dir as $value) {
1345 $value['time']=date('Y-m-d H:i:s',$value['time']);
1346 echo "<tr><td>[{$value['type']}] <a onclick=\"".(($value['type']=="d")?"openLoc('','?control=addons&site={$site}&aref=filemanager&path={$mysqlfs->simplify_path($_GET['path'])}/{$value['filename']}','{$site}_ctrls_filemanager')":"window.open('?control=addons&site=$site&aref=filemanager&path={$mysqlfs->simplify_path($_GET['path'])}/{$value['filename']}&action=view'); return false;")."\">{$value['filename']}</a></td><td>{$value['rights']}</td><td>{$value['owner']}</td><td>{$value['group']}</td><td>{$value['time']}</td><td>{$mysqlfs->sizetohuman($value['size'])}</td><td>
1347- <a onclick=\"openLoc('','?control=addons&site={$site}&aref=filemanager&path={$mysqlfs->simplify_path($_GET['path'])}/{$value['filename']}&action=delete','{$site}_ctrls_filemanager')\">Wissen</a>".(($value['type']=='f')?" <a onclick=\"openLoc('','?control=addons&site={$site}&aref=filemanager&path={$mysqlfs->simplify_path($_GET['path'])}/{$value['filename']}&action=edit','{$site}_ctrls_filemanager')\">Bewerken</a>":"")." <a onclick=\"openLoc('','?control=addons&site={$site}&aref=filemanager&path={$mysqlfs->simplify_path($_GET['path'])}/{$value['filename']}&action=chmod','{$site}_ctrls_filemanager')\">Chmod</a> <a onclick=\"openLoc('','?control=addons&site={$site}&aref=filemanager&path={$mysqlfs->simplify_path($_GET['path'])}/{$value['filename']}&action=chown','{$site}_ctrls_filemanager')\">Chown</a> <a onclick=\"openLoc('','?control=addons&site={$site}&aref=filemanager&path={$mysqlfs->simplify_path($_GET['path'])}/{$value['filename']}&action=chgrp','{$site}_ctrls_filemanager')\">Chgrp</a> <a onclick=\"openLoc('','?control=addons&site={$site}&aref=filemanager&path={$mysqlfs->simplify_path($_GET['path'])}/{$value['filename']}&action=rename','{$site}_ctrls_filemanager')\">Hernoemen</a> <a onclick=\"openLoc('','?control=addons&site={$site}&aref=filemanager&path={$mysqlfs->simplify_path($_GET['path'])}/{$value['filename']}&action=copy','{$site}_ctrls_filemanager')\">Kopi&euml;ren</a></td></tr>";
1348+ <a onclick=\"openLoc('','?control=addons&site={$site}&aref=filemanager&path={$mysqlfs->simplify_path($_GET['path'])}/{$value['filename']}&action=delete','{$site}_ctrls_filemanager')\">".$t->_('Delete')."</a>".(($value['type']=='f')?" <a onclick=\"openLoc('','?control=addons&site={$site}&aref=filemanager&path={$mysqlfs->simplify_path($_GET['path'])}/{$value['filename']}&action=edit','{$site}_ctrls_filemanager')\">".$t->_('Edit')."</a>":"")." <a onclick=\"openLoc('','?control=addons&site={$site}&aref=filemanager&path={$mysqlfs->simplify_path($_GET['path'])}/{$value['filename']}&action=chmod','{$site}_ctrls_filemanager')\">".$t->_('Chmod')."</a> <a onclick=\"openLoc('','?control=addons&site={$site}&aref=filemanager&path={$mysqlfs->simplify_path($_GET['path'])}/{$value['filename']}&action=chown','{$site}_ctrls_filemanager')\">".$t->_('Chown')."</a> <a onclick=\"openLoc('','?control=addons&site={$site}&aref=filemanager&path={$mysqlfs->simplify_path($_GET['path'])}/{$value['filename']}&action=chgrp','{$site}_ctrls_filemanager')\">".$t->_('Chgrp')."</a> <a onclick=\"openLoc('','?control=addons&site={$site}&aref=filemanager&path={$mysqlfs->simplify_path($_GET['path'])}/{$value['filename']}&action=rename','{$site}_ctrls_filemanager')\">".$t->_('Rename')."</a> <a onclick=\"openLoc('','?control=addons&site={$site}&aref=filemanager&path={$mysqlfs->simplify_path($_GET['path'])}/{$value['filename']}&action=copy','{$site}_ctrls_filemanager')\">".$t->_('Copy')."</a></td></tr>";
1349 }
1350 echo "</tbody></table>";
1351 }
1352-term:
1353-$ctnt=ob_get_contents();
1354-ob_clean();
1355+term();return;
1356 ?>
1357-<!-- HEADERS >
1358-<AJAX_SCRIPTLOC>filemanager_scripts.js</AJAX_SCRIPTLOC>
1359-<AJAX_SCRIPTEVAL><?php echo $seval ?></AJAX_SCRIPTEVAL>
1360-< HEADERS --><?php
1361-echo $ctnt;
1362-?>
1363\ No newline at end of file
1364
1365=== modified file 'cpanel-incs/plugins/news.php'
1366--- cpanel-incs/plugins/news.php 2011-01-08 14:32:45 +0000
1367+++ cpanel-incs/plugins/news.php 2011-01-11 19:52:14 +0000
1368@@ -5,43 +5,43 @@
1369 if(!hasSiteAddonLevel()) {$session->log('403','Site access denied ('.$site.')'); exit;} //Kill & log non-siteadmins (ze zouden hier nooit mogen geweest zijn :)
1370 if(!isset($_GET['function'])) { $_GET['function']="list"; }
1371 if($_GET['function']=="list") {
1372- $q=$remote_connection->query('SELECT * FROM '.$site.'_a_news ORDER BY news_datetime DESC'); ?>
1373- <table><tr><th></th><th>Titel</th><th>Link</th><th>Datum</th><th>Acties</th></tr>
1374+ $q=$remote_connection->query('SELECT * FROM `'.$site.'_a_news` ORDER BY `news_datetime` DESC'); ?>
1375+ <table><tr><th></th><th><?php echo $t->_('Title'); ?></th><th><?php echo $t->_('Link'); ?></th><th><?php echo $t->_('Date'); ?></th><th><?php echo $t->_('Actions'); ?></th></tr>
1376 <?php while($news=$q->fetch_assoc()) { ?>
1377- <tr><td><img src="<?php echo URL_IMG; ?>/Silk/newspaper.png" alt=""></td><td ondblclick="news.edit_title.expand('<?php echo $site; ?>','<?php echo $news['id']; ?>',this);"><?php echo $news['news_header']; ?></td><td>/news/<?php echo $news['id']; ?></td><td ondblclick="news.edit_date.expand('<?php echo $site; ?>','<?php echo $news['id']; ?>',this);"><?php echo $news['news_datetime']; ?></td><td><a onclick="news.delete('<?php echo $site; ?>','<?php echo $news['id']; ?>');"><img src="<?php echo URL_IMG; ?>/Silk/delete.png" alt="Wissen" title="Bericht wissen"></a> <a onclick="news.edit_body('<?php echo $site; ?>','<?php echo $news['id']; ?>');"><img src="<?php echo URL_IMG; ?>/Silk/pencil.png" alt="Bewerken" title="Nieuwsbericht bewerken"></a></td></tr>
1378+ <tr><td><img src="<?php echo URL_IMG; ?>/Silk/newspaper.png" alt=""></td><td ondblclick="news.edit_title.expand('<?php echo $site; ?>','<?php echo $news['id']; ?>',this);"><?php echo $news['news_header']; ?></td><td>/news/<?php echo $news['id']; ?></td><td ondblclick="news.edit_date.expand('<?php echo $site; ?>','<?php echo $news['id']; ?>',this);"><?php echo $news['news_datetime']; ?></td><td><a onclick="news.delete('<?php echo $site; ?>','<?php echo $news['id']; ?>');"><img src="<?php echo URL_IMG; ?>/Silk/delete.png" alt="<?php echo $t->_('Delete'); ?>" title="<?php echo $t->_('Delete announcement'); ?>"></a> <a onclick="news.edit_body('<?php echo $site; ?>','<?php echo $news['id']; ?>');"><img src="<?php echo URL_IMG; ?>/Silk/pencil.png" alt="<?php echo $t->_('Edit'); ?>" title="<?php echo $t->_('Edit announcement'); ?>"></a></td></tr>
1379 <?php } ?>
1380- <tr onclick="news.add('<?php echo $site; ?>');"><td><img src="<?php echo URL_IMG; ?>/Silk/newspaper_add.png" alt=""></td><td colspan="4">Nieuw nieuwsbericht</td></tr>
1381+ <tr onclick="news.add('<?php echo $site; ?>');"><td><img src="<?php echo URL_IMG; ?>/Silk/newspaper_add.png" alt=""></td><td colspan="4"><?php echo $t->_('New announcement'); ?></td></tr>
1382 </table>
1383 <?php }
1384 else if($_GET['function']=="delete") {
1385- $q= $remote_connection->query('DELETE FROM '.$site.'_a_news WHERE id='.$_GET['id']);
1386+ $q= $remote_connection->query('DELETE FROM `'.$site.'_a_news` WHERE `id`='.$_GET['id']);
1387 if($q) { echo "true"; } else { echo "false"; }
1388 }
1389 else if($_GET['function']=="edit_title") {
1390- $q= $remote_connection->query('UPDATE '.$site.'_a_news SET news_header="'.$_GET['title'].'" WHERE id='.$_GET['id']);
1391+ $q= $remote_connection->query('UPDATE `'.$site.'_a_news` SET `news_header`="'.$_GET['title'].'" WHERE `id`='.$_GET['id']);
1392 if($q) { echo "true"; } else { echo "false"; }
1393 }
1394 else if($_GET['function']=="edit_date") {
1395- $q= $remote_connection->query('UPDATE '.$site.'_a_news SET news_datetime="'.$_GET['date'].'" WHERE id='.$_GET['id']);
1396+ $q= $remote_connection->query('UPDATE `'.$site.'_a_news` SET `news_datetime`="'.$_GET['date'].'" WHERE `id`='.$_GET['id']);
1397 if($q) { echo "true"; } else { echo "false"; }
1398 }
1399 else if($_GET['function']=="new") {
1400- $q=$remote_connection->query('INSERT INTO '.$site.'_a_news VALUES(0,"Nieuw nieuwsbericht","","'.date('Y-m-d',$session->time).'")');
1401+ $q=$remote_connection->query('INSERT INTO `'.$site.'_a_news` VALUES(0,"Nieuw nieuwsbericht","","'.date('Y-m-d',$session->time).'")');
1402 if($q) { echo "true"; } else { echo "false"; }
1403 }
1404 else if($_GET['function']=="edit") {
1405 if(isset($_GET['save'])) {
1406- if($remote_connection->query('UPDATE '.$site.'_a_news SET news_main="'.strip_tags($_POST['news_main']).'" WHERE id='.$_GET['id']))
1407- { echo '<script language="JavaScript">alert("Opgeslaan");</script>'; }
1408- else { echo '<script language="JavaScript">alert("Fout bij het opslaan");</script>'; }
1409+ if($remote_connection->query('UPDATE `'.$site.'_a_news` SET `news_main`="'.strip_tags($_POST['news_main']).'" WHERE `id`='.$_GET['id']))
1410+ { echo '<script language="JavaScript">alert("'.$t->_('Saved').'");</script>'; }
1411+ else { echo '<script language="JavaScript">alert("'.$t->_('Error while saving').'");</script>'; }
1412 }
1413- $edit_data=$remote_connection->query('SELECT * FROM '.$site.'_a_news WHERE id='.$_GET['id'])->fetch_assoc();?>
1414+ $edit_data=$remote_connection->query('SELECT * FROM `'.$site.'_a_news` WHERE `id`='.$_GET['id'])->fetch_assoc();?>
1415 <script language="JavaScript" src="<?php echo URL_TINYMCE; ?>/tiny_mce/tiny_mce.js"></script>
1416 <script type="text/javascript">
1417
1418 tinyMCE.init({
1419 // General options
1420- language: "nl",
1421+ language: "<?php echo $session->userinfo['lang']; ?>",
1422 mode : "textareas",
1423 theme : "advanced",
1424 skin : "o2k7",
1425
1426=== modified file 'cpanel-incs/plugins/slideshow.php'
1427--- cpanel-incs/plugins/slideshow.php 2011-01-11 19:14:58 +0000
1428+++ cpanel-incs/plugins/slideshow.php 2011-01-11 19:52:14 +0000
1429@@ -6,11 +6,11 @@
1430 if(!isset($_GET['function'])) { $_GET['function']="list"; }
1431 if($_GET['function']=="list") {
1432 $q=$remote_connection->query('SELECT * FROM `'.$site.'_a_slideshowindex`'); ?>
1433- <table><tr><th></th><th>Titel</th><th>Link</th><th>Hoofdpad</th><th>Acties</th></tr>
1434+ <table><tr><th></th><th><?php echo $t->_('Title'); ?></th><th><?php echo $t->_('Link'); ?></th><th><?php echo $t->_('Folder'); ?></th><th><?php echo $t->_('Actions'); ?></th></tr>
1435 <?php while($ss=$q->fetch_assoc()) { ?>
1436- <tr><td><img src="<?php echo URL_IMG; ?>/Silk/pictures.png" alt=""></td><td ondblclick="slideshow.main.edit_title.expand('<?php echo $site; ?>','<?php echo $ss['id']; ?>',this);"><?php echo $ss['title']; ?></td><td>/slideshow/<?php echo $ss['id']; ?></td><td ondblclick="slideshow.main.edit_root.expand('<?php echo $site; ?>','<?php echo $ss['id']; ?>',this);"><?php echo $ss['root']; ?></td><td><a onclick="slideshow.main.delete('<?php echo $site; ?>','<?php echo $ss['id']; ?>');"><img src="<?php echo URL_IMG; ?>/Silk/delete.png" alt="Wissen" title="Diavoorstelling wissen"></a> <a onclick="slideshow.main.edit_images('<?php echo $site; ?>','<?php echo $ss['id']; ?>');"><img src="<?php echo URL_IMG; ?>/Silk/pencil.png" alt="Bewerken" title="Diavoorstelling bewerken"></a></td></tr>
1437+ <tr><td><img src="<?php echo URL_IMG; ?>/Silk/pictures.png" alt=""></td><td ondblclick="slideshow.main.edit_title.expand('<?php echo $site; ?>','<?php echo $ss['id']; ?>',this);"><?php echo $ss['title']; ?></td><td>/slideshow/<?php echo $ss['id']; ?></td><td ondblclick="slideshow.main.edit_root.expand('<?php echo $site; ?>','<?php echo $ss['id']; ?>',this);"><?php echo $ss['root']; ?></td><td><a onclick="slideshow.main.delete('<?php echo $site; ?>','<?php echo $ss['id']; ?>');"><img src="<?php echo URL_IMG; ?>/Silk/delete.png" alt="<?php echo $t->_('Delete'); ?>" title="<?php echo $t->_('Delete slideshow'); ?>"></a> <a onclick="slideshow.main.edit_images('<?php echo $site; ?>','<?php echo $ss['id']; ?>');"><img src="<?php echo URL_IMG; ?>/Silk/pencil.png" alt="<?php echo $t->_('Edit'); ?>" title="<?php echo $t->_('Edit slideshow'); ?>"></a></td></tr>
1438 <?php } ?>
1439- <tr onclick="slideshow.main.add('<?php echo $site; ?>');"><td><img src="<?php echo URL_IMG; ?>/Silk/add.png" alt=""></td><td colspan="4">Nieuwe diavoostelling</td></tr>
1440+ <tr onclick="slideshow.main.add('<?php echo $site; ?>');"><td><img src="<?php echo URL_IMG; ?>/Silk/add.png" alt=""></td><td colspan="4"><?php echo $t->_('Add slideshow'); ?></td></tr>
1441 </table>
1442 <?php }
1443 else if($_GET['function']=="delete") {
1444@@ -30,18 +30,18 @@
1445 if($q) { echo "true"; } else { echo "false"; }
1446 }
1447 else if($_GET['function']=="new") {
1448- $q=$remote_connection->query('INSERT INTO `'.$site.'_a_slideshowindex` VALUES(0,"Nieuwe diavoostelling","/")');
1449+ $q=$remote_connection->query('INSERT INTO `'.$site.'_a_slideshowindex` VALUES(0,"'.$t->_('New slideshow').'","/")');
1450 if($q) { echo "true"; } else { echo "false"; }
1451 }
1452 else if ($_GET['function']=="images_list") {
1453 $q=$remote_connection->query('SELECT * FROM `'.$site.'_a_slideshow` WHERE `ssid`='.$_GET['ssid']); ?>
1454- <a onclick="openLoc('','?control=addons&site=<?php echo $site; ?>&aref=slideshow&function=list','<?php echo $site; ?>_ctrls_slideshow');">Diavoorstellingen</a>
1455- <table><tr><th></th><th>Afbeelding</th><th>Titel</th><th>Acties</th></tr>
1456+ <a onclick="openLoc('','?control=addons&site=<?php echo $site; ?>&aref=slideshow&function=list','<?php echo $site; ?>_ctrls_slideshow');"><?php echo $t->_('Slideshows'); ?></a>
1457+ <table><tr><th></th><th><?php echo $t->_('Image'); ?></th><th><?php echo $t->_('Title'); ?></th><th><?php echo $t->_('Actions'); ?></th></tr>
1458 <?php while($ss=$q->fetch_assoc()) { ?>
1459- <tr><td><img src="<?php echo URL_IMG; ?>/Silk/picture.png" alt=""></td><td ondblclick="slideshow.image.edit_path.expand('<?php echo $site; ?>','<?php echo $ss['id']; ?>',this);"><?php echo $ss['file']; ?></td><td ondblclick="slideshow.image.edit_title.expand('<?php echo $site; ?>','<?php echo $ss['id']; ?>',this);"><?php echo $ss['title']; ?></td><td><a onclick="slideshow.image.delete('<?php echo $site; ?>','<?php echo $ss['id']; ?>');"><img src="<?php echo URL_IMG; ?>/Silk/delete.png" alt="Wissen" title="Afbeelding wissen"></a> <a onclick="slideshow.image.edit_info('<?php echo $site; ?>','<?php echo $ss['id']; ?>');"><img src="<?php echo URL_IMG; ?>/Silk/pencil.png" alt="Bewerken" title="Afbeeldingsinfo bewerken"></a></td></tr>
1460+ <tr><td><img src="<?php echo URL_IMG; ?>/Silk/picture.png" alt=""></td><td ondblclick="slideshow.image.edit_path.expand('<?php echo $site; ?>','<?php echo $ss['id']; ?>',this);"><?php echo $ss['file']; ?></td><td ondblclick="slideshow.image.edit_title.expand('<?php echo $site; ?>','<?php echo $ss['id']; ?>',this);"><?php echo $ss['title']; ?></td><td><a onclick="slideshow.image.delete('<?php echo $site; ?>','<?php echo $ss['id']; ?>');"><img src="<?php echo URL_IMG; ?>/Silk/delete.png" alt="<?php echo $t->_('Delete'); ?>" title="<?php echo $t->_('Delete image'); ?>"></a> <a onclick="slideshow.image.edit_info('<?php echo $site; ?>','<?php echo $ss['id']; ?>');"><img src="<?php echo URL_IMG; ?>/Silk/pencil.png" alt="<?php echo $t->_('Edit'); ?>" title="<?php echo $t->_('Edit image info'); ?>"></a></td></tr>
1461 <?php } ?>
1462- <tr onclick="slideshow.image.add('<?php echo $site; ?>','<?php echo $_GET['ssid']; ?>');"><td><img src="<?php echo URL_IMG; ?>/Silk/picture_add.png" alt=""></td><td colspan="4">Nieuwe afbeelding</td></tr>
1463- <tr onclick="slideshow.image.scandir('<?php echo $site; ?>','<?php echo $_GET['ssid']; ?>');"><td><img src="<?php echo URL_IMG; ?>/Silk/folder_magnify.png" alt=""</td><td colspan="4">Map scannen</td></tr>
1464+ <tr onclick="slideshow.image.add('<?php echo $site; ?>','<?php echo $_GET['ssid']; ?>');"><td><img src="<?php echo URL_IMG; ?>/Silk/picture_add.png" alt=""></td><td colspan="4"><?php echo $t->_('Add image'); ?></td></tr>
1465+ <tr onclick="slideshow.image.scandir('<?php echo $site; ?>','<?php echo $_GET['ssid']; ?>');"><td><img src="<?php echo URL_IMG; ?>/Silk/folder_magnify.png" alt=""</td><td colspan="4"><?php echo $t->_('Scan folder for images'); ?></td></tr>
1466 </table>
1467 <?php }
1468 else if($_GET['function']=="image_delete") {
1469@@ -72,14 +72,14 @@
1470
1471 }
1472 else if($_GET['function']=="image_new") {
1473- $q=$remote_connection->query('INSERT INTO `'.$site.'_a_slideshow` VALUES('.$_GET['ssid'].',NULL,"Nieuwe afbeelding","#","","")');
1474+ $q=$remote_connection->query('INSERT INTO `'.$site.'_a_slideshow` VALUES('.$_GET['ssid'].',NULL,"'.$t->_('New image').'","/","","")');
1475 if($q) { echo "true"; } else { echo "false"; }
1476 }
1477 else if($_GET['function']=="image_detail") {
1478 if(isset($_GET['save'])||isset($_POST['save'])) {
1479 echo "<script language='JavaScript'>alert('";
1480 $q=$remote_connection->query('UPDATE `'.$site.'_a_slideshow` SET `comment`="'.$_POST['description'].'", `credit`="'.$_POST['credit'].'" WHERE id='.$_GET['id']);
1481- if($q) { echo "Gegevens opgeslaan";} else { echo "Fout bij gegevens opslaan";}
1482+ if($q) { echo $t->_('Saved');} else { echo $t->_('Error while saving');}
1483 echo "');</script>";
1484 }
1485 $imgq=$remote_connection->query('SELECT * FROM `'.$site.'_a_slideshow` WHERE `id`='.$_GET['id']);
1486@@ -92,7 +92,7 @@
1487
1488 tinyMCE.init({
1489 // General options
1490- language: "nl",
1491+ language: "<?php echo $session->userinfo['lang'] ?>",
1492 mode : "textareas",
1493 theme : "advanced",
1494 skin : "o2k7",
1495@@ -115,7 +115,7 @@
1496 <table height="100%" width="100%"><tr><td rowspan="2"><img src="<?php echo $ss['root'].'/'.$img['file']; ?>" width="330"></td>
1497 <td><textarea name="description" id="description" style="width: 100%; height: 100%"><?php echo $img['comment']; ?></textarea></td></tr>
1498 <tr><td><input type="text" name="credit" id="credit" value="<?php echo htmlentities($img['credit']); ?>" style="width: 100%"></td></tr>
1499-<tr><td colspan="2" align="center"><input type="submit" value="verzenden" name="save"></td></tr></table>
1500+<tr><td colspan="2" align="center"><input type="submit" value="<?php echo $t->_('Save'); ?>" name="save"></td></tr></table>
1501 </form>
1502
1503 <?php } ?>
1504\ No newline at end of file
1505
1506=== modified file 'cpanel-incs/register.php'
1507--- cpanel-incs/register.php 2010-12-06 17:50:35 +0000
1508+++ cpanel-incs/register.php 2011-01-11 19:52:14 +0000
1509@@ -1,7 +1,27 @@
1510 <!-- HEADERS >
1511 <AJAX_SCRIPTLOC>NULL</AJAX_SCRIPTLOC>
1512 <AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>
1513-< HEADERS --><form onsubmit="reg=ajax.post('?control=process','ajax=true&user='+this.user.value+'&pass='+this.pass.value+'&email='+this.email.value+'&subjoin=1');reg=reg.split('|');if(reg[0]=='true') {$(this).prepend(message.info('Gebruiker geregistreerd'));}else if(reg[0]=='false') {reg[0]='Fouten:';reg.join('<br>');$(this).prepend(message.error(reg));}else {reg.join('|');$(this).prepend(reg);} return false;">
1514-<label><?php echo T_USER_USERNAME ?>:<input type="text" name="user" maxlength="30" value="" class="textfield"></label><br><label><?php echo T_USER_REG_PASS ?>:<input type="password" name="pass" maxlength="30" value="" class="textfield"></label><br><label><?php echo T_USER_REG_MAIL?>:<input type="text" name="email" maxlength="50" value="" class="textfield"></label><br>
1515-<input type="submit" value="<?php echo T_USER_REG_SUBMIT ?>" class="button">
1516-</form>
1517\ No newline at end of file
1518+< HEADERS --><?php if(!isset($_POST['user'])) {
1519+?><form onsubmit="reg=ajax.post('?control=register','ajax=true&user='+this.user.value+'&pass='+this.pass.value+'&email='+this.email.value+'&subjoin=1');reg=reg.split('|');if(reg[0]=='true') {$(this).prepend(message.info('<?php echo $t->_('User registered'); ?>'));}else if(reg[0]=='false') {reg[0]='<?php echo $t->_('User not registered.<br>Errors'); ?>:';reg.join('<br>');$(this).prepend(message.error(reg));}else {reg.join('|');$(this).prepend(reg);} return false;">
1520+<label><?php echo $t->_('Username'); ?>:<input type="text" name="user" maxlength="30" value="" class="textfield"></label><br><label><?php echo $t->_('Password') ?>:<input type="password" name="pass" maxlength="30" value="" class="textfield"></label><br><label><?php echo $t->_('E-mail address'); ?>:<input type="text" name="email" maxlength="50" value="" class="textfield"></label><br>
1521+<input type="submit" value="<?php echo $t->_('Register'); ?>" class="button">
1522+</form>
1523+<?php
1524+}
1525+else {
1526+ /* Registration attempt */
1527+ $retval = $session->register($_POST['user'], $_POST['pass'], $_POST['email']);
1528+
1529+ /* Registration Successful */
1530+ if($retval == 0){
1531+ echo "true";
1532+ }
1533+ /* Error found with form */
1534+ else if($retval == 1){
1535+ echo "false|".implode('|',$form->getErrorArray());
1536+ }
1537+ /* Registration attempt failed */
1538+ else if($retval == 2){
1539+ echo "false|".$t->_('Unknown');
1540+ }
1541+}
1542\ No newline at end of file
1543
1544=== modified file 'inc/sitemgmt/constants.php'
1545--- inc/sitemgmt/constants.php 2010-12-16 12:58:06 +0000
1546+++ inc/sitemgmt/constants.php 2011-01-11 19:52:14 +0000
1547@@ -16,8 +16,8 @@
1548 * If these locations are incorrect, there won't
1549 * be any lay-out, images, site title or correct RSS.
1550 */
1551-define("DOMAIN","http://localhost/dev/account");
1552-define("URL_STATIC",DOMAIN."/../../static/");
1553+define("DOMAIN","http://localhost/dev/remotecp-panel-trans");
1554+define("URL_STATIC",DOMAIN."/static/");
1555 define("URL_IMG", URL_STATIC."/images/icons/"); //Images location
1556 #define("URL_CSS", URL_STATIC."/css/chromz/"); //CSS location
1557 define("URL_TINYMCE", DOMAIN."/tinymce/jscripts/"); //Tinymce's javascript library location
1558
1559=== modified file 'inc/sitemgmt/database.php'
1560--- inc/sitemgmt/database.php 2010-12-06 17:50:35 +0000
1561+++ inc/sitemgmt/database.php 2011-01-11 19:52:14 +0000
1562@@ -150,7 +150,7 @@
1563 }else{
1564 $ulevel = USER_LEVEL;
1565 }
1566- $q = "INSERT INTO ".TBL_USERS." VALUES ('$username', '$password', '0', $ulevel, '$email', $time, 'dos')";
1567+ $q = "INSERT INTO ".TBL_USERS." VALUES ('$username', '$password', '0', $ulevel, '$email', $time, 0,'en')";
1568 return $this->connection->query($q);
1569 }
1570
1571
1572=== modified file 'inc/sitemgmt/session.php'
1573--- inc/sitemgmt/session.php 2010-12-13 20:42:58 +0000
1574+++ inc/sitemgmt/session.php 2011-01-11 19:52:14 +0000
1575@@ -128,19 +128,19 @@
1576 /* Username error checking */
1577 $field = "user"; //Use field name for username
1578 if(!$subuser || strlen($subuser = trim($subuser)) == 0){
1579- $form->setError($field, "* ".T_USER_LOGIN_E_T1);
1580+ $form->setError($field, "*");
1581 }
1582 else{
1583 /* Check if username is not alphanumeric */
1584 if(!preg_match('%^([0-9a-z])*$%', $subuser)){
1585- $form->setError($field, "* ".T_USER_LOGIN_E_T2);
1586+ $form->setError($field, "*");
1587 }
1588 }
1589
1590 /* Password error checking */
1591 $field = "pass"; //Use field name for password
1592 if(!$subpass){
1593- $form->setError($field, "* ".T_USER_LOGIN_E_T3);
1594+ $form->setError($field, "*");
1595 }
1596
1597 /* Return if form errors exist */
1598@@ -155,11 +155,11 @@
1599 /* Check error codes */
1600 if($result == 1){
1601 $field = "user";
1602- $form->setError($field, "* ".T_USER_LOGIN_E_T4);
1603+ $form->setError($field, "*");
1604 }
1605 else if($result == 2){
1606 $field = "pass";
1607- $form->setError($field, "* ".T_USER_LOGIN_E_T5);
1608+ $form->setError($field, "*");
1609 }
1610
1611 /* Return if form errors exist */
1612@@ -227,67 +227,57 @@
1613 * returns 0. Returns 2 if registration failed.
1614 */
1615 function register($subuser, $subpass, $subemail){
1616- global $database, $form, $mailer; //The database, form and mailer object
1617+ global $database, $form, $mailer, $t; //The database, form and mailer object + translation
1618
1619 /* Username error checking */
1620 $field = "user"; //Use field name for username
1621 if(!$subuser || strlen($subuser = trim($subuser)) == 0){
1622- $form->setError($field, "* Gebruikersnaam niet ingevoerd");
1623+ $form->setError($field, $t->_('You didn\'t enter a username'));
1624 }
1625 else{
1626 /* Spruce up username, check length */
1627 $subuser = stripslashes($subuser);
1628 if(strlen($subuser) < 5){
1629- $form->setError($field, "* ".T_USER_REG_E_T1);
1630+ $form->setError($field, $t->_('Username too short (at least 5 letters)'));
1631 }
1632 else if(strlen($subuser) > 30){
1633- $form->setError($field, "* ".T_USER_REG_E_T2);
1634+ $form->setError($field, $t->_('Username too long (not more than 30 letters)'));
1635 }
1636 /* Check if username is not alphanumeric */
1637 else if(!eregi("^([0-9a-z])+$", $subuser)){
1638- $form->setError($field, "* ".T_USER_REG_E_T3);
1639+ $form->setError($field, $t->_('Username must be alphanumeric'));
1640 }
1641 /* Check if username is reserved */
1642 else if(strcasecmp($subuser, GUEST_NAME) == 0){
1643- $form->setError($field, "* ".T_USER_REG_E_T4);
1644+ $form->setError($field, $t->_('Reserved username'));
1645 }
1646 /* Check if username is already in use */
1647 else if($database->usernameTaken($subuser)){
1648- $form->setError($field, "* ".T_USER_REG_E_T5);
1649+ $form->setError($field, $t->_('User already exists'));
1650 }
1651 /* Check if username is banned */
1652 else if($database->usernameBanned($subuser)){
1653- $form->setError($field, "* ".T_USER_REG_E_T6);
1654+ $form->setError($field, $t->_('User banned'));
1655 }
1656 }
1657
1658 /* Password error checking */
1659 $field = "pass"; //Use field name for password
1660 if(!$subpass){
1661- $form->setError($field, "* ".T_USER_REG_E_T7);
1662+ $form->setError($field, $t->_('Please enter a password'));
1663 }
1664 else{
1665 /* Spruce up password and check length*/
1666 $subpass = stripslashes($subpass);
1667 if(strlen($subpass) < 4){
1668- $form->setError($field, "* ".T_USER_REG_E_T8);
1669- }
1670- /* Check if password is not alphanumeric */
1671- else if(!eregi("^([0-9a-z])+$", ($subpass = trim($subpass)))){
1672- $form->setError($field, "* ".T_USER_REG_E_T9);
1673- }
1674- /**
1675- * Note: I trimmed the password only after I checked the length
1676- * because if you fill the password field up with spaces
1677- * it looks like a lot more characters than 4, so it looks
1678- * kind of stupid to report "password too short".
1679- */
1680+ $form->setError($field, $t->_('Password too short (at least 4 characters)'));
1681+ }
1682 }
1683
1684 /* Email error checking */
1685 $field = "email"; //Use field name for email
1686 if(!$subemail || strlen($subemail = trim($subemail)) == 0){
1687- $form->setError($field, "* ".T_USER_REG_E_T10);
1688+ $form->setError($field, $t->_('Please enter an e-mail address'));
1689 }
1690 else{
1691 /* Check if valid email address */
1692@@ -295,7 +285,7 @@
1693 ."@[a-z0-9-]+(\.[a-z0-9-]{1,})*"
1694 ."\.([a-z]{2,}){1}$";
1695 if(!eregi($regex,$subemail)){
1696- $form->setError($field, "* ".T_USER_REG_E_T11);
1697+ $form->setError($field, $t->_('Please enter a valid e-mail address'));
1698 }
1699 $subemail = stripslashes($subemail);
1700 }
1701@@ -325,25 +315,24 @@
1702 * automatically.
1703 */
1704
1705- function editAccount($subcurpass, $subnewpass, $subemail, $subgui){
1706- global $database, $form; //The database and form object
1707+ function editAccount($subcurpass=false, $subnewpass=false, $subemail=false){
1708+ global $database, $form, $t; //The database and form object + translation
1709 /* New password entered */
1710 if($subnewpass){
1711 /* Current Password error checking */
1712 $field = "curpass"; //Use field name for current password
1713 if(!$subcurpass){
1714- $form->setError($field, "* ".T_USER_EDIT_E_T1);
1715+ $form->setError($field, $t->_('Please enter your current password'));
1716 }
1717 else{
1718 /* Check if password too short or is not alphanumeric */
1719 $subcurpass = stripslashes($subcurpass);
1720- if(strlen($subcurpass) < 4 ||
1721- !eregi("^([0-9a-z])+$", ($subcurpass = trim($subcurpass)))){
1722- $form->setError($field, "* ".T_USER_EDIT_E_T2);
1723- }
1724+ if(strlen($subcurpass)<4) {
1725+ $form->setError($field,$t->_('Current password is incorrect'));
1726+ }
1727 /* Password entered is incorrect */
1728 if($database->confirmUserPass($this->username,md5($subcurpass)) != 0){
1729- $form->setError($field, "* ".T_USER_EDIT_E_T3);
1730+ $form->setError($field, $t->_('Current password is incorrect'));
1731 }
1732 }
1733
1734@@ -352,18 +341,14 @@
1735 /* Spruce up password and check length*/
1736 $subpass = stripslashes($subnewpass);
1737 if(strlen($subnewpass) < 4){
1738- $form->setError($field, "* ".T_USER_EDIT_E_T4);
1739- }
1740- /* Check if password is not alphanumeric */
1741- else if(!eregi("^([0-9a-z])+$", ($subnewpass = trim($subnewpass)))){
1742- $form->setError($field, "* ".T_USER_EDIT_E_T5);
1743+ $form->setError($field, $t->_('New password is too short'));
1744 }
1745 }
1746 /* Change password attempted */
1747 else if($subcurpass){
1748 /* New Password error reporting */
1749 $field = "newpass"; //Use field name for new password
1750- $form->setError($field, "* ".T_USER_EDIT_E_T6);
1751+ $form->setError($field, $t->_('Please enter your new password'));
1752 }
1753
1754 /* Email error checking */
1755@@ -374,7 +359,7 @@
1756 ."@[a-z0-9-]+(\.[a-z0-9-]{1,})*"
1757 ."\.([a-z]{2,}){1}$";
1758 if(!eregi($regex,$subemail)){
1759- $form->setError($field, "* ".T_USER_EDIT_E_T7);
1760+ $form->setError($field, $t->_('Invalid E-mail address'));
1761 }
1762 $subemail = stripslashes($subemail);
1763 }
1764@@ -383,22 +368,19 @@
1765 if($form->num_errors > 0){
1766 return false; //Errors with form
1767 }
1768-
1769+ $exec=0;
1770 /* Update password since there were no errors */
1771 if($subcurpass && $subnewpass){
1772 $database->updateUserField($this->username,"password",md5($subnewpass));
1773+ $exec++;
1774 }
1775
1776 /* Change Email */
1777 if($subemail){
1778 $database->updateUserField($this->username,"email",$subemail);
1779- }
1780-
1781- /* Change GUI */
1782- if($subgui){
1783- $database->updateUserField($this->username,"gui",$subgui);
1784- }
1785-
1786+ $exec++;
1787+ }
1788+ if($exec==0) return false;
1789 /* Success! */
1790 return true;
1791 }
1792@@ -470,4 +452,6 @@
1793 /* Initialize form object */
1794 $form = new Form;
1795
1796+//Define user language
1797+define('USER_LNG',$session->userinfo['lang']);
1798 ?>
1799
1800=== modified file 'lang/set.php'
1801--- lang/set.php 2010-12-06 17:50:35 +0000
1802+++ lang/set.php 2011-01-11 19:52:14 +0000
1803@@ -4,4 +4,5 @@
1804 * Sets the languagepack for the website
1805 */
1806 //Module not activated
1807+include('nl.lng.php');
1808 ?>
1809\ No newline at end of file
1810
1811=== modified file 'panel.php'
1812--- panel.php 2011-01-02 20:21:07 +0000
1813+++ panel.php 2011-01-11 19:52:14 +0000
1814@@ -112,7 +112,7 @@
1815 $(this).dialog('close');
1816 }
1817 else if(logged_in=="false") {
1818- $(this).prepend('<div id="dlg_log-in-error" class="ui-state-error ui-corner-all" style="padding: 0 .7em;"><p><span class="ui-icon ui-icon-alert" style="float: left; margin-right: .3em;"></span>Login mislukt. Probeer opnieuw</p></div>');
1819+ $(this).prepend('<div id="dlg_log-in-error" class="ui-state-error ui-corner-all" style="padding: 0 .7em;"><p><span class="ui-icon ui-icon-alert" style="float: left; margin-right: .3em;"></span><?php echo $t->_('Login failed. Try again'); ?></p></div>');
1820 setTimeout('$("#dlg_log-in-error").hide("clip","slow")',2000);
1821 }
1822 else {
1823@@ -185,28 +185,27 @@
1824
1825 </head>
1826 <body onload="page_loading.remove()">
1827- <p class="gui-button" id="button_log-off" onclick="$.ajax({async:false,url:'?control=logoff'});refreshLoc(); $('#dlg_log-in').dialog('open'); return false;">Afmelden</p>
1828- <p class="gui-button" id="button_register" onclick="$('#dlg_register').empty().append(ajax.get('?control=register')).dialog('open');return false;">Registreren</p>
1829+ <p class="gui-button" id="button_log-off" onclick="$.ajax({async:false,url:'?control=logoff'});refreshLoc(); $('#dlg_log-in').dialog('open'); return false;"><?php echo $t->_('Log off'); ?></p>
1830+ <p class="gui-button" id="button_register" onclick="$('#dlg_register').empty().append(ajax.get('?control=register')).dialog('open');return false;"><?php echo $t->_('Register'); ?></p>
1831 <div id="tabs">
1832 <ul>
1833
1834- <li><a href="#tabs-desktop">Bureaublad</a></li>
1835+ <li><a href="#tabs-desktop"><?php echo $t->_('Desktop'); ?></a></li>
1836 </ul>
1837 <div id="tabs-desktop">
1838 <div class='gui-progress'></div>
1839 </div>
1840 </div>
1841 <div id="dlg_js-e" title="JavaScript ERROR" class="gui-dlg gui-dlg-fs gui-dlg-alert">
1842- <div class="ui-state-error ui-corner-all" style="padding: 0 .7em;"><p><span class="ui-icon ui-icon-alert" style="float: left; margin-right: .3em;"></span>Er is een fout opgetreden in de JavaScript interpreter van je browser.</p>
1843- <p>Mogelijk werkt de pagina niet goed.</p></div>
1844+ <div class="ui-state-error ui-corner-all" style="padding: 0 .7em;"><p><span class="ui-icon ui-icon-alert" style="float: left; margin-right: .3em;"></span><?php echo $t->_('An error occured in your browser\'s JavaScript interpreter.</p><p>Probably the page doesn\'t work anymore.'); ?></p></div>
1845 </div>
1846 <div id="dlg_log-in" title="Aanmelden" class="gui-dlg gui-dlg-fs gui-dlg-noresize">
1847 <form name="login">
1848- Gebruikersnaam: <input type="text" name="user" id="login-user"><br>
1849- Wachtwoord: <input type="password" name="pass" id="login-pass">
1850+ <?php echo $t->_('Username'); ?>: <input type="text" name="user" id="login-user"><br>
1851+ <?php echo $t->_('Password'); ?>: <input type="password" name="pass" id="login-pass">
1852 </form>
1853 </div>
1854- <div id="dlg_register" title="Registreren" class="gui-dlg gui-dlg-fs gui-dlg-noresize">
1855+ <div id="dlg_register" title="<?php echo $t->_('Register'); ?>" class="gui-dlg gui-dlg-fs gui-dlg-noresize">
1856 </div>
1857 <script language="JavaScript">
1858 //Initialize desktop
1859@@ -223,7 +222,7 @@
1860 <AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>
1861 < HEADERS -->
1862 <div class="ui-state-highlight ui-corner-all" style="padding: 0 .7em;"><p><span class="ui-icon ui-icon-info" style="float: left; margin-right: .3em;"></span>
1863-<strong>Login verlopen</strong> U bent te lang niet actief geweest, daarom is uw sessie verlopen.</p><p><span aria-disabled="false" role="button" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only" onclick="$('#dlg_log-in').dialog('open');"><span class="ui-button-text">Opnieuw inloggen</span></span>
1864+<?php echo $t->_('<strong>Authentication expired</strong> You were too long inactive. Your session has expired.'); ?></p><p><span aria-disabled="false" role="button" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only" onclick="$('#dlg_log-in').dialog('open');"><span class="ui-button-text"><?php echo $t->_('Relogin'); ?></span></span>
1865 </p></div>
1866 <!-- AJAX_STOP --><?php
1867 exit;
1868
1869=== modified file 'scripts/cms_scripts.js'
1870--- scripts/cms_scripts.js 2010-12-15 20:29:36 +0000
1871+++ scripts/cms_scripts.js 2011-01-11 19:52:14 +0000
1872@@ -6,11 +6,11 @@
1873 if(cont.value!=cont.getAttribute('orig_val')) {
1874 success=ajax.get('?control=addons&site='+site+'&aref=cms&function=edit_title&type=page&id='+id+'&title='+cont.value);
1875 if(success=="true") {
1876- alert('Titel opgeslaan');
1877+ alert('<?php echo $t->_('Title saved'); ?>');
1878 refreshLoc();
1879 }
1880 else if(success=="false") {
1881- alert('Fout bij titel opslaan');
1882+ alert('<?php echo $t->_('Error saving title'); ?>');
1883 }
1884 else {
1885 alert('FATAL ERROR:'+success);
1886@@ -30,14 +30,14 @@
1887 }
1888 },
1889 delete: function(site,id) {
1890- if(confirm('Pagina wissen?\nAlle secties van de pagina zullen ook gewist worden!')) {
1891+ if(confirm('<?php echo $t->_('Do you really want to delete this page?\nAll sections will be deleted too.'); ?>')) {
1892 success=ajax.get('?control=addons&site='+site+'&aref=cms&function=delete&type=page&id='+id);
1893 if(success=="true") {
1894- alert('Pagina gewist');
1895+ alert('<?php echo $t->_('Page deleted'); ?>');
1896 refreshLoc();
1897 }
1898 else if(success=="false") {
1899- alert('Fout bij pagina wissen');
1900+ alert('<?php echo $t->_('Error deleting page'); ?>');
1901 }
1902 else {
1903 alert('FATAL ERROR:'+success);
1904@@ -48,11 +48,11 @@
1905 up: function(site,id) {
1906 success=ajax.get('?control=addons&site='+site+'&aref=cms&function=move&type=page&id='+id+'&move=up');
1907 if(success=="true") {
1908- alert('Pagina verplaatst');
1909+ alert('<?php echo $t->_('Page moved up'); ?>');
1910 refreshLoc();
1911 }
1912 else if(success=="false") {
1913- alert('Fout bij pagina verplaatsen');
1914+ alert('<?php echo $t->_('Error moving page'); ?>');
1915 }
1916 else {
1917 alert('FATAL ERROR:'+success);
1918@@ -61,11 +61,11 @@
1919 down: function(site,id) {
1920 success=ajax.get('?control=addons&site='+site+'&aref=cms&function=move&type=page&id='+id+'&move=down');
1921 if(success=="true") {
1922- alert('Pagina verplaatst');
1923+ alert('<?php echo $t->_('Page moved down'); ?>');
1924 refreshLoc();
1925 }
1926 else if(success=="false") {
1927- alert('Fout bij pagina verplaatsen');
1928+ alert('<?php echo $t->_('Error moving page'); ?>');
1929 }
1930 else {
1931 alert('FATAL ERROR:'+success);
1932@@ -75,11 +75,11 @@
1933 add: function(site) {
1934 success=ajax.get('?control=addons&site='+site+'&aref=cms&function=new&type=page');
1935 if(success=="true") {
1936- alert('Pagina gemaakt');
1937+ alert('<?php echo $t->_('New page created'); ?>');
1938 refreshLoc();
1939 }
1940 else if(success=="false") {
1941- alert('Fout bij pagina maken');
1942+ alert('<?php echo $t->_('Error creating page'); ?>');
1943 }
1944 else {
1945 alert('FATAL ERROR:'+success);
1946@@ -91,11 +91,11 @@
1947 cont.value=escape(cont.value);
1948 success=ajax.get('?control=addons&site='+site+'&aref=cms&function=edit_link&id='+id+'&newlink='+cont.value);
1949 if(success=="true") {
1950- alert('Link opgeslaan');
1951+ alert('<?php echo $t->_('Link saved'); ?>');
1952 refreshLoc();
1953 }
1954 else if(success=="false") {
1955- alert('Fout bij link opslaan');
1956+ alert('<?php echo $t->_('Error saving link'); ?>');
1957 }
1958 else {
1959 alert('FATAL ERROR:'+success);
1960@@ -109,7 +109,7 @@
1961 cont.parentNode.innerHTML=cont.value;
1962 },
1963 expand: function(site,id,cont) {
1964- inputbox=cont
1965+ inputbox=cont;
1966 inputbox.innerHTML='<input type=\'text\' value=\''+inputbox.innerHTML+'\' orig_val=\''+inputbox.innerHTML+'\'onblur=cms.page.edit_link.func(\''+site+'\',\''+id+'\',this)>';
1967 inputbox.getElementsByTagName('input')[0].focus();
1968 }
1969@@ -117,11 +117,11 @@
1970 add_link: function(site) {
1971 success=ajax.get('?control=addons&site='+site+'&aref=cms&function=new&type=link');
1972 if(success=="true") {
1973- alert('Link gemaakt');
1974+ alert('<?php echo $t->_('New link created'); ?>');
1975 refreshLoc();
1976 }
1977 else if(success=="false") {
1978- alert('Fout bij link maken');
1979+ alert('<?php $t->_('Error creating link'); ?>');
1980 }
1981 else {
1982 alert('FATAL ERROR:'+success);
1983@@ -132,11 +132,11 @@
1984 if(cont.value!=cont.getAttribute('orig_val')) {
1985 success=ajax.get('?control=addons&site='+site+'&aref=cms&function=edit_rights&id='+id+'&rights='+cont.value);
1986 if(success=="true") {
1987- alert('Toegangsrechten opgeslaan');
1988+ alert('<?php echo $t->_('Accessrights saved'); ?>');
1989 refreshLoc();
1990 }
1991 else if(success=="false") {
1992- alert('Fout bij toegangsrechten opslaan');
1993+ alert('<?php echo $t->_('Error saving accessrights'); ?>');
1994 }
1995 else {
1996 alert('FATAL ERROR:'+success);
1997@@ -153,11 +153,11 @@
1998 inputbox=cont;
1999 HTML='<select orig_val=\''+orig_rights+'\' orig_html=\''+inputbox.innerHTML+'\' onblur=cms.page.edit_rights.func(\''+site+'\',\''+id+'\',this)><option value=\'0\'';
2000 if(orig_rights==0) { HTML+=' selected';}
2001- HTML+='>Iedereen</option><option value=\'1\'';
2002+ HTML+='><?php echo $t->_('Everyone'); ?></option><option value=\'1\'';
2003 if(orig_rights==1) { HTML+=' selected'; }
2004- HTML+='>Gebruikers</option><option value=\'2\'';
2005+ HTML+='><?php echo $t->_('Users'); ?></option><option value=\'2\'';
2006 if(orig_rights==2) { HTML+=' selected'; }
2007- HTML+='>Verborgen</option></select>';
2008+ HTML+='><?php echo $t->_('Hidden'); ?></option></select>';
2009 inputbox.innerHTML=HTML;
2010 inputbox.getElementsByTagName('select')[0].focus();
2011 }
2012@@ -166,11 +166,11 @@
2013 on: function(site,id) {
2014 success=ajax.get('?control=addons&site='+site+'&aref=cms&function=visiblity&id='+id+'&v=on');
2015 if(success=="true") {
2016- alert('Pagina zichtbaar gemaakt');
2017+ alert('<?php echo $t->_('Page made visible'); ?>');
2018 refreshLoc();
2019 }
2020 else if(success=="false") {
2021- alert('Fout bij pagina zichtbaar maken');
2022+ alert('<?php echo $t->_('Error making page visible'); ?>');
2023 }
2024 else {
2025 alert('FATAL ERROR:'+success);
2026@@ -179,11 +179,11 @@
2027 off: function(site,id) {
2028 success=ajax.get('?control=addons&site='+site+'&aref=cms&function=visiblity&id='+id+'&v=off');
2029 if(success=="true") {
2030- alert('Pagina onzichtbaar gemaakt');
2031+ alert('<?php echo $t->_('Page made invisible'); ?>');
2032 refreshLoc();
2033 }
2034 else if(success=="false") {
2035- alert('Fout bij pagina onzichtbaar maken');
2036+ alert('<?php echo $t->_('Error making page invisible'); ?>');
2037 }
2038 else {
2039 alert('FATAL ERROR:'+success);
2040@@ -197,11 +197,11 @@
2041 if(cont.value!=cont.getAttribute('orig_val')) {
2042 success=ajax.get('?control=addons&site='+site+'&aref=cms&function=edit_title&type=section&id='+id+'&title='+cont.value);
2043 if(success=="true") {
2044- alert('Titel opgeslaan');
2045+ alert('<?php echo $t->_('Title saved'); ?>');
2046 cms.section.edit_title.collapse(cont);
2047 }
2048 else if(success=="false") {
2049- alert('Fout bij titel opslaan');
2050+ alert('<?php echo $t->_('Error saving title'); ?>');
2051 }
2052 else {
2053 alert('FATAL ERROR:'+success);
2054@@ -221,14 +221,14 @@
2055 }
2056 },
2057 delete: function(site,id) {
2058- if(confirm('Sectie wissen?')) {
2059+ if(confirm('<?php echo $t->_('Delete section?'); ?>')) {
2060 success=ajax.get('?control=addons&site='+site+'&aref=cms&function=delete&type=section&id='+id);
2061 if(success=="true") {
2062- alert('Sectie gewist');
2063+ alert('<?php echo $t->_('Section deleted'); ?>');
2064 refreshLoc();
2065 }
2066 else if(success=="false") {
2067- alert('Fout bij sectie wissen');
2068+ alert('<?php echo $t->_('Error deleting section'); ?>');
2069 }
2070 else {
2071 alert('FATAL ERROR:'+success);
2072@@ -239,11 +239,11 @@
2073 up: function(site,id) {
2074 success=ajax.get('?control=addons&site='+site+'&aref=cms&function=move&type=section&id='+id+'&move=up');
2075 if(success=="true") {
2076- alert('Sectie verplaatst');
2077+ alert('<?php echo $t->_('Section moved up'); ?>');
2078 refreshLoc();
2079 }
2080 else if(success=="false") {
2081- alert('Fout bij sectie verplaatsen');
2082+ alert('<?php echo $t->_('Error moving section'); ?>');
2083 }
2084 else {
2085 alert('FATAL ERROR:'+success);
2086@@ -252,11 +252,11 @@
2087 down: function(site,id) {
2088 success=ajax.get('?control=addons&site='+site+'&aref=cms&function=move&type=section&id='+id+'&move=down');
2089 if(success=="true") {
2090- alert('Sectie verplaatst');
2091+ alert('<?php echo $t->_('Section moved down'); ?>');
2092 refreshLoc();
2093 }
2094 else if(success=="false") {
2095- alert('Fout bij sectie verplaatsen');
2096+ alert('<?php echo $t->_('Error moving section'); ?>');
2097 }
2098 else {
2099 alert('FATAL ERROR:'+success);
2100@@ -266,11 +266,11 @@
2101 add: function(site,pageid) {
2102 success=ajax.get('?control=addons&site='+site+'&aref=cms&function=new&type=section&page='+pageid);
2103 if(success=="true") {
2104- alert('Sectie gemaakt');
2105+ alert('<?php echo $t->_('New section created'); ?>');
2106 refreshLoc();
2107 }
2108 else if(success=="false") {
2109- alert('Fout bij sectie maken');
2110+ alert('<?php echo $t->_('Error creating section'); ?>');
2111 }
2112 else {
2113 alert('FATAL ERROR:'+success);
2114@@ -283,11 +283,11 @@
2115 func: function(site,id,newpage) {
2116 success=ajax.get('?control=addons&site='+site+'&aref=cms&function=switch_page&newpage='+newpage+'&id='+id);
2117 if(success=="true") {
2118- alert('Sectie verplaatst');
2119+ alert('<?php echo $t->_('Section moved'); ?>');
2120 refreshLoc();
2121 }
2122 else if(success=="false") {
2123- alert('Fout bij sectie verplaatsen');
2124+ alert('<?php echo $t->_('Error moving section'); ?>');
2125 }
2126 else {
2127 alert('FATAL ERROR:'+success);
2128@@ -305,7 +305,7 @@
2129 onclick=img.getAttribute('prevclick');
2130 img.setAttribute('onclick',onclick);
2131 img.removeAttribute('prevclick');
2132- img.innerHTML='<img src="http://static.lnhost.co.cc/images/icons/Silk/arrow_switch.png" alt="Pagina wisselen" title="Sectie verplaatsen naar een andere pagina">';
2133+ img.innerHTML='<img src="<?php echo URL_IMG; ?>/Silk/arrow_switch.png" alt="<?php echo $t->_('Other page'); ?>" title="<?php echo $t->_('Move this section to another page'); ?>">';
2134 }
2135
2136 }
2137
2138=== modified file 'scripts/col1_scripts.js'
2139--- scripts/col1_scripts.js 2010-12-15 20:29:36 +0000
2140+++ scripts/col1_scripts.js 2011-01-11 19:52:14 +0000
2141@@ -5,11 +5,11 @@
2142 if(cont.value!=cont.getAttribute('orig_val')) {
2143 success=ajax.get('?control=addons&site='+site+'&aref=col1&function=edit_title&id='+id+'&title='+cont.value);
2144 if(success=="true") {
2145- alert('Titel opgeslaan');
2146+ alert('<?php echo $t->_('Title saved'); ?>');
2147 refreshLoc();
2148 }
2149 else if(success=="false") {
2150- alert('Fout bij titel opslaan');
2151+ alert('<?php echo $t->_('Error saving title'); ?>');
2152 }
2153 else {
2154 alert('FATAL ERROR:'+success);
2155@@ -31,11 +31,11 @@
2156 delete: function(site,id) {
2157 success=ajax.get('?control=addons&site='+site+'&aref=col1&function=delete&id='+id);
2158 if(success=="true") {
2159- alert('Sectie gewist');
2160+ alert('<?php echo $t->_('Section deleted'); ?>');
2161 refreshLoc();
2162 }
2163 else if(success=="false") {
2164- alert('Fout bij sectie wissen');
2165+ alert('<?php echo $t->_('Error deleting section'); ?>');
2166 }
2167 else {
2168 alert('FATAL ERROR:'+success);
2169@@ -45,11 +45,11 @@
2170 up: function(site,id) {
2171 success=ajax.get('?control=addons&site='+site+'&aref=col1&function=move&id='+id+'&move=up');
2172 if(success=="true") {
2173- alert('Sectie verplaatst');
2174+ alert('<?php echo $t->_('Section moved up'); ?>');
2175 refreshLoc();
2176 }
2177 else if(success=="false") {
2178- alert('Fout bij sectie verplaatsen');
2179+ alert('<?php echo $t->_('Error moving section'); ?>');
2180 }
2181 else {
2182 alert('FATAL ERROR:'+success);
2183@@ -58,11 +58,11 @@
2184 down: function(site,id) {
2185 success=ajax.get('?control=addons&site='+site+'&aref=col1&function=move&id='+id+'&move=down');
2186 if(success=="true") {
2187- alert('Sectie verplaatst');
2188+ alert('<?php echo $t->_('Section moved down'); ?>');
2189 refreshLoc();
2190 }
2191 else if(success=="false") {
2192- alert('Fout bij sectieverplaatsen');
2193+ alert('<?php echo $t->_('Error moving section'); ?>');
2194 }
2195 else {
2196 alert('FATAL ERROR:'+success);
2197@@ -72,11 +72,11 @@
2198 add: function(site) {
2199 success=ajax.get('?control=addons&site='+site+'&aref=col1&function=new');
2200 if(success=="true") {
2201- alert('Sectie gemaakt');
2202+ alert('<?php echo $t->_('New section created'); ?>');
2203 refreshLoc();
2204 }
2205 else if(success=="false") {
2206- alert('Fout bij sectie maken');
2207+ alert('<?php echo $t->_('Error creating section'); ?>');
2208 }
2209 else {
2210 alert('FATAL ERROR:'+success);
2211@@ -90,11 +90,11 @@
2212 if(cont.value!=cont.getAttribute('orig_val')) {
2213 success=ajax.get('?control=addons&site='+site+'&aref=col1&function=edit_rights&id='+id+'&rights='+cont.value);
2214 if(success=="true") {
2215- alert('Toegangsrechten opgeslaan');
2216+ alert('<?php echo $t->_('Access rights saved'); ?>');
2217 refreshLoc();
2218 }
2219 else if(success=="false") {
2220- alert('Fout bij toegangsrechten opslaan');
2221+ alert('<?php echo $t->_('Error saving access rights'); ?>');
2222 }
2223 else {
2224 alert('FATAL ERROR:'+success);
2225@@ -110,12 +110,11 @@
2226 expand: function(site,id,cont,orig_rights) {
2227 inputbox=cont;
2228 HTML='<select orig_val=\''+orig_rights+'\' orig_html=\''+inputbox.innerHTML+'\' onblur=col1.edit_rights.func(\''+site+'\',\''+id+'\',this)><option value=\'0\'';
2229- if(orig_rights==0) { HTML+=' selected';}
2230- HTML+='>Iedereen</option><option value=\'1\'';
2231+ HTML+='><?php echo $t->_('Everyone'); ?></option><option value=\'1\'';
2232 if(orig_rights==1) { HTML+=' selected'; }
2233- HTML+='>Gebruikers</option><option value=\'2\'';
2234+ HTML+='><?php echo $t->_('Users'); ?></option><option value=\'2\'';
2235 if(orig_rights==2) { HTML+=' selected'; }
2236- HTML+='>Verborgen</option></select>';
2237+ HTML+='><?php echo $t->_('Hidden'); ?></option></select>';
2238 inputbox.innerHTML=HTML;
2239 inputbox.getElementsByTagName('select')[0].focus();
2240 }
2241
2242=== modified file 'scripts/col3_scripts.js'
2243--- scripts/col3_scripts.js 2010-12-15 20:29:36 +0000
2244+++ scripts/col3_scripts.js 2011-01-11 19:52:14 +0000
2245@@ -5,11 +5,11 @@
2246 if(cont.value!=cont.getAttribute('orig_val')) {
2247 success=ajax.get('?control=addons&site='+site+'&aref=col3&function=edit_title&id='+id+'&title='+cont.value);
2248 if(success=="true") {
2249- alert('Titel opgeslaan');
2250+ alert('<?php echo $t->_('Title saved'); ?>');
2251 refreshLoc();
2252 }
2253 else if(success=="false") {
2254- alert('Fout bij titel opslaan');
2255+ alert('<?php echo $t->_('Error saving title'); ?>');
2256 }
2257 else {
2258 alert('FATAL ERROR:'+success);
2259@@ -31,11 +31,11 @@
2260 delete: function(site,id) {
2261 success=ajax.get('?control=addons&site='+site+'&aref=col3&function=delete&id='+id);
2262 if(success=="true") {
2263- alert('Sectie gewist');
2264+ alert('<?php echo $t->_('Section deleted'); ?>');
2265 refreshLoc();
2266 }
2267 else if(success=="false") {
2268- alert('Fout bij sectie wissen');
2269+ alert('<?php echo $t->_('Error deleting section'); ?>');
2270 }
2271 else {
2272 alert('FATAL ERROR:'+success);
2273@@ -45,11 +45,11 @@
2274 up: function(site,id) {
2275 success=ajax.get('?control=addons&site='+site+'&aref=col3&function=move&id='+id+'&move=up');
2276 if(success=="true") {
2277- alert('Sectie verplaatst');
2278+ alert('<?php echo $t->_('Section moved up'); ?>');
2279 refreshLoc();
2280 }
2281 else if(success=="false") {
2282- alert('Fout bij sectie verplaatsen');
2283+ alert('<?php echo $t->_('Error moving section'); ?>');
2284 }
2285 else {
2286 alert('FATAL ERROR:'+success);
2287@@ -58,11 +58,11 @@
2288 down: function(site,id) {
2289 success=ajax.get('?control=addons&site='+site+'&aref=col3&function=move&id='+id+'&move=down');
2290 if(success=="true") {
2291- alert('Sectie verplaatst');
2292+ alert('<?php echo $t->_('Section moved down'); ?>');
2293 refreshLoc();
2294 }
2295 else if(success=="false") {
2296- alert('Fout bij sectieverplaatsen');
2297+ alert('<?php echo $t->_('Error moving section'); ?>');
2298 }
2299 else {
2300 alert('FATAL ERROR:'+success);
2301@@ -72,11 +72,11 @@
2302 add: function(site) {
2303 success=ajax.get('?control=addons&site='+site+'&aref=col3&function=new');
2304 if(success=="true") {
2305- alert('Sectie gemaakt');
2306+ alert('<?php echo $t->_('New section created'); ?>');
2307 refreshLoc();
2308 }
2309 else if(success=="false") {
2310- alert('Fout bij sectie maken');
2311+ alert('<?php echo $t->_('Error creating section'); ?>');
2312 }
2313 else {
2314 alert('FATAL ERROR:'+success);
2315@@ -90,11 +90,11 @@
2316 if(cont.value!=cont.getAttribute('orig_val')) {
2317 success=ajax.get('?control=addons&site='+site+'&aref=col3&function=edit_rights&id='+id+'&rights='+cont.value);
2318 if(success=="true") {
2319- alert('Toegangsrechten opgeslaan');
2320+ alert('<?php echo $t->_('Access rights saved'); ?>');
2321 refreshLoc();
2322 }
2323 else if(success=="false") {
2324- alert('Fout bij toegangsrechten opslaan');
2325+ alert('<?php echo $t->_('Error saving access rights'); ?>');
2326 }
2327 else {
2328 alert('FATAL ERROR:'+success);
2329@@ -110,12 +110,11 @@
2330 expand: function(site,id,cont,orig_rights) {
2331 inputbox=cont;
2332 HTML='<select orig_val=\''+orig_rights+'\' orig_html=\''+inputbox.innerHTML+'\' onblur=col3.edit_rights.func(\''+site+'\',\''+id+'\',this)><option value=\'0\'';
2333- if(orig_rights==0) { HTML+=' selected';}
2334- HTML+='>Iedereen</option><option value=\'1\'';
2335+ HTML+='><?php echo $t->_('Everyone'); ?></option><option value=\'1\'';
2336 if(orig_rights==1) { HTML+=' selected'; }
2337- HTML+='>Gebruikers</option><option value=\'2\'';
2338+ HTML+='><?php echo $t->_('Users'); ?></option><option value=\'2\'';
2339 if(orig_rights==2) { HTML+=' selected'; }
2340- HTML+='>Verborgen</option></select>';
2341+ HTML+='><?php echo $t->_('Hidden'); ?></option></select>';
2342 inputbox.innerHTML=HTML;
2343 inputbox.getElementsByTagName('select')[0].focus();
2344 }
2345
2346=== modified file 'scripts/create_site_scripts.js'
2347--- scripts/create_site_scripts.js 2010-12-25 22:00:55 +0000
2348+++ scripts/create_site_scripts.js 2011-01-11 19:52:14 +0000
2349@@ -10,11 +10,11 @@
2350 _post+='&author='+form.author.value;
2351 success=ajax.post('?control=create_site',_post);
2352 if(success=='true') {
2353- alert('Site aangemaakt');
2354+ alert('<?php echo $t->_('Site created'); ?>');
2355 refreshLoc();
2356 }
2357 else if(success=='false') {
2358- alert('Fout bij site aanmaken');
2359+ alert('<?php echo $t->_('Error creating site'); ?>');
2360 }
2361 else {
2362 alert('FATAL ERROR: '+success);
2363
2364=== modified file 'scripts/db_scripts.js'
2365--- scripts/db_scripts.js 2010-12-25 22:00:55 +0000
2366+++ scripts/db_scripts.js 2011-01-11 19:52:14 +0000
2367@@ -24,7 +24,7 @@
2368 _post+='&register_db=1';
2369 success=ajax.post('?control=database',_post);
2370 if(success=='true') {
2371- alert('Database geregistreerd');
2372+ alert('<?php echo $t->_('New database registered'); ?>');
2373 refreshLoc();
2374 }
2375 else if(success.substr(0,5)=='false') {
2376@@ -33,7 +33,7 @@
2377 for(i=0;i<errors.length;i++) {
2378 errors_con+="\n"+errors[i];
2379 }
2380- alert('Fout bij database registreren:'+errors_con);
2381+ alert('<?php echo $t->_('Error registering database'); ?>:'+errors_con);
2382 }
2383 else {
2384 alert('FATAL ERROR: '+success);
2385
2386=== modified file 'scripts/filemanager_scripts.js'
2387--- scripts/filemanager_scripts.js 2010-12-15 20:29:36 +0000
2388+++ scripts/filemanager_scripts.js 2011-01-11 19:52:14 +0000
2389@@ -21,7 +21,7 @@
2390 form=elem.parentNode;
2391 success=ajax.post('?control=addons&site='+site+'&aref=filemanager&action=edit&path='+path,'content='+form.content.value);
2392 if(success=="true") {
2393- alert('Bestand opgeslaan');
2394+ alert('<?php echo $t->_('File saved'); ?>');
2395 }
2396 else {
2397 success=success.split('|');
2398@@ -50,7 +50,7 @@
2399 form=elem
2400 success=ajax.post('?control=addons&site='+site+'&aref=filemanager&action=rename&path='+path,'newname='+form.newname.value);
2401 if(success=="true") {
2402- alert('Bestand verplaatst');
2403+ alert('<?php echo $t->_('File moved'); ?>');
2404 }
2405 else {
2406 success=success.split('|');
2407@@ -66,7 +66,7 @@
2408 form=elem
2409 success=ajax.post('?control=addons&site='+site+'&aref=filemanager&action=copy&path='+path,'dest='+form.dest.value);
2410 if(success=="true") {
2411- alert('Bestand gekop&iuml;eerd');
2412+ alert('<?php echo $t->_('File copied'); ?>');
2413 }
2414 else {
2415 success=success.split('|');
2416@@ -82,7 +82,7 @@
2417 form=elem
2418 success=ajax.post('?control=addons&site='+site+'&aref=filemanager&action=chgrp&path='+path,'grp='+form.grp.value);
2419 if(success=="true") {
2420- alert('Bestand gechgrped');
2421+ alert('<?php echo $t->_('Changed file group'); ?>');
2422 openLoc('','?control=addons&site='+site+'&aref=filemanager&path='+dirname('/'+path),site+'_ctrls_filemanager');
2423 }
2424 else {
2425@@ -99,7 +99,7 @@
2426 form=elem
2427 success=ajax.post('?control=addons&site='+site+'&aref=filemanager&action=chown&path='+path,'user='+form.user.value);
2428 if(success=="true") {
2429- alert('Bestand gechowned');
2430+ alert('<?php echo $t->_('Changed file owner'); ?>');
2431 openLoc('','?control=addons&site='+site+'&aref=filemanager&path='+dirname('/'+path),site+'_ctrls_filemanager');
2432 }
2433 else {
2434@@ -116,7 +116,7 @@
2435 form=elem
2436 success=ajax.post('?control=addons&site='+site+'&aref=filemanager&action=chmod&path='+path,'mod='+form.mod.value);
2437 if(success=="true") {
2438- alert('Bestand gechmodded');
2439+ alert('<?php echo $t->_('Changed file permissions'); ?>');
2440 openLoc('','?control=addons&site='+site+'&aref=filemanager&path='+dirname('/'+path),site+'_ctrls_filemanager');
2441 }
2442 else {
2443
2444=== modified file 'scripts/news_scripts.js'
2445--- scripts/news_scripts.js 2010-12-15 20:29:36 +0000
2446+++ scripts/news_scripts.js 2011-01-11 19:52:14 +0000
2447@@ -5,11 +5,11 @@
2448 if(cont.value!=cont.getAttribute('orig_val')) {
2449 success=ajax.get('?control=addons&site='+site+'&aref=news&function=edit_title&id='+id+'&title='+cont.value);
2450 if(success=="true") {
2451- alert('Titel opgeslaan');
2452+ alert('<?php echo $t->_('Title saved'); ?>');
2453 refreshLoc();
2454 }
2455 else if(success=="false") {
2456- alert('Fout bij titel opslaan');
2457+ alert('<?php echo $t->_('Error saving title'); ?>');
2458 }
2459 else {
2460 alert('FATAL ERROR:'+success);
2461@@ -33,11 +33,11 @@
2462 if(cont.value!=cont.getAttribute('orig_val')) {
2463 success=ajax.get('?control=addons&site='+site+'&aref=news&function=edit_date&id='+id+'&date='+cont.value);
2464 if(success=="true") {
2465- alert('Datum opgeslaan');
2466+ alert('<?php echo $t->_('Date saved'); ?>');
2467 refreshLoc();
2468 }
2469 else if(success=="false") {
2470- alert('Fout bij datum opslaan');
2471+ alert('<?php echo $t->_('Error saving date'); ?>');
2472 }
2473 else {
2474 alert('FATAL ERROR:'+success);
2475@@ -57,14 +57,14 @@
2476 }
2477 },
2478 delete: function(site,id) {
2479- if(confirm('Nieuwsbericht wissen?')) {
2480+ if(confirm('<?php echo $t->_('Are you sure you want to delete this announcement?'); ?>')) {
2481 success=ajax.get('?control=addons&site='+site+'&aref=news&function=delete&id='+id);
2482 if(success=="true") {
2483- alert('Bericht gewist');
2484+ alert('<?php echo $t->_('Announcement deleted'); ?>');
2485 refreshLoc();
2486 }
2487 else if(success=="false") {
2488- alert('Fout bij bericht wissen');
2489+ alert('<?php echo $t->_('Error deleting announcement'); ?>');
2490 }
2491 else {
2492 alert('FATAL ERROR:'+success);
2493@@ -74,11 +74,11 @@
2494 add: function(site) {
2495 success=ajax.get('?control=addons&site='+site+'&aref=news&function=new');
2496 if(success=="true") {
2497- alert('Bericht gemaakt');
2498+ alert('<?php echo $t->_('New announcement created'); ?>');
2499 refreshLoc();
2500 }
2501 else if(success=="false") {
2502- alert('Fout bij bericht maken');
2503+ alert('<?php echo $t->_('Error creating announcement'); ?>');
2504 }
2505 else {
2506 alert('FATAL ERROR:'+success);
2507
2508=== modified file 'scripts/site_control_scripts.js'
2509--- scripts/site_control_scripts.js 2010-12-15 20:29:36 +0000
2510+++ scripts/site_control_scripts.js 2011-01-11 19:52:14 +0000
2511@@ -4,11 +4,11 @@
2512 install: function(site,ref) {
2513 success=ajax.get('?control=addons&site='+site+'&function=install&a='+ref);
2514 if(success=="true") {
2515- alert('Addon geïnstalleerd');
2516+ alert('<?php echo $t->_('Addon installed'); ?>');
2517 refreshLoc();
2518 }
2519 else if(success=="false") {
2520- alert('Fout bij addon installeren');
2521+ alert('<?php echo $t->_('Error installing addon'); ?>');
2522 }
2523 else {
2524 alert('FATAL ERROR:'+success);
2525@@ -17,11 +17,11 @@
2526 uninstall: function(site,ref) {
2527 success=ajax.get('?control=addons&site='+site+'&function=uninstall&a='+ref);
2528 if(success=="true") {
2529- alert('Addon gedeïnstalleerd');
2530+ alert('<?php echo $t->_('Addon uninstalled'); ?>');
2531 refreshLoc();
2532 }
2533 else if(success=="false") {
2534- alert('Fout bij addon deïnstalleren');
2535+ alert('<?php echo $t->_('Error uninstalling addon'); ?> ');
2536 }
2537 else {
2538 alert('FATAL ERROR:'+success);
2539@@ -34,11 +34,11 @@
2540 if(cont.value!=cont.getAttribute('orig_val')) {
2541 success=ajax.get('?control=addons&site='+site+'&function=editlvl&user='+user+'&lvl='+cont.value);
2542 if(success=="true") {
2543- alert('Niveau opgeslaan');
2544+ alert('<?php echo $t->_('Userlevel saved'); ?>');
2545 refreshLoc();
2546 }
2547 else if(success=="false") {
2548- alert('Fout bij niveau opslaan');
2549+ alert('<?php echo $t->_('Error saving userlevel'); ?>');
2550 }
2551 else {
2552 alert('FATAL ERROR:'+success);
2553@@ -57,19 +57,18 @@
2554 newhtml+=ajax.get('?control=addons&site='+site+'&function=userlvls');
2555 newhtml+='</select>';
2556 selectbox.innerHTML=newhtml;
2557- //inputbox.innerHTML='<input type=\'text\' value=\''+inputbox.innerHTML+'\' orig_val=\''+inputbox.innerHTML+'\'onblur=admin.edit_level.func(\''+user+'\',this)>';
2558 selectbox.getElementsByTagName('select')[0].focus();
2559 }
2560 },
2561 add: function(site,cont) {
2562- user=cont.parentNode.getElementsByTagName('input')[0].value;
2563+ user=cont.parentNode.parentNode.getElementsByTagName('input')[0].value;
2564 success=ajax.post('?control=addons&site='+site+'&function=adduser','username='+user);
2565 if(success=="true") {
2566- alert('Gebruiker toegevoegd');
2567+ alert('<?php echo $t->_('User added'); ?>');
2568 refreshLoc();
2569 }
2570 else if(success=="false") {
2571- alert('Fout bij gebruiker toevoegen');
2572+ alert('<?php echo $t->_('Error adding user'); ?>');
2573 }
2574 else {
2575 alert('FATAL ERROR:'+success);
2576@@ -78,11 +77,11 @@
2577 delete: function(site,user) {
2578 success=ajax.post('?control=addons&site='+site+'&function=deleteuser','username='+user);
2579 if(success=="true") {
2580- alert('Gebruiker gewist');
2581+ alert('<?php echo $t->_('User removed'); ?>');
2582 refreshLoc();
2583 }
2584 else if(success=="false") {
2585- alert('Fout bij gebruiker wissen');
2586+ alert('<?php echo $t->_('Error removing user'); ?>');
2587 }
2588 else {
2589 alert('FATAL ERROR:'+success);
2590@@ -93,11 +92,11 @@
2591 if(cont.value!=cont.getAttribute('orig_val')) {
2592 success=ajax.get('?control=addons&site='+site+'&function=edittitle&user='+user+'&title='+cont.value);
2593 if(success=="true") {
2594- alert('Titel opgeslaan');
2595+ alert('<?php echo $t->_('Title saved'); ?>');
2596 refreshLoc();
2597 }
2598 else if(success=="false") {
2599- alert('Fout bij titel opslaan');
2600+ alert('<?php echo $t->_('Error saving title'); ?>');
2601 }
2602 else {
2603 alert('FATAL ERROR:'+success);
2604@@ -123,14 +122,11 @@
2605 delete: function(site) {
2606 success=ajax.get('?control=addons&site='+site+'&function=deletesite');
2607 if(success=="true") {
2608- alert('Site gewist');
2609- if(confirm('RemoteCP moet ververst worden.\nNu vernieuwen?')) {
2610- location.reload();
2611- }
2612+ alert('<?php echo $t->_('Site deleted'); ?>');
2613 refreshLoc();
2614 }
2615 else if(success=="false") {
2616- alert('Fout bij site wissen');
2617+ alert('<?php echo $t->_('Error deleting site'); ?>');
2618 }
2619 else {
2620 alert('FATAL ERROR:'+success);
2621
2622=== modified file 'scripts/slideshow_scripts.js'
2623--- scripts/slideshow_scripts.js 2010-12-15 20:29:36 +0000
2624+++ scripts/slideshow_scripts.js 2011-01-11 19:52:14 +0000
2625@@ -6,11 +6,11 @@
2626 if(cont.value!=cont.getAttribute('orig_val')) {
2627 success=ajax.get('?control=addons&site='+site+'&aref=slideshow&function=edit_title&id='+id+'&title='+cont.value);
2628 if(success=="true") {
2629- alert('Titel opgeslaan');
2630+ alert('<?php echo $t->_('Title saved'); ?>');
2631 refreshLoc();
2632 }
2633 else if(success=="false") {
2634- alert('Fout bij titel opslaan');
2635+ alert('<?php echo $t->_('Error saving title'); ?>');
2636 }
2637 else {
2638 alert('FATAL ERROR:'+success);
2639@@ -32,11 +32,11 @@
2640 delete: function(site,id) {
2641 success=ajax.get('?control=addons&site='+site+'&aref=slideshow&function=delete&id='+id);
2642 if(success=="true") {
2643- alert('Diavoorstelling gewist');
2644+ alert('<?php echo $t->_('Slideshow deleted'); ?>');
2645 refreshLoc();
2646 }
2647 else if(success=="false") {
2648- alert('Fout bij diavoorstelling wissen');
2649+ alert('<?php echo $t->_('Error deleting slideshow'); ?>');
2650 }
2651 else {
2652 alert('FATAL ERROR:'+success);
2653@@ -47,11 +47,11 @@
2654 if(cont.value!=cont.getAttribute('orig_val')) {
2655 success=ajax.get('?control=addons&site='+site+'&aref=slideshow&function=edit_root&id='+id+'&root='+cont.value);
2656 if(success=="true") {
2657- alert('Bron opgeslaan\n Vergeet niet de afbeeldingen te verplaatsen');
2658+ alert('<?php echo $t->_('Main folder saved'); ?>');
2659 refreshLoc();
2660 }
2661 else if(success=="false") {
2662- alert('Fout bij bron opslaan');
2663+ alert('<?php echo $t->_('Error saving main folder'); ?>');
2664 }
2665 else {
2666 alert('FATAL ERROR:'+success);
2667@@ -73,11 +73,11 @@
2668 add: function(site) {
2669 success=ajax.get('?control=addons&site='+site+'&aref=slideshow&function=new');
2670 if(success=="true") {
2671- alert('Diavoostelling gemaakt');
2672+ alert('<?php echo $t->_('New slideshow created'); ?>');
2673 refreshLoc();
2674 }
2675 else if(success=="false") {
2676- alert('Fout bij diavoostelling maken');
2677+ alert('<?php echo $t->_('Error creating slideshow'); ?>');
2678 }
2679 else {
2680 alert('FATAL ERROR:'+success);
2681@@ -94,11 +94,11 @@
2682 alert(id+'\n'+cont.value);
2683 success=ajax.get('?control=addons&site='+site+'&aref=slideshow&function=image_edit_title&id='+id+'&title='+cont.value);
2684 if(success=="true") {
2685- alert('Titel opgeslaan');
2686+ alert('<?php echo $t->_('Title saved'); ?>');
2687 slideshow.image.edit_title.collapse(cont);
2688 }
2689 else if(success=="false") {
2690- alert('Fout bij titel opslaan');
2691+ alert('<?php echo $t->_('Error saving title'); ?>');
2692 }
2693 else {
2694 alert('FATAL ERROR:'+success);
2695@@ -120,11 +120,11 @@
2696 delete: function(site,id) {
2697 success=ajax.get('?control=addons&site='+site+'&aref=slideshow&function=image_delete&id='+id);
2698 if(success=="true") {
2699- alert('Afbeeldingscontainer gewist');
2700+ alert('<?php echo $t->_('Picture deleted'); ?>');
2701 refreshLoc();
2702 }
2703 else if(success=="false") {
2704- alert('Fout bij afbeeldingscontainer wissen');
2705+ alert('<?php echo $t->_('Error deleting picture'); ?>');
2706 }
2707 else {
2708 alert('FATAL ERROR:'+success);
2709@@ -133,11 +133,11 @@
2710 add: function(site,ssid) {
2711 success=ajax.get('?control=addons&site='+site+'&aref=slideshow&function=image_new&ssid='+ssid);
2712 if(success=="true") {
2713- alert('Afbeeldingscontainer gemaakt');
2714+ alert('<?php echo $t->_('Picture created'); ?>');
2715 refreshLoc();
2716 }
2717 else if(success=="false") {
2718- alert('Fout bij afbeeldingscontainer maken');
2719+ alert('<?php echo $t->_('Error creating picture'); ?>');
2720 }
2721 else {
2722 alert('FATAL ERROR:'+success);
2723@@ -146,18 +146,17 @@
2724 scandir: function (site,ssid) {
2725 success=ajax.get('?control=addons&site='+site+'&aref=slideshow&function=image_scandir&ssid='+ssid);
2726 if(success=="true") {
2727- alert('Map gescand en afbeeldingen ingevoegd');
2728+ alert('<?php echo $t->_('Folder scanned and images added'); ?>');
2729 refreshLoc();
2730 }
2731 else if(success=="false") {
2732- alert('Fout bij map scannen');
2733+ alert('<?php echo $t->_('Error scanning folder'); ?>');
2734 }
2735 else {
2736 alert('FATAL ERROR:'+success);
2737 }
2738 },
2739 edit_info: function(site,id) {
2740- //alert('x-js-error: slideshow.image.edit_info()\nfunction disabeled\nx-js-error-reason: under dev');
2741 //window.open('?control=addons&site='+site+'&aref=slideshow&function=mce&id='+id);
2742 window.open('?control=addons&site='+site+'&aref=slideshow&function=image_detail&id='+id);
2743 }
2744
2745=== removed file 'trans/NL-nl.mo'
2746Binary files trans/NL-nl.mo 2011-01-08 11:31:21 +0000 and trans/NL-nl.mo 1970-01-01 00:00:00 +0000 differ
2747=== modified file 'trans/main.pot'
2748--- trans/main.pot 2011-01-08 11:31:21 +0000
2749+++ trans/main.pot 2011-01-11 19:52:14 +0000
2750@@ -352,3 +352,208 @@
2751 msgid "Too Short"
2752 msgstr ""
2753
2754+msgid "Name"
2755+msgstr ""
2756+
2757+msgid "Action"
2758+msgstr ""
2759+
2760+msgid "Off"
2761+msgstr ""
2762+
2763+msgid "Turn addon off"
2764+msgstr ""
2765+
2766+msgid "On"
2767+msgstr ""
2768+
2769+msgid "Turn addon on"
2770+msgstr ""
2771+
2772+msgid "Revoke user privileges"
2773+msgstr ""
2774+
2775+msgid "Add"
2776+msgstr ""
2777+
2778+msgid "Add user"
2779+msgstr ""
2780+
2781+msgid "Add new user"
2782+msgstr ""
2783+
2784+msgid "Delete site"
2785+msgstr ""
2786+
2787+msgid "Delete all site content and the site itself"
2788+msgstr ""
2789+
2790+msgid "Link path"
2791+msgstr ""
2792+
2793+msgid "Link"
2794+msgstr ""
2795+
2796+msgid "Down"
2797+msgstr ""
2798+
2799+msgid "Move the page down"
2800+msgstr ""
2801+
2802+msgid "Up"
2803+msgstr ""
2804+
2805+msgid "Move the page up"
2806+msgstr ""
2807+
2808+msgid "Visible"
2809+msgstr ""
2810+
2811+msgid "Make page invisible"
2812+msgstr ""
2813+
2814+msgid "Delete section"
2815+msgstr ""
2816+
2817+msgid "Move section down"
2818+msgstr ""
2819+
2820+msgid "Move section up"
2821+msgstr ""
2822+
2823+msgid "Edit"
2824+msgstr ""
2825+
2826+msgid "Edit section content"
2827+msgstr ""
2828+
2829+msgid "Other page"
2830+msgstr ""
2831+
2832+msgid "Move this section to another page"
2833+msgstr ""
2834+
2835+msgid "Add a section to this page"
2836+msgstr ""
2837+
2838+msgid "Add page"
2839+msgstr ""
2840+
2841+msgid "Add link"
2842+msgstr ""
2843+
2844+msgid "Invisible"
2845+msgstr ""
2846+
2847+msgid "Make page visible"
2848+msgstr ""
2849+
2850+msgid "Saved"
2851+msgstr ""
2852+
2853+msgid "Delete page"
2854+msgstr ""
2855+
2856+msgid "Add section"
2857+msgstr ""
2858+
2859+msgid "Index of"
2860+msgstr ""
2861+
2862+msgid "Folder"
2863+msgstr ""
2864+
2865+msgid "File"
2866+msgstr ""
2867+
2868+msgid "Create"
2869+msgstr ""
2870+
2871+msgid "Upload"
2872+msgstr ""
2873+
2874+msgid "Rights"
2875+msgstr ""
2876+
2877+msgid "Owner"
2878+msgstr ""
2879+
2880+msgid "Group"
2881+msgstr ""
2882+
2883+msgid "Last edited"
2884+msgstr ""
2885+
2886+msgid "Size"
2887+msgstr ""
2888+
2889+msgid "Chmod"
2890+msgstr ""
2891+
2892+msgid "Chown"
2893+msgstr ""
2894+
2895+msgid "Chgrp"
2896+msgstr ""
2897+
2898+msgid "Rename"
2899+msgstr ""
2900+
2901+msgid "Copy"
2902+msgstr ""
2903+
2904+msgid "Folder already exists"
2905+msgstr ""
2906+
2907+#NEWS ADDON
2908+
2909+msgid "New announcement"
2910+msgstr ""
2911+
2912+msgid "Delete announcement"
2913+msgstr ""
2914+
2915+msgid "Edit announcement"
2916+msgstr ""
2917+
2918+#SLIDESHOW ADDON
2919+
2920+msgid "Delete slideshow"
2921+msgstr ""
2922+
2923+msgid "Edit slideshow"
2924+msgstr ""
2925+
2926+msgid "Add slideshow"
2927+msgstr ""
2928+
2929+msgid "Slideshows"
2930+msgstr ""
2931+
2932+msgid "Image"
2933+msgstr ""
2934+
2935+msgid "Add image"
2936+msgstr ""
2937+
2938+msgid "Scan folder for images"
2939+msgstr ""
2940+
2941+msgid "New image"
2942+msgstr ""
2943+
2944+msgid "Delete image"
2945+msgstr ""
2946+
2947+msgid "Edit image info"
2948+msgstr ""
2949+
2950+msgid "Save"
2951+msgstr ""
2952+
2953+msgid "New slideshow"
2954+msgstr ""
2955+
2956+msgid "Error while saving"
2957+msgstr ""
2958+

Subscribers

People subscribed via source and target branches

to all changes: