+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ * require_once 'ProgressBar.class.php';
+ * $bar = new ProgressBar();
+ * $bar->setMessage("Let's talk to the user!");
+ *
+ * $bar->initialize(3); //initialize the bar with the total number of elements to process
+ *
+ * //do something time consuming here...
+ * $bar->increase(); //call for first element
+ *
+ * //do something time consuming here...
+ * $bar->increase(); //call for second element
+ * $bar->setMessage("Tell the user what you are doing!");
+ *
+ * //do something time consuming here...
+ * $bar->increase(); //call for third element. end of bar...
+ *
+ *
+ * @changes
+ * Version 1.2
+ * - added method setMessage() to change the message at runtime (JavaScript)
+ * - minor changes in HTML-code
+ * - refactoring: added new setter-methods
+ *
+ * Version 1.1: Use $bar->stop(true) stop the bar instantly at any time.
+ *
+ */
+
+defined( '_JEXEC' ) or die( 'Restricted access-class' );
+
+class ProgressBar {
+ /**
+ * Flag for class initialization.
+ * @param bool $initialized true=class initialized
+ */
+ private $initialized;
+
+ /**
+ * Flag for start of the progress bar.
+ * @started bool $started true=progress bar has been started.
+ */
+ private $started;
+
+ /**
+ * Flag for the end of the progress bar.
+ * @param bool $finished true=progress bar has reached the end.
+ */
+ private $finished;
+
+ private $firstStep;
+
+ /**
+ * Constructor
+ *
+ * @param str $message Message shown above the bar eg. "Please wait...". Default: ''
+ * @param bool $hide Hide the bar after completion (with JavaScript).
+ * Default: false
+ * @param int $sleepOnFinish Seconds to sleep after bar completion. Default: 0
+ * @param int $barLength Length in pixels. Default: 200
+ * @param int $precision Desired number of steps to show. Default: 20. Precision will become $numElements when greater than $numElements. $barLength will increase if $precision is greater than $barLength.
+ * @param str $backgroundColor Color of the bar background
+ * @param str $foregroundColor Color of the actual progress-bar
+ * @param str $domID Html-Attribute "id" for the bar
+ * @param str $stepElement Element the bar is build from
+ */
+ function ProgressBar($message='', $hide=false, $sleepOnFinish=0, $barLength=300, $precision=20,
+ $backgroundColor='#cccccc', $foregroundColor='blue', $domID='progressbar',
+ $stepElement='')
+ {
+ global $pb_instance;
+ $this->instance = $pb_instance++;
+
+ $this->setAutohide($hide);
+ $this->setSleepOnFinish($sleepOnFinish);
+ $this->setDomIDs($domID);
+ $this->setMessage($message);
+ $this->setStepElement($stepElement);
+ $this->setPrecision($precision);
+ $this->setBackgroundColor($backgroundColor);
+ $this->setForegroundColor($foregroundColor);
+ $this->setBarLength($barLength);
+
+ //Initialization
+ $this->initialized = false;
+ $this->started = false;
+ $this->finished = false;
+ $this->firstStep = null;
+ }
+
+
+ /**
+ * Print the empty progress bar
+ * @param int $numElements Number of Elements to be processed and number of times $bar->initialize() will be called while processing
+ */
+ function initialize($numElements)
+ {
+ //increase time limit if allowed
+ if(!ini_get('safe_mode')){
+ set_time_limit(0);
+ }
+
+ $this->StepCount = 0;
+ $this->CallCount = 0;
+
+ $numElements = (int) $numElements ;
+
+ if($numElements == 0){
+ $numElements = 1;
+ }
+
+ //calculate the number of calls for one step
+ $this->CallsPerStep = ceil(($numElements/$this->precision)); // eg. 1000/200 = 100
+
+ //calculate the total number of steps
+ if($numElements >= $this->CallsPerStep){
+ $this->numSteps = round($numElements/$this->CallsPerStep);
+ }else{
+ $this->numSteps = round($numElements);
+ }
+
+ //calculate the length of one step
+ $this->stepLength = floor($this->barLength/$this->numSteps); // eg. 100/10 = 10
+
+ //the rest is the first step
+ $this->rest = $this->barLength-($this->stepLength*$this->numSteps);
+
+ if($this->rest > 0){
+ $this->firstStep = $this->getStep($this->rest);
+ }
+
+ //build bar background
+ $backgroundLength = $this->rest+($this->stepLength*$this->numSteps);
+ $this->backgroundBar = sprintf($this->stepElement,$backgroundLength,$this->backgroundColor);
+
+ //stop buffering (only when a buffer is active)
+ if (count(ob_list_handlers()) != 0) {
+ ob_end_flush();
+ }
+
+ //start buffering
+ ob_start();
+
+ echo '';
+ ob_flush();
+ flush();
+
+ //sleep x seconds before ending the script
+ if(!$error){
+ if($this->sleepOnFinish > 0){
+ sleep($this->sleepOnFinish);
+ }
+
+ //hide the bar
+ if($this->hide){
+ echo '';
+ ob_flush();
+ flush();
+ }
+ }
+ $this->finished = true;
+ }
+
+ function setMessage($text)
+ {
+ if($this->initialized){
+ echo '';
+ ob_flush();flush();
+ }else{
+ $this->message = $text;
+ }
+ }
+
+ function setAutohide($hide)
+ {
+ $this->hide = (bool) $hide;
+ }
+
+ function setSleepOnFinish($sleepOnFinish)
+ {
+ $this->sleepOnFinish = (int) $sleepOnFinish;
+ }
+
+ function setDomIDs($domID)
+ {
+ $this->domID = strip_tags($domID).$this->instance;
+ $this->domIDMessage = $this->domID.'_message';
+ }
+
+ function setStepElement($stepElement)
+ {
+ $this->stepElement = $stepElement;
+ }
+
+ function setBarLength($barLength)
+ {
+ $this->barLength = (int) $barLength;
+
+ if($this->barLength < $this->precision){
+ $this->barLength = $this->precision;
+ }
+ }
+
+ function setPrecision($precision)
+ {
+ $this->precision = (int) $precision;
+ }
+
+ function setBackgroundColor($color)
+ {
+ $this->backgroundColor = strip_tags($color);
+ }
+
+ function setForegroundColor($color)
+ {
+ $this->foregroundColor = strip_tags($color);
+ }
+
+ function getStep($length=null)
+ {
+ if($length==null){
+ $length = $this->stepLength;
+ }
+ return sprintf($this->stepElement,$length,$this->foregroundColor);
+ }
+}
+?>
\ No newline at end of file
diff --git a/oss/joomla/trunk/administrator/components/com_jdownloads/admin.jdownloads.html.php b/oss/joomla/trunk/administrator/components/com_jdownloads/admin.jdownloads.html.php
index cbc54327..6f57cbda 100644
--- a/oss/joomla/trunk/administrator/components/com_jdownloads/admin.jdownloads.html.php
+++ b/oss/joomla/trunk/administrator/components/com_jdownloads/admin.jdownloads.html.php
@@ -315,7 +315,8 @@ function categoriesEdit($option, $row, $inputbox_pic, $access_box, $last_dir_ent
-
+
+
@@ -730,6 +731,39 @@ echo $pane->startPanel(JText::_('JLIST_BACKEND_FILESEDIT_TABTITLE_2'),'daten2');
+ | + |
+
+ + + |
+
+ + |
+ + |
+ |
| @@ -2876,7 +3024,7 @@ echo $pane->startPanel(JText::_('JLIST_BACKEND_SETTINGS_TABTEXT_FRONTEND'),'fron |
- + '.JText::_('JLIST_BACKEND_SETTINGS_FRONTEND_HEADER_DESC2');?> |
|
- + |
||
- + |
@@ -2910,13 +3058,13 @@ echo $pane->startPanel(JText::_('JLIST_BACKEND_SETTINGS_TABTEXT_FRONTEND'),'fron | |
- + |
||
@@ -2976,7 +3124,42 @@ echo $pane->startPanel(JText::_('JLIST_BACKEND_SETTINGS_TABTEXT_FRONTEND'),'fron |
||
+ + |
+
+ + + |
+ |
+ + |
+
+ + + |
+ |
+ + |
+
+ + + |
+
+ |
+ |
+
+ + + |
+ |
@@ -3003,7 +3186,7 @@ echo $pane->startPanel(JText::_('JLIST_BACKEND_SETTINGS_TABTEXT_FRONTEND'),'fron |
||
@@ -3021,7 +3204,8 @@ echo $pane->startPanel(JText::_('JLIST_BACKEND_SETTINGS_TABTEXT_FRONTEND'),'fron |
- ||
startPanel(JText::_('JLIST_BACKEND_SETTINGS_TABTEXT_FRONTEND'),'fron |
||
+ + |
+ + + | +|
- + |
@@ -4077,7 +4276,7 @@ echo $pane->startPanel(JText::_('JLIST_BACKEND_SETTINGS_TABTEXT_SPECIALS'),'spec | |||||||
- + |
@@ -4088,6 +4287,52 @@ echo $pane->startPanel(JText::_('JLIST_BACKEND_SETTINGS_TABTEXT_SPECIALS'),'spec |
|||||||
| + | ||||||||
+
|
+ ||||||||
'.JText::_('JLIST_BACKEND_AUTOCHECK_TITLE').'';
+ echo '
|
| '.JText::_('JLIST_BACKEND_AUTOCHECK_LOG_TITLE').' '.$log_message.' |
| '.JText::_('JLIST_BACKEND_AUTOCHECK_TITLE').' | '; if ($new_files > 0){ - echo ''.$new_files.' '.JText::_('JLIST_BACKEND_AUTOCHECK_NEW_FILES').' '.JText::_('JLIST_BACKEND_AUTOCHECK_REFRESH_MESSAGE').' | ';
+ echo ''.$new_files.' '.JText::_('JLIST_BACKEND_AUTOCHECK_NEW_FILES').' '.JText::_('JLIST_BACKEND_AUTOCHECK_REFRESH_MESSAGE').' | ';
} else {
- echo ''.JText::_('JLIST_BACKEND_AUTOCHECK_NO_NEW_FILES').' | '; + echo ''.JText::_('JLIST_BACKEND_AUTOCHECK_NO_NEW_FILES').' | '; } if ($mis_files > 0){ - echo ''.$mis_files.' '.JText::_('JLIST_BACKEND_AUTOCHECK_MISSING_FILES').' '.JText::_('JLIST_BACKEND_AUTOCHECK_REFRESH_MESSAGE').' |
| '.JText::_('JLIST_BACKEND_AUTOCHECK_LOG_TITLE').' '.$log_message.' |
| '.JText::_('JLIST_BACKEND_AUTOCHECK_TITLE').' | '; if ($new_cats_create > 0){ - echo ''.$new_cats_create.' '.JText::_('JLIST_BACKEND_AUTOCHECK_NEW_CATS').' '.JText::_('JLIST_BACKEND_AUTOCHECK_REFRESH_MESSAGE').' | ';
+ echo ''.$new_cats_create.' '.JText::_('JLIST_BACKEND_AUTOCHECK_NEW_CATS').' '.JText::_('JLIST_BACKEND_AUTOCHECK_REFRESH_MESSAGE').' | ';
} else {
- echo ''.JText::_('JLIST_BACKEND_AUTOCHECK_NO_NEW_CATS').' | '; + echo ''.JText::_('JLIST_BACKEND_AUTOCHECK_NO_NEW_CATS').' | '; } if ($mis_cats > 0){ - echo ''.$mis_cats.' '.JText::_('JLIST_BACKEND_AUTOCHECK_MISSING_CATS').' '.JText::_('JLIST_BACKEND_AUTOCHECK_REFRESH_MESSAGE').' |
| '.JText::_('JLIST_BACKEND_AUTOCHECK_LOG_TITLE').' '.$log_message.' |
 - |
-
|
+ ; ?>components/com_jdownloads/images/jdownloads.jpg) + |
+
+ |
| '.JText::_('JLIST_BACKEND_AUTOCHECK_TITLE').' '; + if ($new_cats_create > 0){ + echo ''.$new_cats_create.' '.JText::_('JLIST_BACKEND_AUTOCHECK_NEW_CATS').' '; + } else { + echo ''.JText::_('JLIST_BACKEND_AUTOCHECK_NO_NEW_CATS').' '; + } + + if ($new_files > 0){ + echo ''.$new_files.' '.JText::_('JLIST_BACKEND_AUTOCHECK_NEW_FILES').' '; + } else { + echo ''.JText::_('JLIST_BACKEND_AUTOCHECK_NO_NEW_FILES').' '; + } + + if ($mis_cats > 0){ + echo ''.$mis_cats.' '.JText::_('JLIST_BACKEND_AUTOCHECK_MISSING_CATS').' '; + } else { + echo ''.JText::_('JLIST_BACKEND_AUTOCHECK_NO_MISSING_CATS').' '; + } + + if ($mis_files > 0){ + echo ''.$mis_files.' '.JText::_('JLIST_BACKEND_AUTOCHECK_MISSING_FILES').' |
| '.JText::_('JLIST_BACKEND_AUTOCHECK_LOG_TITLE').' '.$log_message.' |
下载目录和子目录内容未被卸载！
' - .'文件夹 images/jdownloads/ 未被卸载！
' - .'' - .'
如有必要，请手工删除JDownloads相关的数据表。
' - .'否则，你仅可安装更新版本。
'; - echo $msg; +function com_uninstall() { + + $msg = ''; + $msg = 'The download folder and all subfolders still exists!
' + .'Folder images/jdownloads/ still exists!
' + .'All jDownloads database tables still exist!
' + .'Please delete it (them) manually, if you want.
' + .'Otherwise you can now also install a newer version, when it is available.
'; + echo $msg; } ?> \ No newline at end of file diff --git a/oss/joomla/trunk/administrator/language/en-GB/_notes/dwsync.xml b/oss/joomla/trunk/administrator/language/en-GB/_notes/dwsync.xml deleted file mode 100644 index 2c932028..00000000 --- a/oss/joomla/trunk/administrator/language/en-GB/_notes/dwsync.xml +++ /dev/null @@ -1,8 +0,0 @@ - -This is a graphical example of frontend category description display. The dark red border indicates the area you can change the display for here.
JLIST_BACKEND_SETTINGS_TEMPLATES_FILES=Layout: Files -JLIST_BACKEND_SETTINGS_TEMPLATES_FILES_DESC=This is how files are displayed in the frontend.Example for displaying the list in frontend. Inside the red box you can edit the displaying options.
JLIST_BACKEND_SETTINGS_TEMPLATES_FINAL=Layout: Summary / Start download -JLIST_BACKEND_SETTINGS_TEMPLATES_FINAL_DESC=This is the frontend summary display. A list of selected files is presented to the user before downloading.This is a graphical example of this page in the frontend. The dark red border indicates the area you can change the display from here.
@@ -278,7 +278,7 @@ JLIST_BACKEND_FILESLIST_SEARCH_LIMIT=Limit JLIST_BACKEND_FILESLIST_CATS=All Categories JLIST_BACKEND_FILESLIST_NOCATS=No Category JLIST_BACKEND_FILESLIST_FILE=Downloads -JLIST_BACKEND_FILESLIST_HITS=Number of Downloads +JLIST_BACKEND_FILESLIST_HITS=Downloaded JLIST_BACKEND_FILESLIST_CAT=Category JLIST_BACKEND_FILESLIST_RELEASE=Version @@ -337,7 +337,7 @@ JLIST_BACKEND_FILESEDIT_RELEASE=Version JLIST_BACKEND_FILESEDIT_SIZE=Size JLIST_BACKEND_FILESEDIT_SIZE_DESC=If no choice, the size will be set automatically if possible. -JLIST_BACKEND_FILESEDIT_DADDED=Date and time +JLIST_BACKEND_FILESEDIT_DADDED=Added to the download archive (Date and time) JLIST_BACKEND_FILESEDIT_DADDED_DESC=Define the date in the following format: YYYY-MM-DD H:mm:ss or use the calendar function. When omitted the current date-time is used automatically JLIST_BACKEND_FILESEDIT_FILE=Select file for upload JLIST_BACKEND_FILESEDIT_FILE_DESC=In this field you can assign a file name for the file transferred to the server. This file name will be used for downloading.Graphical example of this page in the frontend. The dark red border indicates the area you can change the display from here.
@@ -877,7 +877,7 @@ JLIST_BACKEND_SETTINGS_FAUTO_HEADER_TITLE=Monitoring of the download folders # NEW OPTION AUTOPUBLISH NEW FOUNDED FILES JLIST_BACKEND_SETTINGS_DOWNLOADS_AUTOPUBLISH_TITLE=Automatically publish downloads? -JLIST_BACKEND_SETTINGS_DOWNLOADS_AUTOPUBLISH_DESC=If Yes, newly found files are published immediately. It is assumed the above option is enabled.